[debian-edu-commits] debian-edu/debian-edu-doc.git (#235) - wheezy (branch) updated: 0.7.20071028-21-gcbae189
David Prévot
taffit at alioth.debian.org
Sat Oct 5 12:14:43 UTC 2013
The branch, wheezy has been updated
via cbae189f85dbfe9aa6a6803cf5fe6d7a6a8eacdc (commit)
from dbd582347b117352d8f9f1da129ce02ec0ebfddf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
documentation/release-manual/release-manual.de.po | 18 +++++++-------
documentation/release-manual/release-manual.es.po | 26 ++++++++++-----------
documentation/release-manual/release-manual.nb.po | 18 +++++++-------
documentation/release-manual/release-manual.pot | 16 ++++++-------
documentation/release-manual/release-manual.xml | 14 +++++------
5 files changed, 46 insertions(+), 46 deletions(-)
The diff of changes is:
diff --git a/documentation/release-manual/release-manual.de.po b/documentation/release-manual/release-manual.de.po
index 5424283..a3a988a 100644
--- a/documentation/release-manual/release-manual.de.po
+++ b/documentation/release-manual/release-manual.de.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-07 11:35+0100\n"
+"POT-Creation-Date: 2007-11-08 10:20+0100\n"
"PO-Revision-Date: 2007-10-23 14:42+0200\n"
"Last-Translator: Roland F.Teichert <rfteichert at imail.de>\n"
"Language-Team: Deutsch <de at li.org>\n"
@@ -44,7 +44,7 @@ msgstr ""
#: release-manual.xml:13
msgid ""
"This document was put into the <computeroutput>debian-edu-doc </"
-"computeroutput> package on <computeroutput>2007-11-07 10:34 UTC</"
+"computeroutput> package on <computeroutput>2007-11-08 09:20 UTC</"
"computeroutput>."
msgstr ""
@@ -1094,7 +1094,7 @@ msgid ""
"For those without a fast internet connection, we offer to send you a CD or "
"DVD for the cost of the CD or DVD and shipping. Just send an email to <ulink "
"url='mailto:cd at skolelinux.no'>cd at skolelinux.no </ulink> and we will discuss "
-"the payment details <inlinemediaobject>"
+"the payment details (for shipping and media) <inlinemediaobject>"
msgstr ""
# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
@@ -2886,28 +2886,28 @@ msgstr ""
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:1545
-msgid "Then install:"
+msgid ""
+"If you previously installed flashplayer-mozilla, you must remove this first:"
msgstr ""
# type: CDATA
#: release-manual.xml:1546
#, no-wrap
msgid ""
-"dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb\n"
+"apt-get remove flashplayer-mozilla\n"
"]]"
msgstr ""
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:1549
-msgid ""
-"If you previously installed flashplayer-mozilla, you must remove this first:"
+msgid "Then install:"
msgstr ""
# type: CDATA
#: release-manual.xml:1550
#, no-wrap
msgid ""
-"apt-get remove flashplayer-mozilla\n"
+"dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb\n"
"]]"
msgstr ""
@@ -4324,7 +4324,7 @@ msgstr ""
# type: Content of: <article><para><section><title>
#: release-manual.xml:2271
-msgid "Live DVD - Boot from CD to test the system"
+msgid "Appendix B - about Debian Edu Live CD/DVDs"
msgstr ""
# type: Content of: <article><para><section><section><title>
diff --git a/documentation/release-manual/release-manual.es.po b/documentation/release-manual/release-manual.es.po
index 0be7f6b..7244a2e 100644
--- a/documentation/release-manual/release-manual.es.po
+++ b/documentation/release-manual/release-manual.es.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-11-07 11:35+0100\n"
+"POT-Creation-Date: 2007-11-08 10:20+0100\n"
"PO-Revision-Date: 2007-07-22 10:19+0200\n"
"Last-Translator: \n"
"Language-Team: <es at li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
#: release-manual.xml:13
msgid ""
"This document was put into the <computeroutput>debian-edu-doc </"
-"computeroutput> package on <computeroutput>2007-11-07 10:34 UTC</"
+"computeroutput> package on <computeroutput>2007-11-08 09:20 UTC</"
"computeroutput>."
msgstr ""
@@ -1265,7 +1265,7 @@ msgid ""
"For those without a fast internet connection, we offer to send you a CD or "
"DVD for the cost of the CD or DVD and shipping. Just send an email to <ulink "
"url='mailto:cd at skolelinux.no'>cd at skolelinux.no </ulink> and we will discuss "
-"the payment details <inlinemediaobject>"
+"the payment details (for shipping and media) <inlinemediaobject>"
msgstr ""
# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
@@ -3226,30 +3226,30 @@ msgstr ""
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:1545
-msgid "Then install:"
+msgid ""
+"If you previously installed flashplayer-mozilla, you must remove this first:"
msgstr ""
# type: CDATA
#: release-manual.xml:1546
-#, no-wrap
+#, fuzzy, no-wrap
msgid ""
-"dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb\n"
+"apt-get remove flashplayer-mozilla\n"
"]]"
-msgstr ""
+msgstr "apt-get remove courier-ldap]]"
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:1549
-msgid ""
-"If you previously installed flashplayer-mozilla, you must remove this first:"
+msgid "Then install:"
msgstr ""
# type: CDATA
#: release-manual.xml:1550
-#, fuzzy, no-wrap
+#, no-wrap
msgid ""
-"apt-get remove flashplayer-mozilla\n"
+"dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb\n"
"]]"
-msgstr "apt-get remove courier-ldap]]"
+msgstr ""
# type: Content of: <article><para><section><section><title>
#: release-manual.xml:1556
@@ -4732,7 +4732,7 @@ msgstr ""
# type: Content of: <article><para><section><title>
#: release-manual.xml:2271
-msgid "Live DVD - Boot from CD to test the system"
+msgid "Appendix B - about Debian Edu Live CD/DVDs"
msgstr ""
# type: Content of: <article><para><section><section><title>
diff --git a/documentation/release-manual/release-manual.nb.po b/documentation/release-manual/release-manual.nb.po
index 2b36474..41017da 100644
--- a/documentation/release-manual/release-manual.nb.po
+++ b/documentation/release-manual/release-manual.nb.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-11-07 11:36+0100\n"
+"POT-Creation-Date: 2007-11-08 10:20+0100\n"
"PO-Revision-Date: 2007-11-06 19:32+0100\n"
"Last-Translator: Håvard Korsvoll <korsvoll at skulelinux.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -38,7 +38,7 @@ msgstr ""
#, fuzzy
msgid ""
"This document was put into the <computeroutput>debian-edu-doc </"
-"computeroutput> package on <computeroutput>2007-11-07 10:34 UTC</"
+"computeroutput> package on <computeroutput>2007-11-08 09:20 UTC</"
"computeroutput>."
msgstr ""
"Dette dokumentet ble plassert i pakken <computeroutput>debian-edu-doc</"
@@ -1181,7 +1181,7 @@ msgid ""
"For those without a fast internet connection, we offer to send you a CD or "
"DVD for the cost of the CD or DVD and shipping. Just send an email to <ulink "
"url='mailto:cd at skolelinux.no'>cd at skolelinux.no </ulink> and we will discuss "
-"the payment details <inlinemediaobject>"
+"the payment details (for shipping and media) <inlinemediaobject>"
msgstr ""
# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
@@ -2951,28 +2951,28 @@ msgstr ""
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:1545
-msgid "Then install:"
+msgid ""
+"If you previously installed flashplayer-mozilla, you must remove this first:"
msgstr ""
# type: CDATA
#: release-manual.xml:1546
#, no-wrap
msgid ""
-"dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb\n"
+"apt-get remove flashplayer-mozilla\n"
"]]"
msgstr ""
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:1549
-msgid ""
-"If you previously installed flashplayer-mozilla, you must remove this first:"
+msgid "Then install:"
msgstr ""
# type: CDATA
#: release-manual.xml:1550
#, no-wrap
msgid ""
-"apt-get remove flashplayer-mozilla\n"
+"dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb\n"
"]]"
msgstr ""
@@ -4347,7 +4347,7 @@ msgstr ""
# type: Content of: <article><para><section><title>
#: release-manual.xml:2271
-msgid "Live DVD - Boot from CD to test the system"
+msgid "Appendix B - about Debian Edu Live CD/DVDs"
msgstr ""
# type: Content of: <article><para><section><section><title>
diff --git a/documentation/release-manual/release-manual.pot b/documentation/release-manual/release-manual.pot
index bc08175..ab71626 100644
--- a/documentation/release-manual/release-manual.pot
+++ b/documentation/release-manual/release-manual.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-11-07 11:35+0100\n"
+"POT-Creation-Date: 2007-11-08 10:20+0100\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"
@@ -35,7 +35,7 @@ msgstr ""
#: release-manual.xml:13
msgid ""
"This document was put into the <computeroutput>debian-edu-doc "
-"</computeroutput> package on <computeroutput>2007-11-07 10:34 "
+"</computeroutput> package on <computeroutput>2007-11-08 09:20 "
"UTC</computeroutput>."
msgstr ""
@@ -978,7 +978,7 @@ msgid ""
"For those without a fast internet connection, we offer to send you a CD or "
"DVD for the cost of the CD or DVD and shipping. Just send an email to <ulink "
"url='mailto:cd at skolelinux.no'>cd at skolelinux.no </ulink> and we will discuss "
-"the payment details <inlinemediaobject>"
+"the payment details (for shipping and media) <inlinemediaobject>"
msgstr ""
# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
@@ -2753,27 +2753,27 @@ msgstr ""
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:1545
-msgid "Then install:"
+msgid "If you previously installed flashplayer-mozilla, you must remove this first:"
msgstr ""
# type: CDATA
#: release-manual.xml:1546
#, no-wrap
msgid ""
-"dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb\n"
+"apt-get remove flashplayer-mozilla\n"
"]]"
msgstr ""
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:1549
-msgid "If you previously installed flashplayer-mozilla, you must remove this first:"
+msgid "Then install:"
msgstr ""
# type: CDATA
#: release-manual.xml:1550
#, no-wrap
msgid ""
-"apt-get remove flashplayer-mozilla\n"
+"dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb\n"
"]]"
msgstr ""
@@ -4146,7 +4146,7 @@ msgstr ""
# type: Content of: <article><para><section><title>
#: release-manual.xml:2271
-msgid "Live DVD - Boot from CD to test the system"
+msgid "Appendix B - about Debian Edu Live CD/DVDs"
msgstr ""
# type: Content of: <article><para><section><section><title>
diff --git a/documentation/release-manual/release-manual.xml b/documentation/release-manual/release-manual.xml
index 5ca6916..405ee4f 100644
--- a/documentation/release-manual/release-manual.xml
+++ b/documentation/release-manual/release-manual.xml
@@ -11,7 +11,7 @@
</emphasis>) release manual for the Debian Edu etch 3.0 release.
</para>
<para>This document was put into the <computeroutput>debian-edu-doc
-</computeroutput> package on <computeroutput>2007-11-07 10:34 UTC</computeroutput>.
+</computeroutput> package on <computeroutput>2007-11-08 09:20 UTC</computeroutput>.
</para>
<para>The version at <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch'>http://wiki.skolelinux.no/DebianEdu/Documentation/Etch
</ulink> is a wiki and updated frequently.
@@ -492,7 +492,7 @@
<title>Request a CD/DVD by mail
</title>
<para>For those without a fast internet connection, we offer to send you a CD or DVD for the cost of the CD or DVD and shipping. Just send an email to <ulink url='mailto:cd at skolelinux.no'>cd at skolelinux.no
-</ulink> and we will discuss the payment details <inlinemediaobject><imageobject><imagedata width='15' fileref='./images/smile.png' depth='15'/>
+</ulink> and we will discuss the payment details (for shipping and media) <inlinemediaobject><imageobject><imagedata width='15' fileref='./images/smile.png' depth='15'/>
</imageobject><textobject><phrase>:)
</phrase>
</textobject>
@@ -1542,14 +1542,14 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"
</para><screen><![CDATA[wget ftp://ftp.skolelinux.no/debian/pool/contrib/f/flashplugin-nonfree/flashplugin-nonfree_9.0.48.0.2_i386.deb
]]>
</screen>
-<para>Then install:
-</para><screen><![CDATA[dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb
-]]>
-</screen>
<para>If you previously installed flashplayer-mozilla, you must remove this first:
</para><screen><![CDATA[apt-get remove flashplayer-mozilla
]]>
</screen>
+<para>Then install:
+</para><screen><![CDATA[dpkg -i flashplugin-nonfree_9.0.48.0.2_i386.deb
+]]>
+</screen>
</section>
<section>
@@ -2268,7 +2268,7 @@ dpkg -i swi-prolog_5.2.13-1_i386.deb
</section>
<section>
-<title>Live DVD - Boot from CD to test the system
+<title>Appendix B - about Debian Edu Live CD/DVDs
</title>
<section>
hooks/post-receive
--
debian-edu-doc.git (Debian package debian-edu-doc)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).
More information about the debian-edu-commits
mailing list