[debian-edu-commits] debian-edu/debian-edu-doc.git (#1623) - master (branch) updated: 1.5_20131001_7.1-3-gd7326f6
David Prévot
taffit at alioth.debian.org
Tue Oct 1 21:31:51 UTC 2013
The branch, master has been updated
via d7326f69920b5c80c14beec7e084f27f760f79f0 (commit)
from 23d8e096b7b267aa123b480eccc8b7e445e6b2ad (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 d7326f69920b5c80c14beec7e084f27f760f79f0
Author: David Prévot <taffit at debian.org>
Date: Tue Oct 1 17:28:30 2013 -0400
Update manual from the wiki, +2f and -1 FIXME
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-wheezy-manual.da.po | 37 ++++++++--------
.../debian-edu-wheezy-manual.de.po | 40 ++++++++---------
.../debian-edu-wheezy-manual.es.po | 31 ++++++--------
.../debian-edu-wheezy-manual.fr.po | 45 +++++++++++---------
.../debian-edu-wheezy-manual.it.po | 40 ++++++++---------
.../debian-edu-wheezy-manual.nb.po | 31 ++++++--------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 26 ++++-------
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 19 +++------
documentation/debian-edu-wheezy/fixme-status.txt | 5 +--
9 files changed, 128 insertions(+), 146 deletions(-)
The diff of changes is:
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 566442e..5fe699f 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-09-17 22:53+0300\n"
+"POT-Creation-Date: 2013-10-01 17:27-0400\n"
"PO-Revision-Date: 2013-09-19 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1453,15 +1453,15 @@ msgstr ""
"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source DVD"
+#, fuzzy
+#| msgid "Source DVD"
+msgid "Source image"
msgstr "Kilde-dvd"
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: the source DVD download URL currently doesn't work"
-msgstr "FIXME: the source DVD download URL currently doesn't work"
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The source DVD is available via"
+#, fuzzy
+#| msgid "The source DVD is available via"
+msgid "The source image is available via"
msgstr "Dvd-Kilderne er tilgængelige via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9107,8 +9107,8 @@ msgstr "Ophavsret for oversættelserne og forfatterne"
#. 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."
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
+"and is released under the GPL2 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 "
@@ -9166,14 +9166,6 @@ 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."
-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>
-msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
"released under the GPL2 or any later version."
msgstr ""
@@ -11455,6 +11447,17 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ 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 ""
+#~ "Den traditionelle kinesiske oversættelse er underlagt ophavsretten af "
+#~ "Andrew Lee (李健秋) (2009) og er udgivet under GPL2 eller enhver senere "
+#~ "version."
+
#~ 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.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index fda209c..c55a646 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: 2013-09-30 19:15-0400\n"
+"POT-Creation-Date: 2013-10-01 17:27-0400\n"
"PO-Revision-Date: 2013-09-23 11:59+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1496,15 +1496,15 @@ msgstr ""
"USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source DVD"
+#, fuzzy
+#| msgid "Source DVD"
+msgid "Source image"
msgstr "DVD mit Quelltexten"
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: the source DVD download URL currently doesn't work"
-msgstr "FIXME: the source DVD download URL currently doesn't work"
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The source DVD is available via"
+#, fuzzy
+#| msgid "The source DVD is available via"
+msgid "The source image is available via"
msgstr "Die Quelltext-DVD ist erhältlich über"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9336,12 +9336,12 @@ 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."
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
+"and is released under the GPL2 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, 2013). Sie wurde unter der GPL 2 oder einer späteren Version lizensiert."
+"(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, "
+"2013). Sie wurde unter der GPL 2 oder einer späteren Version lizensiert."
#. type: Content of: <article><section><para>
msgid ""
@@ -9394,14 +9394,6 @@ 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."
-msgstr ""
-"Die Chinesische Übersetzung wurde verfasst von Andrew Lee (李健秋) (2009) "
-"und ist unter der GPL2 oder später 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."
msgstr ""
@@ -11728,5 +11720,15 @@ msgstr ""
"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.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index 8682da2..30d21df 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-30 19:15-0400\n"
+"POT-Creation-Date: 2013-10-01 17:27-0400\n"
"PO-Revision-Date: 2013-09-20 17:08-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1791,17 +1791,13 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
-msgid "Source DVD"
+msgid "Source image"
msgstr "Recursos"
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: the source DVD download URL currently doesn't work"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| msgid "The Sources are available via"
-msgid "The source DVD is available via"
+msgid "The source image is available via"
msgstr "Los archivos fuente estan disponibles vía: "
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8998,8 +8994,8 @@ msgstr "Copyright de la traducción y Autores"
#, 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."
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
+"and is released under the GPL2 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."
@@ -9051,15 +9047,6 @@ msgstr ""
#. 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."
-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."
-
-#. 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."
msgstr ""
@@ -11171,6 +11158,14 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#, fuzzy
+#~ msgid ""
+#~ "The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+#~ "(2009) and is released under the GPL2 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."
+
+#, fuzzy
#~| msgid "30-ThinClient-LDM_Login.png"
#~ msgid "./images/30-ThinClient-LDM_Login.png"
#~ msgstr "30-ThinClient-LDM_Login.png"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index 4abc4c9..b7ff83a 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2013-09-19 08:51-0400\n"
+"POT-Creation-Date: 2013-10-01 17:27-0400\n"
"PO-Revision-Date: 2013-09-18 15:22+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1502,15 +1502,15 @@ msgstr ""
"USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source DVD"
+#, fuzzy
+#| msgid "Source DVD"
+msgid "Source image"
msgstr "DVD des sources :"
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: the source DVD download URL currently doesn't work"
-msgstr "FIXME: the source DVD download URL currently doesn't work"
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The source DVD is available via"
+#, fuzzy
+#| msgid "The source DVD is available via"
+msgid "The source image is available via"
msgstr "Le DVD contenant les sources est disponible :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3087,9 +3087,9 @@ msgid ""
"here, and then \"User\". You will be guided by the user creation wizard."
msgstr ""
"À côté de cet arbre de navigation vous pouvez voir le menu « Actions ». "
-"Survolez cet élément avec votre souris et un sous-menu apparaitra à l'écran ; "
-"choisissez « Créer », puis « Utilisateur ». Vous serez guidé par l'assistant "
-"de création d'utilisateur."
+"Survolez cet élément avec votre souris et un sous-menu apparaitra à "
+"l'écran ; choisissez « Créer », puis « Utilisateur ». Vous serez guidé par "
+"l'assistant de création d'utilisateur."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -9387,12 +9387,13 @@ msgstr "Droits d'auteur et auteurs des traductions"
#. 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."
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
+"and is released under the GPL2 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, 2013), est distribuée sous GPL2 ou toute version ultérieure."
+"Garcia (2010, 2012, 2013), est distribuée sous GPL2 ou toute version "
+"ultérieure."
#. type: Content of: <article><section><para>
msgid ""
@@ -9447,14 +9448,6 @@ 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."
-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>
-msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
"released under the GPL2 or any later version."
msgstr ""
@@ -11804,6 +11797,16 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ 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 ""
+#~ "La traduction chinoise, dont les droits d'auteur appartiennent à Andrew "
+#~ "Lee (李健秋) (2009), est distribuée sous GPL2 ou toute version ultérieure."
+
#~ 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.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index 57f1a7c..c0aa825 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-09-30 19:15-0400\n"
+"POT-Creation-Date: 2013-10-01 17:27-0400\n"
"PO-Revision-Date: 2013-09-29 09:58+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -1472,15 +1472,15 @@ msgstr ""
"USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-msgid "Source DVD"
+#, fuzzy
+#| msgid "Source DVD"
+msgid "Source image"
msgstr "DVD dei sorgenti"
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: the source DVD download URL currently doesn't work"
-msgstr "FIXME: the source DVD download URL currently doesn't work"
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The source DVD is available via"
+#, fuzzy
+#| msgid "The source DVD is available via"
+msgid "The source image is available via"
msgstr "Il DVD dei sorgenti è disponibile da:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9208,12 +9208,12 @@ msgstr "Copyright e autori delle traduzioni"
#. 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."
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
+"and is released under the GPL2 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, 2013) "
-"rilasciata sotto licenza GPL2 o successiva."
+"(2007), Rafael Rivas (2009, 2010, 2011, 2012) e Norman Garcia (2010, 2012, "
+"2013) rilasciata sotto licenza GPL2 o successiva."
#. type: Content of: <article><section><para>
msgid ""
@@ -9265,14 +9265,6 @@ 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."
-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>
-msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
"released under the GPL2 or any later version."
msgstr ""
@@ -11575,6 +11567,16 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ 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 ""
+#~ "La traduzione in cinese tradizionale è protetta da copyright da Andrew "
+#~ "Lee (李健秋) (2009) e rilasciata sotto licenza GPL2 o successiva."
+
#~ 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.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 36d7571..bd0a3db 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-09-30 19:15-0400\n"
+"POT-Creation-Date: 2013-10-01 17:27-0400\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"
@@ -1496,16 +1496,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
-msgid "Source DVD"
+msgid "Source image"
msgstr "Kilder:"
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: the source DVD download URL currently doesn't work"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
#, fuzzy
-msgid "The source DVD is available via"
+msgid "The source image is available via"
msgstr "Kildekoden er tilgjengelig via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8911,8 +8907,8 @@ msgstr "Opphavsrett for oversettere"
#, 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."
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
+"and is released under the GPL2 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."
@@ -8965,15 +8961,6 @@ msgstr ""
#. 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."
-msgstr ""
-"Den spanske oversettelsen er gjort av José L. Redrejo Rodríguez med "
-"opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
-
-#. 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."
msgstr ""
@@ -11121,6 +11108,14 @@ msgstr ""
"skolelinux.no/info/cdbygging/news.html</ulink>."
#, fuzzy
+#~ msgid ""
+#~ "The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) "
+#~ "(2009) and is released under the GPL2 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."
+
+#, fuzzy
#~ msgid "./images/30-ThinClient-LDM_Login.png"
#~ msgstr ""
#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 0c2baa0..da83d5f 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: 2013-09-30 19:15-0400\n"
+"POT-Creation-Date: 2013-10-01 17:27-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"
@@ -1093,33 +1093,29 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Source DVD"
+msgid "Source image"
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: the source DVD download URL currently doesn't work"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The source DVD is available via"
+msgid "The source image is available via"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
+"source-USB.iso\">debian-edu-7.1+edu0-source-USB.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
+"source-USB.iso\">debian-edu-7.1+edu0-source-USB.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
-"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
+"source-USB.iso debian-edu-7.1+edu0-source-USB.iso</computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -6796,8 +6792,8 @@ msgstr ""
#. 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) and is "
-"released under the GPL2 or any later version."
+"Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
+"and is released under the GPL2 or any later version."
msgstr ""
#. type: Content of: <article><section><para>
@@ -6834,12 +6830,6 @@ 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."
-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."
msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index f1d9fa4..fe0c562 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -454,20 +454,17 @@
</para></listitem></itemizedlist>
</section>
-<section id="Installation--Source_DVD">
-<title>Source DVD
+<section id="Installation--Source_image">
+<title>Source image
</title>
-<para>
-FIXME: the source DVD download URL currently doesn't work
-</para>
-<para>The source DVD is available via
+<para>The source image is available via
</para>
<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-DVD.iso">debian-edu-7.1+edu0-source-DVD.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-USB.iso">debian-edu-7.1+edu0-source-USB.iso</ulink>
</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-DVD.iso">debian-edu-7.1+edu0-source-DVD.iso</ulink>
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-USB.iso">debian-edu-7.1+edu0-source-USB.iso</ulink>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-source-USB.iso debian-edu-7.1+edu0-source-USB.iso</computeroutput>
</para></listitem></itemizedlist>
</section>
</section>
@@ -3109,7 +3106,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
<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, 2013) and is released under the GPL2 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>
@@ -3119,8 +3116,6 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
</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>
-<para>The Traditional Chinese translation is copyrighted by Andrew Lee (李健秋) (2009) and is released under the GPL2 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>
</section>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index ad3b421..eacc395 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -1,11 +1,8 @@
----------------------------------
-https://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
-FIXME: the source DVD download URL currently doesn't work
-----------------------------------
https://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/NetworkClients
FIXME: it would be even better to first/also explain user groups for Windows with GOsa² (and then show an example for the command line)
FIXME: explain how to use profiles from global policies for Windows machines in the skolelinux network
FIXME: describe roaming profile key for the global policy editor here
====================
-4 FIXMEs left to fix
+3 FIXMEs left to fix
====================
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