[SCM] live-config branch, debian, updated. debian/2.0_a7-1-12-gab82ffb

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 425949de6601daeb14241c713c2f4fc1524bcd7b
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 9 16:58:03 2010 +0200

    Updating manpage to reflect that there can be more than one keyboard layout specified at the time.

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 1511e55..96a725b 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -77,9 +77,10 @@ Hardwareuhr auf UTC gestellt ist oder nicht. Der Standard ist 'yes'.
 .IP \fBlive\-config.keyboard\-model\fP=\fITASTATUR_MODELL\fP 4
 Ermöglicht das Tastatur Modell zu bestimmen. Es ist kein Standardwert
 gesetzt.
-.IP \fBlive\-config.keyboard\-layout\fP=\fITASTATUR_LAYOUT\fP 4
-Ermöglicht das Tastatur Layout zu bestimmen. Es ist kein Standardwert
-gesetzt.
+.IP "\fBlive\-config.keyboard\-layout\fP=\fITASTATUR_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP ... \fITASTATUR_LAYOUTn\fP" 4
+Ermöglicht das Tastatur Layout 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_VARIANTE\fP 4
 Ermöglicht die Tastatur Variante zu bestimmen. Es ist kein Standardwert
 gesetzt.
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index aaf400f..dc30ea6 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -46,8 +46,8 @@ Allows to set the timezone of the system, e.g. 'Europe/Zurich'. The default is '
 Allows to change if the system is assuming that the hardware clock is set to UTC or not. The default is 'yes'.
 .IP "\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR" 4
 Allows to change the keyboard model. There is no default value set.
-.IP "\fBlive\-config.keyboard\-layout\fR=\fIKEYBOARD_LAYOUT\fR" 4
-Allows to change the keyboard layout. There is no default value set.
+.IP "\fBlive\-config.keyboard\-layout\fR=\fIKEYBOARD_LAYOUT1\fR,\fIKEYBOARD_LAYOUT2\fR ... \fIKEYBOARD_LAYOUTn\fR" 4
+Allows to change the keyboard layout. 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" 4
 Allows to change the keyboard variant. There is no default value set.
 .IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index e300f96..f924cd7 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 2.0~a7\n"
-"POT-Creation-Date: 2010-06-09 13:04+0300\n"
+"POT-Creation-Date: 2010-06-09 16:54+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"
@@ -288,15 +288,19 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:49
 #, no-wrap
-msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>"
-msgstr "B<live-config.keyboard-layout>=I<TASTATUR_LAYOUT>"
+msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
+msgstr "B<live-config.keyboard-layout>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn>"
 
 #. type: Plain text
 #: en/live-config.7:51
-msgid "Allows to change the keyboard layout. There is no default value set."
+msgid ""
+"Allows to change the keyboard layout. 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 das Tastatur Layout zu bestimmen. Es ist kein Standardwert "
-"gesetzt."
+"Ermöglicht das Tastatur Layout zu bestimmen. Wenn mehr als ein Layout "
+"angegeben wird, ermöglichen die Tools der Desktopumgebung das Wechseln unter "
+"X11. Es ist kein Standardwert gesetzt."
 
 #. type: IP
 #: en/live-config.7:51
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 98dca8f..e91cb1b 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: 2010-06-09 13:04+0300\n"
+"POT-Creation-Date: 2010-06-09 16:54+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"
@@ -248,12 +248,15 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:49
 #, no-wrap
-msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>"
+msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-config.7:51
-msgid "Allows to change the keyboard layout. There is no default value set."
+msgid ""
+"Allows to change the keyboard layout. 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

-- 
live-config