[SCM] live-manual branch, debian-next, updated. debian/3.0_a14-1-2-g4466bcd

chals chals at altorricon.com
Fri Jul 27 19:59:26 UTC 2012


The following commit has been merged in the debian-next branch:
commit 4466bcdcad702e4b3899b6f09ae68e2b14dabdff
Author: chals <chals at altorricon.com>
Date:   Fri Jul 27 21:59:05 2012 +0200

    Updating Spanish and French translations to keyboard-variants.

diff --git a/manual/ca/user_customization-runtime.ssi b/manual/ca/user_customization-runtime.ssi
index 47d89df..4bae885 100644
--- a/manual/ca/user_customization-runtime.ssi
+++ b/manual/ca/user_customization-runtime.ssi
@@ -76,7 +76,7 @@ encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
 
 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
+the #{keyboard-layouts}#, #{keyboard-variants}#, #{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
@@ -117,7 +117,7 @@ layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
 code{
 
  $ lb config --bootappend-live \
-     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -125,8 +125,8 @@ Multiple values may be specified as comma-delimited lists for each of the
 #{keyboard-*}# options, with the exception of #{keyboard-model}#, which
 accepts only one value. Please see the #{keyboard(5)}# man page for details
 and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
-#{XKBOPTIONS}# variables. If multiple #{keyboard-variant}# values are given,
-they will be matched one-to-one with #{keyboard-layouts}# values (see
+#{XKBOPTIONS}# variables. If multiple #{keyboard-variants}# values are
+given, they will be matched one-to-one with #{keyboard-layouts}# values (see
 #{setxkbmap(1)}# #{-variant}# option). Empty values are allowed; e.g. to
 define two layouts, the default being US QWERTY and the other being US
 Dvorak, use:
@@ -134,7 +134,7 @@ Dvorak, use:
 code{
 
  $ lb config --bootappend-live \
-     "keyboard-layouts=us,us keyboard-variant=,dvorak"
+     "keyboard-layouts=us,us keyboard-variants=,dvorak"
 
 }code
 
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index 47d89df..4bae885 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -76,7 +76,7 @@ encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
 
 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
+the #{keyboard-layouts}#, #{keyboard-variants}#, #{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
@@ -117,7 +117,7 @@ layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
 code{
 
  $ lb config --bootappend-live \
-     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -125,8 +125,8 @@ Multiple values may be specified as comma-delimited lists for each of the
 #{keyboard-*}# options, with the exception of #{keyboard-model}#, which
 accepts only one value. Please see the #{keyboard(5)}# man page for details
 and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
-#{XKBOPTIONS}# variables. If multiple #{keyboard-variant}# values are given,
-they will be matched one-to-one with #{keyboard-layouts}# values (see
+#{XKBOPTIONS}# variables. If multiple #{keyboard-variants}# values are
+given, they will be matched one-to-one with #{keyboard-layouts}# values (see
 #{setxkbmap(1)}# #{-variant}# option). Empty values are allowed; e.g. to
 define two layouts, the default being US QWERTY and the other being US
 Dvorak, use:
@@ -134,7 +134,7 @@ Dvorak, use:
 code{
 
  $ lb config --bootappend-live \
-     "keyboard-layouts=us,us keyboard-variant=,dvorak"
+     "keyboard-layouts=us,us keyboard-variants=,dvorak"
 
 }code
 
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index c3da032..398e617 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -85,7 +85,7 @@ variantes locales está en #{/usr/share/i18n/SUPPORTED}#.
 #{live-config}# se encarga de la configuración del teclado de la consola y
 del entorno gráfico X utilizando el paquete #{console-setup}#. Para
 configurarlos se puede utilizar los parámetros de arranque
-#{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# y
+#{keyboard-layouts}#, #{keyboard-variants}#, #{keyboard-options}# y
 #{keyboard-model}# a través de la opción #{--bootappend-live}#. Se puede
 encontrar una lista de opciones válidas para estos parámetros en
 #{/usr/share/X11/xkb/rules/base.lst}#. Para hallar la distribución del
@@ -127,7 +127,7 @@ TypeMatrix EZ-Reach 2030, utilizar:
 code{
 
  $ lb config --bootappend-live \
-     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -136,16 +136,16 @@ se puede especificar varios valores separados por comas. A excepción de
 #{keyboard-model}#, que sólo acepta un valor. En la página de manual
 #{keyboard(5)}# se explican los detalles y algunos ejemplos de cómo utilizar
 las variables #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# y
-#{XKBOPTIONS}#. Si se especifican diferentes valores en #{keyboard-variant}#
-estos se corresponderan uno a uno con los valores #{keyboard-layouts}# (ver
-#{setxkbmap(1)}# opción #{-variant}#). Se admiten valores vacíos; por
-ejemplo para definir dos distribuciones de teclado, la que se usa por
-omisión US QWERTY y otra US Dvorak, utilizar:
+#{XKBOPTIONS}#. Si se especifican diferentes valores en
+#{keyboard-variants}# estos se corresponderan uno a uno con los valores
+#{keyboard-layouts}# (ver #{setxkbmap(1)}# opción #{-variant}#). Se admiten
+valores vacíos; por ejemplo para definir dos distribuciones de teclado, la
+que se usa por omisión US QWERTY y otra US Dvorak, utilizar:
 
 code{
 
  $ lb config --bootappend-live \
-     "keyboard-layouts=us,us keyboard-variant=,dvorak"
+     "keyboard-layouts=us,us keyboard-variants=,dvorak"
 
 }code
 
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index dac3f1e..b836eb7 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -85,7 +85,7 @@ codage pour chacun peuvent être trouvés dans #{/usr/share/i18n/SUPPORTED}#.
 La configuration du clavier pour la console et pour X est faite par
 #{live-config}# en utilisant le paquet #{console-setup}#. Pour les
 configurer, utiliser les paramètres de démarrage #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# et #{keyboard-model}# avec
+#{keyboard-variants}#, #{keyboard-options}# et #{keyboard-model}# avec
 l'option #{--bootappend-live}#. On peut trouver options valides dans
 #{/usr/share/X11/xkb/rules/base.lst}#. Pour trouver les dispositions el les
 variantes correspondantes à une langue essayez de rechercher le nom anglais
@@ -126,7 +126,7 @@ EZ-Reach 2030, utiliser:
 code{
 
  $ lb config --bootappend-live \
-     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -135,15 +135,15 @@ chacune des options #{keyboard-*}#, à l'exception de #{keyboard-model}#, qui
 accepte une seule valeur. S'il vous plaît voir la page de manuel
 #{keyboard(5)}#  pour plus de détails et des exemples des variables
 #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# et #{XKBOPTIONS}#. Si plusieurs
-valeurs #{keyboard-variant}# sont données, elles seront jumelées tête à tête
-avec les valeurs #{keyboard-layouts}# voir #{setxkbmap(1)}# option
+valeurs #{keyboard-variants}# sont données, elles seront jumelées tête à
+tête avec les valeurs #{keyboard-layouts}# voir #{setxkbmap(1)}# option
 #{-variant}#). On peut utiliser des valeurs vides; par exemple pour regler
 deux dispositions, une par défaut US QWERTY et l'autre US Dvorak, utiliser:
 
 code{
 
  $ lb config --bootappend-live \
-     "keyboard-layouts=us,us keyboard-variant=,dvorak"
+     "keyboard-layouts=us,us keyboard-variants=,dvorak"
 
 }code
 
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index ed6ca6c..aee0822 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -78,7 +78,7 @@ encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
 
 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
+the #{keyboard-layouts}#, #{keyboard-variants}#, #{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
@@ -119,7 +119,7 @@ layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
 code{
 
  $ lb config --bootappend-live \
-     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -127,8 +127,8 @@ Multiple values may be specified as comma-delimited lists for each of the
 #{keyboard-*}# options, with the exception of #{keyboard-model}#, which
 accepts only one value. Please see the #{keyboard(5)}# man page for details
 and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
-#{XKBOPTIONS}# variables. If multiple #{keyboard-variant}# values are given,
-they will be matched one-to-one with #{keyboard-layouts}# values (see
+#{XKBOPTIONS}# variables. If multiple #{keyboard-variants}# values are
+given, they will be matched one-to-one with #{keyboard-layouts}# values (see
 #{setxkbmap(1)}# #{-variant}# option). Empty values are allowed; e.g. to
 define two layouts, the default being US QWERTY and the other being US
 Dvorak, use:
@@ -136,7 +136,7 @@ Dvorak, use:
 code{
 
  $ lb config --bootappend-live \
-     "keyboard-layouts=us,us keyboard-variant=,dvorak"
+     "keyboard-layouts=us,us keyboard-variants=,dvorak"
 
 }code
 
diff --git a/manual/po/ca/user_customization-runtime.ssi.po b/manual/po/ca/user_customization-runtime.ssi.po
index 1ddeaec..c3984f6 100644
--- a/manual/po/ca/user_customization-runtime.ssi.po
+++ b/manual/po/ca/user_customization-runtime.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
 "PO-Revision-Date: 2012-07-20 21:51+0200\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -292,8 +292,8 @@ msgstr ""
 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 "
+"layouts}#, #{keyboard-variants}#, #{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:"
@@ -348,7 +348,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -358,10 +358,10 @@ msgid ""
 "{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
 "accepts only one value. Please see the #{keyboard(5)}# man page for details "
 "and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #{XKBOPTIONS}"
-"# variables. If multiple #{keyboard-variant}# values are given, they will be "
-"matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# #{-"
-"variant}# option). Empty values are allowed; e.g. to define two layouts, the "
-"default being US QWERTY and the other being US Dvorak, use:"
+"# variables. If multiple #{keyboard-variants}# values are given, they will "
+"be matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# "
+"#{-variant}# option). Empty values are allowed; e.g. to define two layouts, "
+"the default being US QWERTY and the other being US Dvorak, use:"
 msgstr ""
 
 #. type: Plain text
@@ -369,7 +369,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+"     \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index a7b7a22..8b3fb5f 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-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -292,8 +292,8 @@ msgstr ""
 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 "
+"layouts}#, #{keyboard-variants}#, #{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:"
@@ -348,7 +348,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -358,10 +358,10 @@ msgid ""
 "{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
 "accepts only one value. Please see the #{keyboard(5)}# man page for details "
 "and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #{XKBOPTIONS}"
-"# variables. If multiple #{keyboard-variant}# values are given, they will be "
-"matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# #{-"
-"variant}# option). Empty values are allowed; e.g. to define two layouts, the "
-"default being US QWERTY and the other being US Dvorak, use:"
+"# variables. If multiple #{keyboard-variants}# values are given, they will "
+"be matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# "
+"#{-variant}# option). Empty values are allowed; e.g. to define two layouts, "
+"the default being US QWERTY and the other being US Dvorak, use:"
 msgstr ""
 
 #. type: Plain text
@@ -369,7 +369,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+"     \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index f6f129d..2042606 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-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
 "PO-Revision-Date: 2012-07-20 22:58+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -340,8 +340,8 @@ msgstr ""
 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 "
+"layouts}#, #{keyboard-variants}#, #{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:"
@@ -349,8 +349,8 @@ msgstr ""
 "#{live-config}# se encarga de la configuración del teclado de la consola y "
 "del entorno gráfico X utilizando el paquete #{console-setup}#. Para "
 "configurarlos se puede utilizar los parámetros de arranque #{keyboard-"
-"layouts}#, #{keyboard-variant}#, #{keyboard-options}# y #{keyboard-model}# a "
-"través de la opción #{--bootappend-live}#. Se puede encontrar una lista de "
+"layouts}#, #{keyboard-variants}#, #{keyboard-options}# y #{keyboard-model}# "
+"a través de la opción #{--bootappend-live}#. Se puede encontrar una lista de "
 "opciones válidas para estos parámetros en #{/usr/share/X11/xkb/rules/base."
 "lst}#. Para hallar la distribución del teclado y la variante que corresponde "
 "a un idioma se puede buscar el nombre en inglés de la nación donde se habla "
@@ -412,7 +412,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -422,17 +422,17 @@ msgid ""
 "{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
 "accepts only one value. Please see the #{keyboard(5)}# man page for details "
 "and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #{XKBOPTIONS}"
-"# variables. If multiple #{keyboard-variant}# values are given, they will be "
-"matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# #{-"
-"variant}# option). Empty values are allowed; e.g. to define two layouts, the "
-"default being US QWERTY and the other being US Dvorak, use:"
+"# variables. If multiple #{keyboard-variants}# values are given, they will "
+"be matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# "
+"#{-variant}# option). Empty values are allowed; e.g. to define two layouts, "
+"the default being US QWERTY and the other being US Dvorak, use:"
 msgstr ""
 "Para cada una de las variables de configuración del teclado #{keyboard-*}# "
 "se puede especificar varios valores separados por comas. A excepción de #"
 "{keyboard-model}#, que sólo acepta un valor. En la página de manual #"
 "{keyboard(5)}# se explican los detalles y algunos ejemplos de cómo utilizar "
 "las variables #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# y #{XKBOPTIONS}#. "
-"Si se especifican diferentes valores en #{keyboard-variant}# estos se "
+"Si se especifican diferentes valores en #{keyboard-variants}# estos se "
 "corresponderan uno a uno con los valores #{keyboard-layouts}# (ver #"
 "{setxkbmap(1)}# opción #{-variant}#). Se admiten valores vacíos; por ejemplo "
 "para definir dos distribuciones de teclado, la que se usa por omisión US "
@@ -443,7 +443,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+"     \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 1007262..bd22924 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -1,12 +1,11 @@
 # French translations for live-manual package
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
 # Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
 "PO-Revision-Date: 2012-07-21 00:01+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -335,8 +334,8 @@ msgstr ""
 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 "
+"layouts}#, #{keyboard-variants}#, #{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:"
@@ -344,7 +343,7 @@ msgstr ""
 "La configuration du clavier pour la console et pour X est faite par #{live-"
 "config}# en utilisant le paquet #{console-setup}#. Pour les configurer, "
 "utiliser les paramètres de démarrage #{keyboard-layouts}#, #{keyboard-"
-"variant}#, #{keyboard-options}# et #{keyboard-model}# avec l'option #{--"
+"variants}#, #{keyboard-options}# et #{keyboard-model}# avec l'option #{--"
 "bootappend-live}#. On peut trouver options valides dans #{/usr/share/X11/xkb/"
 "rules/base.lst}#. Pour trouver les dispositions el les variantes "
 "correspondantes à une langue essayez de rechercher le nom anglais de la "
@@ -412,7 +411,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -422,27 +421,27 @@ msgid ""
 "{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
 "accepts only one value. Please see the #{keyboard(5)}# man page for details "
 "and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #{XKBOPTIONS}"
-"# variables. If multiple #{keyboard-variant}# values are given, they will be "
-"matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# #{-"
-"variant}# option). Empty values are allowed; e.g. to define two layouts, the "
-"default being US QWERTY and the other being US Dvorak, use:"
+"# variables. If multiple #{keyboard-variants}# values are given, they will "
+"be matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# "
+"#{-variant}# option). Empty values are allowed; e.g. to define two layouts, "
+"the default being US QWERTY and the other being US Dvorak, use:"
 msgstr ""
 "Plusieurs valeurs peuvent être spécifiées séparées par des virgules pour "
 "chacune des options #{keyboard-*}#, à l'exception de #{keyboard-model}#, qui "
 "accepte une seule valeur. S'il vous plaît voir la page de manuel #{keyboard"
 "(5)}#  pour plus de détails et des exemples des variables #{XKBMODEL}#, #"
 "{XKBLAYOUT}#, #{XKBVARIANT}# et #{XKBOPTIONS}#. Si plusieurs valeurs #"
-"{keyboard-variant}# sont données, elles seront jumelées tête à tête avec les "
-"valeurs #{keyboard-layouts}# voir #{setxkbmap(1)}# option #{-variant}#). On "
-"peut utiliser des valeurs vides; par exemple pour regler deux dispositions, "
-"une par défaut US QWERTY et l'autre US Dvorak, utiliser:"
+"{keyboard-variants}# sont données, elles seront jumelées tête à tête avec "
+"les valeurs #{keyboard-layouts}# voir #{setxkbmap(1)}# option #{-variant}#). "
+"On peut utiliser des valeurs vides; par exemple pour regler deux "
+"dispositions, une par défaut US QWERTY et l'autre US Dvorak, utiliser:"
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:96
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+"     \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index ed14ee3..93b05a0 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-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+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"
@@ -338,8 +338,8 @@ msgstr ""
 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 "
+"layouts}#, #{keyboard-variants}#, #{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:"
@@ -407,7 +407,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -417,10 +417,10 @@ msgid ""
 "{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
 "accepts only one value. Please see the #{keyboard(5)}# man page for details "
 "and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #{XKBOPTIONS}"
-"# variables. If multiple #{keyboard-variant}# values are given, they will be "
-"matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# #{-"
-"variant}# option). Empty values are allowed; e.g. to define two layouts, the "
-"default being US QWERTY and the other being US Dvorak, use:"
+"# variables. If multiple #{keyboard-variants}# values are given, they will "
+"be matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# "
+"#{-variant}# option). Empty values are allowed; e.g. to define two layouts, "
+"the default being US QWERTY and the other being US Dvorak, use:"
 msgstr ""
 
 #. type: Plain text
@@ -428,7 +428,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+"     \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index f801ce4..60255c4 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-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -292,8 +292,8 @@ msgstr ""
 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 "
+"layouts}#, #{keyboard-variants}#, #{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:"
@@ -348,7 +348,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -358,10 +358,10 @@ msgid ""
 "{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
 "accepts only one value. Please see the #{keyboard(5)}# man page for details "
 "and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #{XKBOPTIONS}"
-"# variables. If multiple #{keyboard-variant}# values are given, they will be "
-"matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# #{-"
-"variant}# option). Empty values are allowed; e.g. to define two layouts, the "
-"default being US QWERTY and the other being US Dvorak, use:"
+"# variables. If multiple #{keyboard-variants}# values are given, they will "
+"be matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# "
+"#{-variant}# option). Empty values are allowed; e.g. to define two layouts, "
+"the default being US QWERTY and the other being US Dvorak, use:"
 msgstr ""
 
 #. type: Plain text
@@ -369,7 +369,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+"     \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index da6e70f..b146f65 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-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -293,8 +293,8 @@ msgstr ""
 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 "
+"layouts}#, #{keyboard-variants}#, #{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:"
@@ -349,7 +349,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -359,10 +359,10 @@ msgid ""
 "{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
 "accepts only one value. Please see the #{keyboard(5)}# man page for details "
 "and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #{XKBOPTIONS}"
-"# variables. If multiple #{keyboard-variant}# values are given, they will be "
-"matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# #{-"
-"variant}# option). Empty values are allowed; e.g. to define two layouts, the "
-"default being US QWERTY and the other being US Dvorak, use:"
+"# variables. If multiple #{keyboard-variants}# values are given, they will "
+"be matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# "
+"#{-variant}# option). Empty values are allowed; e.g. to define two layouts, "
+"the default being US QWERTY and the other being US Dvorak, use:"
 msgstr ""
 
 #. type: Plain text
@@ -370,7 +370,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+"     \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index 9ed0b42..81c8b66 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-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+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"
@@ -293,8 +293,8 @@ msgstr ""
 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 "
+"layouts}#, #{keyboard-variants}#, #{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:"
@@ -349,7 +349,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -359,10 +359,10 @@ msgid ""
 "{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
 "accepts only one value. Please see the #{keyboard(5)}# man page for details "
 "and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #{XKBOPTIONS}"
-"# variables. If multiple #{keyboard-variant}# values are given, they will be "
-"matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# #{-"
-"variant}# option). Empty values are allowed; e.g. to define two layouts, the "
-"default being US QWERTY and the other being US Dvorak, use:"
+"# variables. If multiple #{keyboard-variants}# values are given, they will "
+"be matched one-to-one with #{keyboard-layouts}# values (see #{setxkbmap(1)}# "
+"#{-variant}# option). Empty values are allowed; e.g. to define two layouts, "
+"the default being US QWERTY and the other being US Dvorak, use:"
 msgstr ""
 
 #. type: Plain text
@@ -370,7 +370,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
-"     \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+"     \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index 47d89df..4bae885 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -76,7 +76,7 @@ encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
 
 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
+the #{keyboard-layouts}#, #{keyboard-variants}#, #{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
@@ -117,7 +117,7 @@ layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
 code{
 
  $ lb config --bootappend-live \
-     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -125,8 +125,8 @@ Multiple values may be specified as comma-delimited lists for each of the
 #{keyboard-*}# options, with the exception of #{keyboard-model}#, which
 accepts only one value. Please see the #{keyboard(5)}# man page for details
 and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
-#{XKBOPTIONS}# variables. If multiple #{keyboard-variant}# values are given,
-they will be matched one-to-one with #{keyboard-layouts}# values (see
+#{XKBOPTIONS}# variables. If multiple #{keyboard-variants}# values are
+given, they will be matched one-to-one with #{keyboard-layouts}# values (see
 #{setxkbmap(1)}# #{-variant}# option). Empty values are allowed; e.g. to
 define two layouts, the default being US QWERTY and the other being US
 Dvorak, use:
@@ -134,7 +134,7 @@ Dvorak, use:
 code{
 
  $ lb config --bootappend-live \
-     "keyboard-layouts=us,us keyboard-variant=,dvorak"
+     "keyboard-layouts=us,us keyboard-variants=,dvorak"
 
 }code
 
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index 47d89df..4bae885 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -76,7 +76,7 @@ encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#.
 
 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
+the #{keyboard-layouts}#, #{keyboard-variants}#, #{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
@@ -117,7 +117,7 @@ layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
 code{
 
  $ lb config --bootappend-live \
-     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -125,8 +125,8 @@ Multiple values may be specified as comma-delimited lists for each of the
 #{keyboard-*}# options, with the exception of #{keyboard-model}#, which
 accepts only one value. Please see the #{keyboard(5)}# man page for details
 and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
-#{XKBOPTIONS}# variables. If multiple #{keyboard-variant}# values are given,
-they will be matched one-to-one with #{keyboard-layouts}# values (see
+#{XKBOPTIONS}# variables. If multiple #{keyboard-variants}# values are
+given, they will be matched one-to-one with #{keyboard-layouts}# values (see
 #{setxkbmap(1)}# #{-variant}# option). Empty values are allowed; e.g. to
 define two layouts, the default being US QWERTY and the other being US
 Dvorak, use:
@@ -134,7 +134,7 @@ Dvorak, use:
 code{
 
  $ lb config --bootappend-live \
-     "keyboard-layouts=us,us keyboard-variant=,dvorak"
+     "keyboard-layouts=us,us keyboard-variants=,dvorak"
 
 }code
 

-- 
live-manual



More information about the debian-live-changes mailing list