[SCM] live-config branch, debian, updated. debian/3.0_b1-1
Daniel Baumann
daniel at debian.org
Wed Jul 25 13:24:13 UTC 2012
The following commit has been merged in the debian branch:
commit 10a261c93fedc90832ddd04adb6f957aba22ee8b
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jul 20 02:15:53 2012 +0200
Renaming live-config.keyboard-variant option to live-config.keyboard-variants to indicate that multiple values can be specified at the same time, thanks to Ben Armstrong <synrg at debian.org>.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index d70ed80..1a336b4 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 12.07.2012 3.0~a43\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 20.07.2012 3.0~a43\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -107,9 +107,10 @@ gesetzt.
Ermöglicht die Tastatur Layouts zu bestimmen. Wenn mehr als ein Layout
angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter
X11. Es ist kein Standardwert gesetzt.
-.IP "\fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANT\fP | \fBkeyboard\-variant\fP=\fITASTATUR_VARIANT\fP" 4
-Ermöglicht die Tastatur Variante zu bestimmen. Es ist kein Standardwert
-gesetzt.
+.IP "\fBlive\-config.keyboard\-variants\fP=\fITASTATUR_VARIANTE1\fP,\fITASTATUR_VARIANTE2\fP ... \fITASTATUR_VARIANTEn\fP | \fBkeyboard\-variants\fP=\fITASTATUR_VARIANTE1\fP,\fITASTATUR_VARIANTE2\fP ... \fITASTATUR_VARIANTEn\fP" 4
+Ermöglicht die Tastatur Variante zu bestimmen. Wenn mehr als eine Variante
+angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter
+X11. Es ist kein Standardwert gesetzt.
.IP "\fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP | \fBkeyboard\-options\fP=\fITASTATUR_OPTIONEN\fP" 4
Ermöglicht die Tastatur Optionen zu bestimmen. Es ist kein Standardwert
gesetzt.
@@ -233,9 +234,10 @@ Diese Variable enspricht dem
Diese Variable enspricht dem
\&'\fBlive\-config.keyboard\-layouts\fP=\fITASTATUR_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP
\&... \fITASTATUR_LAYOUTn\fP' Parameter.
-.IP \fBLIVE_KEYBOARD_VARIANT\fP=\fITASTATUR_VARIANTE\fP 4
+.IP "\fBLIVE_KEYBOARD_VARIANTS\fP=\fITASTATUR_VARIANTE1\fP,\fITASTATUR_VARIANTE2\fP ... \fITASTATUR_VARIANTEn\fP" 4
Diese Variable enspricht dem
-\&'\fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANTE\fP' Parameter.
+\&'\fBlive\-config.keyboard\-variants\fP=\fITASTATUR_VARIANTE1\fP,\fITASTATUR_VARIANTE2\fP
+\&... \fITASTATUR_VARIANTEn\fP' Parameter.
.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fITASTATUR_OPTIONEN\fP 4
Diese Variable enspricht dem
\&'\fBlive\-config.keyboard\-options\fP=\fITASTATUR_OPTIONEN\fP' Parameter.
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 7efe157..9abebc2 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2012\-07\-12 3.0~a43-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-07\-20 3.0~a43-1 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -62,8 +62,8 @@ Allows to change if the system is assuming that the hardware clock is set to UTC
Allows to change the keyboard model. There is no default value set.
.IP "\fBlive\-config.keyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR | \fBkeyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
Allows to change the keyboard layouts. If more than one is specified, the tools of the desktop environment will allow to switch it under X11. There is no default value set.
-.IP "\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR | \fBkeyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR" 4
-Allows to change the keyboard variant. There is no default value set.
+.IP "\fBlive\-config.keyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR | \fBkeyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR" 4
+Allows to change the keyboard variants. If more than one is specified, the tools of the desktop environment will allow to switch it under X11. There is no default value set.
.IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR | \fBkeyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
Allows to change the keyboard options. There are no default value set.
.IP "\fBlive\-config.sysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR | \fBsysv-rc\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4
@@ -136,8 +136,8 @@ This variable equals the '\fBlive\-config.utc\fR=\fByes\fR|no' parameter.
This variable equals the '\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR' parameter.
.IP "\fBLIVE_KEYBOARD_LAYOUTS\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
This variable equals the '\fBlive\-config.keyboard\-layouts\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR' parameter.
-.IP "\fBLIVE_KEYBOARD_VARIANT\fR=\fIKEYBOARD_VARIANT\fR" 4
-This variable equals the '\fBlive\-config.keyboard\-variant\fR=\fIKEYBOARD_VARIANT\fR' parameter.
+.IP "\fBLIVE_KEYBOARD_VARIANTS\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR" 4
+This variable equals the '\fBlive\-config.keyboard\-variants\fR=\fIKEYBOARD_VARIANT1\fR,\fIKEYBOARD_VARIANT2\fR ... \fIKEYBOARD_VARIANTn\fR' parameter.
.IP "\fBLIVE_KEYBOARD_OPTIONS\fR=\fIKEYBOARD_OPTIONS\fR" 4
This variable equals the '\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR' parameter.
.IP "\fBLIVE_SYSV_RC\fR=\fISERVICE1\fR,\fISERVICE2\fR ... \fISERVICEn\fR" 4
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 43db0cd..3fd99ad 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 12.07.2012 3.0~a43\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 20.07.2012 3.0~a43\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-config\fP \- Scripts de configuración del sistema
@@ -105,8 +105,10 @@ Permite cambiar el modelo de teclado. No hay ningún valor por omisión.
Permite cambiar la disposición del teclado. Si se especifica más de una, las
herramientas de escritorio permitirán cambiarlas bajo X11. No hay ningún
valor por omisión.
-.IP "\fBlive\-config.keyboard\-variant\fP=\fIKEYBOARD_VARIANT\fP | \fBkeyboard\-variant\fP=\fIKEYBOARD_VARIANT\fP" 4
-Permite cambiar la variante del teclado. No hay ningún valor por omisión.
+.IP "\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP | \fBkeyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
+Allows to change the keyboard variants. If more than one is specified, the
+tools of the desktop environment will allow to switch it under X11. There is
+no default value set.
.IP "\fBlive\-config.keyboard\-options\fP=\fIKEYBOARD_OPTIONS\fP | \fBkeyboard\-options\fP=\fIKEYBOARD_OPTIONS\fP" 4
Permite cambiar las opciones del teclado. No hay un valor por omisión.
.IP "\fBlive\-config.sysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP | \fBsysv\-rc\fP=\fISERVICE1\fP,\fISERVICE2\fP ... \fISERVICEn\fP" 4
@@ -224,9 +226,10 @@ Esta variable es igual al parámetro
Esta variable es igual al parámetro
\&'\fBlive\-config.keyboard\-layouts\fP=\fIKEYBOARD_LAYOUT1\fP,\fIKEYBOARD_LAYOUT2\fP
\&... \fIKEYBOARD_LAYOUTn\fP'
-.IP \fBLIVE_KEYBOARD_VARIANT\fP=\fIKEYBOARD_VARIANT\fP 4
+.IP "\fBLIVE_KEYBOARD_VARIANTS\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
Esta variable es igual al parámetro
-\&'\fBlive\-config.keyboard\-variant\fP=\fIKEYBOARD_VARIANT\fP'
+\&'\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP
+\&... \fIKEYBOARD_VARIANTn\fP'
.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fIKEYBOARD_OPTIONS\fP 4
Esta variable es igual al
parámetro'\fBlive\-config.keyboard\-options\fP=\fIKEYBOARD_OPTIONS\fP'
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 8be5731..8709f72 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 12.07.2012 3.0~a43\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 20.07.2012 3.0~a43\-1 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
@@ -110,9 +110,10 @@ Permet de changer la configuration du clavier. Si plus d'une configuration
est spécifiée, les utilitaires de l'environnement de bureau permettront de
passer de l'une à l'autre sous X11. Aucune valeur par défaut n'est
spécifiée.
-.IP "\fBlive\-config.keyboard\-variant\fP=\fITYPE_DE_CLAVIER\fP | \fBkeyboard\-variant\fP=\fITYPE_DE_CLAVIER\fP" 4
-Permet de changer le type de clavier. Aucune valeur par défaut n'est
-spécifiée.
+.IP "\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP | \fBkeyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
+Allows to change the keyboard variants. If more than one is specified, the
+tools of the desktop environment will allow to switch it under X11. There is
+no default value set.
.IP "\fBlive\-config.keyboard\-options\fP=\fIOPTIONS_DU_CLAVIER\fP | \fBkeyboard\-options\fP=\fIOPTIONS_DU_CLAVIER\fP" 4
Permet de changer les options du clavier. Aucune valeur par défaut n'est
spécifiée.
@@ -236,9 +237,10 @@ Cette variable correspond au paramètre
Cette variable correspond au paramètre
\&'\fBlive\-config.keyboard\-layouts\fP=\fICONFIGURATION1_DU_CLAVIER\fP,\fICONFIGURATION2_DU_CLAVIER\fP
\&... \fICONFIGURATIONn_DU_CLAVIER\fP'.
-.IP \fBLIVE_KEYBOARD_VARIANT\fP=\fITYPE_DE_CLAVIER\fP 4
-Cette variable correspond au paramètre
-\&'\fBlive\-config.keyboard\-variant\fP=\fITYPE_DE_CLAVIER\fP'.
+.IP "\fBLIVE_KEYBOARD_VARIANTS\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
+This variable equals the
+\&'\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP
+\&... \fIKEYBOARD_VARIANTn\fP' parameter.
.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fIOPTIONS_DU_CLAVIER\fP 4
Cette variable correspond au paramètre
\&'\fBlive\-config.keyboard\-options\fP=\fIOPTIONS_DU_CLAVIER\fP'.
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index 81d0ec7..f625da8 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 12.07.2012 3.0~a43\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 20.07.2012 3.0~a43\-1 "Progetto Debian Live"
.SH NOME
\fBlive\-config\fP \- Script di configurazione del sistema
@@ -104,9 +104,10 @@ valore predefinito.
Permette di modificare i layout della tastiera. Se ne viene specificato più
di uno, gli strumenti dell'ambiente desktop consentiranno di cambiarlo sotto
X11. Non è impostato alcun valore predefinito.
-.IP "\fBlive\-config.keyboard\-variant\fP=\fIVARIANTE_TASTIERA\fP | \fBkeyboard\-variant\fP=\fIVARIANTE_TASTIERA\fP" 4
-Permette di impostare un layout alternativo per la tastiera, non è impostato
-alcun valore predefinito.
+.IP "\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP | \fBkeyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
+Allows to change the keyboard variants. If more than one is specified, the
+tools of the desktop environment will allow to switch it under X11. There is
+no default value set.
.IP "\fBlive\-config.keyboard\-options\fP=\fIOPZIONI_TASTIERA\fP | \fBkeyboard\-options\fP=\fIOPZIONI_TASTIERA\fP" 4
Permette di modificare le opzioni della tastiera, non è impostato alcun
valore predefinito.
@@ -224,9 +225,10 @@ Questa variabile equivale al parametro
Questa variabile equivale al parametro
"\fBlive\-config.keyboard\-layouts\fP=\fILAYOUT1_TASTIERA\fP,\fILAYOUT2_TASTIERA\fP
\&... \fILAYOUTn_TASTIERA\fP".
-.IP \fBLIVE_KEYBOARD_VARIANT\fP=\fIVARIANTE_TASTIERA\fP 4
-Questa variabile equivale al parametro
-"\fBlive\-config.keyboard\-variant\fP=\fIVARIANTE_TASTIERA\fP".
+.IP "\fBLIVE_KEYBOARD_VARIANTS\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
+This variable equals the
+\&'\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP
+\&... \fIKEYBOARD_VARIANTn\fP' parameter.
.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fIOPZIONI_TASTIERA\fP 4
Questa variabile equivale al parametro
"\fBlive\-config.keyboard\-options\fP=\fIOPZIONI_TASTIERA\fP".
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 16ad66c..c7e8891 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a43-1\n"
-"POT-Creation-Date: 2012-07-12 20:07+0300\n"
+"POT-Creation-Date: 2012-07-20 02:06+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,8 +24,8 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-12"
-msgstr "12.07.2012"
+msgid "2012-07-20"
+msgstr "20.07.2012"
#. type: TH
#: en/live-config.7:9
@@ -388,15 +388,19 @@ msgstr ""
#. type: IP
#: en/live-config.7:65
#, no-wrap
-msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
-msgstr "B<live-config.keyboard-variant>=I<TASTATUR_VARIANT> | B<keyboard-variant>=I<TASTATUR_VARIANT>"
+msgid "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<live-config.keyboard-variants>=I<TASTATUR_VARIANTE1>,I<TASTATUR_VARIANTE2> ... I<TASTATUR_VARIANTEn> | B<keyboard-variants>=I<TASTATUR_VARIANTE1>,I<TASTATUR_VARIANTE2> ... I<TASTATUR_VARIANTEn>"
#. type: Plain text
#: en/live-config.7:67
-msgid "Allows to change the keyboard variant. There is no default value set."
+msgid ""
+"Allows to change the keyboard variants. If more than one is specified, the "
+"tools of the desktop environment will allow to switch it under X11. There is "
+"no default value set."
msgstr ""
-"Ermöglicht die Tastatur Variante zu bestimmen. Es ist kein Standardwert "
-"gesetzt."
+"Ermöglicht die Tastatur Variante zu bestimmen. Wenn mehr als eine Variante "
+"angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter "
+"X11. Es ist kein Standardwert gesetzt."
#. type: IP
#: en/live-config.7:67
@@ -851,17 +855,19 @@ msgstr ""
#. type: IP
#: en/live-config.7:139
#, no-wrap
-msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
-msgstr "B<LIVE_KEYBOARD_VARIANT>=I<TASTATUR_VARIANTE>"
+msgid "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<LIVE_KEYBOARD_VARIANTS>=I<TASTATUR_VARIANTE1>,I<TASTATUR_VARIANTE2> ... I<TASTATUR_VARIANTEn>"
#. type: Plain text
#: en/live-config.7:141
msgid ""
"This variable equals the 'B<live-config.keyboard-"
-"variant>=I<KEYBOARD_VARIANT>' parameter."
+"variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... "
+"I<KEYBOARD_VARIANTn>' parameter."
msgstr ""
"Diese Variable enspricht dem 'B<live-config.keyboard-"
-"variant>=I<TASTATUR_VARIANTE>' Parameter."
+"variants>=I<TASTATUR_VARIANTE1>,I<TASTATUR_VARIANTE2> ... "
+"I<TASTATUR_VARIANTEn>' Parameter."
#. type: IP
#: en/live-config.7:141
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index b7018b5..1ee8bf8 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a43-1\n"
-"POT-Creation-Date: 2012-07-12 20:07+0300\n"
+"POT-Creation-Date: 2012-07-20 02:06+0300\n"
"PO-Revision-Date: 2012-04-07 17:19+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -25,8 +25,8 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-12"
-msgstr "12.07.2012"
+msgid "2012-07-20"
+msgstr "20.07.2012"
#. type: TH
#: en/live-config.7:9
@@ -383,14 +383,24 @@ msgstr ""
#. type: IP
#: en/live-config.7:65
#, no-wrap
-msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
-msgstr "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
+msgid "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
#. type: Plain text
#: en/live-config.7:67
-msgid "Allows to change the keyboard variant. There is no default value set."
+#, fuzzy
+#| msgid ""
+#| "Allows to change the keyboard layouts. If more than one is specified, the "
+#| "tools of the desktop environment will allow to switch it under X11. There "
+#| "is no default value set."
+msgid ""
+"Allows to change the keyboard variants. If more than one is specified, the "
+"tools of the desktop environment will allow to switch it under X11. There is "
+"no default value set."
msgstr ""
-"Permite cambiar la variante del teclado. No hay ningún valor por omisión."
+"Permite cambiar la disposición del teclado. Si se especifica más de una, las "
+"herramientas de escritorio permitirán cambiarlas bajo X11. No hay ningún "
+"valor por omisión."
#. type: IP
#: en/live-config.7:67
@@ -840,17 +850,18 @@ msgstr ""
#. type: IP
#: en/live-config.7:139
#, no-wrap
-msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
-msgstr "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
+msgid "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
#. type: Plain text
#: en/live-config.7:141
msgid ""
"This variable equals the 'B<live-config.keyboard-"
-"variant>=I<KEYBOARD_VARIANT>' parameter."
+"variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... "
+"I<KEYBOARD_VARIANTn>' parameter."
msgstr ""
"Esta variable es igual al parámetro 'B<live-config.keyboard-"
-"variant>=I<KEYBOARD_VARIANT>'"
+"variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>'"
#. type: IP
#: en/live-config.7:141
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 1bacbae..b40b9bb 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a43-1\n"
-"POT-Creation-Date: 2012-07-12 20:07+0300\n"
+"POT-Creation-Date: 2012-07-20 02:06+0300\n"
"PO-Revision-Date: 2012-04-18 15:46+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -25,8 +25,8 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-12"
-msgstr "12.07.2012"
+msgid "2012-07-20"
+msgstr "20.07.2012"
#. type: TH
#: en/live-config.7:9
@@ -391,15 +391,24 @@ msgstr ""
#. type: IP
#: en/live-config.7:65
#, no-wrap
-msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
-msgstr "B<live-config.keyboard-variant>=I<TYPE_DE_CLAVIER> | B<keyboard-variant>=I<TYPE_DE_CLAVIER>"
+msgid "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
#. type: Plain text
#: en/live-config.7:67
-msgid "Allows to change the keyboard variant. There is no default value set."
+#, fuzzy
+#| msgid ""
+#| "Allows to change the keyboard layouts. If more than one is specified, the "
+#| "tools of the desktop environment will allow to switch it under X11. There "
+#| "is no default value set."
+msgid ""
+"Allows to change the keyboard variants. If more than one is specified, the "
+"tools of the desktop environment will allow to switch it under X11. There is "
+"no default value set."
msgstr ""
-"Permet de changer le type de clavier. Aucune valeur par défaut n'est "
-"spécifiée."
+"Permet de changer la configuration du clavier. Si plus d'une configuration "
+"est spécifiée, les utilitaires de l'environnement de bureau permettront de "
+"passer de l'une à l'autre sous X11. Aucune valeur par défaut n'est spécifiée."
#. type: IP
#: en/live-config.7:67
@@ -853,17 +862,24 @@ msgstr ""
#. type: IP
#: en/live-config.7:139
#, no-wrap
-msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
-msgstr "B<LIVE_KEYBOARD_VARIANT>=I<TYPE_DE_CLAVIER>"
+msgid "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
#. type: Plain text
#: en/live-config.7:141
+#, fuzzy
+#| msgid ""
+#| "This variable equals the 'B<live-config.keyboard-"
+#| "layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
+#| "parameter."
msgid ""
"This variable equals the 'B<live-config.keyboard-"
-"variant>=I<KEYBOARD_VARIANT>' parameter."
+"variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... "
+"I<KEYBOARD_VARIANTn>' parameter."
msgstr ""
"Cette variable correspond au paramètre 'B<live-config.keyboard-"
-"variant>=I<TYPE_DE_CLAVIER>'."
+"layouts>=I<CONFIGURATION1_DU_CLAVIER>,I<CONFIGURATION2_DU_CLAVIER> ... "
+"I<CONFIGURATIONn_DU_CLAVIER>'."
#. type: IP
#: en/live-config.7:141
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index 2b08b5d..1864b68 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a43-1\n"
-"POT-Creation-Date: 2012-07-12 20:07+0300\n"
+"POT-Creation-Date: 2012-07-20 02:06+0300\n"
"PO-Revision-Date: 2011-12-06 08:01+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: none\n"
@@ -23,8 +23,8 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-12"
-msgstr "12.07.2012"
+msgid "2012-07-20"
+msgstr "20.07.2012"
#. type: TH
#: en/live-config.7:9
@@ -374,15 +374,24 @@ msgstr ""
#. type: IP
#: en/live-config.7:65
#, no-wrap
-msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
-msgstr "B<live-config.keyboard-variant>=I<VARIANTE_TASTIERA> | B<keyboard-variant>=I<VARIANTE_TASTIERA>"
+msgid "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
#. type: Plain text
#: en/live-config.7:67
-msgid "Allows to change the keyboard variant. There is no default value set."
+#, fuzzy
+#| msgid ""
+#| "Allows to change the keyboard layouts. If more than one is specified, the "
+#| "tools of the desktop environment will allow to switch it under X11. There "
+#| "is no default value set."
+msgid ""
+"Allows to change the keyboard variants. If more than one is specified, the "
+"tools of the desktop environment will allow to switch it under X11. There is "
+"no default value set."
msgstr ""
-"Permette di impostare un layout alternativo per la tastiera, non è impostato "
-"alcun valore predefinito."
+"Permette di modificare i layout della tastiera. Se ne viene specificato più "
+"di uno, gli strumenti dell'ambiente desktop consentiranno di cambiarlo sotto "
+"X11. Non è impostato alcun valore predefinito."
#. type: IP
#: en/live-config.7:67
@@ -831,17 +840,23 @@ msgstr ""
#. type: IP
#: en/live-config.7:139
#, no-wrap
-msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
-msgstr "B<LIVE_KEYBOARD_VARIANT>=I<VARIANTE_TASTIERA>"
+msgid "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
#. type: Plain text
#: en/live-config.7:141
+#, fuzzy
+#| msgid ""
+#| "This variable equals the 'B<live-config.keyboard-"
+#| "layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
+#| "parameter."
msgid ""
"This variable equals the 'B<live-config.keyboard-"
-"variant>=I<KEYBOARD_VARIANT>' parameter."
+"variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... "
+"I<KEYBOARD_VARIANTn>' parameter."
msgstr ""
"Questa variabile equivale al parametro \"B<live-config.keyboard-"
-"variant>=I<VARIANTE_TASTIERA>\"."
+"layouts>=I<LAYOUT1_TASTIERA>,I<LAYOUT2_TASTIERA> ... I<LAYOUTn_TASTIERA>\"."
#. type: IP
#: en/live-config.7:141
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 9c37330..56a9878 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 3.0~a43-1\n"
-"POT-Creation-Date: 2012-07-12 20:07+0300\n"
+"POT-Creation-Date: 2012-07-20 02:06+0300\n"
"PO-Revision-Date: 2012-07-08 11:30-0600\n"
"Last-Translator: Tiago Bortoletto Vaz <tiago at debian.org>\n"
"Language-Team: none\n"
@@ -24,8 +24,8 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-12"
-msgstr "12-07-2012"
+msgid "2012-07-20"
+msgstr "20-07-2012"
#. type: TH
#: en/live-config.7:9
@@ -383,14 +383,24 @@ msgstr ""
#. type: IP
#: en/live-config.7:65
#, no-wrap
-msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
-msgstr "B<live-config.keyboard-variant>=I<VARIANTE_DE_TECLADO> | B<keyboard-variant>=I<VARIANTE_DE_TECLADO>"
+msgid "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
#. type: Plain text
#: en/live-config.7:67
-msgid "Allows to change the keyboard variant. There is no default value set."
+#, fuzzy
+#| msgid ""
+#| "Allows to change the keyboard layouts. If more than one is specified, the "
+#| "tools of the desktop environment will allow to switch it under X11. There "
+#| "is no default value set."
+msgid ""
+"Allows to change the keyboard variants. If more than one is specified, the "
+"tools of the desktop environment will allow to switch it under X11. There is "
+"no default value set."
msgstr ""
-"Permite configurar a variente de teclado. Não há valor padrão definido."
+"Permite configurar layouts de teclado. Se mais de um layout for "
+"especificado, as ferramentas do ambiente desktop possibilitarão a troca "
+"entre eles no X11. Não há valor padrão definido."
#. type: IP
#: en/live-config.7:67
@@ -841,17 +851,24 @@ msgstr ""
#. type: IP
#: en/live-config.7:139
#, no-wrap
-msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
-msgstr "B<LIVE_KEYBOARD_VARIANT>=I<VARIANTE_DE_TECLADO>"
+msgid "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
+msgstr "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
#. type: Plain text
#: en/live-config.7:141
+#, fuzzy
+#| msgid ""
+#| "This variable equals the 'B<live-config.keyboard-"
+#| "layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
+#| "parameter."
msgid ""
"This variable equals the 'B<live-config.keyboard-"
-"variant>=I<KEYBOARD_VARIANT>' parameter."
+"variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... "
+"I<KEYBOARD_VARIANTn>' parameter."
msgstr ""
"Esta variável é equivalente ao parâmetro 'B<live-config.keyboard-"
-"variant>=I<VARIANTE_DE_TECLADO>'."
+"layouts>=I<LAYOUT1_DE_TECLADO>,I<LAYOUT2_DE_TECLADO> ... "
+"I<LAYOUTn_DE_TECLADO>'."
#. type: IP
#: en/live-config.7:141
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 76ad36c..b3c4c37 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2012-07-12 20:07+0300\n"
+"POT-Creation-Date: 2012-07-20 02:06+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"
@@ -25,7 +25,7 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-07-12"
+msgid "2012-07-20"
msgstr ""
#. type: TH
@@ -327,12 +327,15 @@ msgstr ""
#. type: IP
#: en/live-config.7:65
#, no-wrap
-msgid "B<live-config.keyboard-variant>=I<KEYBOARD_VARIANT> | B<keyboard-variant>=I<KEYBOARD_VARIANT>"
+msgid "B<live-config.keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn> | B<keyboard-variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
msgstr ""
#. type: Plain text
#: en/live-config.7:67
-msgid "Allows to change the keyboard variant. There is no default value set."
+msgid ""
+"Allows to change the keyboard variants. If more than one is specified, the "
+"tools of the desktop environment will allow to switch it under X11. There is "
+"no default value set."
msgstr ""
#. type: IP
@@ -714,14 +717,15 @@ msgstr ""
#. type: IP
#: en/live-config.7:139
#, no-wrap
-msgid "B<LIVE_KEYBOARD_VARIANT>=I<KEYBOARD_VARIANT>"
+msgid "B<LIVE_KEYBOARD_VARIANTS>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... I<KEYBOARD_VARIANTn>"
msgstr ""
#. type: Plain text
#: en/live-config.7:141
msgid ""
"This variable equals the 'B<live-config.keyboard-"
-"variant>=I<KEYBOARD_VARIANT>' parameter."
+"variants>=I<KEYBOARD_VARIANT1>,I<KEYBOARD_VARIANT2> ... "
+"I<KEYBOARD_VARIANTn>' parameter."
msgstr ""
#. type: IP
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 5f38dd0..7066de5 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 12\-07\-2012 3.0~a43\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 20\-07\-2012 3.0~a43\-1 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
@@ -104,8 +104,10 @@ Permite configurar o modelo do teclado. Não há valor padrão definido.
Permite configurar layouts de teclado. Se mais de um layout for
especificado, as ferramentas do ambiente desktop possibilitarão a troca
entre eles no X11. Não há valor padrão definido.
-.IP "\fBlive\-config.keyboard\-variant\fP=\fIVARIANTE_DE_TECLADO\fP | \fBkeyboard\-variant\fP=\fIVARIANTE_DE_TECLADO\fP" 4
-Permite configurar a variente de teclado. Não há valor padrão definido.
+.IP "\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP | \fBkeyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
+Allows to change the keyboard variants. If more than one is specified, the
+tools of the desktop environment will allow to switch it under X11. There is
+no default value set.
.IP "\fBlive\-config.keyboard\-options\fP=\fIOPÇÕES_DE_TECLADO\fP | \fBkeyboard\-options\fP=\fIOPÇÕES_DE_TECLADO\fP" 4
Permite configurar as opções de teclado. Não há valor padrão definido.
.IP "\fBlive\-config.sysv\-rc\fP=\fISERVIÇO1\fP,\fISERVIÇO2\fP ... \fISERVIÇOn\fP | \fBsysv\-rc\fP=\fISERVIÇO1\fP,\fISERVIÇO2\fP ... \fISERVIÇOn\fP" 4
@@ -224,9 +226,10 @@ Esta variável é equivalente ao parâmetro
Esta variável é equivalente ao parâmetro
\&'\fBlive\-config.keyboard\-layouts\fP=\fILAYOUT1_DE_TECLADO\fP,\fILAYOUT2_DE_TECLADO\fP
\&... \fILAYOUTn_DE_TECLADO\fP'.
-.IP \fBLIVE_KEYBOARD_VARIANT\fP=\fIVARIANTE_DE_TECLADO\fP 4
-Esta variável é equivalente ao parâmetro
-\&'\fBlive\-config.keyboard\-variant\fP=\fIVARIANTE_DE_TECLADO\fP'.
+.IP "\fBLIVE_KEYBOARD_VARIANTS\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP ... \fIKEYBOARD_VARIANTn\fP" 4
+This variable equals the
+\&'\fBlive\-config.keyboard\-variants\fP=\fIKEYBOARD_VARIANT1\fP,\fIKEYBOARD_VARIANT2\fP
+\&... \fIKEYBOARD_VARIANTn\fP' parameter.
.IP \fBLIVE_KEYBOARD_OPTIONS\fP=\fIOPÇÕES_DE_TECLADO\fP 4
Esta variável é equivalente ao parâmetro
\&'\fBlive\-config.keyboard\-options\fP=\fIOPÇÕES_DE_TECLADO\fP'.
diff --git a/scripts/config/0160-keyboard-configuration b/scripts/config/0160-keyboard-configuration
index fa58b07..bc7da48 100755
--- a/scripts/config/0160-keyboard-configuration
+++ b/scripts/config/0160-keyboard-configuration
@@ -35,8 +35,8 @@ Keyboard_configuration ()
LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
;;
- live-config.keyboard-variant=*|keyboard-variant=*)
- LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
+ live-config.keyboard-variants=*|keyboard-variants=*)
+ LIVE_KEYBOARD_VARIANTS="${_PARAMETER#*keyboard-variants=}"
;;
esac
done
@@ -67,11 +67,11 @@ Configure_keyboard_configuration ()
sed -i -e "s|^XKBOPTIONS=.*$|XKBOPTIONS=\"${LIVE_KEYBOARD_OPTIONS}\"|" /etc/default/keyboard
fi
- if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+ if [ -n "${LIVE_KEYBOARD_VARIANTS}" ]
then
- echo "keyboard-configuration keyboard-configuration/variantcode select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+ echo "keyboard-configuration keyboard-configuration/variantcode select ${LIVE_KEYBOARD_VARIANTS}" >> /tmp/debconf.live
- sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANT}\"|" /etc/default/keyboard
+ sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANTS}\"|" /etc/default/keyboard
fi
if [ -e /tmp/debconf.live ]
diff --git a/scripts/config/1160-xserver-xorg b/scripts/config/1160-xserver-xorg
index 872dc6c..01fde3a 100755
--- a/scripts/config/1160-xserver-xorg
+++ b/scripts/config/1160-xserver-xorg
@@ -34,8 +34,8 @@ Xserver_xorg ()
LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
;;
- live-config.keyboard-variant=*|keyboard-variant=*)
- LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
+ live-config.keyboard-variants=*|keyboard-variants=*)
+ LIVE_KEYBOARD_VARIANTS="${_PARAMETER#*keyboard-variants=}"
;;
live-config.xorg-xsession-manager=*|x-session-manager=*)
@@ -67,9 +67,9 @@ Configure_xserver_xorg ()
echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/layout select ${LIVE_KEYBOARD_LAYOUTS}" >> /tmp/debconf.live
fi
- if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+ if [ -n "${LIVE_KEYBOARD_VARIANTS}" ]
then
- echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/variant select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+ echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/variant select ${LIVE_KEYBOARD_VARIANTS}" >> /tmp/debconf.live
fi
if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
--
live-config
More information about the debian-live-changes
mailing list