[debian-edu-commits] debian-edu/debian-edu-doc.git (#1480) - squeeze (branch) updated: 1.4_20130225_6.0.7+r1-11-g49068e3
David Prévot
taffit at alioth.debian.org
Thu Feb 28 22:37:06 UTC 2013
The branch, squeeze has been updated
via 49068e35f3fb47fba446cbbbb37d1a1248852ad3 (commit)
via 2db2b3db7a7f412574453b496c5e11abb48080d1 (commit)
via 75c192eb5ebe1da64c51a68e63ab14b761f953b8 (commit)
via 5abd06387c7b106f035ea4066184ac7095401cc3 (commit)
via 19d73f4b6d0265c9839e29d1dfafaf8b0a5e87ea (commit)
via 89cf9813e8dc3cdc310f2b5a3c709d3102675aae (commit)
via 032d2f8a22d444cee65204de39b5c97c56fa2911 (commit)
via d366f63bc1088c5ccd44e574df5f6ed79cbf3b55 (commit)
via 74dfa000d1591190cb47cf0c5adacc8d52a56e3a (commit)
via 73f50080926c836081f7f26c0f83524a78e56e79 (commit)
via c3cb3d1dfa609dce9eb238215227162c22355284 (commit)
from ad34d8676c908a2647630edba39197d42538453e (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 -----------------------------------------------------------------
commit 49068e35f3fb47fba446cbbbb37d1a1248852ad3
Merge: ad34d86 2db2b3d
Author: David Prévot <taffit at debian.org>
Date: Thu Feb 28 18:31:08 2013 -0400
Merge branch 'master' into squeeze
Conflicts:
debian/changelog
documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
documentation/debian-edu-wheezy/fixme-status.txt
documentation/debian-edu-wheezy/images/de/worldmap.png
documentation/debian-edu-wheezy/images/es/worldmap.png
documentation/debian-edu-wheezy/images/fr/worldmap.png
documentation/debian-edu-wheezy/images/worldmap.png
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 11 ++++++++++
.../debian-edu-squeeze-manual.da.po | 13 +++++++----
.../debian-edu-squeeze-manual.de.po | 10 ++++----
.../debian-edu-squeeze-manual.es.po | 2 +-
.../debian-edu-squeeze-manual.fr.po | 15 ++++++++++---
.../debian-edu-squeeze-manual.it.po | 22 +++++++++----------
.../debian-edu-squeeze-manual.nb.po | 2 +-
.../debian-edu-squeeze-manual.pot | 4 +-
.../debian-edu-squeeze-manual.xml | 2 +-
.../debian-edu-squeeze-manual.zh.po | 2 +-
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386829 -> 386827 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386934 -> 386934 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386870 -> 386867 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386863 -> 386860 bytes
14 files changed, 51 insertions(+), 32 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a634613..f52e7a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+debian-edu-doc (1.4~20130228~6.0.7+r1) squeeze; urgency=low
+
+ * Update manuals and images from the wiki.
+
+ [ Squeeze manual translation update ]
+ * French (Cédric Boutillier).
+ * Danish (Joe Hansen).
+ * Italian (Claudio Carboncini).
+
+ -- David Prévot <taffit at debian.org> Thu, 28 Feb 2013 18:25:09 -0400
+
debian-edu-doc (1.4~20130225~6.0.7+r1) squeeze; urgency=low
[ Holger Levsen ]
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
index dbdbdb2..a4460a5 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
"POT-Creation-Date: 2013-02-24 13:55-0400\n"
-"PO-Revision-Date: 2013-01-23 11:20+0100\n"
+"PO-Revision-Date: 2013-02-28 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
"Language: da\n"
@@ -8630,6 +8630,9 @@ msgid ""
"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
"well as the following changes:"
msgstr ""
+"Debian Edu 6.0.7+r1 kodenavn »Squeeze« er en trinsvis opdatering til Debian "
+"Edu 6.0.4+r0, indeholdende alle ændringerne mellem Debian 6.0.4 og 6.0.7 samt "
+"de følgende ændringer:"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "sitesummary was updated from 0.1.3 to 0.1.8"
@@ -8644,8 +8647,8 @@ msgid "Comply with 3.X kernel"
msgstr "Overholder 3.x-kernen"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
-msgstr "debian-edu-doc fra 1.4~20120310~6.0.4+r0 til 1.4~20130227~6.0.7+r1"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
+msgstr "debian-edu-doc fra 1.4~20120310~6.0.4+r0 til 1.4~20130228~6.0.7+r1"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Minor updates from the wiki"
@@ -8661,11 +8664,11 @@ msgstr "debian-edu-config fra 1.453 til 1.455"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
-msgstr ""
+msgstr "Rettelse /etc/hosts for LTSP-diskløse arbejdsstationer. Lukker: #699880"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Make ltsp_local_mount script work for multiple devices."
-msgstr ""
+msgstr "Ltsp_local_mount-skriptet virker nu for flere enheder."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
index c867ef9..f6061b1 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-24 13:55-0400\n"
+"POT-Creation-Date: 2013-02-28 14:35-0400\n"
"PO-Revision-Date: 2013-02-24 23:18+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -8860,9 +8860,9 @@ msgid "Comply with 3.X kernel"
msgstr "Kompatibel mit Kernelversionen 3.X"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
msgstr ""
-"debian-edu-doc wurde von 1.4~20120310~6.0.4+r0 auf 1.4~20130227~6.0.7+r1 "
+"debian-edu-doc wurde von 1.4~20120310~6.0.4+r0 auf 1.4~20130228~6.0.7+r1 "
"aktualisiert"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9921,8 +9921,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
index 3cfa387..6986c3f 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
@@ -8536,7 +8536,7 @@ msgid "Comply with 3.X kernel"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
index 43af01e..1b9d749 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-02-24 13:55-0400\n"
-"PO-Revision-Date: 2013-01-20 22:51+0100\n"
+"POT-Creation-Date: 2013-02-28 14:35-0400\n"
+"PO-Revision-Date: 2013-02-25 16:36+0100\n"
"Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
"Language: fr\n"
@@ -8885,6 +8885,9 @@ msgid ""
"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
"well as the following changes:"
msgstr ""
+"Debian Edu 6.0.7+r1 « Squeeze » est une mise à jour incrémentale depuis "
+"Debian Edu 6.0.4+r0, qui contient tous les changements entre Debian 6.0.4 et "
+"6.0.7, ainsi que les modifications suivantes :"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "sitesummary was updated from 0.1.3 to 0.1.8"
@@ -8899,10 +8902,10 @@ msgid "Comply with 3.X kernel"
msgstr "mise en conformité avec le noyau 3.X"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
msgstr ""
"mise à jour de debian-edu-doc de la version 1.4~20120310~6.0.4+r0 vers la "
-"version 1.4~20130227~6.0.7+r1"
+"version 1.4~20130228~6.0.7+r1"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Minor updates from the wiki"
@@ -8920,10 +8923,14 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
msgstr ""
+"correction de /etc/hosts pour les stations de travail LTSP sans disque "
+"(correction du bogue nº 699880)"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Make ltsp_local_mount script work for multiple devices."
msgstr ""
+"modification du script ltsp_local_mount pour fonctionner avec plusieurs "
+"périphériques"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
index 66af63c..37cff9f 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-lenny-manual\n"
-"POT-Creation-Date: 2013-02-24 13:55-0400\n"
-"PO-Revision-Date: 2013-01-23 19:02+0100\n"
+"POT-Creation-Date: 2013-02-28 14:35-0400\n"
+"PO-Revision-Date: 2013-02-28 18:47+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
"Language: it\n"
@@ -8667,15 +8667,10 @@ msgid "New features in Debian Edu Squeeze"
msgstr "Nuove caratteristiche in Debian Edu Squeeze"
#. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "New features for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released "
-#| "2013-03-03"
msgid ""
"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
msgstr ""
-"Nuove caratteristiche in Debian Edu 6.0.7+r1 Codename \"Squeeze\" released "
-"2013-03-03"
+"Cambiamenti in Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -8683,6 +8678,9 @@ msgid ""
"Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
"well as the following changes:"
msgstr ""
+"Debian Edu 6.0.7+r1 Codename \"Squeeze\" è un aggiornamento incrementale di "
+"Debian Edu 6.0.4+r0, che contiene tutte le modifiche tra Debian 6.0.4 e "
+"6.0.7 nonché le seguenti modifiche: "
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "sitesummary was updated from 0.1.3 to 0.1.8"
@@ -8697,8 +8695,8 @@ msgid "Comply with 3.X kernel"
msgstr "Adattato al kernel 3.X"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
-msgstr "debian-edu-doc da 1.4~20120310~6.0.4+r0 a 1.4~20130227~6.0.7+r1"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
+msgstr "debian-edu-doc da 1.4~20120310~6.0.4+r0 a 1.4~20130228~6.0.7+r1"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Minor updates from the wiki"
@@ -8714,11 +8712,11 @@ msgstr "debian-edu-config da 1.453 a 1.455"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
-msgstr ""
+msgstr "Corretto /etc/hosts per LTSP diskless workstations. Closes: #699880"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Make ltsp_local_mount script work for multiple devices."
-msgstr ""
+msgstr "Far funzionare lo script ltsp_local_mount per più dispositivi."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
index 5faff7a..f2e337b 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
@@ -9498,7 +9498,7 @@ msgid "Comply with 3.X kernel"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index d9ebf4a..b72f688 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-02-24 13:55-0400\n"
+"POT-Creation-Date: 2013-02-28 18:17-0400\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"
@@ -6453,7 +6453,7 @@ msgid "Comply with 3.X kernel"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
index 2dc1440..5943adc 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
@@ -2923,7 +2923,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
<para>Comply with 3.X kernel
</para></listitem></itemizedlist></listitem>
<listitem>
-<para>debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1
+<para>debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1
</para>
<itemizedlist>
<listitem>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
index d840c9a..736a1d8 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
@@ -7069,7 +7069,7 @@ msgid "Comply with 3.X kernel"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130227~6.0.7+r1"
+msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 2cf9c19..51d464e 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index 25c31c0..6d15634 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index 2fbab26..ae6e3a6 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 5594c2d..3e8a129 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
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