[SCM] live-manual branch, debian-next, updated. debian/3.0_a13-1-22-gd18a5ef
Daniel Baumann
daniel at debian.org
Wed Jul 18 17:50:23 UTC 2012
The following commit has been merged in the debian-next branch:
commit d18a5ef2d05bd9d16b682a21c00f0efb51d1e122
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jul 18 19:50:58 2012 +0200
Updating name of the default netboot tarball.
diff --git a/manual/ca/live-manual.ssm b/manual/ca/live-manual.ssm
index ab417b0..36d3d4b 100644
--- a/manual/ca/live-manual.ssm
+++ b/manual/ca/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Aquest programa és un programari lliure: es pot redistribuir i/o modificar sota els termes de la Llicència Pública General de la GNU com és publicada per la Free Software Foundation, ja sigui la versió 3 de la Llicència, o (si ho preferiu) qualsevol versió posterior.<br><br>Aquest programa es distribueix amb l'esperança que sigui útil, però sense cap garantia, fins i tot sense la garantia implícita de COMERCIALITZACIÓ o ADEQUACIÓ PER A PROPÒSITS DETERMINATS. Vegeu la Llicència General Pública de la GNU per a més detalls.<br><br>Haurieu de rebre una còpia de la Llicència Pública General de la GNU amb aquest programa. Si no és així, consulteu http://www.gnu.org/licenses/. <br><br>El text complet de la Llicència Pública General de la GNU es pot trobar a /usr/share/common-licenses/GPL-3.
@date:
- :published: 2012-07-13
+ :published: 2012-07-09
@publisher: Projecte Debian Live <debian-live at lists.debian.org>
diff --git a/manual/ca/user_basics.ssi b/manual/ca/user_basics.ssi
index 22f077a..c7d1ed0 100644
--- a/manual/ca/user_basics.ssi
+++ b/manual/ca/user_basics.ssi
@@ -376,10 +376,10 @@ continuació. Per regla general, el següent pas és aconseguir un carregador
d'arrencada de més alt nivell a través del protocol TFTP. Podria ser GRUB,
pxelinux o fins i tot arrencar directament a un sistema operatiu com Linux.
-Per exemple, si es descomprimeix el arxiu #{binary-net.tar.gz}# generat al
-directori #{/srv/debian-live}#, es trobarà la imatge del sistema de fitxers
-a #{live/filesystem.squashfs}# i el nucli, initrd i carregador d'arrencada
-pxelinux a #{tftpboot/debian-live/i386}#.
+Per exemple, si es descomprimeix el arxiu #{binary.netboot.tar.xz}# generat
+al directori #{/srv/debian-live}#, es trobarà la imatge del sistema de
+fitxers a #{live/filesystem.squashfs}# i el nucli, initrd i carregador
+d'arrencada pxelinux a #{tftpboot/debian-live/i386}#.
Ara hem de configurar els tres serveis al servidor per l'arrencada en xarxa:
el servidor DHCP, servidor TFTP i el servidor NFS.
diff --git a/manual/ca/user_customization-runtime.ssi b/manual/ca/user_customization-runtime.ssi
index f9a111f..b721c07 100644
--- a/manual/ca/user_customization-runtime.ssi
+++ b/manual/ca/user_customization-runtime.ssi
@@ -49,17 +49,16 @@ prefix it accordingly (e.g. 2000-passwd) and add it to
2~customizing-locale-and-language Customizing locale and language
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
_* the locale generation
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
-_* setting the keyboard layout for X
-
-The default locale when building a Live system is "locales=en_US.UTF-8". To
-define the locale that should be generated, use the #{locales}# parameter in
-the #{--bootappend-live}# option of #{lb config}#, e.g.
+The default locale when building a Live system is
+#{locales=en_US.UTF-8}#. To define the locale that should be generated, use
+the #{locales}# parameter in the #{--bootappend-live}# option of #{lb
+config}#, e.g.
code{
@@ -67,50 +66,53 @@ code{
}code
-This parameter can also be used at the kernel command line. You can specify
-a locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depend on the
-#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
-options for X keyboard layouts can be found in
-#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
-codes). To find the value (the two characters) corresponding to a language
-try searching for the english name of the nation where the language is
-spoken, e.g:
-
-code{
-
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+Multiple locales may be specified as a comma-delimited list.
-}code
+This parameter, as well as the keyboard configuration parameters indicated
+below, can also be used at the kernel command line. You can specify a locale
+by #{language_country}# (in which case the default encoding is used) or the
+full #{language_country.encoding}# word. A list of supported locales and the
+encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
-To get the locale files for German and Swiss German keyboard layout in X
-use:
+Both the console and X keyboard configuration are performed by
+#{live-config}# using the #{console-setup}# package. To configure them, use
+the #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and
+#{keyboard-model}# boot parameters via the #{--bootappend-live}#
+option. Valid options for these can be found in
+#{/usr/share/X11/xkb/rules/base.lst}#. To find layouts and variants for a
+given language, try searching for the English name of the language and/or
+the country where the language is spoken, e.g:
code{
- $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-A list of the valid values of the keyboards for the console can be figured
-with the following command:
+Note that each variant lists the layout to which it applies in the
+description.
+
+Often, only the layout needs to be configured. For example, to get the
+locale files for German and Swiss German keyboard layout in X use:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
}code
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then set your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-TypeMatrix keyboard, both in console and X11, use:
+However, for very specific use cases, you may wish to include other
+parameters. For example, to set up a French system with a French-Dvorak
+layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
@@ -119,6 +121,12 @@ code{
}code
+Multiple values may be specified as comma-delimited lists for each of the
+keyboard configuration variables. Please see the #{keyboard(5)}# man page
+for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
+#{XKBOPTIONS}# variables which correspond to the similarly-named
+#{live-config}# variables described above.
+
2~persistence Persistence
A live cd paradigm is a pre-installed system which runs from read-only
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index f820d1b..491a45a 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
@date:
- :published: 2012-07-13
+ :published: 18.07.2012
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 05401eb..eddcc0b 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -358,8 +358,8 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated #{binary-net.tar.gz}# archive in
-the #{/srv/debian-live}# directory, you'll find the filesystem image in
+For example, if you unpack the generated #{binary.netboot.tar.xz}# archive
+in the #{/srv/debian-live}# directory, you'll find the filesystem image in
#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
in #{tftpboot/debian-live/i386}#.
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index f9a111f..b721c07 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -49,17 +49,16 @@ prefix it accordingly (e.g. 2000-passwd) and add it to
2~customizing-locale-and-language Customizing locale and language
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
_* the locale generation
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
-_* setting the keyboard layout for X
-
-The default locale when building a Live system is "locales=en_US.UTF-8". To
-define the locale that should be generated, use the #{locales}# parameter in
-the #{--bootappend-live}# option of #{lb config}#, e.g.
+The default locale when building a Live system is
+#{locales=en_US.UTF-8}#. To define the locale that should be generated, use
+the #{locales}# parameter in the #{--bootappend-live}# option of #{lb
+config}#, e.g.
code{
@@ -67,50 +66,53 @@ code{
}code
-This parameter can also be used at the kernel command line. You can specify
-a locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depend on the
-#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
-options for X keyboard layouts can be found in
-#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
-codes). To find the value (the two characters) corresponding to a language
-try searching for the english name of the nation where the language is
-spoken, e.g:
-
-code{
-
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+Multiple locales may be specified as a comma-delimited list.
-}code
+This parameter, as well as the keyboard configuration parameters indicated
+below, can also be used at the kernel command line. You can specify a locale
+by #{language_country}# (in which case the default encoding is used) or the
+full #{language_country.encoding}# word. A list of supported locales and the
+encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
-To get the locale files for German and Swiss German keyboard layout in X
-use:
+Both the console and X keyboard configuration are performed by
+#{live-config}# using the #{console-setup}# package. To configure them, use
+the #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and
+#{keyboard-model}# boot parameters via the #{--bootappend-live}#
+option. Valid options for these can be found in
+#{/usr/share/X11/xkb/rules/base.lst}#. To find layouts and variants for a
+given language, try searching for the English name of the language and/or
+the country where the language is spoken, e.g:
code{
- $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-A list of the valid values of the keyboards for the console can be figured
-with the following command:
+Note that each variant lists the layout to which it applies in the
+description.
+
+Often, only the layout needs to be configured. For example, to get the
+locale files for German and Swiss German keyboard layout in X use:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
}code
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then set your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-TypeMatrix keyboard, both in console and X11, use:
+However, for very specific use cases, you may wish to include other
+parameters. For example, to set up a French system with a French-Dvorak
+layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
@@ -119,6 +121,12 @@ code{
}code
+Multiple values may be specified as comma-delimited lists for each of the
+keyboard configuration variables. Please see the #{keyboard(5)}# man page
+for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
+#{XKBOPTIONS}# variables which correspond to the similarly-named
+#{live-config}# variables described above.
+
2~persistence Persistence
A live cd paradigm is a pre-installed system which runs from read-only
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index a170fc9..b831927 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-07-13
+ :published: 2012-07-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index 3ff6ab0..a2cacfe 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -240,7 +240,7 @@ code{
In a network boot, the client runs a small piece of software which usually resides on the EPROM of the Ethernet card. This program sends a DHCP request to get an IP address and information about what to do next. Typically, the next step is getting a higher level bootloader via the TFTP protocol. That could be pxelinux, GRUB, or even boot directly to an operating system like Linux.
-For example, if you unpack the generated #{binary-net.tar.gz}# archive in the #{/srv/debian-live}# directory, you'll find the filesystem image in #{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader in #{tftpboot/debian-live/i386}#.
+For example, if you unpack the generated #{binary.netboot.tar.xz}# archive in the #{/srv/debian-live}# directory, you'll find the filesystem image in #{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader in #{tftpboot/debian-live/i386}#.
We must now configure three services on the server to enable netboot: the DHCP server, the TFTP server and the NFS server.
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index fa5538f..409d906 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 2012-07-13
+ :published: 18.07.2012
@publisher: Proyecto Debian Live <debian-live at lists.debian.org>
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index fa95046..ce9eb34 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -384,8 +384,8 @@ conseguir un gestor de arranque de alto nivel a través del protocolo
TFTP. Este gestor podría ser PXELINUX, GRUB, o incluso arrancar directamente
un sistema operativo como Linux.
-Por ejemplo, si se descomprime el archivo generado #{binary-net.tar.gz}# en
-el directorio #{/srv/debian-live}#, se verá la imagen del sistema de
+Por ejemplo, si se descomprime el archivo generado #{binary.netboot.tar.xz}#
+en el directorio #{/srv/debian-live}#, se verá la imagen del sistema de
ficheros en #{live/filesystem.squashfs}# y el kernel, initrd y el gestor de
arranque pxelinux en #{tftpboot/debian-live/i386}#.
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index 6daf9c7..d94564f 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -56,18 +56,16 @@ prefijo adecuado (p.ej. 2000-passwd) y añadirlo a
2~customizing-locale-and-language Personalización de las variantes locales e
idioma
-Cuando el sistema en vivo arranca, el idioma está implicado en tres pasos:
+When the live system boots, language is involved in two steps:
_* Generar las variantes locales
-_* Establecer la distribución del teclado para el consola
+_* setting the keyboard configuration
-_* Establecer la distribución del teclado para el entorno gráfico X
-
-La variante local predeterminada en la creación de un sistema en vivo es
-"locales=en_US.UTF-8". Para definir la variante local que se debe generar,
-se puede utilizar el parámetro #{locales}# en la opción
-#{--bootappend-live}# de #{lb config}#, p.ej.
+The default locale when building a Live system is
+#{locales=en_US.UTF-8}#. To define the locale that should be generated, use
+the #{locales}# parameter in the #{--bootappend-live}# option of #{lb
+config}#, e.g.
code{
@@ -75,52 +73,53 @@ code{
}code
-Este parámetro también se puede utilizar en la línea de comandos del
-kernel. Se puede especificar una variante local de esta forma:
-#{language_country.encoding}#.
-
-Tanto la configuración del teclado de la consola y del entorno gráfico X
-dependen del parámetro #{keyboard-layouts}# de la opción
-#{--bootappend-live}#. Se pueden encontrar opciones válidas de la
-disposición del teclado en #{/usr/share/X11/xkb/rules/base.xml}# (bastante
-limitado a los códigos de país de dos letras). Para hallar el valor (los dos
-letras) que corresponde a un idioma se puede buscar el nombre en inglés de
-la nación donde se habla el idioma, por ejemplo:
-
-code{
-
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+Multiple locales may be specified as a comma-delimited list.
-}code
+This parameter, as well as the keyboard configuration parameters indicated
+below, can also be used at the kernel command line. You can specify a locale
+by #{language_country}# (in which case the default encoding is used) or the
+full #{language_country.encoding}# word. A list of supported locales and the
+encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
-Por ejemplo, para obtener los ficheros de la variante local de la
-disposición del teclado alemán y suizo-alemán en X usar:
+Both the console and X keyboard configuration are performed by
+#{live-config}# using the #{console-setup}# package. To configure them, use
+the #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and
+#{keyboard-model}# boot parameters via the #{--bootappend-live}#
+option. Valid options for these can be found in
+#{/usr/share/X11/xkb/rules/base.lst}#. To find layouts and variants for a
+given language, try searching for the English name of the language and/or
+the country where the language is spoken, e.g:
code{
- $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-Se puede ver una lista de los valores de teclados válidos para la consola
-con el siguiente comando:
+Note that each variant lists the layout to which it applies in the
+description.
+
+Often, only the layout needs to be configured. For example, to get the
+locale files for German and Swiss German keyboard layout in X use:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
}code
-Alternativamente, se puede usar el paquete #{console-setup}# una herramienta
-que permite configurar la disposición de la consola utilizando definiciones
-X (XKB), a continuación, se puede configurar el teclado con mayor precisión
-con las variables #{keyboard-layouts}#, #{keyboard-variant}#,
-#{keyboard-options}# y #{keyboard-model}#; live-boot también usará estos
-parámetros para la configuración de X. Por ejemplo, para establecer un
-sistema francés con una distribución de teclas francés-Dvorak (llamado Bepo)
-en un teclado TypeMatrix, tanto en consola X como X11, se puede utilizar:
+However, for very specific use cases, you may wish to include other
+parameters. For example, to set up a French system with a French-Dvorak
+layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
@@ -129,6 +128,12 @@ code{
}code
+Multiple values may be specified as comma-delimited lists for each of the
+keyboard configuration variables. Please see the #{keyboard(5)}# man page
+for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
+#{XKBOPTIONS}# variables which correspond to the similarly-named
+#{live-config}# variables described above.
+
2~persistence Persistencia
Un paradigma de un cd en vivo («live cd» N. del T.) es ser un sistema
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index c86b4af..653b4ec 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
@date:
- :published: 2012-07-13
+ :published: 18.07.2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 3b01d79..533d399 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -381,10 +381,11 @@ chargeur d'amorçage de niveau supérieur via le protocole TFTP. Cela pourrait
être pxelinux, GRUB, ou démarrer directement à un système d'exploitation
comme Linux.
-Par exemple, si vous décompressez le fichier généré #{binary-net.tar.gz}#
-dans le répertoire #{/srv/debian-live}#, vous trouverez l'image du système
-de fichiers dans #{live/filesystem.squashfs}# et le noyau, initrd et le
-chargeur d'amorçage pxelinux dans #{tftpboot/debian-live/i386}#.
+Par exemple, si vous décompressez le fichier généré
+#{binary.netboot.tar.xz}# dans le répertoire #{/srv/debian-live}#, vous
+trouverez l'image du système de fichiers dans #{live/filesystem.squashfs}#
+et le noyau, initrd et le chargeur d'amorçage pxelinux dans
+#{tftpboot/debian-live/i386}#.
Nous devons maintenant configurer trois services sur le serveur pour activer
le démarrage sur le réseau: le serveur DHCP, serveur TFTP et le serveur NFS.
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index af8e961..bc13b78 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -55,18 +55,16 @@ ce faire vous pouvez utiliser le hook "passwd" de
2~customizing-locale-and-language Personnalisation des paramètres régionaux
et de la langue
-Au démarrage du système live, la langue est impliquée dans trois étapes:
+When the live system boots, language is involved in two steps:
_* la génération des paramètres régionaux
-_* réglage de la disposition du clavier pour la console
+_* setting the keyboard configuration
-_* réglage de la disposition du clavier pour X
-
-Les paramètres régionaux par défaut pendant la construction d'un système
-Live sont "locales=en_US.UTF-8". Pour définir les paramètres régionaux qui
-doivent être générés, utilisez le paramètre #{locales}# dans l'option
-#{--bootappend-live}# de #{lb config}#, par exemple
+The default locale when building a Live system is
+#{locales=en_US.UTF-8}#. To define the locale that should be generated, use
+the #{locales}# parameter in the #{--bootappend-live}# option of #{lb
+config}#, e.g.
code{
@@ -74,52 +72,53 @@ code{
}code
-Ce paramètre peut également être utilisé à la ligne de commande du
-noyau. Vous pouvez spécifier des paramètres régionaux par
-#{language_country.encoding}#.
-
-Tant la console et la configuration du clavier X dépendent du paramètre
-#{keyboard-layouts}# de l'option #{--bootappend-live}#. Les options valides
-pour les dispositions des claviers X peuvent être trouvés dans
-#{/usr/share/X11/xkb/rules/base.xml}# (plutôt limitées à des codes des pays
-à deux lettres). Pour trouver la valeur (les deux caractères),
-correspondante à une langue essayez de rechercher le nom anglais de la
-nation où la langue est parlée, par exemple:
-
-code{
-
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+Multiple locales may be specified as a comma-delimited list.
-}code
+This parameter, as well as the keyboard configuration parameters indicated
+below, can also be used at the kernel command line. You can specify a locale
+by #{language_country}# (in which case the default encoding is used) or the
+full #{language_country.encoding}# word. A list of supported locales and the
+encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
-Pour obtenir les fichiers des paramètres régionaux de l'allemand et la
-disposition du clavier suisse allemand dans X utiliser:
+Both the console and X keyboard configuration are performed by
+#{live-config}# using the #{console-setup}# package. To configure them, use
+the #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and
+#{keyboard-model}# boot parameters via the #{--bootappend-live}#
+option. Valid options for these can be found in
+#{/usr/share/X11/xkb/rules/base.lst}#. To find layouts and variants for a
+given language, try searching for the English name of the language and/or
+the country where the language is spoken, e.g:
code{
- $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-Une liste des valeurs valides des claviers pour la console peut être figurée
-avec la commande suivante:
+Note that each variant lists the layout to which it applies in the
+description.
+
+Often, only the layout needs to be configured. For example, to get the
+locale files for German and Swiss German keyboard layout in X use:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
}code
-Alternativement, vous pouvez utiliser le paquet #{console-setup}#, un outil
-pour vous aider à configurer la disposition de la console en utilisant
-définitions X (XKB), vous pouvez alors définir votre clavier plus
-précisément avec variables #{keyboard-layouts}#, #{keyboard-variant}#,
-#{keyboard-options}# et #{keyboard-model}#; live-boot pourra également
-utiliser ces paramètres pour la configuration de X. Par exemple, pour mettre
-en place un système français avec une disposition Français Dvorak (appelée
-Bepo) sur un clavier TypeMatrix, à la fois dans la console et X11, utilisez:
+However, for very specific use cases, you may wish to include other
+parameters. For example, to set up a French system with a French-Dvorak
+layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
@@ -128,6 +127,12 @@ code{
}code
+Multiple values may be specified as comma-delimited lists for each of the
+keyboard configuration variables. Please see the #{keyboard(5)}# man page
+for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
+#{XKBOPTIONS}# variables which correspond to the similarly-named
+#{live-config}# variables described above.
+
2~persistence Persistance
Un paradigme d'un Live CD est être un système pré-installé qui amorce sur un
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 4c8a837..0e167a8 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2012-07-13
+ :published: 2012-07-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index ce31906..d55a745 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -373,7 +373,7 @@ di di livello superiore attraverso il protocollo TFTP. Questi potrebbe
essere pxelinux, GRUB, o anche avviare direttamente un sistema operativo
come Linux.
-Per esempio, estraendo l'archivio generato #{binary-net.tar.gz}# nella
+Per esempio, estraendo l'archivio generato #{binary.netboot.tar.xz}# nella
directory #{/srv/debian-live}#, si troverà l'immagine del filesystem in
#{live/filesystem.squashfs}# mentre il kernel, initrd ed il bootloader
pxelinux in #{tftpboot/debian-live/i386}#.
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index 70fc573..ab668c2 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -51,17 +51,16 @@ in fase di avvio}#boot-time-hooks. Si può usare l'hook "passwd" da
2~customizing-locale-and-language Personalizzare la localizzazione e la
lingua
-Quando il sistema live si avvia, la lingua è inserita in tre fasi:
+When the live system boots, language is involved in two steps:
_* generazione della localizzazione
-_* impostazione del layout di tastiera per la console
+_* setting the keyboard configuration
-impostazione del layout di tastiera per X
-
-Quando si crea un sistema live la localizzazione predefinita è
-"locales=en_US.UTF-8". Per definire quale generare, si usi il parametro
-#{locales}# nell'opzione #{--bootappend-live}# di #{lb config}#:
+The default locale when building a Live system is
+#{locales=en_US.UTF-8}#. To define the locale that should be generated, use
+the #{locales}# parameter in the #{--bootappend-live}# option of #{lb
+config}#, e.g.
code{
@@ -69,50 +68,53 @@ code{
}code
-Questo parametro può inoltre essere usato dalla riga di comando del kernel,
-specificando una localizzazione nella forma #{lingua_nazione.codifica}#.
-
-Sia la configurazione della tastiera in console sia di X dipendono dal
-parametro #{keyboard-layouts}# dell'opzione #{--bootappend-live}#. Si
-possono trovare le opzioni valide per i layout di X in
-#{/usr/share/X11/xkb/rules/base.xml}# (piuttosto che limitate alle due
-lettere del codice della nazione); per trovare il valore (i due caratteri)
-corrispondenti alla lingua, si cerchi con il nome inglese della nazione in
-cui si parla tale lingua:
-
-code{
-
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+Multiple locales may be specified as a comma-delimited list.
-}code
+This parameter, as well as the keyboard configuration parameters indicated
+below, can also be used at the kernel command line. You can specify a locale
+by #{language_country}# (in which case the default encoding is used) or the
+full #{language_country.encoding}# word. A list of supported locales and the
+encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
-Per ottenere i file di localizzazione per il layout di tastiera tedesco e
-svizzero-tedesco in X:
+Both the console and X keyboard configuration are performed by
+#{live-config}# using the #{console-setup}# package. To configure them, use
+the #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and
+#{keyboard-model}# boot parameters via the #{--bootappend-live}#
+option. Valid options for these can be found in
+#{/usr/share/X11/xkb/rules/base.lst}#. To find layouts and variants for a
+given language, try searching for the English name of the language and/or
+the country where the language is spoken, e.g:
code{
- $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-Si può ottenere un elenco di valori validi della tastiera per la console con
-il seguente comando:
+Note that each variant lists the layout to which it applies in the
+description.
+
+Often, only the layout needs to be configured. For example, to get the
+locale files for German and Swiss German keyboard layout in X use:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
}code
-In alternativa è possibile utilizzare il pacchetto #{console-setup}#, uno
-strumento per configurare il layout della console tramite le definizioni di
-X (XKB); si può dunque impostare il layout in modo più preciso con le
-variabili #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# e
-#{keyboard-model}#; live-boot userà questi parametri anche per X. Ad
-esempio, per impostare un layout French-Dvorak (chiamato Bepo) su un sistema
-francese con una tastiera TypeMatrix, sia in console sia in X11:
+However, for very specific use cases, you may wish to include other
+parameters. For example, to set up a French system with a French-Dvorak
+layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
@@ -121,6 +123,12 @@ code{
}code
+Multiple values may be specified as comma-delimited lists for each of the
+keyboard configuration variables. Please see the #{keyboard(5)}# man page
+for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
+#{XKBOPTIONS}# variables which correspond to the similarly-named
+#{live-config}# variables described above.
+
2~persistence Persistenza
Uno dei paradigmi di un cd live è un sistema preinstallato eseguito da un
diff --git a/manual/po/ca/live-manual.ssm.po b/manual/po/ca/live-manual.ssm.po
index 14d0e94..15dde17 100644
--- a/manual/po/ca/live-manual.ssm.po
+++ b/manual/po/ca/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-13 14:16+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-07-09 14:11+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: debian-live at lists.debian.org\n"
@@ -50,7 +50,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-13\n"
+" :published: 2012-07-18\n"
msgstr ""
"@date:\n"
" :published: 2012-07-09\n"
diff --git a/manual/po/ca/user_basics.ssi.po b/manual/po/ca/user_basics.ssi.po
index 0c22c25..76b091a 100644
--- a/manual/po/ca/user_basics.ssi.po
+++ b/manual/po/ca/user_basics.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-06-24 17:14+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -58,19 +58,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -128,19 +128,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -336,7 +336,7 @@ msgstr ""
"«config/» en el directori actual per ser utilitzada per altres ordres:"
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -925,15 +925,15 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
-"Per exemple, si es descomprimeix el arxiu #{binary-net.tar.gz}# generat al "
-"directori #{/srv/debian-live}#, es trobarà la imatge del sistema de fitxers "
-"a #{live/filesystem.squashfs}# i el nucli, initrd i carregador d'arrencada "
-"pxelinux a #{tftpboot/debian-live/i386}#."
+"Per exemple, si es descomprimeix el arxiu #{binary.netboot.tar.xz}# generat "
+"al directori #{/srv/debian-live}#, es trobarà la imatge del sistema de "
+"fitxers a #{live/filesystem.squashfs}# i el nucli, initrd i carregador "
+"d'arrencada pxelinux a #{tftpboot/debian-live/i386}#."
#. type: Plain text
#: en/user_basics.ssi:246
diff --git a/manual/po/ca/user_customization-runtime.ssi.po b/manual/po/ca/user_customization-runtime.ssi.po
index 823ba04..30e0577 100644
--- a/manual/po/ca/user_customization-runtime.ssi.po
+++ b/manual/po/ca/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-27 23:35+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-06-09 20:31+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,19 +59,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -129,19 +129,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -245,7 +245,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -255,95 +255,98 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
-msgstr ""
+#, fuzzy
+#| msgid ":B~ Managing a configuration"
+msgid "_* setting the keyboard configuration"
+msgstr ":B~ Gestió d'una configuració"
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"The default locale when building a Live system is #{locales=en_US.UTF-8}#. "
"To define the locale that should be generated, use the #{locales}# parameter "
"in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"This parameter, as well as the keyboard configuration parameters indicated "
+"below, can also be used at the kernel command line. You can specify a locale "
+"by #{language_country}# (in which case the default encoding is used) or the "
+"full #{language_country.encoding}# word. A list of supported locales and the "
+"encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
+"Both the console and X keyboard configuration are performed by #{live-config}"
+"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
+"layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# "
+"boot parameters via the #{--bootappend-live}# option. Valid options for "
+"these can be found in #{/usr/share/X11/xkb/rules/base.lst}#. To find layouts "
+"and variants for a given language, try searching for the English name of the "
+"language and/or the country where the language is spoken, e.g:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst \n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:68
-#, no-wrap
-msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:74
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"Often, only the layout needs to be configured. For example, to get the "
+"locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:78
#, no-wrap
-msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:82
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
+"However, for very specific use cases, you may wish to include other "
+"parameters. For example, to set up a French system with a French-Dvorak "
+"layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -351,12 +354,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:91
+msgid ""
+"Multiple values may be specified as comma-delimited lists for each of the "
+"keyboard configuration variables. Please see the #{keyboard(5)}# man page "
+"for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #"
+"{XKBOPTIONS}# variables which correspond to the similarly-named #{live-"
+"config}# variables described above."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:93
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:95
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -364,7 +377,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:97
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -373,7 +386,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:99
msgid ""
"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -384,7 +397,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:101
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like local storage media, a network share or even a session of a "
@@ -394,7 +407,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:103
msgid ""
"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
@@ -404,17 +417,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:105
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:107
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:109
msgid ""
"_* an image file located on the root of any readable filesystem (even an "
"NTFS partition of a foreign OS), identified by its file name. In this case "
@@ -423,7 +436,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:111
msgid ""
"The volume label for overlays must be #{persistence}#. And in order to fully "
"customize the volume's persistence there must be a file named #{live-"
@@ -432,7 +445,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:113
msgid ""
"Here are some examples of how to prepare a volume to be used for "
"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
@@ -440,38 +453,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:117
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:121
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:123
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:127
#, no-wrap
msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:136
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -479,17 +492,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:140
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:142
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:144
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -498,7 +511,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:146
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
"live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -507,7 +520,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:153
#, no-wrap
msgid ""
" $ mkfs.ext4 -L persistence /dev/sdb1\n"
@@ -517,7 +530,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:157
msgid ""
"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
"cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -529,7 +542,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:159
msgid ""
"Several different custom overlay volumes (with their own #{live-persistence."
"conf}# files) can be used at the same time, but if several volumes make the "
@@ -542,12 +555,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
+#: en/user_customization-runtime.ssi:161
msgid "3~ Persistence SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:162
msgid ""
"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{persistence-nonwork}# and #"
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 5348de2..019a0a2 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-13 14:16+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-13\n"
+" :published: 2012-07-18\n"
msgstr ""
"@date:\n"
-" :published: 13.07.2012\n"
+" :published: 18.07.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 3009492..4dce9ec 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,19 +59,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -129,19 +129,19 @@ msgstr ""
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -280,7 +280,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -302,7 +302,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -749,8 +749,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index 17bc4f4..d1b0382 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-27 23:35+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,19 +59,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -129,19 +129,19 @@ msgstr ""
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -245,7 +245,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -255,95 +255,96 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
+msgid "_* setting the keyboard configuration"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"The default locale when building a Live system is #{locales=en_US.UTF-8}#. "
"To define the locale that should be generated, use the #{locales}# parameter "
"in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"This parameter, as well as the keyboard configuration parameters indicated "
+"below, can also be used at the kernel command line. You can specify a locale "
+"by #{language_country}# (in which case the default encoding is used) or the "
+"full #{language_country.encoding}# word. A list of supported locales and the "
+"encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
+"Both the console and X keyboard configuration are performed by #{live-config}"
+"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
+"layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# "
+"boot parameters via the #{--bootappend-live}# option. Valid options for "
+"these can be found in #{/usr/share/X11/xkb/rules/base.lst}#. To find layouts "
+"and variants for a given language, try searching for the English name of the "
+"language and/or the country where the language is spoken, e.g:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst \n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
-#, no-wrap
-msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:74
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"Often, only the layout needs to be configured. For example, to get the "
+"locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:78
#, no-wrap
-msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:82
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
+"However, for very specific use cases, you may wish to include other "
+"parameters. For example, to set up a French system with a French-Dvorak "
+"layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -351,12 +352,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:91
+msgid ""
+"Multiple values may be specified as comma-delimited lists for each of the "
+"keyboard configuration variables. Please see the #{keyboard(5)}# man page "
+"for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #"
+"{XKBOPTIONS}# variables which correspond to the similarly-named #{live-"
+"config}# variables described above."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:93
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:95
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -364,7 +375,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:97
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -373,7 +384,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:99
msgid ""
"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -384,7 +395,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:101
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like local storage media, a network share or even a session of a "
@@ -394,7 +405,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:103
msgid ""
"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
@@ -404,17 +415,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:105
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:107
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:109
msgid ""
"_* an image file located on the root of any readable filesystem (even an "
"NTFS partition of a foreign OS), identified by its file name. In this case "
@@ -423,7 +434,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:111
msgid ""
"The volume label for overlays must be #{persistence}#. And in order to fully "
"customize the volume's persistence there must be a file named #{live-"
@@ -432,7 +443,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:113
msgid ""
"Here are some examples of how to prepare a volume to be used for "
"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
@@ -440,38 +451,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:117
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:121
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:123
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:127
#, no-wrap
msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:136
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -479,17 +490,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:140
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:142
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:144
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -498,7 +509,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:146
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
"live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -507,7 +518,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:153
#, no-wrap
msgid ""
" $ mkfs.ext4 -L persistence /dev/sdb1\n"
@@ -517,7 +528,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:157
msgid ""
"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
"cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -529,7 +540,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:159
msgid ""
"Several different custom overlay volumes (with their own #{live-persistence."
"conf}# files) can be used at the same time, but if several volumes make the "
@@ -542,12 +553,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
+#: en/user_customization-runtime.ssi:161
msgid "3~ Persistence SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:162
msgid ""
"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{persistence-nonwork}# and #"
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index bcfcf41..efd0bae 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-13 14:16+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2011-03-12 08:00-0000\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com\n"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-13\n"
+" :published: 2012-07-18\n"
msgstr ""
"@date:\n"
-" :published: 13.07.2012\n"
+" :published: 18.07.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index fa61be8..a9cea2e 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-02-19 21:41+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -64,19 +64,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -134,19 +134,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -346,7 +346,7 @@ msgstr ""
"comandos:"
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -373,7 +373,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr " # lb build\n"
@@ -942,13 +942,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
-"Por ejemplo, si se descomprime el archivo generado #{binary-net.tar.gz}# en "
-"el directorio #{/srv/debian-live}#, se verá la imagen del sistema de "
+"Por ejemplo, si se descomprime el archivo generado #{binary.netboot.tar.xz}# "
+"en el directorio #{/srv/debian-live}#, se verá la imagen del sistema de "
"ficheros en #{live/filesystem.squashfs}# y el kernel, initrd y el gestor de "
"arranque pxelinux en #{tftpboot/debian-live/i386}#."
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index f1f7666..6fb6afa 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-27 23:35+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-03-24 13:18+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -64,19 +64,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -134,19 +134,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -281,7 +281,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+#, fuzzy
+#| msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
"Cuando el sistema en vivo arranca, el idioma está implicado en tres pasos:"
@@ -292,18 +294,20 @@ msgstr "_* Generar las variantes locales"
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
-msgstr "_* Establecer la distribución del teclado para el consola"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
+#, fuzzy
+#| msgid "_* setting the keyboard layout for X"
+msgid "_* setting the keyboard configuration"
msgstr "_* Establecer la distribución del teclado para el entorno gráfico X"
#. type: Plain text
-#: en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:43
+#, fuzzy
+#| msgid ""
+#| "The default locale when building a Live system is \"locales=en_US."
+#| "UTF-8\". To define the locale that should be generated, use the #{locales}"
+#| "# parameter in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"The default locale when building a Live system is #{locales=en_US.UTF-8}#. "
"To define the locale that should be generated, use the #{locales}# parameter "
"in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgstr ""
@@ -313,30 +317,44 @@ msgstr ""
"# de #{lb config}#, p.ej."
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"This parameter, as well as the keyboard configuration parameters indicated "
+"below, can also be used at the kernel command line. You can specify a locale "
+"by #{language_country}# (in which case the default encoding is used) or the "
+"full #{language_country.encoding}# word. A list of supported locales and the "
+"encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#."
msgstr ""
-"Este parámetro también se puede utilizar en la línea de comandos del kernel. "
-"Se puede especificar una variante local de esta forma: #{language_country."
-"encoding}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:55
-msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
+#, fuzzy
+#| msgid ""
+#| "Both the console and X keyboard configuration depend on the #{keyboard-"
+#| "layouts}# parameter of the #{--bootappend-live}# option. Valid options "
+#| "for X keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base."
+#| "xml}# (rather limited to two-letters country codes). To find the value "
+#| "(the two characters) corresponding to a language try searching for the "
+#| "english name of the nation where the language is spoken, e.g:"
+msgid ""
+"Both the console and X keyboard configuration are performed by #{live-config}"
+"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
+"layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# "
+"boot parameters via the #{--bootappend-live}# option. Valid options for "
+"these can be found in #{/usr/share/X11/xkb/rules/base.lst}#. To find layouts "
+"and variants for a given language, try searching for the English name of the "
+"language and/or the country where the language is spoken, e.g:"
msgstr ""
"Tanto la configuración del teclado de la consola y del entorno gráfico X "
"dependen del parámetro #{keyboard-layouts}# de la opción #{--bootappend-live}"
@@ -347,79 +365,80 @@ msgstr ""
"idioma, por ejemplo:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst \n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:72
+msgid ""
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:74
+#, fuzzy
+#| msgid ""
+#| "To get the locale files for German and Swiss German keyboard layout in X "
+#| "use:"
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Often, only the layout needs to be configured. For example, to get the "
+"locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
"Por ejemplo, para obtener los ficheros de la variante local de la "
"disposición del teclado alemán y suizo-alemán en X usar:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:78
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"However, for very specific use cases, you may wish to include other "
+"parameters. For example, to set up a French system with a French-Dvorak "
+"layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:"
msgstr ""
-"Se puede ver una lista de los valores de teclados válidos para la consola "
-"con el siguiente comando:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:81
-msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
-"Alternativamente, se puede usar el paquete #{console-setup}# una herramienta "
-"que permite configurar la disposición de la consola utilizando definiciones "
-"X (XKB), a continuación, se puede configurar el teclado con mayor precisión "
-"con las variables #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-"
-"options}# y #{keyboard-model}#; live-boot también usará estos parámetros "
-"para la configuración de X. Por ejemplo, para establecer un sistema francés "
-"con una distribución de teclas francés-Dvorak (llamado Bepo) en un teclado "
-"TypeMatrix, tanto en consola X como X11, se puede utilizar:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
-#, no-wrap
+#: en/user_customization-runtime.ssi:91
msgid ""
-" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"Multiple values may be specified as comma-delimited lists for each of the "
+"keyboard configuration variables. Please see the #{keyboard(5)}# man page "
+"for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #"
+"{XKBOPTIONS}# variables which correspond to the similarly-named #{live-"
+"config}# variables described above."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:93
msgid "2~persistence Persistence"
msgstr "2~persistence Persistencia"
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:95
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -431,7 +450,7 @@ msgstr ""
"reiniciar el sistema en que se ejecuta."
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:97
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -445,7 +464,7 @@ msgstr ""
"apagar el equipo."
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:99
msgid ""
"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -463,7 +482,7 @@ msgstr ""
"ram (tmpfs) y los datos guardados en la ram no se guardan tras reiniciar."
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:101
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like local storage media, a network share or even a session of a "
@@ -479,7 +498,7 @@ msgstr ""
"especificará en el momento del arranque: #{persistence}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:103
msgid ""
"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
@@ -496,19 +515,19 @@ msgstr ""
"siguientes: "
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:105
msgid "_* a partition, identified by its GPT name."
msgstr "_* una partición, identificada por su nombre GPT."
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:107
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
"_* Un sistema de ficheros, identificado por su etiqueta de sistema de "
"ficheros."
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:109
msgid ""
"_* an image file located on the root of any readable filesystem (even an "
"NTFS partition of a foreign OS), identified by its file name. In this case "
@@ -522,7 +541,7 @@ msgstr ""
"\"persistence.ext4\"."
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:111
msgid ""
"The volume label for overlays must be #{persistence}#. And in order to fully "
"customize the volume's persistence there must be a file named #{live-"
@@ -535,7 +554,7 @@ msgstr ""
"Ver {El fichero live-persistence.conf}#live-persistence-conf"
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:113
msgid ""
"Here are some examples of how to prepare a volume to be used for "
"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
@@ -546,19 +565,19 @@ msgstr ""
"una llave usb creada con, p.ej."
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:117
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:121
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Ver {Usar el espacio libre en el dispositivo USB}#using-usb-extra-space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:123
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -567,13 +586,13 @@ msgstr ""
"etiqueta con uno de los siguientes:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:127
#, no-wrap
msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
@@ -582,7 +601,7 @@ msgstr ""
"persistencia:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:136
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -590,19 +609,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:140
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
"A continuación, copiar el fichero #{persistence}# en la raíz de una "
"partición grabable."
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:142
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr "3~live-persistence-conf El fichero live-persistence.conf"
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:144
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -615,7 +634,7 @@ msgstr ""
"directorios hace persistentes y también de que manera."
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:146
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
"live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -629,7 +648,7 @@ msgstr ""
"ext4 en la partición /dev/sdb1:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:153
#, no-wrap
msgid ""
" $ mkfs.ext4 -L persistence /dev/sdb1\n"
@@ -639,7 +658,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:157
msgid ""
"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
"cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -658,7 +677,7 @@ msgstr ""
"pueden hacerse persistentes montándolos de forma personalizada."
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:159
msgid ""
"Several different custom overlay volumes (with their own #{live-persistence."
"conf}# files) can be used at the same time, but if several volumes make the "
@@ -681,12 +700,12 @@ msgstr ""
"necesario. (aclaración: normalmente no lo es)."
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
+#: en/user_customization-runtime.ssi:161
msgid "3~ Persistence SubText"
msgstr "3~ SubText persistente"
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:162
msgid ""
"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{persistence-nonwork}# and #"
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index b202de6..efc13d1 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-13 14:16+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2011-06-19 16:32+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-13\n"
+" :published: 2012-07-18\n"
msgstr ""
"@date:\n"
-" :published: 13.07.2012\n"
+" :published: 18.07.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 16bc2a3..f4a8249 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-04-28 11:39+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -60,19 +60,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -130,19 +130,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -341,7 +341,7 @@ msgstr ""
"d'autres commandes:"
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -368,7 +368,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -935,13 +935,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
-"Par exemple, si vous décompressez le fichier généré #{binary-net.tar.gz}# "
-"dans le répertoire #{/srv/debian-live}#, vous trouverez l'image du système "
+"Par exemple, si vous décompressez le fichier généré #{binary.netboot.tar.xz}"
+"# dans le répertoire #{/srv/debian-live}#, vous trouverez l'image du système "
"de fichiers dans #{live/filesystem.squashfs}# et le noyau, initrd et le "
"chargeur d'amorçage pxelinux dans #{tftpboot/debian-live/i386}#."
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 7fea304..cd481b6 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-27 23:35+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-04-29 15:48+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -60,19 +60,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -130,19 +130,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -275,7 +275,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+#, fuzzy
+#| msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
"Au démarrage du système live, la langue est impliquée dans trois étapes:"
@@ -286,18 +288,20 @@ msgstr "_* la génération des paramètres régionaux"
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
-msgstr "_* réglage de la disposition du clavier pour la console"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
+#, fuzzy
+#| msgid "_* setting the keyboard layout for X"
+msgid "_* setting the keyboard configuration"
msgstr "_* réglage de la disposition du clavier pour X"
#. type: Plain text
-#: en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:43
+#, fuzzy
+#| msgid ""
+#| "The default locale when building a Live system is \"locales=en_US."
+#| "UTF-8\". To define the locale that should be generated, use the #{locales}"
+#| "# parameter in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"The default locale when building a Live system is #{locales=en_US.UTF-8}#. "
"To define the locale that should be generated, use the #{locales}# parameter "
"in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgstr ""
@@ -307,30 +311,44 @@ msgstr ""
"bootappend-live}# de #{lb config}#, par exemple"
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"This parameter, as well as the keyboard configuration parameters indicated "
+"below, can also be used at the kernel command line. You can specify a locale "
+"by #{language_country}# (in which case the default encoding is used) or the "
+"full #{language_country.encoding}# word. A list of supported locales and the "
+"encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#."
msgstr ""
-"Ce paramètre peut également être utilisé à la ligne de commande du noyau. "
-"Vous pouvez spécifier des paramètres régionaux par #{language_country."
-"encoding}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:55
-msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
+#, fuzzy
+#| msgid ""
+#| "Both the console and X keyboard configuration depend on the #{keyboard-"
+#| "layouts}# parameter of the #{--bootappend-live}# option. Valid options "
+#| "for X keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base."
+#| "xml}# (rather limited to two-letters country codes). To find the value "
+#| "(the two characters) corresponding to a language try searching for the "
+#| "english name of the nation where the language is spoken, e.g:"
+msgid ""
+"Both the console and X keyboard configuration are performed by #{live-config}"
+"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
+"layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# "
+"boot parameters via the #{--bootappend-live}# option. Valid options for "
+"these can be found in #{/usr/share/X11/xkb/rules/base.lst}#. To find layouts "
+"and variants for a given language, try searching for the English name of the "
+"language and/or the country where the language is spoken, e.g:"
msgstr ""
"Tant la console et la configuration du clavier X dépendent du paramètre #"
"{keyboard-layouts}# de l'option #{--bootappend-live}#. Les options valides "
@@ -341,79 +359,80 @@ msgstr ""
"parlée, par exemple:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst \n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:72
+msgid ""
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:74
+#, fuzzy
+#| msgid ""
+#| "To get the locale files for German and Swiss German keyboard layout in X "
+#| "use:"
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Often, only the layout needs to be configured. For example, to get the "
+"locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
"Pour obtenir les fichiers des paramètres régionaux de l'allemand et la "
"disposition du clavier suisse allemand dans X utiliser:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:78
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"However, for very specific use cases, you may wish to include other "
+"parameters. For example, to set up a French system with a French-Dvorak "
+"layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:"
msgstr ""
-"Une liste des valeurs valides des claviers pour la console peut être figurée "
-"avec la commande suivante:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:81
-msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
-"Alternativement, vous pouvez utiliser le paquet #{console-setup}#, un outil "
-"pour vous aider à configurer la disposition de la console en utilisant "
-"définitions X (XKB), vous pouvez alors définir votre clavier plus "
-"précisément avec variables #{keyboard-layouts}#, #{keyboard-variant}#, #"
-"{keyboard-options}# et #{keyboard-model}#; live-boot pourra également "
-"utiliser ces paramètres pour la configuration de X. Par exemple, pour mettre "
-"en place un système français avec une disposition Français Dvorak (appelée "
-"Bepo) sur un clavier TypeMatrix, à la fois dans la console et X11, utilisez:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
-#, no-wrap
+#: en/user_customization-runtime.ssi:91
msgid ""
-" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"Multiple values may be specified as comma-delimited lists for each of the "
+"keyboard configuration variables. Please see the #{keyboard(5)}# man page "
+"for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #"
+"{XKBOPTIONS}# variables which correspond to the similarly-named #{live-"
+"config}# variables described above."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:93
msgid "2~persistence Persistence"
msgstr "2~persistence Persistance"
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:95
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -425,7 +444,7 @@ msgstr ""
"l'exécute."
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:97
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -438,7 +457,7 @@ msgstr ""
"pendant l'exécution du système sont perdus à l'arrêt."
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:99
msgid ""
"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -457,7 +476,7 @@ msgstr ""
"survivent pas à un redémarrage."
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:101
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like local storage media, a network share or even a session of a "
@@ -473,7 +492,7 @@ msgstr ""
"spéciale à préciser au moment du démarrage: #{persistence}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:103
msgid ""
"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
@@ -489,19 +508,19 @@ msgstr ""
"de manuel live-boot(7). Un volume persistant est un des éléments suivants:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:105
msgid "_* a partition, identified by its GPT name."
msgstr "_* une partition, identifiée par son nom GPT."
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:107
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
"_* un système de fichiers, identifié par son étiquette de système de "
"fichiers."
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:109
msgid ""
"_* an image file located on the root of any readable filesystem (even an "
"NTFS partition of a foreign OS), identified by its file name. In this case "
@@ -514,7 +533,7 @@ msgstr ""
"du système de fichiers comme extension, par exemple, \"persistence.ext4\"."
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:111
msgid ""
"The volume label for overlays must be #{persistence}#. And in order to fully "
"customize the volume's persistence there must be a file named #{live-"
@@ -527,7 +546,7 @@ msgstr ""
"fichier live-persistence.conf}#live-persistence-conf"
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:113
msgid ""
"Here are some examples of how to prepare a volume to be used for "
"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
@@ -538,20 +557,20 @@ msgstr ""
"ou sur une clé usb créée avec, par exemple:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:117
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:121
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Voir aussi {Utilisation de l'espace disponible sur une clé USB}#using-usb-"
"extra-space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:123
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -560,13 +579,13 @@ msgstr ""
"modifier l'étiquette avec l'un des suivants:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:127
#, no-wrap
msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
@@ -575,7 +594,7 @@ msgstr ""
"persistance:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:136
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -583,19 +602,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:140
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
"Ensuite, copiez le fichier #{persistence}# à la racine d'une partition "
"accessible en écriture."
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:142
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr "3~live-persistence-conf Le fichier live-persistence.conf"
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:144
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -608,7 +627,7 @@ msgstr ""
"répertoires il fait persistants, et de quelle manière."
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:146
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
"live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -622,7 +641,7 @@ msgstr ""
"système de fichiers ext4 sur la partition /dev/sdb1:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:153
#, no-wrap
msgid ""
" $ mkfs.ext4 -L persistence /dev/sdb1\n"
@@ -632,7 +651,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:157
msgid ""
"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
"cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -652,7 +671,7 @@ msgstr ""
"rendus persistants en utilisant montages personnalisés."
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:159
msgid ""
"Several different custom overlay volumes (with their own #{live-persistence."
"conf}# files) can be used at the same time, but if several volumes make the "
@@ -675,12 +694,12 @@ msgstr ""
"n'avez généralement pas)."
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
+#: en/user_customization-runtime.ssi:161
msgid "3~ Persistence SubText"
msgstr "3~ SubText persistant"
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:162
msgid ""
"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{persistence-nonwork}# and #"
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 5227300..7d547b3 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-13 14:16+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-06-18 19:33+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -50,7 +50,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-13\n"
+" :published: 2012-07-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 33c1699..2e02fa7 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-04-03 17:59+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -61,19 +61,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -131,19 +131,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -339,7 +339,7 @@ msgstr ""
"altri comandi:"
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -366,7 +366,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -927,12 +927,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
-"Per esempio, estraendo l'archivio generato #{binary-net.tar.gz}# nella "
+"Per esempio, estraendo l'archivio generato #{binary.netboot.tar.xz}# nella "
"directory #{/srv/debian-live}#, si troverà l'immagine del filesystem in #"
"{live/filesystem.squashfs}# mentre il kernel, initrd ed il bootloader "
"pxelinux in #{tftpboot/debian-live/i386}#."
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index 5a6e4f9..8aa2109 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-27 23:35+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-06-18 19:35+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -60,19 +60,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -130,19 +130,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -271,7 +271,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+#, fuzzy
+#| msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr "Quando il sistema live si avvia, la lingua è inserita in tre fasi:"
#. type: Plain text
@@ -281,18 +283,20 @@ msgstr "_* generazione della localizzazione"
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
-msgstr "_* impostazione del layout di tastiera per la console"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
+#, fuzzy
+#| msgid "_* setting the keyboard layout for X"
+msgid "_* setting the keyboard configuration"
msgstr "impostazione del layout di tastiera per X"
#. type: Plain text
-#: en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:43
+#, fuzzy
+#| msgid ""
+#| "The default locale when building a Live system is \"locales=en_US."
+#| "UTF-8\". To define the locale that should be generated, use the #{locales}"
+#| "# parameter in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"The default locale when building a Live system is #{locales=en_US.UTF-8}#. "
"To define the locale that should be generated, use the #{locales}# parameter "
"in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgstr ""
@@ -301,29 +305,44 @@ msgstr ""
"{locales}# nell'opzione #{--bootappend-live}# di #{lb config}#:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"This parameter, as well as the keyboard configuration parameters indicated "
+"below, can also be used at the kernel command line. You can specify a locale "
+"by #{language_country}# (in which case the default encoding is used) or the "
+"full #{language_country.encoding}# word. A list of supported locales and the "
+"encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#."
msgstr ""
-"Questo parametro può inoltre essere usato dalla riga di comando del kernel, "
-"specificando una localizzazione nella forma #{lingua_nazione.codifica}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:55
-msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
+#, fuzzy
+#| msgid ""
+#| "Both the console and X keyboard configuration depend on the #{keyboard-"
+#| "layouts}# parameter of the #{--bootappend-live}# option. Valid options "
+#| "for X keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base."
+#| "xml}# (rather limited to two-letters country codes). To find the value "
+#| "(the two characters) corresponding to a language try searching for the "
+#| "english name of the nation where the language is spoken, e.g:"
+msgid ""
+"Both the console and X keyboard configuration are performed by #{live-config}"
+"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
+"layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# "
+"boot parameters via the #{--bootappend-live}# option. Valid options for "
+"these can be found in #{/usr/share/X11/xkb/rules/base.lst}#. To find layouts "
+"and variants for a given language, try searching for the English name of the "
+"language and/or the country where the language is spoken, e.g:"
msgstr ""
"Sia la configurazione della tastiera in console sia di X dipendono dal "
"parametro #{keyboard-layouts}# dell'opzione #{--bootappend-live}#. Si "
@@ -334,78 +353,80 @@ msgstr ""
"lingua:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst \n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:72
+msgid ""
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:74
+#, fuzzy
+#| msgid ""
+#| "To get the locale files for German and Swiss German keyboard layout in X "
+#| "use:"
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Often, only the layout needs to be configured. For example, to get the "
+"locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
"Per ottenere i file di localizzazione per il layout di tastiera tedesco e "
"svizzero-tedesco in X:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:78
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"However, for very specific use cases, you may wish to include other "
+"parameters. For example, to set up a French system with a French-Dvorak "
+"layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:"
msgstr ""
-"Si può ottenere un elenco di valori validi della tastiera per la console con "
-"il seguente comando:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:81
-msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
-"In alternativa è possibile utilizzare il pacchetto #{console-setup}#, uno "
-"strumento per configurare il layout della console tramite le definizioni di "
-"X (XKB); si può dunque impostare il layout in modo più preciso con le "
-"variabili #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# e "
-"#{keyboard-model}#; live-boot userà questi parametri anche per X. Ad "
-"esempio, per impostare un layout French-Dvorak (chiamato Bepo) su un sistema "
-"francese con una tastiera TypeMatrix, sia in console sia in X11:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
-#, no-wrap
+#: en/user_customization-runtime.ssi:91
msgid ""
-" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"Multiple values may be specified as comma-delimited lists for each of the "
+"keyboard configuration variables. Please see the #{keyboard(5)}# man page "
+"for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #"
+"{XKBOPTIONS}# variables which correspond to the similarly-named #{live-"
+"config}# variables described above."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:93
msgid "2~persistence Persistence"
msgstr "2~persistence Persistenza"
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:95
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -416,7 +437,7 @@ msgstr ""
"ai riavvii dell'hardware della macchina ospitante."
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:97
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -430,7 +451,7 @@ msgstr ""
"spegnimento."
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:99
msgid ""
"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -447,7 +468,7 @@ msgstr ""
"sui ram disk non sopravvivono ai riavvii."
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:101
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like local storage media, a network share or even a session of a "
@@ -463,7 +484,7 @@ msgstr ""
"da specificare all'avvio: #{persistence}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:103
msgid ""
"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
@@ -479,18 +500,18 @@ msgstr ""
"dei seguenti:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:105
msgid "_* a partition, identified by its GPT name."
msgstr ""
"_* una partizione, identificata dal suo nome GPT (GUID Partition Table)."
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:107
msgid "_* a filesystem, identified by its filesystem label."
msgstr "_* un filesystem, identificato dalla sua label."
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:109
msgid ""
"_* an image file located on the root of any readable filesystem (even an "
"NTFS partition of a foreign OS), identified by its file name. In this case "
@@ -504,7 +525,7 @@ msgstr ""
"ext4\"."
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:111
msgid ""
"The volume label for overlays must be #{persistence}#. And in order to fully "
"customize the volume's persistence there must be a file named #{live-"
@@ -513,7 +534,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:113
msgid ""
"Here are some examples of how to prepare a volume to be used for "
"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
@@ -521,20 +542,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:117
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:121
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Vedere anche {Usare lo spazio rimanente su una penna USB}#using-usb-extra-"
"space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:123
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -543,13 +564,13 @@ msgstr ""
"l'etichetta con una delle seguenti:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:127
#, no-wrap
msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr " $ tune2fs -L persistence /dev/sdb1 # per filesystem ext2,3,4\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
@@ -558,7 +579,7 @@ msgstr ""
"persistenza:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:136
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -568,19 +589,19 @@ msgstr ""
" $ /sbin/mkfs.ext4 -F persistence\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:140
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
"Quindi copiare il file #{persistence}# nella directory radice di una "
"partizione scrivibile e riavviare."
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:142
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:144
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -593,7 +614,7 @@ msgstr ""
"persistenti e in che modo."
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:146
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
"live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -607,7 +628,7 @@ msgstr ""
"persistente in un filesystem ext4 sulla partizione /dev/sdb1:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:153
#, no-wrap
msgid ""
" $ mkfs.ext4 -L persistence /dev/sdb1\n"
@@ -617,7 +638,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:157
msgid ""
"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
"cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -636,7 +657,7 @@ msgstr ""
"essere resa persistente tramite i mount personalizzati."
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:159
msgid ""
"Several different custom overlay volumes (with their own #{live-persistence."
"conf}# files) can be used at the same time, but if several volumes make the "
@@ -658,12 +679,12 @@ msgstr ""
"manpage di live-persistence.conf(5) per sapere come gestire questo caso."
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
+#: en/user_customization-runtime.ssi:161
msgid "3~ Persistence SubText"
msgstr "3~ Sottotesto persistente"
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:162
msgid ""
"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{persistence-nonwork}# and #"
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index b746e14..dc6a85d 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-13 14:16+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-13\n"
+" :published: 2012-07-18\n"
msgstr ""
"@date:\n"
-" :published: 13-07-2012\n"
+" :published: 18-07-2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 9168165..b80c738 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,19 +59,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -129,19 +129,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -280,7 +280,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -302,7 +302,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -749,8 +749,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index bfa8f02..09cbb6c 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-27 23:35+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,19 +59,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -129,19 +129,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -245,7 +245,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -255,95 +255,96 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
+msgid "_* setting the keyboard configuration"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"The default locale when building a Live system is #{locales=en_US.UTF-8}#. "
"To define the locale that should be generated, use the #{locales}# parameter "
"in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"This parameter, as well as the keyboard configuration parameters indicated "
+"below, can also be used at the kernel command line. You can specify a locale "
+"by #{language_country}# (in which case the default encoding is used) or the "
+"full #{language_country.encoding}# word. A list of supported locales and the "
+"encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
+"Both the console and X keyboard configuration are performed by #{live-config}"
+"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
+"layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# "
+"boot parameters via the #{--bootappend-live}# option. Valid options for "
+"these can be found in #{/usr/share/X11/xkb/rules/base.lst}#. To find layouts "
+"and variants for a given language, try searching for the English name of the "
+"language and/or the country where the language is spoken, e.g:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst \n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
-#, no-wrap
-msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:74
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"Often, only the layout needs to be configured. For example, to get the "
+"locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:78
#, no-wrap
-msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:82
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
+"However, for very specific use cases, you may wish to include other "
+"parameters. For example, to set up a French system with a French-Dvorak "
+"layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -351,12 +352,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:91
+msgid ""
+"Multiple values may be specified as comma-delimited lists for each of the "
+"keyboard configuration variables. Please see the #{keyboard(5)}# man page "
+"for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #"
+"{XKBOPTIONS}# variables which correspond to the similarly-named #{live-"
+"config}# variables described above."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:93
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:95
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -364,7 +375,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:97
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -373,7 +384,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:99
msgid ""
"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -384,7 +395,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:101
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like local storage media, a network share or even a session of a "
@@ -394,7 +405,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:103
msgid ""
"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
@@ -404,17 +415,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:105
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:107
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:109
msgid ""
"_* an image file located on the root of any readable filesystem (even an "
"NTFS partition of a foreign OS), identified by its file name. In this case "
@@ -423,7 +434,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:111
msgid ""
"The volume label for overlays must be #{persistence}#. And in order to fully "
"customize the volume's persistence there must be a file named #{live-"
@@ -432,7 +443,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:113
msgid ""
"Here are some examples of how to prepare a volume to be used for "
"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
@@ -440,38 +451,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:117
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:121
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:123
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:127
#, no-wrap
msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:136
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -479,17 +490,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:140
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:142
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:144
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -498,7 +509,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:146
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
"live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -507,7 +518,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:153
#, no-wrap
msgid ""
" $ mkfs.ext4 -L persistence /dev/sdb1\n"
@@ -517,7 +528,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:157
msgid ""
"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
"cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -529,7 +540,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:159
msgid ""
"Several different custom overlay volumes (with their own #{live-persistence."
"conf}# files) can be used at the same time, but if several volumes make the "
@@ -542,12 +553,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
+#: en/user_customization-runtime.ssi:161
msgid "3~ Persistence SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:162
msgid ""
"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{persistence-nonwork}# and #"
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 09a22bd..48c15c3 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-13 14:16+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-13\n"
+" :published: 2012-07-18\n"
msgstr ""
"@date:\n"
-" :published: 13.07.2012\n"
+" :published: 18.07.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 814e991..40e8d46 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -60,19 +60,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -130,19 +130,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -281,7 +281,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -303,7 +303,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -750,8 +750,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index 56e812d..913c9d8 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-27 23:35+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -60,19 +60,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -130,19 +130,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -246,7 +246,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -256,95 +256,96 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
+msgid "_* setting the keyboard configuration"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"The default locale when building a Live system is #{locales=en_US.UTF-8}#. "
"To define the locale that should be generated, use the #{locales}# parameter "
"in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"This parameter, as well as the keyboard configuration parameters indicated "
+"below, can also be used at the kernel command line. You can specify a locale "
+"by #{language_country}# (in which case the default encoding is used) or the "
+"full #{language_country.encoding}# word. A list of supported locales and the "
+"encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
+"Both the console and X keyboard configuration are performed by #{live-config}"
+"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
+"layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# "
+"boot parameters via the #{--bootappend-live}# option. Valid options for "
+"these can be found in #{/usr/share/X11/xkb/rules/base.lst}#. To find layouts "
+"and variants for a given language, try searching for the English name of the "
+"language and/or the country where the language is spoken, e.g:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst \n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
-#, no-wrap
-msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:74
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"Often, only the layout needs to be configured. For example, to get the "
+"locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:78
#, no-wrap
-msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:82
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
+"However, for very specific use cases, you may wish to include other "
+"parameters. For example, to set up a French system with a French-Dvorak "
+"layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -352,12 +353,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:91
+msgid ""
+"Multiple values may be specified as comma-delimited lists for each of the "
+"keyboard configuration variables. Please see the #{keyboard(5)}# man page "
+"for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #"
+"{XKBOPTIONS}# variables which correspond to the similarly-named #{live-"
+"config}# variables described above."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:93
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:95
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -365,7 +376,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:97
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -374,7 +385,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:99
msgid ""
"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -385,7 +396,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:101
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like local storage media, a network share or even a session of a "
@@ -395,7 +406,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:103
msgid ""
"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
@@ -405,17 +416,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:105
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:107
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:109
msgid ""
"_* an image file located on the root of any readable filesystem (even an "
"NTFS partition of a foreign OS), identified by its file name. In this case "
@@ -424,7 +435,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:111
msgid ""
"The volume label for overlays must be #{persistence}#. And in order to fully "
"customize the volume's persistence there must be a file named #{live-"
@@ -433,7 +444,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:113
msgid ""
"Here are some examples of how to prepare a volume to be used for "
"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
@@ -441,38 +452,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:117
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:121
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:123
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:127
#, no-wrap
msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:136
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -480,17 +491,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:140
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:142
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:144
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -499,7 +510,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:146
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
"live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -508,7 +519,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:153
#, no-wrap
msgid ""
" $ mkfs.ext4 -L persistence /dev/sdb1\n"
@@ -518,7 +529,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:157
msgid ""
"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
"cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -530,7 +541,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:159
msgid ""
"Several different custom overlay volumes (with their own #{live-persistence."
"conf}# files) can be used at the same time, but if several volumes make the "
@@ -543,12 +554,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
+#: en/user_customization-runtime.ssi:161
msgid "3~ Persistence SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:162
msgid ""
"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{persistence-nonwork}# and #"
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index f127a4b..1108e82 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-13 14:16+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-13\n"
+" :published: 2012-07-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 01f2345..051f4de 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -60,19 +60,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -130,19 +130,19 @@ msgstr ""
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -281,7 +281,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -303,7 +303,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -750,8 +750,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index d46245f..b65a3bc 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-27 23:35+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -60,19 +60,19 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
-#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
-#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
-#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
-#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:148 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:115 en/user_examples.ssi:125
+#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
+#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
+#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
+#: en/user_examples.ssi:275 en/user_examples.ssi:285
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:74 en/user_installation.ssi:82
@@ -130,19 +130,19 @@ msgstr ""
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
-#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
-#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
-#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
-#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
-#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:155 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:119 en/user_examples.ssi:129
+#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
+#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
+#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
+#: en/user_examples.ssi:281 en/user_examples.ssi:299
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:70
#: en/user_installation.ssi:78 en/user_installation.ssi:86
@@ -246,7 +246,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -256,95 +256,96 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
+msgid "_* setting the keyboard configuration"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"The default locale when building a Live system is #{locales=en_US.UTF-8}#. "
"To define the locale that should be generated, use the #{locales}# parameter "
"in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"This parameter, as well as the keyboard configuration parameters indicated "
+"below, can also be used at the kernel command line. You can specify a locale "
+"by #{language_country}# (in which case the default encoding is used) or the "
+"full #{language_country.encoding}# word. A list of supported locales and the "
+"encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
+"Both the console and X keyboard configuration are performed by #{live-config}"
+"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
+"layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# "
+"boot parameters via the #{--bootappend-live}# option. Valid options for "
+"these can be found in #{/usr/share/X11/xkb/rules/base.lst}#. To find layouts "
+"and variants for a given language, try searching for the English name of the "
+"language and/or the country where the language is spoken, e.g:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst \n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
-#, no-wrap
-msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:74
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"Often, only the layout needs to be configured. For example, to get the "
+"locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:78
#, no-wrap
-msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:82
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
+"However, for very specific use cases, you may wish to include other "
+"parameters. For example, to set up a French system with a French-Dvorak "
+"layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
@@ -352,12 +353,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:91
+msgid ""
+"Multiple values may be specified as comma-delimited lists for each of the "
+"keyboard configuration variables. Please see the #{keyboard(5)}# man page "
+"for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #"
+"{XKBOPTIONS}# variables which correspond to the similarly-named #{live-"
+"config}# variables described above."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:93
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:95
msgid ""
"A live cd paradigm is a pre-installed system which runs from read-only "
"media, like a cdrom, where writes and modifications do not survive reboots "
@@ -365,7 +376,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:97
msgid ""
"A Debian Live system is a generalization of this paradigm and thus supports "
"other media in addition to CDs; but still, in its default behaviour, it "
@@ -374,7 +385,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:99
msgid ""
"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
@@ -385,7 +396,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:101
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
"medium like local storage media, a network share or even a session of a "
@@ -395,7 +406,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:103
msgid ""
"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
@@ -405,17 +416,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:105
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:107
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:109
msgid ""
"_* an image file located on the root of any readable filesystem (even an "
"NTFS partition of a foreign OS), identified by its file name. In this case "
@@ -424,7 +435,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:111
msgid ""
"The volume label for overlays must be #{persistence}#. And in order to fully "
"customize the volume's persistence there must be a file named #{live-"
@@ -433,7 +444,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:113
msgid ""
"Here are some examples of how to prepare a volume to be used for "
"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
@@ -441,38 +452,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:117
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:121
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:123
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:127
#, no-wrap
msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:136
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -480,17 +491,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:140
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:142
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:144
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -499,7 +510,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:146
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
"live-persistence.conf(5) man page, but a simple example should be sufficient "
@@ -508,7 +519,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:153
#, no-wrap
msgid ""
" $ mkfs.ext4 -L persistence /dev/sdb1\n"
@@ -518,7 +529,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:157
msgid ""
"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
"cache/apt}# will be copied into the persistence volume, and from then on all "
@@ -530,7 +541,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:159
msgid ""
"Several different custom overlay volumes (with their own #{live-persistence."
"conf}# files) can be used at the same time, but if several volumes make the "
@@ -543,12 +554,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
+#: en/user_customization-runtime.ssi:161
msgid "3~ Persistence SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:162
msgid ""
"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{persistence-nonwork}# and #"
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index a170fc9..02baf7c 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-07-13
+ :published: 18-07-2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 05401eb..eddcc0b 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -358,8 +358,8 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated #{binary-net.tar.gz}# archive in
-the #{/srv/debian-live}# directory, you'll find the filesystem image in
+For example, if you unpack the generated #{binary.netboot.tar.xz}# archive
+in the #{/srv/debian-live}# directory, you'll find the filesystem image in
#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
in #{tftpboot/debian-live/i386}#.
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index f9a111f..b721c07 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -49,17 +49,16 @@ prefix it accordingly (e.g. 2000-passwd) and add it to
2~customizing-locale-and-language Customizing locale and language
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
_* the locale generation
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
-_* setting the keyboard layout for X
-
-The default locale when building a Live system is "locales=en_US.UTF-8". To
-define the locale that should be generated, use the #{locales}# parameter in
-the #{--bootappend-live}# option of #{lb config}#, e.g.
+The default locale when building a Live system is
+#{locales=en_US.UTF-8}#. To define the locale that should be generated, use
+the #{locales}# parameter in the #{--bootappend-live}# option of #{lb
+config}#, e.g.
code{
@@ -67,50 +66,53 @@ code{
}code
-This parameter can also be used at the kernel command line. You can specify
-a locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depend on the
-#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
-options for X keyboard layouts can be found in
-#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
-codes). To find the value (the two characters) corresponding to a language
-try searching for the english name of the nation where the language is
-spoken, e.g:
-
-code{
-
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+Multiple locales may be specified as a comma-delimited list.
-}code
+This parameter, as well as the keyboard configuration parameters indicated
+below, can also be used at the kernel command line. You can specify a locale
+by #{language_country}# (in which case the default encoding is used) or the
+full #{language_country.encoding}# word. A list of supported locales and the
+encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
-To get the locale files for German and Swiss German keyboard layout in X
-use:
+Both the console and X keyboard configuration are performed by
+#{live-config}# using the #{console-setup}# package. To configure them, use
+the #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and
+#{keyboard-model}# boot parameters via the #{--bootappend-live}#
+option. Valid options for these can be found in
+#{/usr/share/X11/xkb/rules/base.lst}#. To find layouts and variants for a
+given language, try searching for the English name of the language and/or
+the country where the language is spoken, e.g:
code{
- $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-A list of the valid values of the keyboards for the console can be figured
-with the following command:
+Note that each variant lists the layout to which it applies in the
+description.
+
+Often, only the layout needs to be configured. For example, to get the
+locale files for German and Swiss German keyboard layout in X use:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
}code
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then set your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-TypeMatrix keyboard, both in console and X11, use:
+However, for very specific use cases, you may wish to include other
+parameters. For example, to set up a French system with a French-Dvorak
+layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
@@ -119,6 +121,12 @@ code{
}code
+Multiple values may be specified as comma-delimited lists for each of the
+keyboard configuration variables. Please see the #{keyboard(5)}# man page
+for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
+#{XKBOPTIONS}# variables which correspond to the similarly-named
+#{live-config}# variables described above.
+
2~persistence Persistence
A live cd paradigm is a pre-installed system which runs from read-only
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index a170fc9..56d4ef0 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-07-13
+ :published: 18.07.2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 05401eb..eddcc0b 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -358,8 +358,8 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated #{binary-net.tar.gz}# archive in
-the #{/srv/debian-live}# directory, you'll find the filesystem image in
+For example, if you unpack the generated #{binary.netboot.tar.xz}# archive
+in the #{/srv/debian-live}# directory, you'll find the filesystem image in
#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
in #{tftpboot/debian-live/i386}#.
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index f9a111f..b721c07 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -49,17 +49,16 @@ prefix it accordingly (e.g. 2000-passwd) and add it to
2~customizing-locale-and-language Customizing locale and language
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
_* the locale generation
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
-_* setting the keyboard layout for X
-
-The default locale when building a Live system is "locales=en_US.UTF-8". To
-define the locale that should be generated, use the #{locales}# parameter in
-the #{--bootappend-live}# option of #{lb config}#, e.g.
+The default locale when building a Live system is
+#{locales=en_US.UTF-8}#. To define the locale that should be generated, use
+the #{locales}# parameter in the #{--bootappend-live}# option of #{lb
+config}#, e.g.
code{
@@ -67,50 +66,53 @@ code{
}code
-This parameter can also be used at the kernel command line. You can specify
-a locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depend on the
-#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
-options for X keyboard layouts can be found in
-#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
-codes). To find the value (the two characters) corresponding to a language
-try searching for the english name of the nation where the language is
-spoken, e.g:
-
-code{
-
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+Multiple locales may be specified as a comma-delimited list.
-}code
+This parameter, as well as the keyboard configuration parameters indicated
+below, can also be used at the kernel command line. You can specify a locale
+by #{language_country}# (in which case the default encoding is used) or the
+full #{language_country.encoding}# word. A list of supported locales and the
+encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
-To get the locale files for German and Swiss German keyboard layout in X
-use:
+Both the console and X keyboard configuration are performed by
+#{live-config}# using the #{console-setup}# package. To configure them, use
+the #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and
+#{keyboard-model}# boot parameters via the #{--bootappend-live}#
+option. Valid options for these can be found in
+#{/usr/share/X11/xkb/rules/base.lst}#. To find layouts and variants for a
+given language, try searching for the English name of the language and/or
+the country where the language is spoken, e.g:
code{
- $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-A list of the valid values of the keyboards for the console can be figured
-with the following command:
+Note that each variant lists the layout to which it applies in the
+description.
+
+Often, only the layout needs to be configured. For example, to get the
+locale files for German and Swiss German keyboard layout in X use:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
}code
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then set your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-TypeMatrix keyboard, both in console and X11, use:
+However, for very specific use cases, you may wish to include other
+parameters. For example, to set up a French system with a French-Dvorak
+layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
@@ -119,6 +121,12 @@ code{
}code
+Multiple values may be specified as comma-delimited lists for each of the
+keyboard configuration variables. Please see the #{keyboard(5)}# man page
+for details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
+#{XKBOPTIONS}# variables which correspond to the similarly-named
+#{live-config}# variables described above.
+
2~persistence Persistence
A live cd paradigm is a pre-installed system which runs from read-only
--
live-manual
More information about the debian-live-changes
mailing list