Adding upstream version 4.0~a10.

diff --git a/VERSION b/VERSION
index 144632b..c5a2bb6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a9-1
+4.0~a10-1

diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index bd3aa39..3670d7e 100755 (executable)
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -25,7 +25,7 @@ for MANPAGE in en/*
 do
        SECTION="$(basename ${MANPAGE} | awk -F. '{ print $2 }')"
 
-       sed -i -e "s|^.TH.*$|.TH ${PROGRAM} ${SECTION} ${DATE} ${VERSION} \"Debian Live Project\"|" ${MANPAGE}
+       sed -i -e "s|^.TH.*$|.TH ${PROGRAM} ${SECTION} ${DATE} ${VERSION} \"Live Systems Project\"|" ${MANPAGE}
 done
 
 # European date format

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 30680cb..01c06f3 100644 (file)
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,26 +3,26 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 10.03.2013 4.0~a9\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 01.04.2013 4.0~a10\-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
 
 .SH DESCRIPTION
-\fBlive\-boot\fP contains the scripts that configure a Debian Live system during
-the boot process (early userspace).
+\fBlive\-boot\fP contains the scripts that configure a live system during the
+boot process (early userspace).
 .PP
 .\" FIXME
 live\-boot is a hook for the initramfs\-tools, used to generate a initramfs
 capable to boot live systems, such as those created by
-\fIlive\-helper\fP(7). This includes the Debian Live isos, netboot tarballs, and
-usb stick images.
+\fIlive\-helper\fP(7). This includes the Live systems ISOs, netboot tarballs,
+and usb stick images.
 .PP
 .\" FIXME
 At boot time it will look for a (read\-only) media containing a "/live"
 directory where a root filesystems (often a compressed filesystem image like
 squashfs) is stored. If found, it will create a writable environment, using
-aufs, for Debian like systems to boot from.
+aufs, to boot the system from.
 
 .SH CONFIGURATION
 \fBlive\-boot\fP can be configured through a boot parameter or a configuration
@@ -86,8 +86,8 @@ You may also use the live iso image in place of the squashfs image.
 .IP \fBiscsi\fP=\fIserver\-ip[,server\-port];target\-name\fP 4
 Boot from an iSCSI target that has an iso or disk live image as one of its
 LUNs. The specified target is searched for a LUN which looks like a live
-media. If you use the \fBiscsitarget\fP software iSCSI target solution which is
-packaged in Debian your ietd.conf might look like this:
+media. If you use the \fBiscsitarget\fP software iSCSI target solution your
+ietd.conf might look like this:
 .br
 # The target\-name you specify in the iscsi= parameter
 .br
@@ -137,7 +137,7 @@ for loop\-aes encryption type.
 .IP \fBlive\-media\-offset\fP=\fIBYTES\fP 4
 This way you could tell live\-boot that your image starts at offset BYTES in
 the above specified or autodiscovered device, this could be useful to hide
-the Debian Live iso or image inside another iso or image, to create "clean"
+the live system ISO or image inside another iso or image, to create "clean"
 images.
 .IP \fBlive\-media\-path\fP=\fIPATH\fP 4
 Sets the path to the live filesystem on the medium. By default, it is set to
@@ -270,16 +270,15 @@ loaded in alphanumeric order.
 \fIlive\-tools\fP(7)
 
 .SH HOMEPAGE
-More information about live\-boot and the Debian Live project can be found on
-the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
-<\fIhttp://live.debian.net/manual/\fP>.
+More information about live\-boot and the Live Systems project can be found
+on the homepage at <\fIhttp://live\-systems.org/\fP> and in the manual
+at <\fIhttp://live\-systems.org/manual/\fP>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-boot package in
-the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
-writing a mail to the Debian Live mailing list at
+the Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
+writing a mail to the Live Systems mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-boot was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
-for the Debian project.
+live\-boot was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>.

diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
index de1124c..ec78a84 100644 (file)
--- a/manpages/de/persistence.conf.de.5
+++ b/manpages/de/persistence.conf.de.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 10.03.2013 4.0~a9\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 01.04.2013 4.0~a10\-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
@@ -192,16 +192,15 @@ would have to be copied into \fIVOL\fP/usr during the initial bootstrap.
 \fIlive\-tools\fP(7)
 
 .SH HOMEPAGE
-More information about live\-boot and the Debian Live project can be found on
-the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
-<\fIhttp://live.debian.net/manual/\fP>.
+More information about live\-boot and the Live Systems project can be found
+on the homepage at <\fIhttp://live\-systems.org/\fP> and in the manual
+at <\fIhttp://live\-systems.org/manual/\fP>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-boot package in
-the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
-writing a mail to the Debian Live mailing list at
+the Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
+writing a mail to the Live Systems mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-persistence.conf was written by anonym <\fIanonym@lavabit.com\fP> for
-the Debian project.
+live\-boot was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>.

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 3b5ae80..a91d714 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,15 +1,15 @@
-.TH LIVE\-BOOT 7 2013\-03\-10 4.0~a9-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2013\-04\-01 4.0~a10-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
 
 .SH DESCRIPTION
-\fBlive\-boot\fR contains the scripts that configure a Debian Live system during the boot process (early userspace).
+\fBlive\-boot\fR contains the scripts that configure a live system during the boot process (early userspace).
 .PP
 .\" FIXME
-live\-boot is a hook for the initramfs\-tools, used to generate a initramfs capable to boot live systems, such as those created by \fIlive\-helper\fR(7). This includes the Debian Live isos, netboot tarballs, and usb stick images.
+live\-boot is a hook for the initramfs\-tools, used to generate a initramfs capable to boot live systems, such as those created by \fIlive\-helper\fR(7). This includes the Live systems ISOs, netboot tarballs, and usb stick images.
 .PP
-At boot time it will look for a (read\-only) media containing a "/live" directory where a root filesystems (often a compressed filesystem image like squashfs) is stored. If found, it will create a writable environment, using aufs, for Debian like systems to boot from.
+At boot time it will look for a (read\-only) media containing a "/live" directory where a root filesystems (often a compressed filesystem image like squashfs) is stored. If found, it will create a writable environment, using aufs, to boot the system from.
 .\" FIXME
 
 .SH CONFIGURATION
@@ -58,7 +58,7 @@ Also note that therefore it's currently not possible to fetch an image from a na
 .br
 You may also use the live iso image in place of the squashfs image.
 .IP "\fBiscsi\fR=\fIserver-ip[,server-port];target-name\fR" 4
-Boot from an iSCSI target that has an iso or disk live image as one of its LUNs. The specified target is searched for a LUN which looks like a live media. If you use the \fBiscsitarget\fR software iSCSI target solution which is packaged in Debian your ietd.conf might look like this:
+Boot from an iSCSI target that has an iso or disk live image as one of its LUNs. The specified target is searched for a LUN which looks like a live media. If you use the \fBiscsitarget\fR software iSCSI target solution your ietd.conf might look like this:
 .br
 # The target-name you specify in the iscsi= parameter
 .br
@@ -85,7 +85,7 @@ Instead of specifing an actual device name, the keyword 'removable' can be used
 .IP "{\fBlive\-media\-encryption\fR|\fBencryption\fR}=\fITYPE\fI" 4
 live\-boot will mount the encrypted rootfs TYPE, asking the passphrase, useful to build paranoid live systems :\-). TYPE supported so far are "aes" for loop\-aes encryption type.
 .IP "\fBlive\-media\-offset\fR=\fIBYTES\fR" 4
-This way you could tell live\-boot that your image starts at offset BYTES in the above specified or autodiscovered device, this could be useful to hide the Debian Live iso or image inside another iso or image, to create "clean" images.
+This way you could tell live\-boot that your image starts at offset BYTES in the above specified or autodiscovered device, this could be useful to hide the live system ISO or image inside another iso or image, to create "clean" images.
 .IP "\fBlive\-media\-path\fR=\fIPATH\fR" 4
 Sets the path to the live filesystem on the medium. By default, it is set to '/live' and you should not change that unless you have customized your media accordingly.
 .IP "\fBlive\-media\-timeout\fR=\fISECONDS\fI" 4
@@ -161,10 +161,10 @@ This optional file (inside the live media) contains a list of white\-space or ca
 \fIlive\-tools\fR(7)
 
 .SH HOMEPAGE
-More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-boot and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
 
 .SH BUGS
-Bugs can be reported by submitting a bugreport for the live\-boot package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
+Bugs can be reported by submitting a bugreport for the live\-boot package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-boot was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
+live\-boot was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR>.

diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index ba9c24e..86e1430 100644 (file)
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2013\-03\-10 4.0~a9-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2013\-04\-01 4.0~a10-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fR \- Configuration file for persistence media in
@@ -198,16 +198,10 @@ copied into \fIVOL\fR/usr during the initial bootstrap.
 \fIlive\-tools\fR(7)
 
 .SH HOMEPAGE
-More information about live\-boot and the Debian Live project can be
-found on the homepage at <\fIhttp://live.debian.net/\fR> and in the
-manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-boot and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
 
 .SH BUGS
-Bugs can be reported by submitting a bugreport for the live\-boot
-package in the Debian Bug Tracking System at
-<\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian
-Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
+Bugs can be reported by submitting a bugreport for the live\-boot package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-persistence.conf was written by anonym <\fIanonym@lavabit.com\fR> for the
-Debian project.
+live\-boot was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR>.

diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
index 2d02730..e713f5d 100644 (file)
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,27 +3,26 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 10.03.2013 4.0~a9\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 01.04.2013 4.0~a10\-1 "Live Systems Project"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema
 
 .SH DESCRIPCIÓN
-\fBlive\-boot\fP contiene los scripts que configuran un sistema Debian Live
-durante el proceso de arranque (early userspace).
+\fBlive\-boot\fP contains the scripts that configure a live system during the
+boot process (early userspace).
 .PP
 .\" FIXME
-live\-boot es un hook para initramfs\-tools, usado para generar un initramfs
-capaz de arrancar sistemas en vivo, tales como los creados por
-\fIlive\-helper\fP(7). Esto incluye las isos de Debian Live, netboot tarballs e
-imágenes para llaves usb.
+live\-boot is a hook for the initramfs\-tools, used to generate a initramfs
+capable to boot live systems, such as those created by
+\fIlive\-helper\fP(7). This includes the Live systems ISOs, netboot tarballs,
+and usb stick images.
 .PP
 .\" FIXME
-En el momento del arranque se buscará un dispositivo de sólo lectura que
-contenga un directorio "/live" dónde se almacena un sistema de ficheros raíz
-(a menudo se trata de una imagen comprimida de un sistema de ficheros como
-squashfs). Si live\-boot lo encuentra, creará un entorno de escritura, usando
-aufs, a partir del cual pueda arrancar un sistema Debian u otro similar.
+At boot time it will look for a (read\-only) media containing a "/live"
+directory where a root filesystems (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, to boot the system from.
 
 .SH CONFIGURACIÓN
 \fBlive\-boot\fP se puede configurar mediante un parámetro de arranque o un
@@ -89,11 +88,10 @@ compartiendo la ip con la instancia principal httpd.
 También se puede utilizar la imagen iso en vivo en lugar de la imagen
 squashfs.
 .IP \fBiscsi\fP=\fIserver\-ip[,server\-port];target\-name\fP 4
-Arranca desde un objetivo iSCSI que tiene una iso o una imagen disco en vivo
-como uno de sus LUNs. Se busca en el objetivo especificado un LUN que sea
-similar a un medio en vivo. Si se utiliza el software \fBiscsitarget\fP del
-objetivo iSCSI que se encuentra disponible en un paquete Debian la ietd.conf
-podría ser similar al siguiente:
+Boot from an iSCSI target that has an iso or disk live image as one of its
+LUNs. The specified target is searched for a LUN which looks like a live
+media. If you use the \fBiscsitarget\fP software iSCSI target solution your
+ietd.conf might look like this:
 .br
 # El nombre de destino se especifica en el parámetro iscsi=
 .br
@@ -143,10 +141,10 @@ live\-boot montará el TYPE rotfs cifrado,  pidiendo la contraseña. Es útil
 para crear sistemas en vivo paranoicos :\-) Hasta el momento el TYPE
 soportado es "aes" para cifrado loop\-aes.
 .IP \fBlive\-media\-offset\fP=\fIBYTES\fP 4
-De esta manera se puede especificar a live\-boot que la imagen comienza en
-BYTES en el dispositivo anteriormente especificado, o auto\-descubierto, esto
-podría ser útil para esconder la iso o la imagen Debian Live dentro de otra
-iso o imagen, para crear imágenes "limpias".
+This way you could tell live\-boot that your image starts at offset BYTES in
+the above specified or autodiscovered device, this could be useful to hide
+the live system ISO or image inside another iso or image, to create "clean"
+images.
 .IP \fBlive\-media\-path\fP=\fIPATH\fP 4
 Establece la ruta de acceso al sistema de ficheros en vivo en el medio. De
 forma predeterminada está en '/live' y no se debe cambiar a menos que se
@@ -288,17 +286,15 @@ alfanumérico.
 \fIlive\-tools\fP(7)
 
 .SH "PÁGINA WEB"
-Se puede encontrar más información acerca de live\-boot y el proyecto Debian
-Live en la página web <\fIhttp://live.debian.net/\fP> y en el manual en
-<\fIhttp://live.debian.net/manual/\fP>.
+More information about live\-boot and the Live Systems project can be found
+on the homepage at <\fIhttp://live\-systems.org/\fP> and in the manual
+at <\fIhttp://live\-systems.org/manual/\fP>.
 
 .SH ERRORES
-Se puede notificar los fallos enviando un informe de errores sobre el
-paquete live\-boot en el Debian Bug Tracking System en
-<\fIhttp://bugs.debian.org/\fP> o escribiendo un mensaje a la lista de
-correo de Debian Live a la dirección
+Bugs can be reported by submitting a bugreport for the live\-boot package in
+the Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
+writing a mail to the Live Systems mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTOR
-live\-boot fue escrito por Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
-para el proyecto Debian.
+live\-boot was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>.

diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index b695e9f..f92f2be 100644 (file)
--- a/manpages/es/persistence.conf.es.5
+++ b/manpages/es/persistence.conf.es.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 10.03.2013 4.0~a9\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 01.04.2013 4.0~a10\-1 "Live Systems Project"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
@@ -209,17 +209,15 @@ tendría que ser copiado en \fIVOL\fP/usr durante la preinstalación inicial.
 \fIlive\-tools\fP(7)
 
 .SH "PÁGINA WEB"
-Se puede encontrar más información acerca de live\-boot y el proyecto Debian
-Live en la página web <\fIhttp://live.debian.net/\fP> y en el manual en
-<\fIhttp://live.debian.net/manual/\fP>.
+More information about live\-boot and the Live Systems project can be found
+on the homepage at <\fIhttp://live\-systems.org/\fP> and in the manual
+at <\fIhttp://live\-systems.org/manual/\fP>.
 
 .SH ERRORES
-Se puede notificar los fallos enviando un informe de errores sobre el
-paquete live\-boot en el Debian Bug Tracking System en
-<\fIhttp://bugs.debian.org/\fP> o escribiendo un mensaje a la lista de
-correo de Debian Live a la dirección
+Bugs can be reported by submitting a bugreport for the live\-boot package in
+the Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
+writing a mail to the Live Systems mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTOR
-persistence.conf fue escrito por anonym <\fIanonym@lavabit.com\fP> para
-el proyecto Debian.
+live\-boot was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>.

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 9c8128a..dd1cfaa 100644 (file)
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a9-1\n"
-"POT-Creation-Date: 2013-03-10 22:13+0100\n"
+"Project-Id-Version: live-boot 4.0~a10-1\n"
+"POT-Creation-Date: 2013-04-01 08:19+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -24,19 +24,19 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-03-10"
-msgstr "10.03.2013"
+msgid "2013-04-01"
+msgstr "01.04.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a9-1"
-msgstr "4.0~a9-1"
+msgid "4.0~a10-1"
+msgstr "4.0~a10-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "Debian Live Project"
+msgid "Live Systems Project"
 msgstr ""
 
 #. type: SH
@@ -59,8 +59,8 @@ msgstr ""
 #. type: Plain text
 #: en/live-boot.7:8
 msgid ""
-"B<live-boot> contains the scripts that configure a Debian Live system during "
-"the boot process (early userspace)."
+"B<live-boot> contains the scripts that configure a live system during the "
+"boot process (early userspace)."
 msgstr ""
 
 #.  FIXME
@@ -69,7 +69,7 @@ msgstr ""
 msgid ""
 "live-boot is a hook for the initramfs-tools, used to generate a initramfs "
 "capable to boot live systems, such as those created by I<live-helper>(7). "
-"This includes the Debian Live isos, netboot tarballs, and usb stick images."
+"This includes the Live systems ISOs, netboot tarballs, and usb stick images."
 msgstr ""
 
 #.  FIXME
@@ -79,7 +79,7 @@ msgid ""
 "At boot time it will look for a (read-only) media containing a \"/live\" "
 "directory where a root filesystems (often a compressed filesystem image like "
 "squashfs) is stored. If found, it will create a writable environment, using "
-"aufs, for Debian like systems to boot from."
+"aufs, to boot the system from."
 msgstr ""
 
 #. type: SH
@@ -262,8 +262,8 @@ msgstr ""
 msgid ""
 "Boot from an iSCSI target that has an iso or disk live image as one of its "
 "LUNs. The specified target is searched for a LUN which looks like a live "
-"media. If you use the B<iscsitarget> software iSCSI target solution which is "
-"packaged in Debian your ietd.conf might look like this:"
+"media. If you use the B<iscsitarget> software iSCSI target solution your "
+"ietd.conf might look like this:"
 msgstr ""
 
 #. type: Plain text
@@ -414,7 +414,7 @@ msgstr ""
 msgid ""
 "This way you could tell live-boot that your image starts at offset BYTES in "
 "the above specified or autodiscovered device, this could be useful to hide "
-"the Debian Live iso or image inside another iso or image, to create \"clean"
+"the live system ISO or image inside another iso or image, to create \"clean"
 "\" images."
 msgstr ""
 
@@ -860,37 +860,36 @@ msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:202
 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 "
-"E<lt>I<http://live.debian.net/manual/>E<gt>."
+"More information about live-boot and the Live Systems project can be found "
+"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
+"at E<lt>I<http://live-systems.org/manual/>E<gt>."
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:203
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:205
 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 "
-"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists."
+"the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Live Systems mailing list at E<lt>I<debian-live@lists."
 "debian.org>E<gt>."
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:206
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170
+#: en/live-boot.7:170 en/persistence.conf.5:207
 msgid ""
-"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
-"for the Debian project."
+"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""

diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
index 76dde07..13e7afd 100644 (file)
--- a/manpages/po/de/persistence.conf.5.po
+++ b/manpages/po/de/persistence.conf.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a9-1\n"
-"POT-Creation-Date: 2013-03-10 22:13+0100\n"
+"Project-Id-Version: live-boot 4.0~a10-1\n"
+"POT-Creation-Date: 2013-04-01 08:19+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -24,19 +24,19 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-03-10"
-msgstr "10.03.2013"
+msgid "2013-04-01"
+msgstr "01.04.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a9-1"
-msgstr "4.0~a9-1"
+msgid "4.0~a10-1"
+msgstr "4.0~a10-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "Debian Live Project"
+msgid "Live Systems Project"
 msgstr ""
 
 #. type: SH
@@ -85,35 +85,41 @@ msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:202
 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 "
-"E<lt>I<http://live.debian.net/manual/>E<gt>."
+"More information about live-boot and the Live Systems project can be found "
+"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
+"at E<lt>I<http://live-systems.org/manual/>E<gt>."
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:203
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:205
 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 "
-"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists."
+"the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Live Systems mailing list at E<lt>I<debian-live@lists."
 "debian.org>E<gt>."
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:206
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
+#: en/live-boot.7:170 en/persistence.conf.5:207
+msgid ""
+"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
+msgstr ""
+
+#. type: Plain text
 #: en/persistence.conf.5:6
 msgid ""
 "B<persistence.conf> - Configuration file for persistence media in live-boot"
@@ -502,10 +508,3 @@ msgstr ""
 #: en/persistence.conf.5:193
 msgid "I<live-boot>(7)"
 msgstr ""
-
-#. type: Plain text
-#: en/persistence.conf.5:213
-msgid ""
-"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 ce64fa7..e2d5abd 100644 (file)
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a9-1\n"
-"POT-Creation-Date: 2013-03-10 22:13+0100\n"
+"Project-Id-Version: live-boot 4.0~a10-1\n"
+"POT-Creation-Date: 2013-04-01 08:19+0300\n"
 "PO-Revision-Date: 2013-02-12 14:25+0100\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -24,19 +24,19 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-03-10"
-msgstr "10.03.2013"
+msgid "2013-04-01"
+msgstr "01.04.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a9-1"
-msgstr "4.0~a9-1"
+msgid "4.0~a10-1"
+msgstr "4.0~a10-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "Debian Live Project"
+#, fuzzy, no-wrap
+msgid "Live Systems Project"
 msgstr "Proyecto Debian Live"
 
 #. type: SH
@@ -58,9 +58,13 @@ msgstr "DESCRIPCIÓN"
 
 #. type: Plain text
 #: en/live-boot.7:8
+#, fuzzy
+#| msgid ""
+#| "B<live-boot> contains the scripts that configure a Debian Live system "
+#| "during the boot process (early userspace)."
 msgid ""
-"B<live-boot> contains the scripts that configure a Debian Live system during "
-"the boot process (early userspace)."
+"B<live-boot> contains the scripts that configure a live system during the "
+"boot process (early userspace)."
 msgstr ""
 "B<live-boot> contiene los scripts que configuran un sistema Debian Live "
 "durante el proceso de arranque (early userspace)."
@@ -68,10 +72,16 @@ msgstr ""
 #.  FIXME
 #. type: Plain text
 #: en/live-boot.7:11
+#, fuzzy
+#| msgid ""
+#| "live-boot is a hook for the initramfs-tools, used to generate a initramfs "
+#| "capable to boot live systems, such as those created by I<live-helper>(7). "
+#| "This includes the Debian Live isos, netboot tarballs, and usb stick "
+#| "images."
 msgid ""
 "live-boot is a hook for the initramfs-tools, used to generate a initramfs "
 "capable to boot live systems, such as those created by I<live-helper>(7). "
-"This includes the Debian Live isos, netboot tarballs, and usb stick images."
+"This includes the Live systems ISOs, netboot tarballs, and usb stick images."
 msgstr ""
 "live-boot es un hook para initramfs-tools, usado para generar un initramfs "
 "capaz de arrancar sistemas en vivo, tales como los creados por I<live-helper>"
@@ -81,11 +91,17 @@ msgstr ""
 #.  FIXME
 #. type: Plain text
 #: en/live-boot.7:14
+#, fuzzy
+#| msgid ""
+#| "At boot time it will look for a (read-only) media containing a \"/live\" "
+#| "directory where a root filesystems (often a compressed filesystem image "
+#| "like squashfs) is stored. If found, it will create a writable "
+#| "environment, using aufs, for Debian like systems to boot from."
 msgid ""
 "At boot time it will look for a (read-only) media containing a \"/live\" "
 "directory where a root filesystems (often a compressed filesystem image like "
 "squashfs) is stored. If found, it will create a writable environment, using "
-"aufs, for Debian like systems to boot from."
+"aufs, to boot the system from."
 msgstr ""
 "En el momento del arranque se buscará un dispositivo de sólo lectura que "
 "contenga un directorio \"/live\" dónde se almacena un sistema de ficheros "
@@ -307,11 +323,17 @@ msgstr "B<iscsi>=I<server-ip[,server-port];target-name>"
 
 #. type: Plain text
 #: en/live-boot.7:62
+#, fuzzy
+#| msgid ""
+#| "Boot from an iSCSI target that has an iso or disk live image as one of "
+#| "its LUNs. The specified target is searched for a LUN which looks like a "
+#| "live media. If you use the B<iscsitarget> software iSCSI target solution "
+#| "which is packaged in Debian your ietd.conf might look like this:"
 msgid ""
 "Boot from an iSCSI target that has an iso or disk live image as one of its "
 "LUNs. The specified target is searched for a LUN which looks like a live "
-"media. If you use the B<iscsitarget> software iSCSI target solution which is "
-"packaged in Debian your ietd.conf might look like this:"
+"media. If you use the B<iscsitarget> software iSCSI target solution your "
+"ietd.conf might look like this:"
 msgstr ""
 "Arranca desde un objetivo iSCSI que tiene una iso o una imagen disco en vivo "
 "como uno de sus LUNs. Se busca en el objetivo especificado un LUN que sea "
@@ -500,10 +522,16 @@ msgstr "B<live-media-offset>=I<BYTES>"
 
 #. type: Plain text
 #: en/live-boot.7:89
+#, fuzzy
+#| msgid ""
+#| "This way you could tell live-boot that your image starts at offset BYTES "
+#| "in the above specified or autodiscovered device, this could be useful to "
+#| "hide the Debian Live iso or image inside another iso or image, to create "
+#| "\"clean\" images."
 msgid ""
 "This way you could tell live-boot that your image starts at offset BYTES in "
 "the above specified or autodiscovered device, this could be useful to hide "
-"the Debian Live iso or image inside another iso or image, to create \"clean"
+"the live system ISO or image inside another iso or image, to create \"clean"
 "\" images."
 msgstr ""
 "De esta manera se puede especificar a live-boot que la imagen comienza en "
@@ -1042,28 +1070,30 @@ msgid "HOMEPAGE"
 msgstr "PÁGINA WEB"
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:202
+#, fuzzy
 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 "
-"E<lt>I<http://live.debian.net/manual/>E<gt>."
+"More information about live-boot and the Live Systems project can be found "
+"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
+"at E<lt>I<http://live-systems.org/manual/>E<gt>."
 msgstr ""
 "Se puede encontrar más información acerca de live-boot y el proyecto Debian "
-"Live en la página web E<lt>I<http://live.debian.net/>E<gt> y en el manual en "
-"E<lt>I<http://live.debian.net/manual/>E<gt>."
+"Live en la página web E<lt>I<http://live-systems.org/>E<gt> y en el manual "
+"en E<lt>I<http://live-systems.org/manual/>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:203
 #, no-wrap
 msgid "BUGS"
 msgstr "ERRORES"
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:205
+#, fuzzy
 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 "
-"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists."
+"the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Live Systems mailing list at E<lt>I<debian-live@lists."
 "debian.org>E<gt>."
 msgstr ""
 "Se puede notificar los fallos enviando un informe de errores sobre el "
@@ -1072,16 +1102,16 @@ msgstr ""
 "Live a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:206
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:170
+#: en/live-boot.7:170 en/persistence.conf.5:207
+#, fuzzy
 msgid ""
-"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
-"for the Debian project."
+"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
 "live-boot fue escrito por Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
 "para el proyecto Debian."

diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index 265cc32..2f90008 100644 (file)
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a9-1\n"
-"POT-Creation-Date: 2013-03-10 22:13+0100\n"
+"Project-Id-Version: live-boot 4.0~a10-1\n"
+"POT-Creation-Date: 2013-04-01 08:19+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"
@@ -23,19 +23,19 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-03-10"
-msgstr "10.03.2013"
+msgid "2013-04-01"
+msgstr "01.04.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a9-1"
-msgstr "4.0~a9-1"
+msgid "4.0~a10-1"
+msgstr "4.0~a10-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "Debian Live Project"
+#, fuzzy, no-wrap
+msgid "Live Systems Project"
 msgstr "Proyecto Debian Live"
 
 #. type: SH
@@ -84,28 +84,30 @@ msgid "HOMEPAGE"
 msgstr "PÁGINA WEB"
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:202
+#, fuzzy
 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 "
-"E<lt>I<http://live.debian.net/manual/>E<gt>."
+"More information about live-boot and the Live Systems project can be found "
+"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
+"at E<lt>I<http://live-systems.org/manual/>E<gt>."
 msgstr ""
 "Se puede encontrar más información acerca de live-boot y el proyecto Debian "
-"Live en la página web E<lt>I<http://live.debian.net/>E<gt> y en el manual en "
-"E<lt>I<http://live.debian.net/manual/>E<gt>."
+"Live en la página web E<lt>I<http://live-systems.org/>E<gt> y en el manual "
+"en E<lt>I<http://live-systems.org/manual/>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:203
 #, no-wrap
 msgid "BUGS"
 msgstr "ERRORES"
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:205
+#, fuzzy
 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 "
-"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists."
+"the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Live Systems mailing list at E<lt>I<debian-live@lists."
 "debian.org>E<gt>."
 msgstr ""
 "Se puede notificar los fallos enviando un informe de errores sobre el "
@@ -114,12 +116,21 @@ msgstr ""
 "Live a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:206
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
+#: en/live-boot.7:170 en/persistence.conf.5:207
+#, fuzzy
+msgid ""
+"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
+msgstr ""
+"live-boot fue escrito por Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"para el proyecto Debian."
+
+#. type: Plain text
 #: en/persistence.conf.5:6
 msgid ""
 "B<persistence.conf> - Configuration file for persistence media in live-boot"
@@ -627,12 +638,3 @@ msgstr ""
 #: en/persistence.conf.5:193
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
-
-#. type: Plain text
-#: en/persistence.conf.5:213
-msgid ""
-"persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> for "
-"the Debian project."
-msgstr ""
-"persistence.conf fue escrito por anonym E<lt>I<anonym@lavabit.com>E<gt> para "
-"el proyecto Debian."

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 447900c..ff22863 100644 (file)
--- 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: 2013-03-10 22:13+0100\n"
+"POT-Creation-Date: 2013-04-01 08:19+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"
@@ -25,19 +25,19 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-03-10"
+msgid "2013-04-01"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a9-1"
+msgid "4.0~a10-1"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "Debian Live Project"
+msgid "Live Systems Project"
 msgstr ""
 
 #. type: SH
@@ -60,8 +60,8 @@ msgstr ""
 #. type: Plain text
 #: en/live-boot.7:8
 msgid ""
-"B<live-boot> contains the scripts that configure a Debian Live system during "
-"the boot process (early userspace)."
+"B<live-boot> contains the scripts that configure a live system during the "
+"boot process (early userspace)."
 msgstr ""
 
 #.  FIXME
@@ -70,7 +70,7 @@ msgstr ""
 msgid ""
 "live-boot is a hook for the initramfs-tools, used to generate a initramfs "
 "capable to boot live systems, such as those created by I<live-helper>(7). "
-"This includes the Debian Live isos, netboot tarballs, and usb stick images."
+"This includes the Live systems ISOs, netboot tarballs, and usb stick images."
 msgstr ""
 
 #.  FIXME
@@ -80,7 +80,7 @@ msgid ""
 "At boot time it will look for a (read-only) media containing a \"/live\" "
 "directory where a root filesystems (often a compressed filesystem image like "
 "squashfs) is stored. If found, it will create a writable environment, using "
-"aufs, for Debian like systems to boot from."
+"aufs, to boot the system from."
 msgstr ""
 
 #. type: SH
@@ -263,8 +263,8 @@ msgstr ""
 msgid ""
 "Boot from an iSCSI target that has an iso or disk live image as one of its "
 "LUNs. The specified target is searched for a LUN which looks like a live "
-"media. If you use the B<iscsitarget> software iSCSI target solution which is "
-"packaged in Debian your ietd.conf might look like this:"
+"media. If you use the B<iscsitarget> software iSCSI target solution your "
+"ietd.conf might look like this:"
 msgstr ""
 
 #. type: Plain text
@@ -415,7 +415,7 @@ msgstr ""
 msgid ""
 "This way you could tell live-boot that your image starts at offset BYTES in "
 "the above specified or autodiscovered device, this could be useful to hide "
-"the Debian Live iso or image inside another iso or image, to create \"clean"
+"the live system ISO or image inside another iso or image, to create \"clean"
 "\" images."
 msgstr ""
 
@@ -861,37 +861,36 @@ msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:202
 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 "
-"E<lt>I<http://live.debian.net/manual/>E<gt>."
+"More information about live-boot and the Live Systems project can be found "
+"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
+"at E<lt>I<http://live-systems.org/manual/>E<gt>."
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:203
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:205
 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 "
-"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists."
+"the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Live Systems mailing list at E<lt>I<debian-live@lists."
 "debian.org>E<gt>."
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:206
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170
+#: en/live-boot.7:170 en/persistence.conf.5:207
 msgid ""
-"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
-"for the Debian project."
+"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""

diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index 816332f..b1ad1c4 100644 (file)
--- a/manpages/pot/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: 2013-03-10 22:13+0100\n"
+"POT-Creation-Date: 2013-04-01 08:19+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"
@@ -25,19 +25,19 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-03-10"
+msgid "2013-04-01"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a9-1"
+msgid "4.0~a10-1"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "Debian Live Project"
+msgid "Live Systems Project"
 msgstr ""
 
 #. type: SH
@@ -86,35 +86,41 @@ msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:204
+#: en/live-boot.7:165 en/persistence.conf.5:202
 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 "
-"E<lt>I<http://live.debian.net/manual/>E<gt>."
+"More information about live-boot and the Live Systems project can be found "
+"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
+"at E<lt>I<http://live-systems.org/manual/>E<gt>."
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:205
+#: en/live-boot.7:166 en/persistence.conf.5:203
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:210
+#: en/live-boot.7:168 en/persistence.conf.5:205
 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 "
-"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists."
+"the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Live Systems mailing list at E<lt>I<debian-live@lists."
 "debian.org>E<gt>."
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:211
+#: en/live-boot.7:169 en/persistence.conf.5:206
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
+#: en/live-boot.7:170 en/persistence.conf.5:207
+msgid ""
+"live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
+msgstr ""
+
+#. type: Plain text
 #: en/persistence.conf.5:6
 msgid ""
 "B<persistence.conf> - Configuration file for persistence media in live-boot"
@@ -503,10 +509,3 @@ msgstr ""
 #: en/persistence.conf.5:193
 msgid "I<live-boot>(7)"
 msgstr ""
-
-#. type: Plain text
-#: en/persistence.conf.5:213
-msgid ""
-"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-initramfs-tools.sh b/scripts/boot/9990-initramfs-tools.sh
index 37aa0c3..5354134 100755 (executable)
--- a/scripts/boot/9990-initramfs-tools.sh
+++ b/scripts/boot/9990-initramfs-tools.sh
@@ -41,13 +41,12 @@ panic() {
        kill ${tailpid}
 
        printf "\n\n"
-       printf "     ${DEB_1}\n"
-       printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"
-       printf "     ${DEB_3}\n"
-       printf "     ${DEB_4}  This Debian Live image failed to boot.\n\n"
+       printf "  \033[1;37mBOOT FAILED!\033[0m\n"
+       printf "\n"
+       printf "  This Live System image failed to boot.\n\n"
 
-       printf "  Please file a bug against the 'live-boot' package or email the Debian\n"
-       printf "  Live mailing list at <debian-live@lists.debian.org>, making sure to note the\n"
+       printf "  Please file a bug against the 'live-boot' package or email the Live Systems\n"
+       printf "  mailing list at <debian-live@lists.debian.org>, making sure to note the\n"
        printf "  exact version, name and distribution of the image you were attempting to boot.\n\n"
 
        printf "  The file ${LIVELOG} contains some debugging information but booting with the\n"

diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index cb3940b..83b822d 100755 (executable)
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -2,21 +2,21 @@
 
 #set -e
 
-is_live_path ()
+file_pattern_matches()
 {
-       DIRECTORY="${1}"
-
-       if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ]
-       then
-               for FILESYSTEM in squashfs ext2 ext3 ext4 xfs dir jffs2
-               do
-                       if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ]
-                       then
-                               return 0
-                       fi
-               done
-       fi
+       [ -e "$1" ]
+}
 
+is_live_path()
+{
+       DIRECTORY="${1}/${LIVE_MEDIA_PATH}"
+       for FILESYSTEM in squashfs ext2 ext3 ext4 xfs dir jffs
+       do
+               if file_pattern_matches "${DIRECTORY}/"*.${FILESYSTEM}
+               then
+                       return 0
+               fi
+       done
        return 1
 }
 
@@ -62,32 +62,13 @@ get_backing_device ()
        esac
 }
 
-match_files_in_dir ()
-{
-       # Does any files match pattern ${1} ?
-       local pattern
-       pattern="${1}"
-
-       if [ "$(echo ${pattern})" != "${pattern}" ]
-       then
-               return 0
-       fi
-
-       return 1
-}
-
 mount_images_in_directory ()
 {
        directory="${1}"
        rootmnt="${2}"
        mac="${3}"
 
-       if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
-               match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext2" ||
-               match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext3" ||
-               match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext4" ||
-               match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.jffs2" ||
-               match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir"
+       if is_live_path "${directory}"
        then
                [ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}"
                setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}" "${adddirectory}"
@@ -1482,7 +1463,7 @@ activate_custom_mounts ()
                # ignore the loop below and set rootfs_dest_backing=$dest
                local rootfs_dest_backing
                rootfs_dest_backing=""
-               if [ -n "${opt_link}" ]
+               if [ -n "${opt_link}" ] || [ -n "${opt_union}" ]
                then
                        for d in /live/rootfs/*
                        do