[debian-edu-commits] debian-edu/ 01/01: Update manuals and images from the wiki; update translation README files and debian/copyright file. (de) Update squeeze manual translation.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Fri May 2 16:51:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch master
in repository debian-edu-doc.
commit 32cada3af581f07834a35a2acb3b77e74b26fc08
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Fri May 2 18:44:59 2014 +0200
Update manuals and images from the wiki;
update translation README files and debian/copyright file.
(de) Update squeeze manual translation.
---
debian/changelog | 1 +
debian/copyright | 12 ++-
.../audacity/README.audacity-manual-translations | 12 +--
documentation/audacity/audacity-manual.fr.po | 21 ++++-
documentation/audacity/audacity-manual.pot | 8 +-
documentation/audacity/audacity-manual.xml | 4 +-
.../README.debian-edu-squeeze-manual-translations | 12 +--
.../debian-edu-squeeze-manual.da.po | 64 ++++++++++++---
.../debian-edu-squeeze-manual.de.po | 86 ++++++---------------
.../debian-edu-squeeze-manual.es.po | 19 ++---
.../debian-edu-squeeze-manual.fr.po | 64 ++++++++++++---
.../debian-edu-squeeze-manual.it.po | 64 ++++++++++++---
.../debian-edu-squeeze-manual.nb.po | 19 ++---
.../debian-edu-squeeze-manual.pot | 19 ++---
.../debian-edu-squeeze-manual.xml | 16 ++--
.../debian-edu-squeeze-manual.zh.po | 19 ++---
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386901 -> 386957 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 387002 -> 387061 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386936 -> 386999 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386926 -> 386995 bytes
.../debian-edu-wheezy-manual.de.po | 69 +----------------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 2 +-
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386974 -> 386957 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 387079 -> 387061 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 387016 -> 386999 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 387012 -> 386995 bytes
.../README.rosegarden-manual-translations | 12 +--
documentation/rosegarden/rosegarden-manual.es.po | 12 +--
documentation/rosegarden/rosegarden-manual.fr.po | 27 +++++--
documentation/rosegarden/rosegarden-manual.nb.po | 12 +--
documentation/rosegarden/rosegarden-manual.pot | 12 +--
documentation/rosegarden/rosegarden-manual.xml | 6 +-
32 files changed, 334 insertions(+), 258 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 41b40e2..77389c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ debian-edu-doc (1.5~XXX) UNRELEASED; urgency=medium
* scripts/get_copyright:
- add entry for Dutch.
- make translation string condition fit the wiki content.
+ * Update translation README files and debian/copyright file.
[ Frans Spiesschaert ]
* Initial Dutch translation of the Debian Edu wheezy manual
diff --git a/debian/copyright b/debian/copyright
index d8751f0..941a909 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -138,7 +138,7 @@ Copyright: 2012, 2013 Joe Hansen
License: GPL-2+
Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
-Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013 Holger Levsen
+Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Holger Levsen
2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012 Petter Reinholdtsen
2007 Daniel Heß
2007 Patrick Winnertz
@@ -160,7 +160,7 @@ Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013 Holger Levsen
2011 Mike Gabriel
2012 Justin B Rye
2012 David Prévot
- 2012, 2013 Wolfgang Schweer
+ 2012, 2013, 2014 Wolfgang Schweer
2012 Bernhard Hammes
License: GPL-2+
@@ -176,6 +176,8 @@ Copyright: 2007 Petter Reinholdtsen
2008 Tore Skogly
2010 Ole-Anders Andreassen
2010 Jan Roar Rød
+ 2014 Ole-Erik Yrvin
+ 2014 Ingrid Yrvin
License: GPL-2+
Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -190,7 +192,7 @@ Copyright: 2007 Holger Levsen
2009 Franziska Teichert
2009 Philipp Hübner
2009, 2010 Andreas Mundt
- 2012, 2013 Wolfgang Schweer
+ 2012, 2013, 2014 Wolfgang Schweer
License: GPL-2+
Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -211,6 +213,10 @@ Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
Copyright: 2012, 2013 Joe Hansen
License: GPL-2+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
+Copyright: 2014 Frans Spiesschaert
+License: GPL-2+
+
Files: documentation/rosegarden/rosegarden-manual.xml documentation/rosegarden/rosegarden-manual.pot
Copyright: 2008, 2009 Alf Tonny Bätz
2008 Holger Levsen
diff --git a/documentation/audacity/README.audacity-manual-translations b/documentation/audacity/README.audacity-manual-translations
index 5980243..51f1cba 100644
--- a/documentation/audacity/README.audacity-manual-translations
+++ b/documentation/audacity/README.audacity-manual-translations
@@ -90,14 +90,14 @@ $CC is your language. They will be picked up automatically.
If you spot errors in the English version or see how it could be improved,
please do contribute to the English version too. Just edit the wiki at
-http://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/ - an user account
+https://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/ - a user account
is needed to edit these pages, so you will probably need to create a wiki
user first (via the login link).
-If you cannot commit your work to the VCS directly, please file a bug against the
-debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach
-the PO file to the bugreport. Instructions how to submit bugs are available
-at http://bugs.debian.org
+If you cannot commit your work to the VCS directly, please file a bug against
+the debian-edu-doc package, see https://bugs.debian.org/debian-edu-doc. Compress
+the PO file using gzip and attach the file to the bugreport. Instructions how
+to submit bugs are available at https://bugs.debian.org
--- Holger Levsen, holger at debian.org, last updated: 2013-02-08
+-- Holger Levsen, holger at debian.org, last updated: 2013-04-30
diff --git a/documentation/audacity/audacity-manual.fr.po b/documentation/audacity/audacity-manual.fr.po
index 7223370..90537ca 100644
--- a/documentation/audacity/audacity-manual.fr.po
+++ b/documentation/audacity/audacity-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2013-08-07 16:02+0300\n"
+"POT-Creation-Date: 2014-05-02 18:19+0300\n"
"PO-Revision-Date: 2012-02-25 17:05+0100\n"
"Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -484,11 +484,17 @@ msgstr ""
"avec la license GPL2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you add content to it, <emphasis role=\"strong\">please only do so if "
+#| "you are the author of it and plan to release it under the same "
+#| "conditions</emphasis>! Then add your name here and release it under the "
+#| "GPL2 or later version."
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author of it and plan to release it under the same conditions</"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+"emphasis>! Then add your name here and release it under the \"GPL v2 or any "
+"later version\" licence."
msgstr ""
"Si vous enrichissez son contenu, <emphasis role=\"strong\">ne le faites, "
"s'il-vous-plaît, que si vous êtes l'auteur des ajouts et envisagez de les "
@@ -501,11 +507,18 @@ msgid "Translation copyright and authors"
msgstr "Copyright de traduction et auteurs"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012), Jean-Paul Guilloneau "
+#| "(2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n "
+#| "team (2009, 2010, 2012) and is released under the GPL2 or any later "
+#| "version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012), Jean-Paul Guilloneau (2012), David "
"Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, "
-"2012) and is released under the GPL2 or any later version."
+"2012) and is released under the GPL v2 or any later version."
msgstr ""
"La traduction française, dont les droits d'auteur appartiennent à Christophe "
"Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012), Jean-Paul "
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index 4ac3b96..9df7622 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-04-03 13:19+0300\n"
+"POT-Creation-Date: 2014-05-02 18:19+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"
@@ -401,8 +401,8 @@ msgstr ""
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author of it and plan to release it under the same conditions</"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+"emphasis>! Then add your name here and release it under the \"GPL v2 or any "
+"later version\" licence."
msgstr ""
#. type: Content of: <article><section><title>
@@ -414,7 +414,7 @@ msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012), Jean-Paul Guilloneau (2012), David "
"Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, "
-"2012) and is released under the GPL2 or any later version."
+"2012) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/audacity/audacity-manual.xml b/documentation/audacity/audacity-manual.xml
index 00464cc..2853cd8 100644
--- a/documentation/audacity/audacity-manual.xml
+++ b/documentation/audacity/audacity-manual.xml
@@ -157,14 +157,14 @@
</title>
<para>This document is written and copyrighted by Alf Tonny Bätz (2008, 2009), Holger Levsen (2009) and is released under the GPL2 or any later version. Enjoy!
</para>
-<para>If you add content to it, <emphasis role="strong">please only do so if you are the author of it and plan to release it under the same conditions</emphasis>! Then add your name here and release it under the GPL2 or later version.
+<para>If you add content to it, <emphasis role="strong">please only do so if you are the author of it and plan to release it under the same conditions</emphasis>! Then add your name here and release it under the "GPL v2 or any later version" licence.
</para>
</section>
<section id="CopyRight--Translation_copyright_and_authors">
<title>Translation copyright and authors
</title>
-<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL2 or any later version.
+<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version.
</para>
</section>
diff --git a/documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations b/documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations
index 4a66dd6..9049353 100644
--- a/documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations
+++ b/documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations
@@ -90,14 +90,14 @@ $CC is your language. They will be picked up automatically.
If you spot errors in the English version or see how it could be improved,
please do contribute to the English version too. Just edit the wiki at
-http://wiki.debian.org/DebianEdu/Documentation/Squeeze/ - an user account
+https://wiki.debian.org/DebianEdu/Documentation/Squeeze/ - a user account
is needed to edit these pages, so you will probably need to create a wiki
user first (via the login link).
-If you cannot commit your work to the VCS directly, please file a bug against the
-debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach
-the PO file to the bugreport. Instructions how to submit bugs are available
-at http://bugs.debian.org
+If you cannot commit your work to the VCS directly, please file a bug against
+the debian-edu-doc package, see https://bugs.debian.org/debian-edu-doc. Compress
+the PO file using gzip and attach the file to the bugreport. Instructions how
+to submit bugs are available at https://bugs.debian.org
--- Holger Levsen, holger at debian.org, last updated: 2013-02-08
+-- Holger Levsen, holger at debian.org, last updated: 2013-04-30
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 9506602..95daa52 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2014-04-03 13:18+0300\n"
+"POT-Creation-Date: 2014-05-02 18:18+0300\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"
@@ -9528,10 +9528,17 @@ msgstr ""
"er udgivet under GPL2 eller enhver senere version. God fornøjelse!"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you add content to it, <emphasis role=\"strong\">please only do so if "
+#| "you are the author. You need to release it under the same conditions</"
+#| "emphasis>! Then add your name here and release it under the GPL2 or later "
+#| "version."
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+"Then add your name here and release it under the \"GPL v2 or any later "
+"version\" licence."
msgstr ""
"Hvis du tilføjer indhold, <emphasis role=\"strong\">så gør det kun hvis du "
"selv er forfatteren. Du skal udgive materialet under de samme betingelser</"
@@ -9543,20 +9550,31 @@ msgid "Translation copyright and authors"
msgstr "Ophavsret for oversættelserne og forfatterne"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Spanish translation is copyrighted by José L. Redrejo Rodríguez "
+#| "(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
+#| "2012) and is released under the GPL2 or any later version."
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"Den spanske oversættelse er underlagt ophavsretten af José L. Redrejo "
"Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012) og Norman Garcia "
"(2010, 2012). Udgivet under GPL2 eller enhver senere version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
+#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
+#| "(2010) and Jan Roar Rød (2010) and is released under the GPL2 or any "
+#| "later version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+"Jan Roar Rød (2010) and is released under the GPL v2 or any later version."
msgstr ""
"Oversættelsen til bokmål er underlagt ophavsretten af Petter Reinholdtsen "
"(2007), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders "
@@ -9564,13 +9582,21 @@ msgstr ""
"enhver senere version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
+#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
+#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking "
+#| "(2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert "
+#| "(2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang "
+#| "Schweer (2012, 2013) and is released under the GPL2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+"and is released under the GPL v2 or any later version."
msgstr ""
"Den tyske oversættelse er underlagt ophavsretten af Holger Levsen (2007), "
"Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
@@ -9581,20 +9607,32 @@ msgstr ""
"version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+#| "version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
"version."
msgstr ""
"Den italiensk oversættelse Claudio Carboncini (2007, 2008, 2009, 2010, 2011, "
"2012, 2013) og er udgivet under GPL2 eller en senere version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
+#| "French l10n team (2009, 2010, 2012) and is released under the GPL2 or any "
+#| "later version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+"2010, 2012) and is released under the GPL v2 or any later version."
msgstr ""
"Den franske oversættelse er underlagt ophavsretten af Christophe Masson "
"(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
@@ -9603,17 +9641,25 @@ msgstr ""
"version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+#| "(2009) and is released under the GPL2 or any later version."
msgid ""
"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+"(2009) and is released under the GPL v2 or any later version."
msgstr ""
"Den traditionelle kinesiske oversættelse er underlagt ophavsretten af Andrew "
"Lee (李健秋) (2009) og er udgivet under GPL2 eller enhver senere version."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+#| "released under the GPL2 or any later version."
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013) "
"og er udgivet under GPL2 eller enhver senere version."
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 2f969d9..f98be46 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: 2014-04-03 13:18+0300\n"
+"POT-Creation-Date: 2014-05-01 10:50+0300\n"
"PO-Revision-Date: 2014-04-03 13:33+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -2180,10 +2180,6 @@ msgstr ""
"vorzugsweise noch vor der Partitionierung."
#. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "More information is available in <ulink url=\"http://bugs.skolelinux.org/"
-#| "show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
-#| "url=\"http://bugs.debian.org/516280#\">516280</ulink>."
msgid ""
"More information is available in <ulink url=\"http://bugs.skolelinux.org/"
"show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug <ulink "
@@ -2198,12 +2194,6 @@ msgid "A note on thin-client-server installations"
msgstr "Bemerkung zur Installation des Profils Terminal-Server"
#. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "First of all, this profile name is confusing for historic reasons. "
-#| "Currently this profile actually installs an LTSP server environment for "
-#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
-#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
-#| "the profile into a better suited one."
msgid ""
"First of all, this profile name is confusing for historic reasons. Currently "
"this profile actually installs an LTSP server environment for thin-clients "
@@ -4491,12 +4481,6 @@ msgid "General notes on upgrading"
msgstr "Allgemeine Hinweise zum Upgrade"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Upgrading Debian from one distribution to the next is generally rather "
-#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
-#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
-#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
-#| "information.) Upgrading is still possible but may require some work."
msgid ""
"Upgrading Debian from one distribution to the next is generally rather easy. "
"For Debian Edu this is unfortunately not yet true as we heavily modify "
@@ -8167,14 +8151,6 @@ msgid "Moodle"
msgstr "Moodle"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
-#| "is a free, Open Source course management system - software designed using "
-#| "sound pedagogical principles to help educators create effective online "
-#| "learning communities. You can download and use it on any computer "
-#| "(including webhosts), yet it can scale from a single-teacher site to a "
-#| "University with 200,000 students. Some schools in France use Moodle to "
-#| "keep track of students' facilities and credit points."
msgid ""
"<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
"a free, Open Source course management system - software designed using sound "
@@ -8216,10 +8192,6 @@ msgid "Teaching Prolog"
msgstr "Prolog unterrichten"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
-#| "ulink> is an open source implementation of the programming language "
-#| "Prolog, commonly used for teaching and semantic web applications."
msgid ""
"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
"ulink> is an open source implementation of the programming language Prolog, "
@@ -8234,14 +8206,6 @@ msgid "Monitoring pupils"
msgstr "Schüler/-innen beobachten"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Some schools use control tools like <ulink url=\"http://packages.debian."
-#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
-#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
-#| "their students. See also the <ulink url=\"http://sourceforge.net/apps/"
-#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
-#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
-#| "\">511387</ulink>)."
msgid ""
"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
@@ -8273,11 +8237,6 @@ msgid "Restricting pupils' network access"
msgstr "Den Netzwerkzugang von Schülern beschränken"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
-#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
-#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
-#| "access."
msgid ""
"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
@@ -9768,12 +9727,14 @@ msgstr ""
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+"Then add your name here and release it under the \"GPL v2 or any later "
+"version\" licence."
msgstr ""
"Wenn Sie Inhalte hinzufügen wollen: <emphasis role=\"strong\">Bitte nur, "
"wenn Sie auch dessen Autor sind und beabsichtigen, es unter den gleichen "
-"Bedingungen zu lizensieren!</emphasis> Dann fügen Sie hier Ihren Namen hinzu "
-"und lizensieren Sie die Inhalte unter der GPL2 oder einer späteren Version."
+"Bedingungen zu lizenzieren!</emphasis>. Dann fügen Sie hier Ihren Namen "
+"hinzu und lizenzieren Sie die Inhalte unter der Lizenz »GPL v2 oder eine "
+"spätere Version«."
#. type: Content of: <article><section><title>
msgid "Translation copyright and authors"
@@ -9783,21 +9744,21 @@ msgstr "Autoren und Copyright der Übersetzungen"
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"Das Copyright der spanischen Übersetzung liegt bei José L. Redrejo Rodríguez "
"(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
-"2012). Sie wurde unter der GPL 2 oder einer späteren Version lizensiert."
+"2012). Sie wurde unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+"Jan Roar Rød (2010) and is released under the GPL v2 or any later version."
msgstr ""
"Das Copyright der norwegischen Bokmål-Übersetzung liegt bei Petter "
"Reinholdtsen (2007), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-"
-"Anders Andreassen (2010) and Jan Roar Rød (2010). Sie ist unter der GPL2 "
+"Anders Andreassen (2010) and Jan Roar Rød (2010). Sie ist unter der GPL v2 "
"oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
@@ -9807,52 +9768,53 @@ msgid ""
"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+"and is released under the GPL v2 or any later version."
msgstr ""
"Die deutsche Übersetzung wurde erstellt und ist Copyright von Holger Levsen "
"(2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2011), Ludger Sicking "
"(2008), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
"Philipp Hübner (2009), Andreas Mundt (2009, 2010) und Wolfgang Schweer "
-"(2012, 2013). Sie ist unter der GPL2 oder einer späteren Version lizenziert."
+"(2012, 2013). Sie ist unter der GPL v2 oder einer späteren Version "
+"lizenziert."
#. type: Content of: <article><section><para>
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
"version."
msgstr ""
"Die italienische Übersetzung wurde erstellt und ist Copyright von Claudio "
-"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013). Sie ist unter der "
-"GPL2 oder späteren Versionen lizenziert."
+"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013). Sie ist unter der GPL "
+"v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+"2010, 2012) and is released under the GPL v2 or any later version."
msgstr ""
"Die französische Übersetzung wurde von Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
"David Prévot (2012) und dem französischen l10n-Team (2009, 2010) verfasst "
-"und ist unter der GPL2 oder später lizenziert."
+"und ist unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
msgid ""
"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+"(2009) and is released under the GPL v2 or any later version."
msgstr ""
"Die Chinesische Übersetzung wurde verfasst von Andrew Lee (李健秋) (2009) "
-"und ist unter der GPL2 oder später lizenziert."
+"und ist unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"Die dänische Übersetzung wurde verfasst von Joe Hansen (2012, 2013) und ist "
-"unter der GPL2 oder später lizenziert."
+"unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><title>
msgid "Translations of this document"
@@ -9974,8 +9936,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 d8d2bfa..7a40c59 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-03 13:18+0300\n"
+"POT-Creation-Date: 2014-05-02 18:18+0300\n"
"PO-Revision-Date: 2012-06-16 18:34-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -9304,7 +9304,8 @@ msgstr ""
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+"Then add your name here and release it under the \"GPL v2 or any later "
+"version\" licence."
msgstr ""
"¡Si le añades contenido <emphasis role=\"strong\"> hazlo sólo si eres su "
"autor y planeas liberarlo bajo las mismas condiciones !</emphasis>. Después "
@@ -9319,7 +9320,7 @@ msgstr "Copyright de la traducción y Autores"
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
"está bajo la licencia GPL2 o versiones posteriores."
@@ -9329,7 +9330,7 @@ msgstr ""
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+"Jan Roar Rød (2010) and is released under the GPL v2 or any later version."
msgstr ""
"La traducción a noruego es copyright 2007 de Petter Reinholdtsen y está bajo "
"la licencia GPL2 o versiones posteriores."
@@ -9342,7 +9343,7 @@ msgid ""
"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+"and is released under the GPL v2 or any later version."
msgstr ""
"La traducción a alemán es copyright 2007 de Holger Levsen y está bajo la "
"licencia GPL2 o versiones posteriores."
@@ -9351,7 +9352,7 @@ msgstr ""
#, fuzzy
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
"version."
msgstr ""
"La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
@@ -9363,7 +9364,7 @@ msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+"2010, 2012) and is released under the GPL v2 or any later version."
msgstr ""
"La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
"está bajo la licencia GPL2 o versiones posteriores."
@@ -9372,7 +9373,7 @@ msgstr ""
#, fuzzy
msgid ""
"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+"(2009) and is released under the GPL v2 or any later version."
msgstr ""
"La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
"está bajo la licencia GPL2 o versiones posteriores."
@@ -9381,7 +9382,7 @@ msgstr ""
#, fuzzy
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
"está bajo la licencia GPL2 o versiones posteriores."
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 2ecaade..53965ef 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2014-04-03 13:18+0300\n"
+"POT-Creation-Date: 2014-05-02 18:18+0300\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"
@@ -9818,10 +9818,17 @@ msgstr ""
"sous GPL2 ou toute version ultérieure. Profitez-en !"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you add content to it, <emphasis role=\"strong\">please only do so if "
+#| "you are the author. You need to release it under the same conditions</"
+#| "emphasis>! Then add your name here and release it under the GPL2 or later "
+#| "version."
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+"Then add your name here and release it under the \"GPL v2 or any later "
+"version\" licence."
msgstr ""
"Si vous enrichissez son contenu, <emphasis role=\"strong\">veuillez ne le "
"faire que si vous êtes l'auteur des ajouts. Vous devez les distribuer sous "
@@ -9833,20 +9840,31 @@ msgid "Translation copyright and authors"
msgstr "Droits d'auteur et auteurs des traductions"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Spanish translation is copyrighted by José L. Redrejo Rodríguez "
+#| "(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
+#| "2012) and is released under the GPL2 or any later version."
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"La traduction espagnole, dont les droits d'auteur appartiennent à José L. "
"Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012) et Norman "
"Garcia (2010, 2012), est distribuée sous GPL2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
+#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
+#| "(2010) and Jan Roar Rød (2010) and is released under the GPL2 or any "
+#| "later version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+"Jan Roar Rød (2010) and is released under the GPL v2 or any later version."
msgstr ""
"La traduction norvégienne Bokmål, dont les droits d'auteur appartiennent à "
"Petter Reinholdtsen (2007), Håvard Korsvoll (2007, 2008), Tore Skogly "
@@ -9854,13 +9872,21 @@ msgstr ""
"sous GPL2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
+#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
+#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking "
+#| "(2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert "
+#| "(2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang "
+#| "Schweer (2012, 2013) and is released under the GPL2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+"and is released under the GPL v2 or any later version."
msgstr ""
"La traduction allemande, dont les droits d'auteur appartiennent à Holger "
"Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), "
@@ -9871,9 +9897,14 @@ msgstr ""
"ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+#| "version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
"version."
msgstr ""
"La traduction italienne, dont les droits d'auteur appartiennent à Claudio "
@@ -9881,11 +9912,18 @@ msgstr ""
"GPL2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
+#| "French l10n team (2009, 2010, 2012) and is released under the GPL2 or any "
+#| "later version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+"2010, 2012) and is released under the GPL v2 or any later version."
msgstr ""
"La traduction française, dont les droits d'auteur appartiennent à Christophe "
"Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-"
@@ -9894,17 +9932,25 @@ msgstr ""
"GPL2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+#| "(2009) and is released under the GPL2 or any later version."
msgid ""
"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+"(2009) and is released under the GPL v2 or any later version."
msgstr ""
"La traduction chinoise, dont les droits d'auteur appartiennent à Andrew Lee "
"(李健秋) (2009), est distribuée sous GPL2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+#| "released under the GPL2 or any later version."
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
"(2012, 2013), est distribuée sous GPL2 ou toute version ultérieure."
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 aff0ca5..0b986eb 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-lenny-manual\n"
-"POT-Creation-Date: 2014-04-03 13:18+0300\n"
+"POT-Creation-Date: 2014-05-02 18:18+0300\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"
@@ -9578,10 +9578,17 @@ msgstr ""
"sotto licenza GPL2 o versioni successive. Buon divertimento!"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you add content to it, <emphasis role=\"strong\">please only do so if "
+#| "you are the author. You need to release it under the same conditions</"
+#| "emphasis>! Then add your name here and release it under the GPL2 or later "
+#| "version."
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+"Then add your name here and release it under the \"GPL v2 or any later "
+"version\" licence."
msgstr ""
"Se si aggiungono contenuti a questo documento, <emphasis role=\"strong"
"\">fallo solo se sei l'autore. Occorre rilascialarlo alle stesse condizioni "
@@ -9593,33 +9600,52 @@ msgid "Translation copyright and authors"
msgstr "Copyright di traduzione e autori"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Spanish translation is copyrighted by José L. Redrejo Rodríguez "
+#| "(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
+#| "2012) and is released under the GPL2 or any later version."
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"La traduzione spagnola è protetta da copyright di José L. Redrejo Rodríguez "
"(2007), Rafael Rivas (2009, 2010, 2011, 2012), e Norman Garcia (2010,2012) "
"rilasciata sotto licenza GPL2 o successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
+#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
+#| "(2010) and Jan Roar Rød (2010) and is released under the GPL2 or any "
+#| "later version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+"Jan Roar Rød (2010) and is released under the GPL v2 or any later version."
msgstr ""
"La traduzione norvegese Bokmål è protetta da copyright di Petter "
"Reinholdtsen (2007), Håvard Korsvoll (2007, 2008) e, Tore Skogly (2008) e "
"Ole-Anders Andreassen (2010) rilasciata sotto licenza GPL2 o successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
+#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
+#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking "
+#| "(2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert "
+#| "(2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang "
+#| "Schweer (2012, 2013) and is released under the GPL2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+"and is released under the GPL v2 or any later version."
msgstr ""
"La traduzione tedesca è protetta da copyright di Holger Levsen (2007), "
"Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
@@ -9629,9 +9655,14 @@ msgstr ""
"Wolfgang Schweer (2012, 2013), rilasciata sotto licenza GPL2 o successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+#| "version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
"version."
msgstr ""
"La traduzione italiana è protetta da copyright di Claudio Carboncini (2007, "
@@ -9639,11 +9670,18 @@ msgstr ""
"successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
+#| "French l10n team (2009, 2010, 2012) and is released under the GPL2 or any "
+#| "later version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+"2010, 2012) and is released under the GPL v2 or any later version."
msgstr ""
"La traduzione francese è protetta da copyright di Christophe Masson (2008), "
"Olivier Vitrat (2010) Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau "
@@ -9651,17 +9689,25 @@ msgstr ""
"(2009, 2010, 2012), rilasciata sotto licenza GPL2 o successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+#| "(2009) and is released under the GPL2 or any later version."
msgid ""
"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+"(2009) and is released under the GPL v2 or any later version."
msgstr ""
"La traduzione in Cinese tradizionale è protetta da copyright da Andrew Lee "
"(李健秋) (2009) e rilasciata sotto licenza GPL2 o successiva."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+#| "released under the GPL2 or any later version."
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"La traduzione in Danese è protetta da copyright da Joe Hansen (2012, 2013) "
"e rilasciata sotto licenza GPL2 o successiva."
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 86486fa..40f530d 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2014-04-03 13:18+0300\n"
+"POT-Creation-Date: 2014-05-02 18:18+0300\n"
"PO-Revision-Date: 2012-03-10 18:32+0100\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -10206,7 +10206,8 @@ msgstr ""
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+"Then add your name here and release it under the \"GPL v2 or any later "
+"version\" licence."
msgstr ""
"Hvis du legger til innhold, <emphasis role='strong'>så bare gjør det hvis du "
"er forfatteren av innholdet og planlegger å gi det ut under samme "
@@ -10222,7 +10223,7 @@ msgstr "Opphavsrett for oversettere"
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
"opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
@@ -10232,7 +10233,7 @@ msgstr ""
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+"Jan Roar Rød (2010) and is released under the GPL v2 or any later version."
msgstr ""
"Den norske bokmålsoversettelsen er gjort av Petter Reinholdtsen og Håvard "
"Korsvoll med opphavsrett 2007 og utgitt under GPL2 eller senere versjoner."
@@ -10245,7 +10246,7 @@ msgid ""
"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+"and is released under the GPL v2 or any later version."
msgstr ""
"Den tyske oversettelsen er gjort av Holger Levsen, Patrick Winnertz, Ralf "
"Gesellensetter, Roland F. Teichert og Jürgen Leibner med opphavsrett 2007 og "
@@ -10255,7 +10256,7 @@ msgstr ""
#, fuzzy
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
"version."
msgstr ""
"Den italienske oversettelsen er gjort av Claudio Carboncini med opphavsrett "
@@ -10267,7 +10268,7 @@ msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+"2010, 2012) and is released under the GPL v2 or any later version."
msgstr ""
"Den italienske oversettelsen er gjort av Claudio Carboncini med opphavsrett "
"2007 og er utgitt under GPL2 eller senere versjoner."
@@ -10276,7 +10277,7 @@ msgstr ""
#, fuzzy
msgid ""
"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+"(2009) and is released under the GPL v2 or any later version."
msgstr ""
"Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
"opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
@@ -10285,7 +10286,7 @@ msgstr ""
#, fuzzy
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
"Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
"opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index ab3de1c..eb33b4d 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: 2014-04-03 13:18+0300\n"
+"POT-Creation-Date: 2014-05-02 18:18+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"
@@ -7105,7 +7105,8 @@ msgstr ""
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+"Then add your name here and release it under the \"GPL v2 or any later "
+"version\" licence."
msgstr ""
#. type: Content of: <article><section><title>
@@ -7116,14 +7117,14 @@ msgstr ""
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+"Jan Roar Rød (2010) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
@@ -7133,13 +7134,13 @@ msgid ""
"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+"and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
"version."
msgstr ""
@@ -7148,19 +7149,19 @@ msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+"2010, 2012) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+"(2009) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
index 9332e53..11527c4 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
@@ -3325,26 +3325,26 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
</title>
<para>This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012 [...]
</para>
-<para>If you add content to it, <emphasis role="strong">please only do so if you are the author. You need to release it under the same conditions</emphasis>! Then add your name here and release it under the GPL2 or later version.
+<para>If you add content to it, <emphasis role="strong">please only do so if you are the author. You need to release it under the same conditions</emphasis>! Then add your name here and release it under the "GPL v2 or any later version" licence.
</para>
</section>
<section id="CopyRight--Translation_copyright_and_authors">
<title>Translation copyright and authors
</title>
-<para>The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is released under the GPL2 or any later version.
+<para>The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is released under the GPL v2 or any later version.
</para>
-<para>The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and Jan Roar Rød (2010) and is released under the GPL2 or any later version.
+<para>The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and Jan Roar Rød (2010) and is released under the GPL v2 or any later version.
</para>
-<para>The German translation is copyrighted by Holger Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) and is released under the GPL2 or any later version.
+<para>The German translation is copyrighted by Holger Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) and is released under the GPL v2 or any later version.
</para>
-<para>The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later version.
+<para>The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later version.
</para>
-<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL2 or any later version.
+<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version.
</para>
-<para>The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) (2009) and is released under the GPL2 or any later version.
+<para>The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) (2009) and is released under the GPL v2 or any later version.
</para>
-<para>The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released under the GPL2 or any later version.
+<para>The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released under the GPL v2 or any later version.
</para>
</section>
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 905d55a..d42b351 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.zh\n"
-"POT-Creation-Date: 2014-04-03 13:18+0300\n"
+"POT-Creation-Date: 2014-05-02 18:18+0300\n"
"PO-Revision-Date: 2011-03-28 20:21+0800\n"
"Last-Translator: Andrew Lee <ajqlee at debian.org>\n"
"Language-Team: zh-l10n <zh-l10n at lists.linux.org.tw>\n"
@@ -7747,7 +7747,8 @@ msgstr ""
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author. You need to release it under the same conditions</emphasis>! "
-"Then add your name here and release it under the GPL2 or later version."
+"Then add your name here and release it under the \"GPL v2 or any later "
+"version\" licence."
msgstr ""
#. type: Content of: <article><section><title>
@@ -7758,14 +7759,14 @@ msgstr ""
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010) and "
-"Jan Roar Rød (2010) and is released under the GPL2 or any later version."
+"Jan Roar Rød (2010) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
@@ -7775,13 +7776,13 @@ msgid ""
"2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking (2008, 2010), "
"Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp "
"Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013) "
-"and is released under the GPL2 or any later version."
+"and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
+"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
"version."
msgstr ""
@@ -7790,19 +7791,19 @@ msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL2 or any later version."
+"2010, 2012) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-"(2009) and is released under the GPL2 or any later version."
+"(2009) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL2 or any later version."
+"released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 6cd04eb..5c8eaaf 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 1f97493..4e14c4f 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 4f1a076..00d24ed 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 50fa827..a327a5e 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index 9524c0b..eccc800 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-29 19:19+0300\n"
+"POT-Creation-Date: 2014-05-02 18:19+0300\n"
"PO-Revision-Date: 2014-04-30 18:01+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -9469,19 +9469,6 @@ msgid "Copyright and authors"
msgstr "Copyright und Autoren"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, "
-#| "2003, 2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick "
-#| "Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny "
-#| "Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
-#| "2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
-#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012), "
-#| "Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
-#| "Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel "
-#| "(2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, "
-#| "2013) and Bernhard Hammes (2012) and is released under the GPL2 or any "
-#| "later version. Enjoy!"
msgid ""
"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
"2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
@@ -9509,11 +9496,6 @@ msgstr ""
"Freude!"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "If you add content to it, <emphasis role=\"strong\">please only do so if "
-#| "you are the author. You need to release it under the same conditions</"
-#| "emphasis>! Then add your name here and release it under the GPL2 or later "
-#| "version."
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author. You need to release it under the same conditions</emphasis>! "
@@ -9530,10 +9512,6 @@ msgid "Translation copyright and authors"
msgstr "Autoren und Copyright der Übersetzungen"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Spanish translation is copyrighted by José L. Redrejo Rodríguez "
-#| "(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
-#| "2012, 2013) and is released under the GPL2 or any later version."
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
@@ -9544,11 +9522,6 @@ msgstr ""
"2013). Sie wurde unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
-#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
-#| "(2010) and Jan Roar Rød (2010) and is released under the GPL2 or any "
-#| "later version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
@@ -9562,13 +9535,6 @@ msgstr ""
"lizenziert."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
-#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
-#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking "
-#| "(2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert "
-#| "(2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang "
-#| "Schweer (2012, 2013) and is released under the GPL2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -9586,10 +9552,6 @@ msgstr ""
"lizenziert."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
-#| "version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
@@ -9600,12 +9562,6 @@ msgstr ""
"v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The French translation is copyrighted by Christophe Masson (2008), "
-#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
-#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
-#| "French l10n team (2009, 2010, 2012) and is released under the GPL2 or any "
-#| "later version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
@@ -9619,9 +9575,6 @@ msgstr ""
"Version lizenziert."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-#| "released under the GPL2 or any later version."
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
"released under the GPL v2 or any later version."
@@ -9630,9 +9583,6 @@ msgstr ""
"unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-#| "released under the GPL2 or any later version."
msgid ""
"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
"released under the GPL v2 or any later version."
@@ -9790,8 +9740,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 "
@@ -11959,16 +11909,3 @@ msgstr ""
"Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
-
-#~ msgid "FIXME: the source DVD download URL currently doesn't work"
-#~ msgstr "FIXME: the source DVD download URL currently doesn't work"
-
-#~ msgid ""
-#~ "The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
-#~ "(2009) and is released under the GPL2 or any later version."
-#~ msgstr ""
-#~ "Die Chinesische Übersetzung wurde verfasst von Andrew Lee (李健秋) (2009) "
-#~ "und ist unter der GPL2 oder später lizenziert."
-
-#~ msgid "FIXME: screenshot 22 needs to be updated with new artwork."
-#~ msgstr "FIXME: screenshot 22 needs to be updated with new artwork."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 0036b01..f24edfc 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-04-29 19:19+0300\n"
+"POT-Creation-Date: 2014-05-02 18:19+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"
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 56e8a7f..5c8eaaf 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index 5e22e64..4e14c4f 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index e9a55a5..00d24ed 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 9087978..a327a5e 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
diff --git a/documentation/rosegarden/README.rosegarden-manual-translations b/documentation/rosegarden/README.rosegarden-manual-translations
index 468eb40..52a5379 100644
--- a/documentation/rosegarden/README.rosegarden-manual-translations
+++ b/documentation/rosegarden/README.rosegarden-manual-translations
@@ -90,14 +90,14 @@ $CC is your language. They will be picked up automatically.
If you spot errors in the English version or see how it could be improved,
please do contribute to the English version too. Just edit the wiki at
-http://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/ - an user account
+https://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/ - a user account
is needed to edit these pages, so you will probably need to create a wiki
user first (via the login link).
-If you cannot commit your work to the VCS directly, please file a bug against the
-debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach
-the PO file to the bugreport. Instructions how to submit bugs are available
-at http://bugs.debian.org
+If you cannot commit your work to the VCS directly, please file a bug against
+the debian-edu-doc package, see https://bugs.debian.org/debian-edu-doc. Compress
+the PO file using gzip and attach the file to the bugreport. Instructions how
+to submit bugs are available at https://bugs.debian.org
--- Holger Levsen, holger at debian.org, last updated: 2013-02-08
+-- Holger Levsen, holger at debian.org, last updated: 2013-04-30
diff --git a/documentation/rosegarden/rosegarden-manual.es.po b/documentation/rosegarden/rosegarden-manual.es.po
index d1031a2..d1db8d0 100644
--- a/documentation/rosegarden/rosegarden-manual.es.po
+++ b/documentation/rosegarden/rosegarden-manual.es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Rosegarden Manual Debian Edu\n"
"Report-Msgid-Bugs-To: tato at debian.org.sv\n"
-"POT-Creation-Date: 2013-08-26 00:25+0300\n"
+"POT-Creation-Date: 2014-05-02 18:19+0300\n"
"PO-Revision-Date: 2012-01-10 10:33-0600\n"
"Last-Translator: Rafael Ernesto Rivas <tato at debian.org.sv>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -3019,8 +3019,8 @@ msgstr ""
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author of it and plan to release it under the same conditions</"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+"emphasis>! Then add your name here and release it under the \"GPL v2 or any "
+"later version\" licence."
msgstr ""
#. type: Content of: <article><section><title>
@@ -3030,14 +3030,14 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
-"Skogly (2008) and is released under the GPL2 or any later version."
+"Skogly (2008) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas "
-"Vincent (2012) and the French l10n team (2012) and is released under the "
-"GPL2 or any later version."
+"Vincent (2012) and the French l10n team (2012) and is released under the GPL "
+"v2 or any later version."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/rosegarden/rosegarden-manual.fr.po b/documentation/rosegarden/rosegarden-manual.fr.po
index 956d76d..8596038 100644
--- a/documentation/rosegarden/rosegarden-manual.fr.po
+++ b/documentation/rosegarden/rosegarden-manual.fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-09-14 15:57+0300\n"
+"POT-Creation-Date: 2014-05-02 18:19+0300\n"
"PO-Revision-Date: 2012-02-25 11:11-0400\n"
"Last-Translator: Thomas Vincent <thomas at vinc-net.fr>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -3345,11 +3345,17 @@ msgstr ""
"Profitez-en !"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you add content to it, <emphasis role=\"strong\">please only do so if "
+#| "you are the author of it and plan to release it under the same "
+#| "conditions</emphasis>! Then add your name here and release it under the "
+#| "GPL2 or later version."
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author of it and plan to release it under the same conditions</"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+"emphasis>! Then add your name here and release it under the \"GPL v2 or any "
+"later version\" licence."
msgstr ""
"Si vous enrichissez son contenu, <emphasis role=\"strong\">veuillez ne le "
"faire que si vous êtes l'auteur des ajouts. Vous devez les distribuer sous "
@@ -3361,18 +3367,27 @@ msgid "Translation copyright and authors"
msgstr "Droit de reproduction et auteurs des traductions"
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
+#| "Skogly (2008) and is released under the GPL2 or any later version."
msgid ""
"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
-"Skogly (2008) and is released under the GPL2 or any later version."
+"Skogly (2008) and is released under the GPL v2 or any later version."
msgstr ""
"La traduction norvégienne Bokmål, dont les droits d'auteur appartiennent à "
"Tore Skogly (2008), est distribuée sous GPL2 ou toute version ultérieure."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas "
+#| "Vincent (2012) and the French l10n team (2012) and is released under the "
+#| "GPL2 or any later version."
msgid ""
"The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas "
-"Vincent (2012) and the French l10n team (2012) and is released under the "
-"GPL2 or any later version."
+"Vincent (2012) and the French l10n team (2012) and is released under the GPL "
+"v2 or any later version."
msgstr ""
"La traduction française, dont les droits d'auteur appartiennent à Arnaud "
"Bonvalle (2009), Thomas Vincent (2012) et l'équipe française de localisation "
diff --git a/documentation/rosegarden/rosegarden-manual.nb.po b/documentation/rosegarden/rosegarden-manual.nb.po
index b9e68f1..fbc5397 100644
--- a/documentation/rosegarden/rosegarden-manual.nb.po
+++ b/documentation/rosegarden/rosegarden-manual.nb.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rosegarden-manual.nb\n"
-"POT-Creation-Date: 2013-08-26 00:25+0300\n"
+"POT-Creation-Date: 2014-05-02 18:19+0300\n"
"PO-Revision-Date: 2009-10-31 13:13+0100\n"
"Last-Translator: \n"
"Language-Team: <en at li.org>\n"
@@ -3526,8 +3526,8 @@ msgstr ""
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author of it and plan to release it under the same conditions</"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+"emphasis>! Then add your name here and release it under the \"GPL v2 or any "
+"later version\" licence."
msgstr ""
#. type: Content of: <article><section><title>
@@ -3537,14 +3537,14 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
-"Skogly (2008) and is released under the GPL2 or any later version."
+"Skogly (2008) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas "
-"Vincent (2012) and the French l10n team (2012) and is released under the "
-"GPL2 or any later version."
+"Vincent (2012) and the French l10n team (2012) and is released under the GPL "
+"v2 or any later version."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 3d468ef..1b551bd 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-04-03 13:19+0300\n"
+"POT-Creation-Date: 2014-05-02 18:19+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"
@@ -2920,8 +2920,8 @@ msgstr ""
msgid ""
"If you add content to it, <emphasis role=\"strong\">please only do so if you "
"are the author of it and plan to release it under the same conditions</"
-"emphasis>! Then add your name here and release it under the GPL2 or later "
-"version."
+"emphasis>! Then add your name here and release it under the \"GPL v2 or any "
+"later version\" licence."
msgstr ""
#. type: Content of: <article><section><title>
@@ -2931,14 +2931,14 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore "
-"Skogly (2008) and is released under the GPL2 or any later version."
+"Skogly (2008) and is released under the GPL v2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
msgid ""
"The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas "
-"Vincent (2012) and the French l10n team (2012) and is released under the "
-"GPL2 or any later version."
+"Vincent (2012) and the French l10n team (2012) and is released under the GPL "
+"v2 or any later version."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/rosegarden/rosegarden-manual.xml b/documentation/rosegarden/rosegarden-manual.xml
index 7be4245..b191dab 100644
--- a/documentation/rosegarden/rosegarden-manual.xml
+++ b/documentation/rosegarden/rosegarden-manual.xml
@@ -1384,16 +1384,16 @@
</title>
<para>This document is written and copyrighted by Alf Tonny Bätz (2008, 2009), Holger Levsen (2008) and is released under the GPL2 or any later version. Enjoy!
</para>
-<para>If you add content to it, <emphasis role="strong">please only do so if you are the author of it and plan to release it under the same conditions</emphasis>! Then add your name here and release it under the GPL2 or later version.
+<para>If you add content to it, <emphasis role="strong">please only do so if you are the author of it and plan to release it under the same conditions</emphasis>! Then add your name here and release it under the "GPL v2 or any later version" licence.
</para>
</section>
<section id="CopyRight--Translation_copyright_and_authors">
<title>Translation copyright and authors
</title>
-<para>The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore Skogly (2008) and is released under the GPL2 or any later version.
+<para>The Bokmål translation is copyrighted by Alf Tonny Bätz (2008) and Tore Skogly (2008) and is released under the GPL v2 or any later version.
</para>
-<para>The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas Vincent (2012) and the French l10n team (2012) and is released under the GPL2 or any later version.
+<para>The French translation is copyrighted by Arnaud Bonvalle (2009), Thomas Vincent (2012) and the French l10n team (2012) and is released under the GPL v2 or any later version.
</para>
</section>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list