[SCM] live-debconfig branch, debian-next, updated. debian/4.0_a3-1-1-g16b5258

Daniel Baumann daniel at debian.org
Thu Aug 16 22:08:21 UTC 2012 

The following commit has been merged in the debian-next branch:
commit 16b52587258db730454df4d614c8b8da64fd93f0
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 17 00:08:20 2012 +0200

    Harmonize script descriptions in live-debconfig manpage.

diff --git a/manpages/de/live-debconfig.de.7 b/manpages/de/live-debconfig.de.7
index 6e33164..2c3a47b 100644
--- a/manpages/de/live-debconfig.de.7
+++ b/manpages/de/live-debconfig.de.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-DEBCONFIG 7 16.08.2012 4.0~a3\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 7 17.08.2012 4.0~a3\-1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-debconfig\fP \- System Konfiguration Skripte
@@ -31,9 +31,10 @@ konfiguriert die Netzwerkeinstellungen des Systems (/etc/network/interfaces,
 /etc/resolv.conf, /etc/hosts), siehe \fIlive\-debconfig_ifupdown\fP(5).
 .IP \fBsysvinit\fP 4
 konfiguriert den Typ des Systems für Linux Container, LXC (/etc/inittab),
-siehe \fIlive\-debconfig_sysvinit\fP(5).
+und schaltet einige Services ab die für LXC nicht benötigt werden, siehe
+\fIlive\-debconfig_sysvinit\fP(5).
 .IP \fButil\-linux\fP 4
-konfiguriert den Zugriff auf die Hardware Uhr, siehe
+konfiguriert den Zugriff auf die Hardware Uhr (/etc/default/hwclock), siehe
 \fIlive\-debconfig_util\-linux\fP(5).
 .IP \fBselinux\fP 4
 schaltet SELinux ein oder aus (/selinux), siehe
diff --git a/manpages/de/live-debconfig_hostname.de.5 b/manpages/de/live-debconfig_hostname.de.5
index 92ce88d..3dcf219 100644
--- a/manpages/de/live-debconfig_hostname.de.5
+++ b/manpages/de/live-debconfig_hostname.de.5
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-DEBCONFIG 5 16.08.2012 4.0~a3\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 5 17.08.2012 4.0~a3\-1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-debconfig\fP \- Hostname Skript
diff --git a/manpages/en/live-debconfig.7 b/manpages/en/live-debconfig.7
index 7a0d4da..720e628 100644
--- a/manpages/en/live-debconfig.7
+++ b/manpages/en/live-debconfig.7
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-DEBCONFIG 7 2012\-08\-16 4.0~a3-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a3-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-debconfig\fR \- System Configuration Scripts
@@ -22,9 +22,9 @@ sets the systems hostname (/etc/hostname), see \fIlive\-debconfig_hostname\fR(5)
 .IP "\fBifupdown\fR" 4
 configures the systems network settings (/etc/network/interfaces, /etc/resolv.conf, /etc/hosts), see \fIlive\-debconfig_ifupdown\fR(5).
 .IP "\fBsysvinit\fR" 4
-configures the systems type for Linux Containers, LXC (/etc/inittab), see \fIlive\-debconfig_sysvinit\fR(5).
+configures the systems type for Linux Containers, LXC (/etc/inittab) and disables some services not needed for LXC, see \fIlive\-debconfig_sysvinit\fR(5).
 .IP "\fButil\-linux\fR" 4
-configure the access to the hardware clock, see \fIlive\-debconfig_util\-linux\fR(5).
+configure the access to the hardware clock (/etc/default/hwclock), see \fIlive\-debconfig_util\-linux\fR(5).
 .IP "\fBselinux\fR" 4
 enables or disables selinux (/selinux), see \fIlive\-debconfig_selinux\fR(5).
 .IP "\fBopenssh\-server\fR" 4
diff --git a/manpages/en/live-debconfig_hostname.5 b/manpages/en/live-debconfig_hostname.5
index cfa4def..bbb67ac 100644
--- a/manpages/en/live-debconfig_hostname.5
+++ b/manpages/en/live-debconfig_hostname.5
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-DEBCONFIG 5 2012\-08\-16 4.0~a3-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a3-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-debconfig\fR \- hostname script
diff --git a/manpages/es/live-debconfig.es.7 b/manpages/es/live-debconfig.es.7
index d4438df..b96f0ed 100644
--- a/manpages/es/live-debconfig.es.7
+++ b/manpages/es/live-debconfig.es.7
@@ -31,10 +31,11 @@ establece el nombre del anfitrión del sistema (/etc/hostname), ver
 establece la configuración de red del sistema (/etc/network/interfaces,
 /etc/resolv.conf, /etc/hosts), ver \fIlive\-debconfig_ifupdown\fP(5).
 .IP \fBsysvinit\fP 4
-configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab),
-ver \fIlive\-debconfig_sysvinit\fP(5).
+configures the systems type for Linux Containers, LXC (/etc/inittab) and
+disables some services not needed for LXC, see
+\fIlive\-debconfig_sysvinit\fP(5).
 .IP \fButil\-linux\fP 4
-configure the access to the hardware clock, see
+configure the access to the hardware clock (/etc/default/hwclock), see
 \fIlive\-debconfig_util\-linux\fP(5).
 .IP \fBselinux\fP 4
 activa o desactiva selinux (/selinux), ver \fIlive\-debconfig_selinux\fP(5).
diff --git a/manpages/po/de/live-debconfig.7.po b/manpages/po/de/live-debconfig.7.po
index 6cfa593..727f3be 100644
--- a/manpages/po/de/live-debconfig.7.po
+++ b/manpages/po/de/live-debconfig.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"POT-Creation-Date: 2012-08-17 00:03+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-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "17.08.2012"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
@@ -118,11 +118,12 @@ msgstr "B<sysvinit>"
 #. type: Plain text
 #: en/live-debconfig.7:26
 msgid ""
-"configures the systems type for Linux Containers, LXC (/etc/inittab), see "
-"I<live-debconfig_sysvinit>(5)."
+"configures the systems type for Linux Containers, LXC (/etc/inittab) and "
+"disables some services not needed for LXC, see I<live-debconfig_sysvinit>(5)."
 msgstr ""
 "konfiguriert den Typ des Systems für Linux Container, LXC (/etc/inittab), "
-"siehe I<live-debconfig_sysvinit>(5)."
+"und schaltet einige Services ab die für LXC nicht benötigt werden, siehe "
+"I<live-debconfig_sysvinit>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:26
@@ -133,11 +134,11 @@ msgstr "B<util-linux>"
 #. type: Plain text
 #: en/live-debconfig.7:28
 msgid ""
-"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
-"(5)."
+"configure the access to the hardware clock (/etc/default/hwclock), see "
+"I<live-debconfig_util-linux>(5)."
 msgstr ""
-"konfiguriert den Zugriff auf die Hardware Uhr, siehe I<live-debconfig_util-"
-"linux>(5)."
+"konfiguriert den Zugriff auf die Hardware Uhr (/etc/default/hwclock), siehe "
+"I<live-debconfig_util-linux>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:28
diff --git a/manpages/po/de/live-debconfig_hostname.5.po b/manpages/po/de/live-debconfig_hostname.5.po
index 057695b..9cf9476 100644
--- a/manpages/po/de/live-debconfig_hostname.5.po
+++ b/manpages/po/de/live-debconfig_hostname.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"POT-Creation-Date: 2012-08-17 00:03+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-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "17.08.2012"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/es/live-debconfig.7.po b/manpages/po/es/live-debconfig.7.po
index 0931c68..e5fce8f 100644
--- a/manpages/po/es/live-debconfig.7.po
+++ b/manpages/po/es/live-debconfig.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"POT-Creation-Date: 2012-08-17 00:03+0300\n"
 "PO-Revision-Date: 2012-07-30 14:08+0200\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
@@ -24,7 +24,7 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
+msgid "2012-08-17"
 msgstr "16.08.2012"
 
 #. type: TH
@@ -117,9 +117,13 @@ msgstr "B<sysvinit>"
 
 #. type: Plain text
 #: en/live-debconfig.7:26
+#, fuzzy
+#| msgid ""
+#| "configures the systems type for Linux Containers, LXC (/etc/inittab), see "
+#| "I<live-debconfig_sysvinit>(5)."
 msgid ""
-"configures the systems type for Linux Containers, LXC (/etc/inittab), see "
-"I<live-debconfig_sysvinit>(5)."
+"configures the systems type for Linux Containers, LXC (/etc/inittab) and "
+"disables some services not needed for LXC, see I<live-debconfig_sysvinit>(5)."
 msgstr ""
 "configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab), "
 "ver I<live-debconfig_sysvinit>(5)."
@@ -132,10 +136,16 @@ msgstr "B<util-linux>"
 
 #. type: Plain text
 #: en/live-debconfig.7:28
+#, fuzzy
+#| msgid ""
+#| "configures the systems type for Linux Containers, LXC (/etc/inittab), see "
+#| "I<live-debconfig_sysvinit>(5)."
 msgid ""
-"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
-"(5)."
+"configure the access to the hardware clock (/etc/default/hwclock), see "
+"I<live-debconfig_util-linux>(5)."
 msgstr ""
+"configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab), "
+"ver I<live-debconfig_sysvinit>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:28
diff --git a/manpages/po/es/live-debconfig_hostname.5.po b/manpages/po/es/live-debconfig_hostname.5.po
index 8300100..55d273d 100644
--- a/manpages/po/es/live-debconfig_hostname.5.po
+++ b/manpages/po/es/live-debconfig_hostname.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"POT-Creation-Date: 2012-08-17 00:03+0300\n"
 "PO-Revision-Date: 2012-07-30 14:39+0200\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
@@ -24,7 +24,7 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
+msgid "2012-08-17"
 msgstr "16.08.2012"
 
 #. type: TH
diff --git a/manpages/pot/live-debconfig.7.pot b/manpages/pot/live-debconfig.7.pot
index 0c59500..01333e7 100644
--- a/manpages/pot/live-debconfig.7.pot
+++ b/manpages/pot/live-debconfig.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"POT-Creation-Date: 2012-08-17 00:03+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-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
+msgid "2012-08-17"
 msgstr ""
 
 #. type: TH
@@ -111,8 +111,8 @@ msgstr ""
 #. type: Plain text
 #: en/live-debconfig.7:26
 msgid ""
-"configures the systems type for Linux Containers, LXC (/etc/inittab), see "
-"I<live-debconfig_sysvinit>(5)."
+"configures the systems type for Linux Containers, LXC (/etc/inittab) and "
+"disables some services not needed for LXC, see I<live-debconfig_sysvinit>(5)."
 msgstr ""
 
 #. type: IP
@@ -124,8 +124,8 @@ msgstr ""
 #. type: Plain text
 #: en/live-debconfig.7:28
 msgid ""
-"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
-"(5)."
+"configure the access to the hardware clock (/etc/default/hwclock), see "
+"I<live-debconfig_util-linux>(5)."
 msgstr ""
 
 #. type: IP
diff --git a/manpages/pot/live-debconfig_hostname.5.pot b/manpages/pot/live-debconfig_hostname.5.pot
index 035bbe3..8611510 100644
--- a/manpages/pot/live-debconfig_hostname.5.pot
+++ b/manpages/pot/live-debconfig_hostname.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"POT-Creation-Date: 2012-08-17 00:03+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-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
+msgid "2012-08-17"
 msgstr ""
 
 #. type: TH

-- 
live-debconfig

More information about the debian-live-changes mailing list