[SCM] live-config branch, debian-next, updated. debian/2.0_a9-1-4-g1f3c1ba
Daniel Baumann
daniel at debian.org
Fri Jun 11 20:27:10 UTC 2010
The following commit has been merged in the debian-next branch:
commit 1f3c1ba765dbce802fd3286f02684cfcc2120415
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jun 11 22:27:05 2010 +0200
Renaming live-config.keyboard-layout parameter to live-config.keyboard-layouts for consistency.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 5286174..98594d0 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -77,8 +77,8 @@ 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_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP ... \fITASTATUR_LAYOUTn\fP" 4
-Ermöglicht das Tastatur Layout zu bestimmen. Wenn mehr als ein Layout
+.IP "\fBlive\-config.keyboard\-layouts\fP=\fITASTATUR_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP ... \fITASTATUR_LAYOUTn\fP" 4
+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_VARIANTE\fP 4
@@ -170,9 +170,10 @@ Diese Variable enspricht dem '\fBlive\-config.utc\fP=\fByes\fP|no' Parameter.
.IP \fBLIVE_KEYBOARD_MODEL\fP=\fITASTATUR_MODELL\fP 4
Diese Variable enspricht dem
\&'\fBlive\-config.keyboard\-model\fP=\fITASTATUR_MODELL\fP' Parameter.
-.IP \fBLIVE_KEYBOARD_LAOUT\fP=\fITASTATUR_LAYOUT\fP 4
+.IP "\fBLIVE_KEYBOARD_LAYOUTS\fP=\fITASTATUR_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP ... \fITASTATUR_LAYOUTn\fP" 4
Diese Variable enspricht dem
-\&'\fBlive\-config.keyboard\-layout\fP=\fITASTATUR_LAYOUT\fP' Parameter.
+\&'\fBlive\-config.keyboard\-layouts\fP=\fITASTATUR_LAYOUT1\fP,\fITASTATUR_LAYOUT2\fP
+\&... \fITASTATUR_LAYOUTn\fP' Parameter.
.IP \fBLIVE_KEYBOARD_VARIANT\fP=\fITASTATUR_VARIANTE\fP 4
Diese Variable enspricht dem
\&'\fBlive\-config.keyboard\-variant\fP=\fITASTATUR_VARIANTE\fP' Parameter.
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index de76108..2f8a34d 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_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\-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" 4
Allows to change the keyboard variant. There is no default value set.
.IP "\fBlive\-config.keyboard\-options\fR=\fIKEYBOARD_OPTIONS\fR" 4
@@ -98,8 +98,8 @@ This variable equals the '\fBlive\-config.timezone\fR=\fITIMEZONE\fR' parameter.
This variable equals the '\fBlive\-config.utc\fR=\fByes\fR|no' parameter.
.IP "\fBLIVE_KEYBOARD_MODEL\fR=\fIKEYBOARD_MODEL\fR" 4
This variable equals the '\fBlive\-config.keyboard\-model\fR=\fIKEYBOARD_MODEL\fR' parameter.
-.IP "\fBLIVE_KEYBOARD_LAYOUT\fR=\fIKEYBOARD_LAYOUT\fR" 4
-This variable equals the '\fBlive\-config.keyboard\-layout\fR=\fIKEYBOARD_LAYOUT\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_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 02260e6..8abbdb6 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~a9\n"
-"POT-Creation-Date: 2010-06-11 18:35+0300\n"
+"POT-Creation-Date: 2010-06-11 22:24+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,17 +288,17 @@ msgstr ""
#. type: IP
#: en/live-config.7:49
#, no-wrap
-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>"
+msgid "B<live-config.keyboard-layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
+msgstr "B<live-config.keyboard-layouts>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn>"
#. type: Plain text
#: en/live-config.7:51
msgid ""
-"Allows to change the keyboard layout. If more than one is specified, the "
+"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."
msgstr ""
-"Ermöglicht das Tastatur Layout zu bestimmen. Wenn mehr als ein Layout "
+"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."
@@ -641,17 +641,19 @@ msgstr ""
#. type: IP
#: en/live-config.7:101
#, no-wrap
-msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
-msgstr "B<LIVE_KEYBOARD_LAOUT>=I<TASTATUR_LAYOUT>"
+msgid "B<LIVE_KEYBOARD_LAYOUTS>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
+msgstr "B<LIVE_KEYBOARD_LAYOUTS>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn>"
#. type: Plain text
#: en/live-config.7:103
msgid ""
-"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
+"This variable equals the 'B<live-config.keyboard-"
+"layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
"parameter."
msgstr ""
"Diese Variable enspricht dem 'B<live-config.keyboard-"
-"layout>=I<TASTATUR_LAYOUT>' Parameter."
+"layouts>=I<TASTATUR_LAYOUT1>,I<TASTATUR_LAYOUT2> ... I<TASTATUR_LAYOUTn>' "
+"Parameter."
#. type: IP
#: en/live-config.7:103
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 29cac5d..ba4795f 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-11 18:35+0300\n"
+"POT-Creation-Date: 2010-06-11 22:24+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,13 +248,13 @@ msgstr ""
#. type: IP
#: en/live-config.7:49
#, no-wrap
-msgid "B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
+msgid "B<live-config.keyboard-layouts>=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. If more than one is specified, the "
+"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."
msgstr ""
@@ -541,13 +541,14 @@ msgstr ""
#. type: IP
#: en/live-config.7:101
#, no-wrap
-msgid "B<LIVE_KEYBOARD_LAYOUT>=I<KEYBOARD_LAYOUT>"
+msgid "B<LIVE_KEYBOARD_LAYOUTS>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>"
msgstr ""
#. type: Plain text
#: en/live-config.7:103
msgid ""
-"This variable equals the 'B<live-config.keyboard-layout>=I<KEYBOARD_LAYOUT>' "
+"This variable equals the 'B<live-config.keyboard-"
+"layouts>=I<KEYBOARD_LAYOUT1>,I<KEYBOARD_LAYOUT2> ... I<KEYBOARD_LAYOUTn>' "
"parameter."
msgstr ""
diff --git a/scripts/config.sh b/scripts/config.sh
index f031c5f..1998fb6 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -86,8 +86,8 @@ Cmdline ()
LIVE_KEYBOARD_MODEL="${_PARAMETER#live-config.keyboard-model=}"
;;
- live-config.keyboard-layout=*)
- LIVE_KEYBOARD_LAYOUT="${_PARAMETER#live-config.keyboard-layout=}"
+ live-config.keyboard-layouts=*)
+ LIVE_KEYBOARD_LAYOUTS="${_PARAMETER#live-config.keyboard-layouts=}"
;;
live-config.keyboard-variant=*)
diff --git a/scripts/config/012-console-setup b/scripts/config/012-console-setup
index 4a94987..0d70e17 100755
--- a/scripts/config/012-console-setup
+++ b/scripts/config/012-console-setup
@@ -37,11 +37,11 @@ Configure_console_setup ()
sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/console-setup
fi
- if [ -n "${LIVE_KEYBOARD_LAYOUT}" ]
+ if [ -n "${LIVE_KEYBOARD_LAYOUTS}" ]
then
- echo "console-setup console-setup/layoutcode select ${LIVE_KEYBOARD_LAYOUT}" >> /tmp/debconf.live
+ echo "console-setup console-setup/layoutcode select ${LIVE_KEYBOARD_LAYOUTS}" >> /tmp/debconf.live
- sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUT}\"|" /etc/default/console-setup
+ sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUTS}\"|" /etc/default/console-setup
fi
if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
diff --git a/scripts/config/013-keyboard-configuration b/scripts/config/013-keyboard-configuration
index 0637529..a837ef8 100755
--- a/scripts/config/013-keyboard-configuration
+++ b/scripts/config/013-keyboard-configuration
@@ -31,11 +31,11 @@ Configure_keyboard_configuration ()
sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/keyboard
fi
- if [ -n "${LIVE_KEYBOARD_LAYOUT}" ]
+ if [ -n "${LIVE_KEYBOARD_LAYOUTS}" ]
then
- echo "keyboard-configuration keyboard-configuration/layoutcode select ${LIVE_KEYBOARD_LAYOUT}" >> /tmp/debconf.live
+ echo "keyboard-configuration keyboard-configuration/layoutcode select ${LIVE_KEYBOARD_LAYOUTS}" >> /tmp/debconf.live
- sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUT}\"|" /etc/default/keyboard
+ sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUTS}\"|" /etc/default/keyboard
fi
if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index 15a2229..4b8e6b6 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -35,9 +35,9 @@ Configure_xserver_xorg ()
echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/model select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
fi
- if [ -n "${LIVE_KEYBOARD_LAYOUT}" ]
+ if [ -n "${LIVE_KEYBOARD_LAYOUTS}" ]
then
- echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/layout select ${LIVE_KEYBOARD_LAYOUT}" >> /tmp/debconf.live
+ echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/layout select ${LIVE_KEYBOARD_LAYOUTS}" >> /tmp/debconf.live
fi
if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
--
live-config
More information about the debian-live-changes
mailing list