[SCM] live-tools branch, upstream, updated. upstream/3.0_a3-1-g325b491

Daniel Baumann daniel at debian.org
Wed May 18 16:40:48 UTC 2011


The following commit has been merged in the upstream branch:
commit 325b49104538bd56382b69cdba134f2446c449d9
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed May 18 18:37:47 2011 +0200

    Adding upstream version 3.0~a4.

diff --git a/Makefile b/Makefile
index ededfca..46231cc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SHELL := sh -e
 
-LANGUAGES = de
+LANGUAGES = en $(shell cd manpages/po && ls)
 
 SCRIPTS = scripts/*
 
diff --git a/VERSION b/VERSION
index 2f4c7df..d436840 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a3
+3.0~a4
diff --git a/manpages/de/live-tools.de.7 b/manpages/de/live-tools.de.7
index e23a336..c73c43e 100644
--- a/manpages/de/live-tools.de.7
+++ b/manpages/de/live-tools.de.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-TOOLS 7 09.03.2011 3.0~a3 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 18.05.2011 3.0~a4 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-tools\fP \- System Support Skripte
@@ -24,6 +24,8 @@
 
 .IP \fBlive\-toram\fP 4
 kopiert das laufende System in RAM um das Live Medium auszuwerfen.
+.IP \fBlive\-system\fP 4
+bestimmt ob das laufende System ein Live System ist.
 
 .SH "SIEHE AUCH"
 \fIlive\-boot\fP(7)
@@ -45,5 +47,5 @@ Debian Live Mailing Liste unter <\fIdebian\-live at lists.debian.org\fP>
 (englischsprachig) mitgeteilt werden.
 
 .SH AUTOR
-live\-tools wurde von Daniel Baumann <\fIdaniel at debian.org\fP> für das
-Debian Projekt geschrieben.
+live\-tools wurde von Daniel Baumann <\fIdaniel at debian.org\fP>
+geschrieben.
diff --git a/manpages/en/live-tools.7 b/manpages/en/live-tools.7
index c574237..5f3a5a6 100644
--- a/manpages/en/live-tools.7
+++ b/manpages/en/live-tools.7
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-TOOLS 7 2011\-03\-09 3.0~a3 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2011\-05\-18 3.0~a4 "Debian Live Project"
 
 .SH NAME
 \fBlive\-tools\fR \- System Support Scripts
@@ -15,10 +15,12 @@
 \fBlive\-tools\fR contains additional support scripts for Debian Live systems.
 
 .SH TOOLS
-\fBlive\-tools\fR currently features the following tools.
+\fBlive\-tools\fR currently contains the following tools.
 
-.IP "\fBlive-toram\fR" 4
+.IP "\fBlive\-toram\fR" 4
 copies running system to RAM in order to eject the live media.
+.IP "\fBlive\-system\fR" 4
+determines if running system is a live system.
 
 .SH SEE ALSO
 \fIlive\-boot\fR(7)
@@ -34,4 +36,4 @@ More information about live\-tools and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-tools package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian\-live at lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-tools was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.
+live\-tools was written by Daniel Baumann <\fIdaniel at debian.org\fR>.
diff --git a/manpages/po/de/live-tools.7.po b/manpages/po/de/live-tools.7.po
index 9c55093..b0bbcba 100644
--- a/manpages/po/de/live-tools.7.po
+++ b/manpages/po/de/live-tools.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-tools 3.0~a3\n"
-"POT-Creation-Date: 2011-03-09 20:21+0100\n"
+"Project-Id-Version: live-tools 3.0~a4\n"
+"POT-Creation-Date: 2011-05-18 18:34+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,14 +24,14 @@ msgstr "LIVE-TOOLS"
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "2011-03-09"
-msgstr "09.03.2011"
+msgid "2011-05-18"
+msgstr "18.05.2011"
 
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "3.0~a3"
-msgstr "3.0~a3"
+msgid "3.0~a4"
+msgstr "3.0~a4"
 
 #. type: TH
 #: en/live-tools.7:9
@@ -70,7 +70,7 @@ msgstr "TOOLS"
 
 #. type: Plain text
 #: en/live-tools.7:19
-msgid "B<live-tools> currently features the following tools."
+msgid "B<live-tools> currently contains the following tools."
 msgstr "B<live-tools> enthält derzeit folgende Tools."
 
 #. type: IP
@@ -84,35 +84,46 @@ msgstr "B<live-toram>"
 msgid "copies running system to RAM in order to eject the live media."
 msgstr "kopiert das laufende System in RAM um das Live Medium auszuwerfen."
 
+#. type: IP
+#: en/live-tools.7:22
+#, no-wrap
+msgid "B<live-system>"
+msgstr "B<live-system>"
+
+#. type: Plain text
+#: en/live-tools.7:24
+msgid "determines if running system is a live system."
+msgstr "bestimmt ob das laufende System ein Live System ist."
+
 #. type: SH
-#: en/live-tools.7:23
+#: en/live-tools.7:25
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: en/live-tools.7:25
+#: en/live-tools.7:27
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/live-tools.7:27
+#: en/live-tools.7:29
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
-#: en/live-tools.7:29
+#: en/live-tools.7:31
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: SH
-#: en/live-tools.7:30
+#: en/live-tools.7:32
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-tools.7:32
+#: en/live-tools.7:34
 msgid ""
 "More information about live-tools 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 "
@@ -123,13 +134,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-tools.7:33
+#: en/live-tools.7:35
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-tools.7:35
+#: en/live-tools.7:37
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-tools package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -143,16 +154,15 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-tools.7:36
+#: en/live-tools.7:38
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-tools.7:37
+#: en/live-tools.7:39
 msgid ""
-"live-tools was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
-"the Debian project."
+"live-tools was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
 msgstr ""
-"live-tools wurde von Daniel Baumann E<lt>I<daniel at debian.org>E<gt> für das "
-"Debian Projekt geschrieben."
+"live-tools wurde von Daniel Baumann E<lt>I<daniel at debian.org>E<gt> "
+"geschrieben."
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 07d80df..86ea1e9 100644
--- a/manpages/pot/live-tools.7.pot
+++ b/manpages/pot/live-tools.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2011-03-09 20:21+0100\n"
+"POT-Creation-Date: 2011-05-18 18:34+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,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "2011-03-09"
+msgid "2011-05-18"
 msgstr ""
 
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "3.0~a3"
+msgid "3.0~a4"
 msgstr ""
 
 #. type: TH
@@ -71,7 +71,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-tools.7:19
-msgid "B<live-tools> currently features the following tools."
+msgid "B<live-tools> currently contains the following tools."
 msgstr ""
 
 #. type: IP
@@ -85,35 +85,46 @@ msgstr ""
 msgid "copies running system to RAM in order to eject the live media."
 msgstr ""
 
+#. type: IP
+#: en/live-tools.7:22
+#, no-wrap
+msgid "B<live-system>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-tools.7:24
+msgid "determines if running system is a live system."
+msgstr ""
+
 #. type: SH
-#: en/live-tools.7:23
+#: en/live-tools.7:25
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-tools.7:25
+#: en/live-tools.7:27
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-tools.7:27
+#: en/live-tools.7:29
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-tools.7:29
+#: en/live-tools.7:31
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-tools.7:30
+#: en/live-tools.7:32
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-tools.7:32
+#: en/live-tools.7:34
 msgid ""
 "More information about live-tools 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 "
@@ -121,13 +132,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-tools.7:33
+#: en/live-tools.7:35
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-tools.7:35
+#: en/live-tools.7:37
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-tools package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -136,14 +147,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-tools.7:36
+#: en/live-tools.7:38
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-tools.7:37
+#: en/live-tools.7:39
 msgid ""
-"live-tools was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
-"the Debian project."
+"live-tools was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
 msgstr ""

-- 
live-tools



More information about the debian-live-changes mailing list