[SCM] live-config branch, debian-next, updated. debian/2.0_a2-1-5-g2fc0fb4
Daniel Baumann
daniel at debian.org
Fri May 28 19:46:20 UTC 2010
The following commit has been merged in the debian-next branch:
commit 17af9202d305e2926859d283ef42bbcc123fb6a4
Author: Daniel Baumann <daniel at debian.org>
Date: Fri May 28 10:07:48 2010 +0200
Adding reference to locales script in manpages.
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 1dd3e52..1696b31 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 27.05.2010 2.0~a2 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 2010\-05\-28 2.0~a2 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
@@ -49,6 +49,8 @@ konfiguriert /etc/hostname und /etc/hosts.
fuegt das Live Benutzerkonto hinzu.
.IP \fBsudo\fP 4
raeumt dem Live Benutzer sudo Privilegien ein.
+.IP \fBlocales\fP 4
+configures locales.
.IP \fBtzdata\fP 4
konfiguriert /etc/timezone.
.IP \fBgdm\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index d8f7fab..6c65e99 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -1,4 +1,4 @@
-.TH LIVE\-CONFIG 7 2010\-05\-27 2.0~a2 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-05\-28 2.0~a2 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
@@ -29,6 +29,8 @@ configures /etc/hostname and /etc/hosts.
adds an live user account.
.IP "\fBsudo\fR" 4
grants sudo privileges to the live user.
+.IP "\fBlocales\fR" 4
+configures locales.
.IP "\fBtzdata\fR" 4
configures /etc/timezone.
.IP "\fBgdm\fR" 4
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index ba606b1..6c252fb 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~a1\n"
-"POT-Creation-Date: 2010-05-24 11:34+0300\n"
+"POT-Creation-Date: 2010-05-28 09:53+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"
@@ -23,8 +23,9 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:1
-#, no-wrap
-msgid "2010-05-27"
+#, fuzzy, no-wrap
+#| msgid "2010-05-27"
+msgid "2010-05-28"
msgstr "27.05.2010"
#. type: TH
@@ -195,123 +196,136 @@ msgstr "raeumt dem Live Benutzer sudo Privilegien ein."
#. type: IP
#: en/live-config.7:32
#, no-wrap
+msgid "B<locales>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:34
+#, fuzzy
+#| msgid "configures /etc/timezone."
+msgid "configures locales."
+msgstr "konfiguriert /etc/timezone."
+
+#. type: IP
+#: en/live-config.7:34
+#, no-wrap
msgid "B<tzdata>"
msgstr "B<tzdata>"
#. type: Plain text
-#: en/live-config.7:34
+#: en/live-config.7:36
msgid "configures /etc/timezone."
msgstr "konfiguriert /etc/timezone."
#. type: IP
-#: en/live-config.7:34
+#: en/live-config.7:36
#, no-wrap
msgid "B<gdm>"
msgstr "B<gdm>"
#. type: Plain text
-#: en/live-config.7:36
+#: en/live-config.7:38
msgid "configures autologin in gdm (lenny)."
msgstr "konfiguriert Autologin in gdm (lenny)."
#. type: IP
-#: en/live-config.7:36
+#: en/live-config.7:38
#, no-wrap
msgid "B<gdm3>"
msgstr "B<gdm3>"
#. type: Plain text
-#: en/live-config.7:38
+#: en/live-config.7:40
msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr "konfiguriert Autologin in gdm3 (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:38
+#: en/live-config.7:40
#, no-wrap
msgid "B<kdm>"
msgstr "B<kdm>"
#. type: Plain text
-#: en/live-config.7:40
+#: en/live-config.7:42
msgid "configures autologin in kdm."
msgstr "konfiguriert Autologin in kdm."
#. type: IP
-#: en/live-config.7:40
+#: en/live-config.7:42
#, no-wrap
msgid "B<lxdm>"
msgstr "B<lxdm>"
#. type: Plain text
-#: en/live-config.7:42
+#: en/live-config.7:44
msgid "configures autologin in lxdm."
msgstr "konfiguriert Autologin in lxdm."
#. type: IP
-#: en/live-config.7:42
+#: en/live-config.7:44
#, no-wrap
msgid "B<nodm>"
msgstr "B<nodm>"
#. type: Plain text
-#: en/live-config.7:44
+#: en/live-config.7:46
msgid "configures autologin in nodm."
msgstr "konfiguriert Autologin in nodm."
#. type: IP
-#: en/live-config.7:44
+#: en/live-config.7:46
#, no-wrap
msgid "B<apport>"
msgstr "B<apport>"
#. type: Plain text
-#: en/live-config.7:46
+#: en/live-config.7:48
msgid "enables apport."
msgstr "aktiviert apport."
#. type: IP
-#: en/live-config.7:46
+#: en/live-config.7:48
#, no-wrap
msgid "B<gnome-panel-data>"
msgstr "B<gnome-panel-data>"
#. type: Plain text
-#: en/live-config.7:48
+#: en/live-config.7:50
msgid "disables lock button for the screen."
msgstr "entfernt den Sperrknopf fuer den Bildschirm."
#. type: IP
-#: en/live-config.7:48
+#: en/live-config.7:50
#, no-wrap
msgid "B<gnome-power-manager>"
msgstr "B<gnome-power-manager>"
#. type: Plain text
-#: en/live-config.7:50
+#: en/live-config.7:52
msgid "disables hibernation."
msgstr "verhindert Hibernation."
#. type: IP
-#: en/live-config.7:50
+#: en/live-config.7:52
#, no-wrap
msgid "B<gnome-screensaver>"
msgstr "B<gnome-screensaver>"
#. type: Plain text
-#: en/live-config.7:52
+#: en/live-config.7:54
msgid "disables the screensaver locking the screen."
msgstr ""
"schaltet das Sperren des Bildschirmes waehrend der Bildschirmschoner laeuft "
"ab."
#. type: IP
-#: en/live-config.7:52
+#: en/live-config.7:54
#, no-wrap
msgid "B<initramfs-tools>"
msgstr "B<initramfs-tools>"
#. type: Plain text
-#: en/live-config.7:54
+#: en/live-config.7:56
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
@@ -319,101 +333,101 @@ msgstr ""
"Persistency benutzt wird."
#. type: IP
-#: en/live-config.7:54
+#: en/live-config.7:56
#, no-wrap
msgid "B<kaboom>"
msgstr "B<kaboom>"
#. type: Plain text
-#: en/live-config.7:56
+#: en/live-config.7:58
msgid "disables kde migration wizard (squeeze and newer)."
msgstr "schaltet den KDE Migration Wizard ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:56
+#: en/live-config.7:58
#, no-wrap
msgid "B<kde-services>"
msgstr "B<kde-services>"
#. type: Plain text
-#: en/live-config.7:58
+#: en/live-config.7:60
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr "schaltet ein paar ungewollte KDE Services ab (squeeze und neuer)."
#. type: IP
-#: en/live-config.7:58
+#: en/live-config.7:60
#, no-wrap
msgid "B<kpersonalizer>"
msgstr "B<kpersonalizer>"
#. type: Plain text
-#: en/live-config.7:60
+#: en/live-config.7:62
msgid "disables kde configuration wizard (lenny)."
msgstr "schaltet den KDE Configuration Wizard ab (lenny)."
#. type: IP
-#: en/live-config.7:60
+#: en/live-config.7:62
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr "B<live-installer-launcher>"
#. type: Plain text
-#: en/live-config.7:62
+#: en/live-config.7:64
msgid "adds live-installer-launcher on users desktop."
msgstr "fuegt live-installer-launcher auf dem Benutzer Desktop hinzu."
#. type: IP
-#: en/live-config.7:62
+#: en/live-config.7:64
#, no-wrap
msgid "B<module-init-tools>"
msgstr "B<module-init-tools>"
#. type: Plain text
-#: en/live-config.7:64
+#: en/live-config.7:66
msgid "automatically load some modules on some architectures."
msgstr "laedt automatisch gewisse Module auf bestimmten Architekturen."
#. type: IP
-#: en/live-config.7:64
+#: en/live-config.7:66
#, no-wrap
msgid "B<policykit>"
msgstr "B<policykit>"
#. type: Plain text
-#: en/live-config.7:66
+#: en/live-config.7:68
msgid "grant user privilegies through policykit."
msgstr "raeumt dem Benutzer Privilegien durch policykit ein."
#. type: IP
-#: en/live-config.7:66
+#: en/live-config.7:68
#, no-wrap
msgid "B<sslcert>"
msgstr "B<sslcert>"
#. type: Plain text
-#: en/live-config.7:68
+#: en/live-config.7:70
msgid "regenerating ssl snake-oil certificates."
msgstr "erneuert SSL snake-oil Zertifikate."
#. type: IP
-#: en/live-config.7:68
+#: en/live-config.7:70
#, no-wrap
msgid "B<update-notifier>"
msgstr "B<update-notifier>"
#. type: Plain text
-#: en/live-config.7:70
+#: en/live-config.7:72
msgid "disables update-notifier."
msgstr "schaltet update-notifier ab."
#. type: IP
-#: en/live-config.7:70
+#: en/live-config.7:72
#, no-wrap
msgid "B<hook>"
msgstr "B<hook>"
#. type: Plain text
-#: en/live-config.7:72
+#: en/live-config.7:74
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
@@ -422,71 +436,71 @@ msgstr ""
"einem HTTP/FTP Server auszufuehren."
#. type: SH
-#: en/live-config.7:73
+#: en/live-config.7:75
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-config.7:74
+#: en/live-config.7:76
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr "B</etc/live/config.conf>"
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:77
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr "B</etc/live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:76
+#: en/live-config.7:78
#, no-wrap
msgid "B<live/config.conf>"
msgstr "B<live/config.conf>"
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:79
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr "B<live/config.conf.d/>"
#. type: IP
-#: en/live-config.7:78
+#: en/live-config.7:80
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr "B</lib/live/config.sh>"
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "B</lib/live/config/>"
msgstr "B</lib/live/config/>"
#. type: SH
-#: en/live-config.7:81
+#: en/live-config.7:83
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:85
msgid "I<live-helper>(7)"
msgstr "I<live-helper>(7)"
#. type: Plain text
-#: en/live-config.7:85
+#: en/live-config.7:87
msgid "I<live-initramfs>(7)"
msgstr "I<live-initramfs>(7)"
#. type: SH
-#: en/live-config.7:86
+#: en/live-config.7:88
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-config.7:88
+#: en/live-config.7:90
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -497,13 +511,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-config.7:89
+#: en/live-config.7:91
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -517,13 +531,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-config.7:92
+#: en/live-config.7:94
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 3d6d80b..6bbdd54 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-05-27 22:36+0300\n"
+"POT-Creation-Date: 2010-05-28 09:53+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"
@@ -24,7 +24,7 @@ msgstr ""
#. type: TH
#: en/live-config.7:1
#, no-wrap
-msgid "2010-05-27"
+msgid "2010-05-28"
msgstr ""
#. type: TH
@@ -175,292 +175,303 @@ msgstr ""
#. type: IP
#: en/live-config.7:32
#, no-wrap
-msgid "B<tzdata>"
+msgid "B<locales>"
msgstr ""
#. type: Plain text
#: en/live-config.7:34
-msgid "configures /etc/timezone."
+msgid "configures locales."
msgstr ""
#. type: IP
#: en/live-config.7:34
#, no-wrap
-msgid "B<gdm>"
+msgid "B<tzdata>"
msgstr ""
#. type: Plain text
#: en/live-config.7:36
-msgid "configures autologin in gdm (lenny)."
+msgid "configures /etc/timezone."
msgstr ""
#. type: IP
#: en/live-config.7:36
#, no-wrap
-msgid "B<gdm3>"
+msgid "B<gdm>"
msgstr ""
#. type: Plain text
#: en/live-config.7:38
-msgid "configures autologin in gdm3 (squeeze and newer)."
+msgid "configures autologin in gdm (lenny)."
msgstr ""
#. type: IP
#: en/live-config.7:38
#, no-wrap
-msgid "B<kdm>"
+msgid "B<gdm3>"
msgstr ""
#. type: Plain text
#: en/live-config.7:40
-msgid "configures autologin in kdm."
+msgid "configures autologin in gdm3 (squeeze and newer)."
msgstr ""
#. type: IP
#: en/live-config.7:40
#, no-wrap
-msgid "B<lxdm>"
+msgid "B<kdm>"
msgstr ""
#. type: Plain text
#: en/live-config.7:42
-msgid "configures autologin in lxdm."
+msgid "configures autologin in kdm."
msgstr ""
#. type: IP
#: en/live-config.7:42
#, no-wrap
-msgid "B<nodm>"
+msgid "B<lxdm>"
msgstr ""
#. type: Plain text
#: en/live-config.7:44
-msgid "configures autologin in nodm."
+msgid "configures autologin in lxdm."
msgstr ""
#. type: IP
#: en/live-config.7:44
#, no-wrap
-msgid "B<apport>"
+msgid "B<nodm>"
msgstr ""
#. type: Plain text
#: en/live-config.7:46
-msgid "enables apport."
+msgid "configures autologin in nodm."
msgstr ""
#. type: IP
#: en/live-config.7:46
#, no-wrap
-msgid "B<gnome-panel-data>"
+msgid "B<apport>"
msgstr ""
#. type: Plain text
#: en/live-config.7:48
-msgid "disables lock button for the screen."
+msgid "enables apport."
msgstr ""
#. type: IP
#: en/live-config.7:48
#, no-wrap
-msgid "B<gnome-power-manager>"
+msgid "B<gnome-panel-data>"
msgstr ""
#. type: Plain text
#: en/live-config.7:50
-msgid "disables hibernation."
+msgid "disables lock button for the screen."
msgstr ""
#. type: IP
#: en/live-config.7:50
#, no-wrap
-msgid "B<gnome-screensaver>"
+msgid "B<gnome-power-manager>"
msgstr ""
#. type: Plain text
#: en/live-config.7:52
-msgid "disables the screensaver locking the screen."
+msgid "disables hibernation."
msgstr ""
#. type: IP
#: en/live-config.7:52
#, no-wrap
-msgid "B<initramfs-tools>"
+msgid "B<gnome-screensaver>"
msgstr ""
#. type: Plain text
#: en/live-config.7:54
+msgid "disables the screensaver locking the screen."
+msgstr ""
+
+#. type: IP
+#: en/live-config.7:54
+#, no-wrap
+msgid "B<initramfs-tools>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-config.7:56
msgid ""
"makes update-initramfs to also update the live media when using persistency."
msgstr ""
#. type: IP
-#: en/live-config.7:54
+#: en/live-config.7:56
#, no-wrap
msgid "B<kaboom>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:56
+#: en/live-config.7:58
msgid "disables kde migration wizard (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:56
+#: en/live-config.7:58
#, no-wrap
msgid "B<kde-services>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:58
+#: en/live-config.7:60
msgid "disables some unwanted KDE services (squeeze and newer)."
msgstr ""
#. type: IP
-#: en/live-config.7:58
+#: en/live-config.7:60
#, no-wrap
msgid "B<kpersonalizer>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:60
+#: en/live-config.7:62
msgid "disables kde configuration wizard (lenny)."
msgstr ""
#. type: IP
-#: en/live-config.7:60
+#: en/live-config.7:62
#, no-wrap
msgid "B<live-installer-launcher>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:62
+#: en/live-config.7:64
msgid "adds live-installer-launcher on users desktop."
msgstr ""
#. type: IP
-#: en/live-config.7:62
+#: en/live-config.7:64
#, no-wrap
msgid "B<module-init-tools>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:64
+#: en/live-config.7:66
msgid "automatically load some modules on some architectures."
msgstr ""
#. type: IP
-#: en/live-config.7:64
+#: en/live-config.7:66
#, no-wrap
msgid "B<policykit>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:66
+#: en/live-config.7:68
msgid "grant user privilegies through policykit."
msgstr ""
#. type: IP
-#: en/live-config.7:66
+#: en/live-config.7:68
#, no-wrap
msgid "B<sslcert>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:68
+#: en/live-config.7:70
msgid "regenerating ssl snake-oil certificates."
msgstr ""
#. type: IP
-#: en/live-config.7:68
+#: en/live-config.7:70
#, no-wrap
msgid "B<update-notifier>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:70
+#: en/live-config.7:72
msgid "disables update-notifier."
msgstr ""
#. type: IP
-#: en/live-config.7:70
+#: en/live-config.7:72
#, no-wrap
msgid "B<hook>"
msgstr ""
#. type: Plain text
-#: en/live-config.7:72
+#: en/live-config.7:74
msgid ""
"allows to run arbitrary commands from a script placed on the live media or "
"an http/ftp server."
msgstr ""
#. type: SH
-#: en/live-config.7:73
+#: en/live-config.7:75
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-config.7:74
+#: en/live-config.7:76
#, no-wrap
msgid "B</etc/live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:75
+#: en/live-config.7:77
#, no-wrap
msgid "B</etc/live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:76
+#: en/live-config.7:78
#, no-wrap
msgid "B<live/config.conf>"
msgstr ""
#. type: IP
-#: en/live-config.7:77
+#: en/live-config.7:79
#, no-wrap
msgid "B<live/config.conf.d/>"
msgstr ""
#. type: IP
-#: en/live-config.7:78
+#: en/live-config.7:80
#, no-wrap
msgid "B</lib/live/config.sh>"
msgstr ""
#. type: IP
-#: en/live-config.7:79
+#: en/live-config.7:81
#, no-wrap
msgid "B</lib/live/config/>"
msgstr ""
#. type: SH
-#: en/live-config.7:81
+#: en/live-config.7:83
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-config.7:83
+#: en/live-config.7:85
msgid "I<live-helper>(7)"
msgstr ""
#. type: Plain text
-#: en/live-config.7:85
+#: en/live-config.7:87
msgid "I<live-initramfs>(7)"
msgstr ""
#. type: SH
-#: en/live-config.7:86
+#: en/live-config.7:88
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-config.7:88
+#: en/live-config.7:90
msgid ""
"More information about live-config and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -468,13 +479,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:89
+#: en/live-config.7:91
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-config.7:91
+#: en/live-config.7:93
msgid ""
"Bugs can be reported by submitting a bugreport for the live-config package "
"in the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or "
@@ -483,13 +494,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-config.7:92
+#: en/live-config.7:94
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-config.7:93
+#: en/live-config.7:95
msgid ""
"live-config was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
--
live-config
More information about the debian-live-changes
mailing list