diff options
| -rw-r--r-- | manpages/de/live-boot.de.7 | 8 | ||||
| -rw-r--r-- | manpages/de/persistence.conf.de.5 (renamed from manpages/de/live-persistence.conf.de.5) | 56 | ||||
| -rw-r--r-- | manpages/en/live-boot.7 | 8 | ||||
| -rw-r--r-- | manpages/en/persistence.conf.5 (renamed from manpages/en/live-persistence.conf.5) | 20 | ||||
| -rw-r--r-- | manpages/es/live-boot.es.7 | 10 | ||||
| -rw-r--r-- | manpages/es/persistence.conf.es.5 (renamed from manpages/es/live-persistence.conf.es.5) | 46 | ||||
| -rw-r--r-- | manpages/po/de/live-boot.7.po | 46 | ||||
| -rw-r--r-- | manpages/po/de/persistence.conf.5.po (renamed from manpages/po/de/live-persistence.conf.5.po) | 206 | ||||
| -rw-r--r-- | manpages/po/es/live-boot.7.po | 56 | ||||
| -rw-r--r-- | manpages/po/es/persistence.conf.5.po (renamed from manpages/po/es/live-persistence.conf.5.po) | 252 | ||||
| -rw-r--r-- | manpages/po4a.cfg | 2 | ||||
| -rw-r--r-- | manpages/pot/live-boot.7.pot | 44 | ||||
| -rw-r--r-- | manpages/pot/persistence.conf.5.pot (renamed from manpages/pot/live-persistence.conf.5.pot) | 204 | ||||
| -rwxr-xr-x | scripts/boot/9990-aaa-fixme.sh | 2 | ||||
| -rwxr-xr-x | scripts/boot/9990-misc-helpers.sh | 2 |
15 files changed, 477 insertions, 485 deletions
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index d2b0e5f..0c77340 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 26.09.2012 3.0~b3\-1 "Debian Live Project" +.TH LIVE\-BOOT 7 27.09.2012 3.0~b3\-1 "Debian Live Project" .SH NAME \fBlive\-boot\fP \- System Boot Scripts @@ -180,7 +180,7 @@ This parameter enables usage of local swap partitions. live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" -(see \fIlive\-persistence.conf\fP(5)). Overlay image files have extensions which +(see \fIpersistence.conf\fP(5)). Overlay image files have extensions which determines their filesystem, e.g. "persistence.ext4". .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 This option determines which types of encryption that we allow to be used @@ -263,10 +263,10 @@ loaded in alphanumeric order. .IP \fB/etc/live/boot/*\fP 4 .IP \fBlive/boot.conf\fP 4 .IP \fBlive/boot/*\fP 4 -.IP \fBlive\-persistence.conf\fP 4 +.IP \fBpersistence.conf\fP 4 .SH "SEE ALSO" -\fIlive\-persistence.conf\fP(5) +\fIpersistence.conf\fP(5) .PP \fIlive\-build\fP(7) .PP diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/persistence.conf.de.5 index f160b4e..18e6b4f 100644 --- a/manpages/de/live-persistence.conf.de.5 +++ b/manpages/de/persistence.conf.de.5 @@ -3,22 +3,21 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 26.09.2012 3.0~b3\-1 "Debian Live Project" +.TH LIVE\-BOOT conf 27.09.2012 3.0~b3\-1 "Debian Live Project" .SH NAME -\fBlive\-persistence.conf\fP \- Configuration file for persistence media in -live\-boot +\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot .SH DESCRIPTION If live\-boot probes a persistence volume with the label (or GPT name, or file name, but from now on we will just say "label") "persistence", that -volume's persistence is fully customizable through the -\fBlive\-persistence.conf\fP file stored on the root of its file system. Any -such labeled volume must have such a file, or it will be ignored. +volume's persistence is fully customizable through the \fBpersistence.conf\fP +file stored on the root of its file system. Any such labeled volume must +have such a file, or it will be ignored. .PP -The format of \fBlive\-persistence.conf\fP allows empty lines and lines starting -with a "#" (used for comments), both which will be ignored. A so called -"custom mount" has the format: +The format of \fBpersistence.conf\fP allows empty lines and lines starting with +a "#" (used for comments), both which will be ignored. A so called "custom +mount" has the format: .PP .RS \fIDIR\fP [\fIOPTION\fP]... @@ -39,14 +38,14 @@ be changed through the use of \fIOPTION\fPs. All custom mounts will be done in an order so that no two custom mounts can "hide" each other. For instance, if we have the two \fIDIR\fP:s /a and /a/b it would always be the case that /a is mounted first, then /a/b. This remains -true no matter how the lines in \fBlive\-persistence.conf\fP are ordered, or if -several \fBlive\-persistence.conf\fP files on different persistence media are -used at the same time. However, it is forbidden for custom mounts to have -their source directory inside the source directory of another custom mount, -so the source directories that are auto\-created by live\-boot does not -support "nested" mounts like /a and /a/b on the same media. In this case you -must use the \fBsource\fP option (see below) to make sure that they are stored -in different source directories. +true no matter how the lines in \fBpersistence.conf\fP are ordered, or if +several \fBpersistence.conf\fP files on different persistence media are used at +the same time. However, it is forbidden for custom mounts to have their +source directory inside the source directory of another custom mount, so the +source directories that are auto\-created by live\-boot does not support +"nested" mounts like /a and /a/b on the same media. In this case you must +use the \fBsource\fP option (see below) to make sure that they are stored in +different source directories. .PP When a source directory doesn't exist on the persistence media for a certain custom mount, it will be created automatically, and permissions and @@ -56,8 +55,8 @@ on the persistence media. The bootstrapping will not happen when the \fBlink\fP or \fBunion\fP options are used (see below). .SH OPTIONS -Custom mounts defined in \fBlive\-persistence.conf\fP accept the following -options in a coma\-separated list: +Custom mounts defined in \fBpersistence.conf\fP accept the following options in +a coma\-separated list: .IP \fBsource\fP=\fIPATH\fP 4 When given, store the persistence changes into \fIPATH\fP on the persistence media. \fIPATH\fP must be a relative path (with respect to the persistence @@ -100,15 +99,14 @@ supported with \fBunion=unionmount\fP. .SH DIRECTORIES .IP \fB/live/persistence\fP 4 All persistence volumes will be mounted here (in a directory corresponding -to the device name). The \fBlive\-persistence.conf\fP file can easily be edited +to the device name). The \fBpersistence.conf\fP file can easily be edited through this mount, as well as any source directories (which is especially practical for custom mounts using the \fBlink\fP option). .SH EXAMPLES -Let's say we have a persistence volume \fIVOL\fP with the a -\fBlive\-persistence.conf\fP file containing the following four lines (numbered -for ease of reference): +Let's say we have a persistence volume \fIVOL\fP with the a \fBpersistence.conf\fP +file containing the following four lines (numbered for ease of reference): .TP 7 1. /home/user1 link,source=config\-files/user1 @@ -171,10 +169,10 @@ Link: c) .PP One could argue, though, that lines 1 and 2 in the example -\fBlive\-persistence.conf\fP file above are unnecessary since line 3 already -would make all of /home persistent. The \fBlink\fP option is intended for -situations where you don't want a complete directory to be persistent, only -certain files in it or its sub\-directories. +\fBpersistence.conf\fP file above are unnecessary since line 3 already would +make all of /home persistent. The \fBlink\fP option is intended for situations +where you don't want a complete directory to be persistent, only certain +files in it or its sub\-directories. .PP Line 4 can be mounted at any time since its \fIDIR\fP (and source directory) is completely disjoint from all the other custom mounts. When mounted, @@ -205,5 +203,5 @@ writing a mail to the Debian Live mailing list at <\fIdebian\-live@lists.debian.org\fP>. .SH AUTHOR -live\-persistence.conf was written by anonym <\fIanonym@lavabit.com\fP> -for the Debian project. +persistence.conf was written by anonym <\fIanonym@lavabit.com\fP> for +the Debian project. diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 8fd08a4..8871abb 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2012\-09\-26 3.0~b3-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2012\-09\-27 3.0~b3-1 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts @@ -109,7 +109,7 @@ This parameters allows to set a custom ramdisk size (it's the '\-o size' option .IP "\fBswapon\fR" 4 This parameter enables usage of local swap partitions. .IP "\fBpersistence\fR" 4 -live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" (see \fIlive-persistence.conf\fR(5)). Overlay image files have extensions which determines their filesystem, e.g. "persistence.ext4". +live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" (see \fIpersistence.conf\fR(5)). Overlay image files have extensions which determines their filesystem, e.g. "persistence.ext4". .IP "\fBpersistence\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4 This option determines which types of encryption that we allow to be used when probing devices for persistence media. If "none" is in the list, we allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none". .IP "\fBpersistence\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4 @@ -151,10 +151,10 @@ This optional file (inside the live media) contains a list of white\-space or ca .IP "\fB/etc/live/boot/*\fR" 4 .IP "\fBlive/boot.conf\fR" 4 .IP "\fBlive/boot/*\fR" 4 -.IP "\fBlive-persistence.conf\fR" 4 +.IP "\fBpersistence.conf\fR" 4 .SH SEE ALSO -\fIlive-persistence.conf\fR(5) +\fIpersistence.conf\fR(5) .PP \fIlive\-build\fR(7) .PP diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/persistence.conf.5 index 92fa09f..cb5503b 100644 --- a/manpages/en/live-persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,17 +1,17 @@ -.TH LIVE\-BOOT conf 2012\-09\-26 3.0~b3-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-09\-27 3.0~b3-1 "Debian Live Project" .SH NAME -\fBlive-persistence.conf\fR \- Configuration file for persistence media in +\fBpersistence.conf\fR \- Configuration file for persistence media in live\-boot .SH DESCRIPTION If live-boot probes a persistence volume with the label (or GPT name, or file name, but from now on we will just say "label") "persistence", that volume's persistence is fully customizable through the -\fBlive-persistence.conf\fR file stored on the root of its file system. Any such +\fBpersistence.conf\fR file stored on the root of its file system. Any such labeled volume must have such a file, or it will be ignored. .PP -The format of \fBlive-persistence.conf\fR allows empty lines and lines starting +The format of \fBpersistence.conf\fR allows empty lines and lines starting with a "#" (used for comments), both which will be ignored. A so called "custom mount" has the format: .PP @@ -37,7 +37,7 @@ All custom mounts will be done in an order so that no two custom mounts can "hide" each other. For instance, if we have the two \fIDIR\fR:s /a and /a/b it would always be the case that /a is mounted first, then /a/b. This remains true no matter how the lines in -\fBlive-persistence.conf\fR are ordered, or if several \fBlive-persistence.conf\fR files +\fBpersistence.conf\fR are ordered, or if several \fBpersistence.conf\fR files on different persistence media are used at the same time. However, it is forbidden for custom mounts to have their source directory inside the source directory of another custom mount, so the source @@ -55,7 +55,7 @@ bootstrapping will not happen when the \fBlink\fR or \fBunion\fR options are used (see below). .SH OPTIONS -Custom mounts defined in \fBlive-persistence.conf\fR accept the following +Custom mounts defined in \fBpersistence.conf\fR accept the following options in a coma-separated list: .IP "\fBsource\fR=\fIPATH\fR" 4 When given, store the persistence changes into \fIPATH\fR on the @@ -102,7 +102,7 @@ live-boot's \fBunion\fR boot parameter, but is not supported with .SH DIRECTORIES .IP "\fB/live/persistence\fR" 4 All persistence volumes will be mounted here (in a directory -corresponding to the device name). The \fBlive-persistence.conf\fR file can +corresponding to the device name). The \fBpersistence.conf\fR file can easily be edited through this mount, as well as any source directories (which is especially practical for custom mounts using the \fBlink\fR option). @@ -110,7 +110,7 @@ easily be edited through this mount, as well as any source directories .SH EXAMPLES Let's say we have a persistence volume \fIVOL\fR with the a -\fBlive-persistence.conf\fR file containing the following four lines (numbered +\fBpersistence.conf\fR file containing the following four lines (numbered for ease of reference): .TP 7 1. @@ -174,7 +174,7 @@ Link: (from c) .PP One could argue, though, that lines 1 and 2 in the example -\fBlive-persistence.conf\fR file above are unnecessary since line 3 already +\fBpersistence.conf\fR file above are unnecessary since line 3 already would make all of /home persistent. The \fBlink\fR option is intended for situations where you don't want a complete directory to be persistent, only certain files in it or its sub-directories. @@ -209,5 +209,5 @@ package in the Debian Bug Tracking System at Live mailing list at <\fIdebian-live@lists.debian.org\fR>. .SH AUTHOR -live\-persistence.conf was written by anonym <\fIanonym@lavabit.com\fR> for the +persistence.conf was written by anonym <\fIanonym@lavabit.com\fR> for the Debian project. diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index ce14d4d..b35d1a5 100644 --- a/manpages/es/live-boot.es.7 +++ b/manpages/es/live-boot.es.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 26.09.2012 3.0~b3\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT 7 27.09.2012 3.0~b3\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-boot\fP \- Scripts de Arranque del Sistema @@ -191,8 +191,8 @@ live\-boot buscará dispositivos con "persistence". Estos pueden ser particiones (con el nombre GPT correcto), sistemas de ficheros (con la etiqueta correcta) o ficheros imagen (con el nombre de fichero correcto). Los overlays tienen la etiqueta/nombre "persistence" (ver -\fIlive\-persistence.conf\fP(5)). Los ficheros imagen overlay tienen extensiones -que determinan su sistema de ficheros, por ejemplo, "persistence.ext4". +\fIpersistence.conf\fP(5)). Los ficheros imagen overlay tienen extensiones que +determinan su sistema de ficheros, por ejemplo, "persistence.ext4". .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 Esta opción determina qué tipo de cifrado se usa cuando se prueban los dispositivos de los medios con persistencia. Si se especifica "none" en la @@ -282,10 +282,10 @@ alfanumérico. .IP \fB/etc/live/boot/*\fP 4 .IP \fBlive/boot.conf\fP 4 .IP \fBlive/boot.d/*\fP 4 -.IP \fBlive\-persistence.conf\fP 4 +.IP \fBpersistence.conf\fP 4 .SH "VER ADEMÁS" -\fIlive\-persistence.conf\fP(5) +\fIpersistence.conf\fP(5) .PP \fIlive\-build\fP(7) .PP diff --git a/manpages/es/live-persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 757363e..52cd84f 100644 --- a/manpages/es/live-persistence.conf.es.5 +++ b/manpages/es/persistence.conf.es.5 @@ -3,23 +3,23 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 26.09.2012 3.0~b3\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT conf 27.09.2012 3.0~b3\-1 "Proyecto Debian Live" .SH NOMBRE -\fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento -con persistencia en live\-boot +\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con +persistencia en live\-boot .SH DESCRIPCIÓN Si live\-boot prueba un volumen persistente con la etiqueta (o nombre GPT, o nombre de fichero, aunque a partir de este momento nos referiremos a él como simplemente "etiqueta") "persistence", la persistencia de ese volumen es -completamente personalizable a través del fichero \fBlive\-persistence.conf\fP +completamente personalizable a través del fichero \fBpersistence.conf\fP almacenado en la raíz de su sistema de ficheros. Cualquier volumen esa etiqueta debe tener uno de esos ficheros, o si no será ignorado. .PP -El formato de \fBlive\-persistence.conf\fP permite añadir líneas vacias o líneas -que comiencen por "#" (usado para los comentarios), ambos serán -ignorados. Un "montaje personalizado" tiene el formato: +El formato de \fBpersistence.conf\fP permite añadir líneas vacias o líneas que +comiencen por "#" (usado para los comentarios), ambos serán ignorados. Un +"montaje personalizado" tiene el formato: .PP .RS \fIDIR\fP [\fIOPTION\fP]... @@ -43,10 +43,10 @@ Todos los montajes personalizados serán montados en orden de tal manera que dos montajes personalizados no se "escondan" uno al otro. Por ejemplo, si tenemos los dos \fIDIR\fP:s /a y /a/b siempre /a será montado en primer lugar, después /a/b. Esto siempre es así sin importar el orden en que aparezcan las -líneas en \fBlive\-persistence.conf\fP o incluso si se usan varios ficheros -\fBlive\-persistence.conf\fP en medios persistentes distintos al mismo -tiempo. Sin embargo, no está permitido que un montaje personalizado tenga su -directorio de origen en el interior del directorio de origen de otro montaje +líneas en \fBpersistence.conf\fP o incluso si se usan varios ficheros +\fBpersistence.conf\fP en medios persistentes distintos al mismo tiempo. Sin +embargo, no está permitido que un montaje personalizado tenga su directorio +de origen en el interior del directorio de origen de otro montaje personalizado, ya que los directorios de origen que live\-boot crea automáticamente no tienen soporte para montajes "anidados" como /a y /a/b en el mismo medio. En este caso se debe usar la opción \fBsource\fP (ver debajo) @@ -61,8 +61,8 @@ persistencia. La preinstalación no se realiza cuando se utilizan las opciones \fBlink\fP o \fBunion\fP (ver debajo). .SH OPCIONES -Los montajes personalizados definidos en \fBlive\-persistence.conf\fP aceptan -las siguientes opciones en una lista separada por comas: +Los montajes personalizados definidos en \fBpersistence.conf\fP aceptan las +siguientes opciones en una lista separada por comas: .IP \fBsource\fP=\fIPATH\fP 4 Cuando se especifica, se guardan los cambios persistentes en \fIPATH\fP en los medios con persistencia. \fIPATH\fP debe ser una ruta relativa (respecto a la @@ -112,16 +112,16 @@ tiene soporte si se utiliza \fBunion=unionmount\fP. .SH DIRECTORIOS .IP \fB/live/persistence\fP 4 Aquí se montarán todos los volumenes persistentes (en un directorio que -corresponda con el nombre del dispositivo). El fichero -\fBlive\-persistence.conf\fP se puede editar fácilmente a través de este -montaje, así como cualquier directorio de origen (esto resulta especialmente -práctico para los montajes personalizados usando la opción \fBlink\fP). +corresponda con el nombre del dispositivo). El fichero \fBpersistence.conf\fP +se puede editar fácilmente a través de este montaje, así como cualquier +directorio de origen (esto resulta especialmente práctico para los montajes +personalizados usando la opción \fBlink\fP). .SH EJEMPLOS Si tenemos un volumen con persistencia \fIVOL\fP con un fichero -\fBlive\-persistence.conf\fP que contiene las cuatro lineas siguientes -(numeradas para una mejor referencia): +\fBpersistence.conf\fPque contiene las cuatro lineas siguientes (numeradas para +una mejor referencia): .TP 7 1. /home/user1 link,source=config\-files/user1 @@ -184,8 +184,8 @@ Enlace: /home/user2/.ssh/config \-> \fIVOL\fP/config\-files/user2/.ssh/config (de c) .PP Se podría decir, sin embargo, que las líneas 1 y 2 en el fichero de ejemplo -\fBlive\-persistence.conf\fP anterior son innecesarias ya que la línea 3 ya -crearía el directorio /home persistente. La opción \fBlink\fP se utiliza en +\fBpersistence.conf\fP anterior son innecesarias ya que la línea 3 ya crearía +el directorio /home persistente. La opción \fBlink\fP se utiliza en situaciones en las que no se desea guardar de forma persistente un directorio completo, sino únicamente algunos ficheros o subdirectorios incluidos en él. @@ -221,5 +221,5 @@ correo de Debian Live a la dirección <\fIdebian\-live@lists.debian.org\fP>. .SH AUTOR -live\-persistence.conf fue escrito por anonym <\fIanonym@lavabit.com\fP> -para el proyecto Debian. +persistence.conf fue escrito por anonym <\fIanonym@lavabit.com\fP> para +el proyecto Debian. diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index 0369a03..837a24b 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot 3.0~b3-1\n" -"POT-Creation-Date: 2012-09-26 14:38+0300\n" +"POT-Creation-Date: 2012-09-27 10:58+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann <daniel@debian.org>\n" "Language-Team: none\n" @@ -16,31 +16,31 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "LIVE-BOOT" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2012-09-26" -msgstr "26.09.2012" +msgid "2012-09-27" +msgstr "27.09.2012" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "3.0~b3-1" msgstr "3.0~b3-1" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "Debian Live Project" msgstr "" #. type: SH -#: en/live-boot.7:3 en/live-persistence.conf.5:3 +#: en/live-boot.7:3 en/persistence.conf.5:3 #, no-wrap msgid "NAME" msgstr "" @@ -51,7 +51,7 @@ msgid "B<live-boot> - System Boot Scripts" msgstr "" #. type: SH -#: en/live-boot.7:6 en/live-persistence.conf.5:7 +#: en/live-boot.7:6 en/persistence.conf.5:7 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -137,7 +137,7 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:28 en/live-persistence.conf.5:57 +#: en/live-boot.7:28 en/persistence.conf.5:57 #, no-wrap msgid "OPTIONS" msgstr "" @@ -573,8 +573,8 @@ msgid "" "live-boot will probe devices for persistence media. These can be partitions " "(with the correct GPT name), filesystems (with the correct label) or image " "files (with the correct file name). Overlays are labeled/named \"persistence" -"\" (see I<live-persistence.conf>(5)). Overlay image files have extensions " -"which determines their filesystem, e.g. \"persistence.ext4\"." +"\" (see I<persistence.conf>(5)). Overlay image files have extensions which " +"determines their filesystem, e.g. \"persistence.ext4\"." msgstr "" #. type: IP @@ -839,43 +839,43 @@ msgstr "" #. type: IP #: en/live-boot.7:154 #, no-wrap -msgid "B<live-persistence.conf>" +msgid "B<persistence.conf>" msgstr "" #. type: SH -#: en/live-boot.7:156 en/live-persistence.conf.5:191 +#: en/live-boot.7:156 en/persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text #: en/live-boot.7:158 -msgid "I<live-persistence.conf>(5)" +msgid "I<persistence.conf>(5)" msgstr "" #. type: Plain text -#: en/live-boot.7:160 en/live-persistence.conf.5:195 +#: en/live-boot.7:160 en/persistence.conf.5:195 msgid "I<live-build>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:162 en/live-persistence.conf.5:197 +#: en/live-boot.7:162 en/persistence.conf.5:197 msgid "I<live-config>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:164 en/live-persistence.conf.5:199 +#: en/live-boot.7:164 en/persistence.conf.5:199 msgid "I<live-tools>(7)" msgstr "" #. type: SH -#: en/live-boot.7:165 en/live-persistence.conf.5:200 +#: en/live-boot.7:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:167 en/live-persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -883,13 +883,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:168 en/live-persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:170 en/live-persistence.conf.5:210 +#: en/live-boot.7:170 en/persistence.conf.5:210 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -898,7 +898,7 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:171 en/live-persistence.conf.5:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "" diff --git a/manpages/po/de/live-persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po index 539eede..000363b 100644 --- a/manpages/po/de/live-persistence.conf.5.po +++ b/manpages/po/de/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot 3.0~b3-1\n" -"POT-Creation-Date: 2012-09-26 14:38+0300\n" +"POT-Creation-Date: 2012-09-27 10:49+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann <daniel@debian.org>\n" "Language-Team: none\n" @@ -16,76 +16,76 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "LIVE-BOOT" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2012-09-26" -msgstr "26.09.2012" +msgid "2012-09-27" +msgstr "27.09.2012" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "3.0~b3-1" msgstr "3.0~b3-1" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "Debian Live Project" msgstr "" #. type: SH -#: en/live-boot.7:3 en/live-persistence.conf.5:3 +#: en/live-boot.7:3 en/persistence.conf.5:3 #, no-wrap msgid "NAME" msgstr "" #. type: SH -#: en/live-boot.7:6 en/live-persistence.conf.5:7 +#: en/live-boot.7:6 en/persistence.conf.5:7 #, no-wrap msgid "DESCRIPTION" msgstr "" #. type: SH -#: en/live-boot.7:28 en/live-persistence.conf.5:57 +#: en/live-boot.7:28 en/persistence.conf.5:57 #, no-wrap msgid "OPTIONS" msgstr "" #. type: SH -#: en/live-boot.7:156 en/live-persistence.conf.5:191 +#: en/live-boot.7:156 en/persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:160 en/live-persistence.conf.5:195 +#: en/live-boot.7:160 en/persistence.conf.5:195 msgid "I<live-build>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:162 en/live-persistence.conf.5:197 +#: en/live-boot.7:162 en/persistence.conf.5:197 msgid "I<live-config>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:164 en/live-persistence.conf.5:199 +#: en/live-boot.7:164 en/persistence.conf.5:199 msgid "I<live-tools>(7)" msgstr "" #. type: SH -#: en/live-boot.7:165 en/live-persistence.conf.5:200 +#: en/live-boot.7:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:167 en/live-persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -93,13 +93,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:168 en/live-persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:170 en/live-persistence.conf.5:210 +#: en/live-boot.7:170 en/persistence.conf.5:210 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -108,50 +108,49 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:171 en/live-persistence.conf.5:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:6 +#: en/persistence.conf.5:6 msgid "" -"B<live-persistence.conf> - Configuration file for persistence media in live-" -"boot" +"B<persistence.conf> - Configuration file for persistence media in live-boot" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:13 +#: en/persistence.conf.5:13 msgid "" "If live-boot probes a persistence volume with the label (or GPT name, or " "file name, but from now on we will just say \"label\") \"persistence\", that " -"volume's persistence is fully customizable through the B<live-persistence." -"conf> file stored on the root of its file system. Any such labeled volume " -"must have such a file, or it will be ignored." +"volume's persistence is fully customizable through the B<persistence.conf> " +"file stored on the root of its file system. Any such labeled volume must " +"have such a file, or it will be ignored." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:17 +#: en/persistence.conf.5:17 msgid "" -"The format of B<live-persistence.conf> allows empty lines and lines starting " -"with a \"#\" (used for comments), both which will be ignored. A so called " +"The format of B<persistence.conf> allows empty lines and lines starting with " +"a \"#\" (used for comments), both which will be ignored. A so called " "\"custom mount\" has the format:" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:20 +#: en/persistence.conf.5:20 msgid "I<DIR> [I<OPTION>]..." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:24 +#: en/persistence.conf.5:24 msgid "" "which roughly translates to \"make I<DIR> persistence in the way described " "by the list of I<OPTION>s\"." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:35 +#: en/persistence.conf.5:35 msgid "" "For each custom mount I<DIR> must be an absolute path that cannot contain " "white spaces or the special . and .. path components, and cannot be /live " @@ -164,23 +163,23 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:48 +#: en/persistence.conf.5:48 msgid "" "All custom mounts will be done in an order so that no two custom mounts can " "\"hide\" each other. For instance, if we have the two I<DIR>:s /a and /a/b " "it would always be the case that /a is mounted first, then /a/b. This " -"remains true no matter how the lines in B<live-persistence.conf> are " -"ordered, or if several B<live-persistence.conf> files on different " -"persistence media are used at the same time. However, it is forbidden for " -"custom mounts to have their source directory inside the source directory of " -"another custom mount, so the source directories that are auto-created by " -"live-boot does not support \"nested\" mounts like /a and /a/b on the same " -"media. In this case you must use the B<source> option (see below) to make " -"sure that they are stored in different source directories." +"remains true no matter how the lines in B<persistence.conf> are ordered, or " +"if several B<persistence.conf> files on different persistence media are used " +"at the same time. However, it is forbidden for custom mounts to have their " +"source directory inside the source directory of another custom mount, so the " +"source directories that are auto-created by live-boot does not support " +"\"nested\" mounts like /a and /a/b on the same media. In this case you must " +"use the B<source> option (see below) to make sure that they are stored in " +"different source directories." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:56 +#: en/persistence.conf.5:56 msgid "" "When a source directory doesn't exist on the persistence media for a certain " "custom mount, it will be created automatically, and permissions and " @@ -191,20 +190,20 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:60 +#: en/persistence.conf.5:60 msgid "" -"Custom mounts defined in B<live-persistence.conf> accept the following " -"options in a coma-separated list:" +"Custom mounts defined in B<persistence.conf> accept the following options in " +"a coma-separated list:" msgstr "" #. type: IP -#: en/live-persistence.conf.5:60 +#: en/persistence.conf.5:60 #, no-wrap msgid "B<source>=I<PATH>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:69 +#: en/persistence.conf.5:69 msgid "" "When given, store the persistence changes into I<PATH> on the persistence " "media. I<PATH> must be a relative path (with respect to the persistence " @@ -217,31 +216,31 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:72 +#: en/persistence.conf.5:72 msgid "" "The following options are mutually exclusive (only the last given one will " "be in effect):" msgstr "" #. type: IP -#: en/live-persistence.conf.5:72 +#: en/persistence.conf.5:72 #, no-wrap msgid "B<bind>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:74 +#: en/persistence.conf.5:74 msgid "Bind-mount the source directory to I<DIR>. This is the default." msgstr "" #. type: IP -#: en/live-persistence.conf.5:74 +#: en/persistence.conf.5:74 #, no-wrap msgid "B<link>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:83 +#: en/persistence.conf.5:83 msgid "" "Create the directory structure of the source directory on the persistence " "media in I<DIR> and create symbolic links from the corresponding place in " @@ -253,7 +252,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:91 +#: en/persistence.conf.5:91 msgid "" "Effectively B<link> will make only files already in the source directory " "persistent, not any other files in I<DIR>. These files must be manually " @@ -264,13 +263,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-persistence.conf.5:91 +#: en/persistence.conf.5:91 #, no-wrap msgid "B<union>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:101 +#: en/persistence.conf.5:101 msgid "" "Save the rw branch of a union on the persistence media, so only the changes " "are stored persistently. This can potentially reduce disk usage compared to " @@ -283,122 +282,121 @@ msgid "" msgstr "" #. type: SH -#: en/live-persistence.conf.5:102 +#: en/persistence.conf.5:102 #, no-wrap msgid "DIRECTORIES" msgstr "" #. type: IP -#: en/live-persistence.conf.5:103 +#: en/persistence.conf.5:103 #, no-wrap msgid "B</live/persistence>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:109 +#: en/persistence.conf.5:109 msgid "" "All persistence volumes will be mounted here (in a directory corresponding " -"to the device name). The B<live-persistence.conf> file can easily be edited " +"to the device name). The B<persistence.conf> file can easily be edited " "through this mount, as well as any source directories (which is especially " "practical for custom mounts using the B<link> option)." msgstr "" #. type: SH -#: en/live-persistence.conf.5:110 +#: en/persistence.conf.5:110 #, no-wrap msgid "EXAMPLES" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:115 +#: en/persistence.conf.5:115 msgid "" -"Let's say we have a persistence volume I<VOL> with the a B<live-persistence." -"conf> file containing the following four lines (numbered for ease of " -"reference):" +"Let's say we have a persistence volume I<VOL> with the a B<persistence.conf> " +"file containing the following four lines (numbered for ease of reference):" msgstr "" #. type: TP -#: en/live-persistence.conf.5:115 en/live-persistence.conf.5:129 +#: en/persistence.conf.5:115 en/persistence.conf.5:129 #, no-wrap msgid "1." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:118 +#: en/persistence.conf.5:118 msgid "/home/user1 link,source=config-files/user1" msgstr "" #. type: TP -#: en/live-persistence.conf.5:118 en/live-persistence.conf.5:133 +#: en/persistence.conf.5:118 en/persistence.conf.5:133 #, no-wrap msgid "2." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:121 +#: en/persistence.conf.5:121 msgid "/home/user2 link,source=config-files/user2" msgstr "" #. type: TP -#: en/live-persistence.conf.5:121 en/live-persistence.conf.5:137 +#: en/persistence.conf.5:121 en/persistence.conf.5:137 #, no-wrap msgid "3." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:124 +#: en/persistence.conf.5:124 msgid "/home" msgstr "" #. type: TP -#: en/live-persistence.conf.5:124 en/live-persistence.conf.5:140 +#: en/persistence.conf.5:124 en/persistence.conf.5:140 #, no-wrap msgid "4." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:127 +#: en/persistence.conf.5:127 msgid "/usr union" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:129 +#: en/persistence.conf.5:129 msgid "The corresponding source directories are:" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:133 +#: en/persistence.conf.5:133 msgid "" "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the " "B<source> option)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:137 +#: en/persistence.conf.5:137 msgid "" "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the " "B<source> option)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:140 +#: en/persistence.conf.5:140 msgid "I<VOL>/home" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:143 +#: en/persistence.conf.5:143 msgid "I<VOL>/usr" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:146 +#: en/persistence.conf.5:146 msgid "" "It was necessary to set the B<source> options for 1 and 2, since they " "otherwise would become nested with 3's source, which is invalid." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:151 +#: en/persistence.conf.5:151 msgid "" "Line 3 will be taken care of before line 1 and 2 in order to prevent custom " "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home " @@ -407,89 +405,89 @@ msgid "" msgstr "" #. type: TP -#: en/live-persistence.conf.5:151 +#: en/persistence.conf.5:151 #, no-wrap msgid "a." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:154 +#: en/persistence.conf.5:154 msgid "I<VOL>/config-files/user1/.emacs" msgstr "" #. type: TP -#: en/live-persistence.conf.5:154 +#: en/persistence.conf.5:154 #, no-wrap msgid "b." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:157 +#: en/persistence.conf.5:157 msgid "I<VOL>/config-files/user2/.bashrc" msgstr "" #. type: TP -#: en/live-persistence.conf.5:157 +#: en/persistence.conf.5:157 #, no-wrap msgid "c." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:160 +#: en/persistence.conf.5:160 msgid "I<VOL>/config-files/user2/.ssh/config" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:162 +#: en/persistence.conf.5:162 msgid "Then the following links and directories will be created:" msgstr "" #. type: TP -#: en/live-persistence.conf.5:162 en/live-persistence.conf.5:165 -#: en/live-persistence.conf.5:171 +#: en/persistence.conf.5:162 en/persistence.conf.5:165 +#: en/persistence.conf.5:171 #, no-wrap msgid "Link:" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:165 +#: en/persistence.conf.5:165 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:168 +#: en/persistence.conf.5:168 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)" msgstr "" #. type: TP -#: en/live-persistence.conf.5:168 +#: en/persistence.conf.5:168 #, no-wrap msgid "Dir:" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:171 +#: en/persistence.conf.5:171 msgid "/homea/user2/.ssh (from c)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:175 +#: en/persistence.conf.5:175 msgid "" "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:181 +#: en/persistence.conf.5:181 msgid "" -"One could argue, though, that lines 1 and 2 in the example B<live-" -"persistence.conf> file above are unnecessary since line 3 already would make " -"all of /home persistent. The B<link> option is intended for situations where " -"you don't want a complete directory to be persistent, only certain files in " -"it or its sub-directories." +"One could argue, though, that lines 1 and 2 in the example B<persistence." +"conf> file above are unnecessary since line 3 already would make all of /" +"home persistent. The B<link> option is intended for situations where you " +"don't want a complete directory to be persistent, only certain files in it " +"or its sub-directories." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:190 +#: en/persistence.conf.5:190 msgid "" "Line 4 can be mounted at any time since its I<DIR> (and source directory) is " "completely disjoint from all the other custom mounts. When mounted, I<VOL>/" @@ -501,13 +499,13 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:193 +#: en/persistence.conf.5:193 msgid "I<live-boot>(7)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:213 +#: en/persistence.conf.5:213 msgid "" -"live-persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> " -"for the Debian project." +"persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> for " +"the Debian project." msgstr "" diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index 3cc4b9c..a9a6931 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot 3.0~b3-1\n" -"POT-Creation-Date: 2012-09-26 14:38+0300\n" +"POT-Creation-Date: 2012-09-27 11:01+0300\n" "PO-Revision-Date: 2012-06-07 20:29+0200\n" "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n" "Language-Team: none\n" @@ -16,31 +16,31 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "LIVE-BOOT" msgstr "LIVE-BOOT" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2012-09-26" -msgstr "26.09.2012" +msgid "2012-09-27" +msgstr "27.09.2012" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "3.0~b3-1" msgstr "3.0~b3-1" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "Debian Live Project" msgstr "Proyecto Debian Live" #. type: SH -#: en/live-boot.7:3 en/live-persistence.conf.5:3 +#: en/live-boot.7:3 en/persistence.conf.5:3 #, no-wrap msgid "NAME" msgstr "NOMBRE" @@ -51,7 +51,7 @@ msgid "B<live-boot> - System Boot Scripts" msgstr "B<live-boot> - Scripts de Arranque del Sistema" #. type: SH -#: en/live-boot.7:6 en/live-persistence.conf.5:7 +#: en/live-boot.7:6 en/persistence.conf.5:7 #, no-wrap msgid "DESCRIPTION" msgstr "DESCRIPCIÓN" @@ -161,7 +161,7 @@ msgstr "" "boot.conf, live/boot/*)." #. type: SH -#: en/live-boot.7:28 en/live-persistence.conf.5:57 +#: en/live-boot.7:28 en/persistence.conf.5:57 #, no-wrap msgid "OPTIONS" msgstr "OPCIONES" @@ -692,15 +692,15 @@ msgid "" "live-boot will probe devices for persistence media. These can be partitions " "(with the correct GPT name), filesystems (with the correct label) or image " "files (with the correct file name). Overlays are labeled/named \"persistence" -"\" (see I<live-persistence.conf>(5)). Overlay image files have extensions " -"which determines their filesystem, e.g. \"persistence.ext4\"." +"\" (see I<persistence.conf>(5)). Overlay image files have extensions which " +"determines their filesystem, e.g. \"persistence.ext4\"." msgstr "" "live-boot buscará dispositivos con \"persistence\". Estos pueden ser " "particiones (con el nombre GPT correcto), sistemas de ficheros (con la " "etiqueta correcta) o ficheros imagen (con el nombre de fichero correcto). " -"Los overlays tienen la etiqueta/nombre \"persistence\" (ver I<live-" -"persistence.conf>(5)). Los ficheros imagen overlay tienen extensiones que " -"determinan su sistema de ficheros, por ejemplo, \"persistence.ext4\"." +"Los overlays tienen la etiqueta/nombre \"persistence\" (ver I<persistence." +"conf>(5)). Los ficheros imagen overlay tienen extensiones que determinan su " +"sistema de ficheros, por ejemplo, \"persistence.ext4\"." #. type: IP #: en/live-boot.7:113 @@ -1027,43 +1027,43 @@ msgstr "B<live/boot.d/*>" #. type: IP #: en/live-boot.7:154 #, no-wrap -msgid "B<live-persistence.conf>" -msgstr "B<live-persistence.conf>" +msgid "B<persistence.conf>" +msgstr "B<persistence.conf>" #. type: SH -#: en/live-boot.7:156 en/live-persistence.conf.5:191 +#: en/live-boot.7:156 en/persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "VER ADEMÁS" #. type: Plain text #: en/live-boot.7:158 -msgid "I<live-persistence.conf>(5)" -msgstr "I<live-persistence.conf>(5)" +msgid "I<persistence.conf>(5)" +msgstr "I<persistence.conf>(5)" #. type: Plain text -#: en/live-boot.7:160 en/live-persistence.conf.5:195 +#: en/live-boot.7:160 en/persistence.conf.5:195 msgid "I<live-build>(7)" msgstr "I<live-build>(7)" #. type: Plain text -#: en/live-boot.7:162 en/live-persistence.conf.5:197 +#: en/live-boot.7:162 en/persistence.conf.5:197 msgid "I<live-config>(7)" msgstr "I<live-config>(7)" #. type: Plain text -#: en/live-boot.7:164 en/live-persistence.conf.5:199 +#: en/live-boot.7:164 en/persistence.conf.5:199 msgid "I<live-tools>(7)" msgstr "I<live-tools>(7)" #. type: SH -#: en/live-boot.7:165 en/live-persistence.conf.5:200 +#: en/live-boot.7:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "PÁGINA WEB" #. type: Plain text -#: en/live-boot.7:167 en/live-persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -1074,13 +1074,13 @@ msgstr "" "E<lt>I<http://live.debian.net/manual/>E<gt>." #. type: SH -#: en/live-boot.7:168 en/live-persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "ERRORES" #. type: Plain text -#: en/live-boot.7:170 en/live-persistence.conf.5:210 +#: en/live-boot.7:170 en/persistence.conf.5:210 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -1093,7 +1093,7 @@ msgstr "" "Live a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>." #. type: SH -#: en/live-boot.7:171 en/live-persistence.conf.5:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" diff --git a/manpages/po/es/live-persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 37f4797..7a9bd4c 100644 --- a/manpages/po/es/live-persistence.conf.5.po +++ b/manpages/po/es/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot 3.0~b3-1\n" -"POT-Creation-Date: 2012-09-26 14:38+0300\n" +"POT-Creation-Date: 2012-09-27 10:54+0300\n" "PO-Revision-Date: 2012-06-07 19:11+0200\n" "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n" "Language-Team: none\n" @@ -15,76 +15,76 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "LIVE-BOOT" msgstr "LIVE-BOOT" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2012-09-26" -msgstr "26.09.2012" +msgid "2012-09-27" +msgstr "27.09.2012" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "3.0~b3-1" msgstr "3.0~b3-1" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "Debian Live Project" msgstr "Proyecto Debian Live" #. type: SH -#: en/live-boot.7:3 en/live-persistence.conf.5:3 +#: en/live-boot.7:3 en/persistence.conf.5:3 #, no-wrap msgid "NAME" msgstr "NOMBRE" #. type: SH -#: en/live-boot.7:6 en/live-persistence.conf.5:7 +#: en/live-boot.7:6 en/persistence.conf.5:7 #, no-wrap msgid "DESCRIPTION" msgstr "DESCRIPCIÓN" #. type: SH -#: en/live-boot.7:28 en/live-persistence.conf.5:57 +#: en/live-boot.7:28 en/persistence.conf.5:57 #, no-wrap msgid "OPTIONS" msgstr "OPCIONES" #. type: SH -#: en/live-boot.7:156 en/live-persistence.conf.5:191 +#: en/live-boot.7:156 en/persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "VER ADEMÁS" #. type: Plain text -#: en/live-boot.7:160 en/live-persistence.conf.5:195 +#: en/live-boot.7:160 en/persistence.conf.5:195 msgid "I<live-build>(7)" msgstr "I<live-build>(7)" #. type: Plain text -#: en/live-boot.7:162 en/live-persistence.conf.5:197 +#: en/live-boot.7:162 en/persistence.conf.5:197 msgid "I<live-config>(7)" msgstr "I<live-config>(7)" #. type: Plain text -#: en/live-boot.7:164 en/live-persistence.conf.5:199 +#: en/live-boot.7:164 en/persistence.conf.5:199 msgid "I<live-tools>(7)" msgstr "I<live-tools>(7)" #. type: SH -#: en/live-boot.7:165 en/live-persistence.conf.5:200 +#: en/live-boot.7:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "PÁGINA WEB" #. type: Plain text -#: en/live-boot.7:167 en/live-persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -95,13 +95,13 @@ msgstr "" "E<lt>I<http://live.debian.net/manual/>E<gt>." #. type: SH -#: en/live-boot.7:168 en/live-persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "ERRORES" #. type: Plain text -#: en/live-boot.7:170 en/live-persistence.conf.5:210 +#: en/live-boot.7:170 en/persistence.conf.5:210 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -114,54 +114,53 @@ msgstr "" "Live a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>." #. type: SH -#: en/live-boot.7:171 en/live-persistence.conf.5:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text -#: en/live-persistence.conf.5:6 +#: en/persistence.conf.5:6 msgid "" -"B<live-persistence.conf> - Configuration file for persistence media in live-" -"boot" +"B<persistence.conf> - Configuration file for persistence media in live-boot" msgstr "" -"B<live-persistence.conf> - Fichero para configurar medios de almacenamiento " -"con persistencia en live-boot" +"B<persistence.conf> - Fichero para configurar medios de almacenamiento con " +"persistencia en live-boot" #. type: Plain text -#: en/live-persistence.conf.5:13 +#: en/persistence.conf.5:13 msgid "" "If live-boot probes a persistence volume with the label (or GPT name, or " "file name, but from now on we will just say \"label\") \"persistence\", that " -"volume's persistence is fully customizable through the B<live-persistence." -"conf> file stored on the root of its file system. Any such labeled volume " -"must have such a file, or it will be ignored." +"volume's persistence is fully customizable through the B<persistence.conf> " +"file stored on the root of its file system. Any such labeled volume must " +"have such a file, or it will be ignored." msgstr "" "Si live-boot prueba un volumen persistente con la etiqueta (o nombre GPT, o " "nombre de fichero, aunque a partir de este momento nos referiremos a él como " "simplemente \"etiqueta\") \"persistence\", la persistencia de ese volumen es " -"completamente personalizable a través del fichero B<live-persistence.conf> " +"completamente personalizable a través del fichero B<persistence.conf> " "almacenado en la raíz de su sistema de ficheros. Cualquier volumen esa " "etiqueta debe tener uno de esos ficheros, o si no será ignorado." #. type: Plain text -#: en/live-persistence.conf.5:17 +#: en/persistence.conf.5:17 msgid "" -"The format of B<live-persistence.conf> allows empty lines and lines starting " -"with a \"#\" (used for comments), both which will be ignored. A so called " +"The format of B<persistence.conf> allows empty lines and lines starting with " +"a \"#\" (used for comments), both which will be ignored. A so called " "\"custom mount\" has the format:" msgstr "" -"El formato de B<live-persistence.conf> permite añadir líneas vacias o líneas " -"que comiencen por \"#\" (usado para los comentarios), ambos serán ignorados. " -"Un \"montaje personalizado\" tiene el formato:" +"El formato de B<persistence.conf> permite añadir líneas vacias o líneas que " +"comiencen por \"#\" (usado para los comentarios), ambos serán ignorados. Un " +"\"montaje personalizado\" tiene el formato:" #. type: Plain text -#: en/live-persistence.conf.5:20 +#: en/persistence.conf.5:20 msgid "I<DIR> [I<OPTION>]..." msgstr "I<DIR> [I<OPTION>]..." #. type: Plain text -#: en/live-persistence.conf.5:24 +#: en/persistence.conf.5:24 msgid "" "which roughly translates to \"make I<DIR> persistence in the way described " "by the list of I<OPTION>s\"." @@ -170,7 +169,7 @@ msgstr "" "lista de I<OPTION>s\"." #. type: Plain text -#: en/live-persistence.conf.5:35 +#: en/persistence.conf.5:35 msgid "" "For each custom mount I<DIR> must be an absolute path that cannot contain " "white spaces or the special . and .. path components, and cannot be /live " @@ -193,28 +192,28 @@ msgstr "" "esto se puede cambiar utilizando las opciones I<OPTION>s." #. type: Plain text -#: en/live-persistence.conf.5:48 +#: en/persistence.conf.5:48 msgid "" "All custom mounts will be done in an order so that no two custom mounts can " "\"hide\" each other. For instance, if we have the two I<DIR>:s /a and /a/b " "it would always be the case that /a is mounted first, then /a/b. This " -"remains true no matter how the lines in B<live-persistence.conf> are " -"ordered, or if several B<live-persistence.conf> files on different " -"persistence media are used at the same time. However, it is forbidden for " -"custom mounts to have their source directory inside the source directory of " -"another custom mount, so the source directories that are auto-created by " -"live-boot does not support \"nested\" mounts like /a and /a/b on the same " -"media. In this case you must use the B<source> option (see below) to make " -"sure that they are stored in different source directories." +"remains true no matter how the lines in B<persistence.conf> are ordered, or " +"if several B<persistence.conf> files on different persistence media are used " +"at the same time. However, it is forbidden for custom mounts to have their " +"source directory inside the source directory of another custom mount, so the " +"source directories that are auto-created by live-boot does not support " +"\"nested\" mounts like /a and /a/b on the same media. In this case you must " +"use the B<source> option (see below) to make sure that they are stored in " +"different source directories." msgstr "" "Todos los montajes personalizados serán montados en orden de tal manera que " "dos montajes personalizados no se \"escondan\" uno al otro. Por ejemplo, si " "tenemos los dos I<DIR>:s /a y /a/b siempre /a será montado en primer lugar, " "después /a/b. Esto siempre es así sin importar el orden en que aparezcan las " -"líneas en B<live-persistence.conf> o incluso si se usan varios ficheros " -"B<live-persistence.conf> en medios persistentes distintos al mismo tiempo. " -"Sin embargo, no está permitido que un montaje personalizado tenga su " -"directorio de origen en el interior del directorio de origen de otro montaje " +"líneas en B<persistence.conf> o incluso si se usan varios ficheros " +"B<persistence.conf> en medios persistentes distintos al mismo tiempo. Sin " +"embargo, no está permitido que un montaje personalizado tenga su directorio " +"de origen en el interior del directorio de origen de otro montaje " "personalizado, ya que los directorios de origen que live-boot crea " "automáticamente no tienen soporte para montajes \"anidados\" como /a y /a/b " "en el mismo medio. En este caso se debe usar la opción B<source> (ver " @@ -222,7 +221,7 @@ msgstr "" "diferentes." #. type: Plain text -#: en/live-persistence.conf.5:56 +#: en/persistence.conf.5:56 msgid "" "When a source directory doesn't exist on the persistence media for a certain " "custom mount, it will be created automatically, and permissions and " @@ -240,22 +239,22 @@ msgstr "" "opciones B<link> o B<union> (ver debajo)." #. type: Plain text -#: en/live-persistence.conf.5:60 +#: en/persistence.conf.5:60 msgid "" -"Custom mounts defined in B<live-persistence.conf> accept the following " -"options in a coma-separated list:" +"Custom mounts defined in B<persistence.conf> accept the following options in " +"a coma-separated list:" msgstr "" -"Los montajes personalizados definidos en B<live-persistence.conf> aceptan " -"las siguientes opciones en una lista separada por comas:" +"Los montajes personalizados definidos en B<persistence.conf> aceptan las " +"siguientes opciones en una lista separada por comas:" #. type: IP -#: en/live-persistence.conf.5:60 +#: en/persistence.conf.5:60 #, no-wrap msgid "B<source>=I<PATH>" msgstr "B<source>=I<PATH>" #. type: Plain text -#: en/live-persistence.conf.5:69 +#: en/persistence.conf.5:69 msgid "" "When given, store the persistence changes into I<PATH> on the persistence " "media. I<PATH> must be a relative path (with respect to the persistence " @@ -277,7 +276,7 @@ msgstr "" "rw>)" #. type: Plain text -#: en/live-persistence.conf.5:72 +#: en/persistence.conf.5:72 msgid "" "The following options are mutually exclusive (only the last given one will " "be in effect):" @@ -286,26 +285,26 @@ msgstr "" "tendrá efecto):" #. type: IP -#: en/live-persistence.conf.5:72 +#: en/persistence.conf.5:72 #, no-wrap msgid "B<bind>" msgstr "B<bind>" #. type: Plain text -#: en/live-persistence.conf.5:74 +#: en/persistence.conf.5:74 msgid "Bind-mount the source directory to I<DIR>. This is the default." msgstr "" "Montar de forma enlazada el directorio de origen a I<DIR>. Esto es así por " "defecto." #. type: IP -#: en/live-persistence.conf.5:74 +#: en/persistence.conf.5:74 #, no-wrap msgid "B<link>" msgstr "B<link>" #. type: Plain text -#: en/live-persistence.conf.5:83 +#: en/persistence.conf.5:83 msgid "" "Create the directory structure of the source directory on the persistence " "media in I<DIR> and create symbolic links from the corresponding place in " @@ -326,7 +325,7 @@ msgstr "" "origen." #. type: Plain text -#: en/live-persistence.conf.5:91 +#: en/persistence.conf.5:91 msgid "" "Effectively B<link> will make only files already in the source directory " "persistent, not any other files in I<DIR>. These files must be manually " @@ -345,13 +344,13 @@ msgstr "" "home de un usuario." #. type: IP -#: en/live-persistence.conf.5:91 +#: en/persistence.conf.5:91 #, no-wrap msgid "B<union>" msgstr "B<union>" #. type: Plain text -#: en/live-persistence.conf.5:101 +#: en/persistence.conf.5:101 msgid "" "Save the rw branch of a union on the persistence media, so only the changes " "are stored persistently. This can potentially reduce disk usage compared to " @@ -374,99 +373,98 @@ msgstr "" "tiene soporte si se utiliza B<union=unionmount>." #. type: SH -#: en/live-persistence.conf.5:102 +#: en/persistence.conf.5:102 #, no-wrap msgid "DIRECTORIES" msgstr "DIRECTORIOS" #. type: IP -#: en/live-persistence.conf.5:103 +#: en/persistence.conf.5:103 #, no-wrap msgid "B</live/persistence>" msgstr "B</live/persistence>" #. type: Plain text -#: en/live-persistence.conf.5:109 +#: en/persistence.conf.5:109 msgid "" "All persistence volumes will be mounted here (in a directory corresponding " -"to the device name). The B<live-persistence.conf> file can easily be edited " +"to the device name). The B<persistence.conf> file can easily be edited " "through this mount, as well as any source directories (which is especially " "practical for custom mounts using the B<link> option)." msgstr "" "Aquí se montarán todos los volumenes persistentes (en un directorio que " -"corresponda con el nombre del dispositivo). El fichero B<live-persistence." -"conf> se puede editar fácilmente a través de este montaje, así como " -"cualquier directorio de origen (esto resulta especialmente práctico para los " -"montajes personalizados usando la opción B<link>)." +"corresponda con el nombre del dispositivo). El fichero B<persistence.conf> " +"se puede editar fácilmente a través de este montaje, así como cualquier " +"directorio de origen (esto resulta especialmente práctico para los montajes " +"personalizados usando la opción B<link>)." #. type: SH -#: en/live-persistence.conf.5:110 +#: en/persistence.conf.5:110 #, no-wrap msgid "EXAMPLES" msgstr "EJEMPLOS" #. type: Plain text -#: en/live-persistence.conf.5:115 +#: en/persistence.conf.5:115 msgid "" -"Let's say we have a persistence volume I<VOL> with the a B<live-persistence." -"conf> file containing the following four lines (numbered for ease of " -"reference):" +"Let's say we have a persistence volume I<VOL> with the a B<persistence.conf> " +"file containing the following four lines (numbered for ease of reference):" msgstr "" -"Si tenemos un volumen con persistencia I<VOL> con un fichero B<live-" -"persistence.conf> que contiene las cuatro lineas siguientes (numeradas para " -"una mejor referencia):" +"Si tenemos un volumen con persistencia I<VOL> con un fichero B<persistence." +"conf>que contiene las cuatro lineas siguientes (numeradas para una mejor " +"referencia):" #. type: TP -#: en/live-persistence.conf.5:115 en/live-persistence.conf.5:129 +#: en/persistence.conf.5:115 en/persistence.conf.5:129 #, no-wrap msgid "1." msgstr "1." #. type: Plain text -#: en/live-persistence.conf.5:118 +#: en/persistence.conf.5:118 msgid "/home/user1 link,source=config-files/user1" msgstr "/home/user1 link,source=config-files/user1" #. type: TP -#: en/live-persistence.conf.5:118 en/live-persistence.conf.5:133 +#: en/persistence.conf.5:118 en/persistence.conf.5:133 #, no-wrap msgid "2." msgstr "2." #. type: Plain text -#: en/live-persistence.conf.5:121 +#: en/persistence.conf.5:121 msgid "/home/user2 link,source=config-files/user2" msgstr "/home/user2 link,source=config-files/user2" #. type: TP -#: en/live-persistence.conf.5:121 en/live-persistence.conf.5:137 +#: en/persistence.conf.5:121 en/persistence.conf.5:137 #, no-wrap msgid "3." msgstr "3." #. type: Plain text -#: en/live-persistence.conf.5:124 +#: en/persistence.conf.5:124 msgid "/home" msgstr "/home" #. type: TP -#: en/live-persistence.conf.5:124 en/live-persistence.conf.5:140 +#: en/persistence.conf.5:124 en/persistence.conf.5:140 #, no-wrap msgid "4." msgstr "4." #. type: Plain text -#: en/live-persistence.conf.5:127 +#: en/persistence.conf.5:127 msgid "/usr union" msgstr "/usr union" #. type: Plain text -#: en/live-persistence.conf.5:129 +#: en/persistence.conf.5:129 msgid "The corresponding source directories are:" msgstr "Los directorios de origen correspondientes son:" #. type: Plain text -#: en/live-persistence.conf.5:133 +#: en/persistence.conf.5:133 msgid "" "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the " "B<source> option)" @@ -475,7 +473,7 @@ msgstr "" "B<source>)" #. type: Plain text -#: en/live-persistence.conf.5:137 +#: en/persistence.conf.5:137 msgid "" "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the " "B<source> option)" @@ -484,17 +482,17 @@ msgstr "" "B<source>)" #. type: Plain text -#: en/live-persistence.conf.5:140 +#: en/persistence.conf.5:140 msgid "I<VOL>/home" msgstr "I<VOL>/home" #. type: Plain text -#: en/live-persistence.conf.5:143 +#: en/persistence.conf.5:143 msgid "I<VOL>/usr" msgstr "I<VOL>/usr" #. type: Plain text -#: en/live-persistence.conf.5:146 +#: en/persistence.conf.5:146 msgid "" "It was necessary to set the B<source> options for 1 and 2, since they " "otherwise would become nested with 3's source, which is invalid." @@ -503,7 +501,7 @@ msgstr "" "modo resultarían anidados con el origen de 3, lo cual no es válido." #. type: Plain text -#: en/live-persistence.conf.5:151 +#: en/persistence.conf.5:151 msgid "" "Line 3 will be taken care of before line 1 and 2 in order to prevent custom " "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home " @@ -517,96 +515,96 @@ msgstr "" "ficheros existen: " #. type: TP -#: en/live-persistence.conf.5:151 +#: en/persistence.conf.5:151 #, no-wrap msgid "a." msgstr "a." #. type: Plain text -#: en/live-persistence.conf.5:154 +#: en/persistence.conf.5:154 msgid "I<VOL>/config-files/user1/.emacs" msgstr "I<VOL>/config-files/user1/.emacs" #. type: TP -#: en/live-persistence.conf.5:154 +#: en/persistence.conf.5:154 #, no-wrap msgid "b." msgstr "b." #. type: Plain text -#: en/live-persistence.conf.5:157 +#: en/persistence.conf.5:157 msgid "I<VOL>/config-files/user2/.bashrc" msgstr "I<VOL>/config-files/user2/.bashrc" #. type: TP -#: en/live-persistence.conf.5:157 +#: en/persistence.conf.5:157 #, no-wrap msgid "c." msgstr "c." #. type: Plain text -#: en/live-persistence.conf.5:160 +#: en/persistence.conf.5:160 msgid "I<VOL>/config-files/user2/.ssh/config" msgstr "I<VOL>/config-files/user2/.ssh/config" #. type: Plain text -#: en/live-persistence.conf.5:162 +#: en/persistence.conf.5:162 msgid "Then the following links and directories will be created:" msgstr "Entonces se crearán los siguientes enlaces y directorios:" #. type: TP -#: en/live-persistence.conf.5:162 en/live-persistence.conf.5:165 -#: en/live-persistence.conf.5:171 +#: en/persistence.conf.5:162 en/persistence.conf.5:165 +#: en/persistence.conf.5:171 #, no-wrap msgid "Link:" msgstr "Enlace:" #. type: Plain text -#: en/live-persistence.conf.5:165 +#: en/persistence.conf.5:165 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)" msgstr "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (de a)" #. type: Plain text -#: en/live-persistence.conf.5:168 +#: en/persistence.conf.5:168 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)" msgstr "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (de b)" #. type: TP -#: en/live-persistence.conf.5:168 +#: en/persistence.conf.5:168 #, no-wrap msgid "Dir:" msgstr "Directorio:" #. type: Plain text -#: en/live-persistence.conf.5:171 +#: en/persistence.conf.5:171 msgid "/homea/user2/.ssh (from c)" msgstr "/homea/user2/.ssh (de c)" #. type: Plain text -#: en/live-persistence.conf.5:175 +#: en/persistence.conf.5:175 msgid "" "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)" msgstr "" "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (de c)" #. type: Plain text -#: en/live-persistence.conf.5:181 +#: en/persistence.conf.5:181 msgid "" -"One could argue, though, that lines 1 and 2 in the example B<live-" -"persistence.conf> file above are unnecessary since line 3 already would make " -"all of /home persistent. The B<link> option is intended for situations where " -"you don't want a complete directory to be persistent, only certain files in " -"it or its sub-directories." +"One could argue, though, that lines 1 and 2 in the example B<persistence." +"conf> file above are unnecessary since line 3 already would make all of /" +"home persistent. The B<link> option is intended for situations where you " +"don't want a complete directory to be persistent, only certain files in it " +"or its sub-directories." msgstr "" "Se podría decir, sin embargo, que las líneas 1 y 2 en el fichero de ejemplo " -"B<live-persistence.conf> anterior son innecesarias ya que la línea 3 ya " -"crearía el directorio /home persistente. La opción B<link> se utiliza en " +"B<persistence.conf> anterior son innecesarias ya que la línea 3 ya crearía " +"el directorio /home persistente. La opción B<link> se utiliza en " "situaciones en las que no se desea guardar de forma persistente un " "directorio completo, sino únicamente algunos ficheros o subdirectorios " "incluidos en él." #. type: Plain text -#: en/live-persistence.conf.5:190 +#: en/persistence.conf.5:190 msgid "" "Line 4 can be mounted at any time since its I<DIR> (and source directory) is " "completely disjoint from all the other custom mounts. When mounted, I<VOL>/" @@ -626,15 +624,15 @@ msgstr "" "tendría que ser copiado en I<VOL>/usr durante la preinstalación inicial." #. type: Plain text -#: en/live-persistence.conf.5:193 +#: en/persistence.conf.5:193 msgid "I<live-boot>(7)" msgstr "I<live-boot>(7)" #. type: Plain text -#: en/live-persistence.conf.5:213 +#: en/persistence.conf.5:213 msgid "" -"live-persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> " -"for the Debian project." +"persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> for " +"the Debian project." msgstr "" -"live-persistence.conf fue escrito por anonym E<lt>I<anonym@lavabit.com>E<gt> " -"para el proyecto Debian." +"persistence.conf fue escrito por anonym E<lt>I<anonym@lavabit.com>E<gt> para " +"el proyecto Debian." diff --git a/manpages/po4a.cfg b/manpages/po4a.cfg index 943a035..baa1fa9 100644 --- a/manpages/po4a.cfg +++ b/manpages/po4a.cfg @@ -1,4 +1,4 @@ [po4a_langs] de es [po4a_paths] pot/$master.pot $lang:po/$lang/$master.po [type: man] en/live-boot.7 $lang:$lang/live-boot.$lang.7 -[type: man] en/live-persistence.conf.5 $lang:$lang/live-persistence.conf.$lang.5 +[type: man] en/persistence.conf.5 $lang:$lang/persistence.conf.$lang.5 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 1054a7a..7fb5d4e 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2012-09-26 14:38+0300\n" +"POT-Creation-Date: 2012-09-27 11:01+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,31 +17,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "LIVE-BOOT" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2012-09-26" +msgid "2012-09-27" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "3.0~b3-1" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "Debian Live Project" msgstr "" #. type: SH -#: en/live-boot.7:3 en/live-persistence.conf.5:3 +#: en/live-boot.7:3 en/persistence.conf.5:3 #, no-wrap msgid "NAME" msgstr "" @@ -52,7 +52,7 @@ msgid "B<live-boot> - System Boot Scripts" msgstr "" #. type: SH -#: en/live-boot.7:6 en/live-persistence.conf.5:7 +#: en/live-boot.7:6 en/persistence.conf.5:7 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -138,7 +138,7 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:28 en/live-persistence.conf.5:57 +#: en/live-boot.7:28 en/persistence.conf.5:57 #, no-wrap msgid "OPTIONS" msgstr "" @@ -574,8 +574,8 @@ msgid "" "live-boot will probe devices for persistence media. These can be partitions " "(with the correct GPT name), filesystems (with the correct label) or image " "files (with the correct file name). Overlays are labeled/named \"persistence" -"\" (see I<live-persistence.conf>(5)). Overlay image files have extensions " -"which determines their filesystem, e.g. \"persistence.ext4\"." +"\" (see I<persistence.conf>(5)). Overlay image files have extensions which " +"determines their filesystem, e.g. \"persistence.ext4\"." msgstr "" #. type: IP @@ -840,43 +840,43 @@ msgstr "" #. type: IP #: en/live-boot.7:154 #, no-wrap -msgid "B<live-persistence.conf>" +msgid "B<persistence.conf>" msgstr "" #. type: SH -#: en/live-boot.7:156 en/live-persistence.conf.5:191 +#: en/live-boot.7:156 en/persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text #: en/live-boot.7:158 -msgid "I<live-persistence.conf>(5)" +msgid "I<persistence.conf>(5)" msgstr "" #. type: Plain text -#: en/live-boot.7:160 en/live-persistence.conf.5:195 +#: en/live-boot.7:160 en/persistence.conf.5:195 msgid "I<live-build>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:162 en/live-persistence.conf.5:197 +#: en/live-boot.7:162 en/persistence.conf.5:197 msgid "I<live-config>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:164 en/live-persistence.conf.5:199 +#: en/live-boot.7:164 en/persistence.conf.5:199 msgid "I<live-tools>(7)" msgstr "" #. type: SH -#: en/live-boot.7:165 en/live-persistence.conf.5:200 +#: en/live-boot.7:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:167 en/live-persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -884,13 +884,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:168 en/live-persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:170 en/live-persistence.conf.5:210 +#: en/live-boot.7:170 en/persistence.conf.5:210 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -899,7 +899,7 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:171 en/live-persistence.conf.5:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "" diff --git a/manpages/pot/live-persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index 227f5c7..d537884 100644 --- a/manpages/pot/live-persistence.conf.5.pot +++ b/manpages/pot/persistence.conf.5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2012-09-26 14:38+0300\n" +"POT-Creation-Date: 2012-09-27 11:01+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,76 +17,76 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "LIVE-BOOT" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2012-09-26" +msgid "2012-09-27" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "3.0~b3-1" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 +#: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "Debian Live Project" msgstr "" #. type: SH -#: en/live-boot.7:3 en/live-persistence.conf.5:3 +#: en/live-boot.7:3 en/persistence.conf.5:3 #, no-wrap msgid "NAME" msgstr "" #. type: SH -#: en/live-boot.7:6 en/live-persistence.conf.5:7 +#: en/live-boot.7:6 en/persistence.conf.5:7 #, no-wrap msgid "DESCRIPTION" msgstr "" #. type: SH -#: en/live-boot.7:28 en/live-persistence.conf.5:57 +#: en/live-boot.7:28 en/persistence.conf.5:57 #, no-wrap msgid "OPTIONS" msgstr "" #. type: SH -#: en/live-boot.7:156 en/live-persistence.conf.5:191 +#: en/live-boot.7:156 en/persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:160 en/live-persistence.conf.5:195 +#: en/live-boot.7:160 en/persistence.conf.5:195 msgid "I<live-build>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:162 en/live-persistence.conf.5:197 +#: en/live-boot.7:162 en/persistence.conf.5:197 msgid "I<live-config>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:164 en/live-persistence.conf.5:199 +#: en/live-boot.7:164 en/persistence.conf.5:199 msgid "I<live-tools>(7)" msgstr "" #. type: SH -#: en/live-boot.7:165 en/live-persistence.conf.5:200 +#: en/live-boot.7:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:167 en/live-persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -94,13 +94,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:168 en/live-persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:170 en/live-persistence.conf.5:210 +#: en/live-boot.7:170 en/persistence.conf.5:210 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -109,50 +109,49 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:171 en/live-persistence.conf.5:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:6 +#: en/persistence.conf.5:6 msgid "" -"B<live-persistence.conf> - Configuration file for persistence media in live-" -"boot" +"B<persistence.conf> - Configuration file for persistence media in live-boot" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:13 +#: en/persistence.conf.5:13 msgid "" "If live-boot probes a persistence volume with the label (or GPT name, or " "file name, but from now on we will just say \"label\") \"persistence\", that " -"volume's persistence is fully customizable through the B<live-persistence." -"conf> file stored on the root of its file system. Any such labeled volume " -"must have such a file, or it will be ignored." +"volume's persistence is fully customizable through the B<persistence.conf> " +"file stored on the root of its file system. Any such labeled volume must " +"have such a file, or it will be ignored." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:17 +#: en/persistence.conf.5:17 msgid "" -"The format of B<live-persistence.conf> allows empty lines and lines starting " -"with a \"#\" (used for comments), both which will be ignored. A so called " +"The format of B<persistence.conf> allows empty lines and lines starting with " +"a \"#\" (used for comments), both which will be ignored. A so called " "\"custom mount\" has the format:" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:20 +#: en/persistence.conf.5:20 msgid "I<DIR> [I<OPTION>]..." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:24 +#: en/persistence.conf.5:24 msgid "" "which roughly translates to \"make I<DIR> persistence in the way described " "by the list of I<OPTION>s\"." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:35 +#: en/persistence.conf.5:35 msgid "" "For each custom mount I<DIR> must be an absolute path that cannot contain " "white spaces or the special . and .. path components, and cannot be /live " @@ -165,23 +164,23 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:48 +#: en/persistence.conf.5:48 msgid "" "All custom mounts will be done in an order so that no two custom mounts can " "\"hide\" each other. For instance, if we have the two I<DIR>:s /a and /a/b " "it would always be the case that /a is mounted first, then /a/b. This " -"remains true no matter how the lines in B<live-persistence.conf> are " -"ordered, or if several B<live-persistence.conf> files on different " -"persistence media are used at the same time. However, it is forbidden for " -"custom mounts to have their source directory inside the source directory of " -"another custom mount, so the source directories that are auto-created by " -"live-boot does not support \"nested\" mounts like /a and /a/b on the same " -"media. In this case you must use the B<source> option (see below) to make " -"sure that they are stored in different source directories." +"remains true no matter how the lines in B<persistence.conf> are ordered, or " +"if several B<persistence.conf> files on different persistence media are used " +"at the same time. However, it is forbidden for custom mounts to have their " +"source directory inside the source directory of another custom mount, so the " +"source directories that are auto-created by live-boot does not support " +"\"nested\" mounts like /a and /a/b on the same media. In this case you must " +"use the B<source> option (see below) to make sure that they are stored in " +"different source directories." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:56 +#: en/persistence.conf.5:56 msgid "" "When a source directory doesn't exist on the persistence media for a certain " "custom mount, it will be created automatically, and permissions and " @@ -192,20 +191,20 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:60 +#: en/persistence.conf.5:60 msgid "" -"Custom mounts defined in B<live-persistence.conf> accept the following " -"options in a coma-separated list:" +"Custom mounts defined in B<persistence.conf> accept the following options in " +"a coma-separated list:" msgstr "" #. type: IP -#: en/live-persistence.conf.5:60 +#: en/persistence.conf.5:60 #, no-wrap msgid "B<source>=I<PATH>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:69 +#: en/persistence.conf.5:69 msgid "" "When given, store the persistence changes into I<PATH> on the persistence " "media. I<PATH> must be a relative path (with respect to the persistence " @@ -218,31 +217,31 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:72 +#: en/persistence.conf.5:72 msgid "" "The following options are mutually exclusive (only the last given one will " "be in effect):" msgstr "" #. type: IP -#: en/live-persistence.conf.5:72 +#: en/persistence.conf.5:72 #, no-wrap msgid "B<bind>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:74 +#: en/persistence.conf.5:74 msgid "Bind-mount the source directory to I<DIR>. This is the default." msgstr "" #. type: IP -#: en/live-persistence.conf.5:74 +#: en/persistence.conf.5:74 #, no-wrap msgid "B<link>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:83 +#: en/persistence.conf.5:83 msgid "" "Create the directory structure of the source directory on the persistence " "media in I<DIR> and create symbolic links from the corresponding place in " @@ -254,7 +253,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:91 +#: en/persistence.conf.5:91 msgid "" "Effectively B<link> will make only files already in the source directory " "persistent, not any other files in I<DIR>. These files must be manually " @@ -265,13 +264,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-persistence.conf.5:91 +#: en/persistence.conf.5:91 #, no-wrap msgid "B<union>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:101 +#: en/persistence.conf.5:101 msgid "" "Save the rw branch of a union on the persistence media, so only the changes " "are stored persistently. This can potentially reduce disk usage compared to " @@ -284,122 +283,121 @@ msgid "" msgstr "" #. type: SH -#: en/live-persistence.conf.5:102 +#: en/persistence.conf.5:102 #, no-wrap msgid "DIRECTORIES" msgstr "" #. type: IP -#: en/live-persistence.conf.5:103 +#: en/persistence.conf.5:103 #, no-wrap msgid "B</live/persistence>" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:109 +#: en/persistence.conf.5:109 msgid "" "All persistence volumes will be mounted here (in a directory corresponding " -"to the device name). The B<live-persistence.conf> file can easily be edited " +"to the device name). The B<persistence.conf> file can easily be edited " "through this mount, as well as any source directories (which is especially " "practical for custom mounts using the B<link> option)." msgstr "" #. type: SH -#: en/live-persistence.conf.5:110 +#: en/persistence.conf.5:110 #, no-wrap msgid "EXAMPLES" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:115 +#: en/persistence.conf.5:115 msgid "" -"Let's say we have a persistence volume I<VOL> with the a B<live-persistence." -"conf> file containing the following four lines (numbered for ease of " -"reference):" +"Let's say we have a persistence volume I<VOL> with the a B<persistence.conf> " +"file containing the following four lines (numbered for ease of reference):" msgstr "" #. type: TP -#: en/live-persistence.conf.5:115 en/live-persistence.conf.5:129 +#: en/persistence.conf.5:115 en/persistence.conf.5:129 #, no-wrap msgid "1." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:118 +#: en/persistence.conf.5:118 msgid "/home/user1 link,source=config-files/user1" msgstr "" #. type: TP -#: en/live-persistence.conf.5:118 en/live-persistence.conf.5:133 +#: en/persistence.conf.5:118 en/persistence.conf.5:133 #, no-wrap msgid "2." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:121 +#: en/persistence.conf.5:121 msgid "/home/user2 link,source=config-files/user2" msgstr "" #. type: TP -#: en/live-persistence.conf.5:121 en/live-persistence.conf.5:137 +#: en/persistence.conf.5:121 en/persistence.conf.5:137 #, no-wrap msgid "3." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:124 +#: en/persistence.conf.5:124 msgid "/home" msgstr "" #. type: TP -#: en/live-persistence.conf.5:124 en/live-persistence.conf.5:140 +#: en/persistence.conf.5:124 en/persistence.conf.5:140 #, no-wrap msgid "4." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:127 +#: en/persistence.conf.5:127 msgid "/usr union" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:129 +#: en/persistence.conf.5:129 msgid "The corresponding source directories are:" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:133 +#: en/persistence.conf.5:133 msgid "" "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the " "B<source> option)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:137 +#: en/persistence.conf.5:137 msgid "" "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the " "B<source> option)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:140 +#: en/persistence.conf.5:140 msgid "I<VOL>/home" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:143 +#: en/persistence.conf.5:143 msgid "I<VOL>/usr" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:146 +#: en/persistence.conf.5:146 msgid "" "It was necessary to set the B<source> options for 1 and 2, since they " "otherwise would become nested with 3's source, which is invalid." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:151 +#: en/persistence.conf.5:151 msgid "" "Line 3 will be taken care of before line 1 and 2 in order to prevent custom " "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home " @@ -408,89 +406,89 @@ msgid "" msgstr "" #. type: TP -#: en/live-persistence.conf.5:151 +#: en/persistence.conf.5:151 #, no-wrap msgid "a." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:154 +#: en/persistence.conf.5:154 msgid "I<VOL>/config-files/user1/.emacs" msgstr "" #. type: TP -#: en/live-persistence.conf.5:154 +#: en/persistence.conf.5:154 #, no-wrap msgid "b." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:157 +#: en/persistence.conf.5:157 msgid "I<VOL>/config-files/user2/.bashrc" msgstr "" #. type: TP -#: en/live-persistence.conf.5:157 +#: en/persistence.conf.5:157 #, no-wrap msgid "c." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:160 +#: en/persistence.conf.5:160 msgid "I<VOL>/config-files/user2/.ssh/config" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:162 +#: en/persistence.conf.5:162 msgid "Then the following links and directories will be created:" msgstr "" #. type: TP -#: en/live-persistence.conf.5:162 en/live-persistence.conf.5:165 -#: en/live-persistence.conf.5:171 +#: en/persistence.conf.5:162 en/persistence.conf.5:165 +#: en/persistence.conf.5:171 #, no-wrap msgid "Link:" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:165 +#: en/persistence.conf.5:165 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:168 +#: en/persistence.conf.5:168 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)" msgstr "" #. type: TP -#: en/live-persistence.conf.5:168 +#: en/persistence.conf.5:168 #, no-wrap msgid "Dir:" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:171 +#: en/persistence.conf.5:171 msgid "/homea/user2/.ssh (from c)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:175 +#: en/persistence.conf.5:175 msgid "" "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:181 +#: en/persistence.conf.5:181 msgid "" -"One could argue, though, that lines 1 and 2 in the example B<live-" -"persistence.conf> file above are unnecessary since line 3 already would make " -"all of /home persistent. The B<link> option is intended for situations where " -"you don't want a complete directory to be persistent, only certain files in " -"it or its sub-directories." +"One could argue, though, that lines 1 and 2 in the example B<persistence." +"conf> file above are unnecessary since line 3 already would make all of /" +"home persistent. The B<link> option is intended for situations where you " +"don't want a complete directory to be persistent, only certain files in it " +"or its sub-directories." msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:190 +#: en/persistence.conf.5:190 msgid "" "Line 4 can be mounted at any time since its I<DIR> (and source directory) is " "completely disjoint from all the other custom mounts. When mounted, I<VOL>/" @@ -502,13 +500,13 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:193 +#: en/persistence.conf.5:193 msgid "I<live-boot>(7)" msgstr "" #. type: Plain text -#: en/live-persistence.conf.5:213 +#: en/persistence.conf.5:213 msgid "" -"live-persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> " -"for the Debian project." +"persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> for " +"the Debian project." msgstr "" diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh index 6530cc1..822a604 100755 --- a/scripts/boot/9990-aaa-fixme.sh +++ b/scripts/boot/9990-aaa-fixme.sh @@ -43,7 +43,7 @@ fi old_root_overlay_label="live-rw" old_home_overlay_label="home-rw" custom_overlay_label="persistence" -persistence_list="live-persistence.conf" +persistence_list="persistence.conf" if [ ! -f /live.vars ] then diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 4429c33..c5bcaa0 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -1233,7 +1233,7 @@ do_union () get_custom_mounts () { - # Side-effect: leaves $devices with live-persistence.conf mounted in /live/persistence + # Side-effect: leaves $devices with persistence.conf mounted in /live/persistence # Side-effect: prints info to file $custom_mounts local custom_mounts=${1} |