[debian-edu-commits] debian-edu/ 01/01: Updated manuals and images from the wiki.

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Sat Sep 20 08:19:03 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 d2b04445e4b5f9582f600a6f79bec4215cbf1d74
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Sep 20 10:18:03 2014 +0200

    Updated manuals and images from the wiki.
---
 documentation/audacity/audacity-manual.fr.po       |   2 +-
 documentation/audacity/audacity-manual.nl.po       |  13 +-
 documentation/audacity/audacity-manual.pot         |   2 +-
 documentation/audacity/audacity-manual.xml         |   6 +
 .../debian-edu-squeeze-manual.da.po                |   2 +-
 .../debian-edu-squeeze-manual.de.po                |  26 ++--
 .../debian-edu-squeeze-manual.es.po                |   2 +-
 .../debian-edu-squeeze-manual.fr.po                |  10 +-
 .../debian-edu-squeeze-manual.it.po                |  30 ++--
 .../debian-edu-squeeze-manual.nb.po                |  46 +++---
 .../debian-edu-squeeze-manual.pot                  |   2 +-
 .../debian-edu-squeeze-manual.xml                  |  41 +++--
 .../debian-edu-squeeze-manual.zh.po                |   2 +-
 .../debian-edu-squeeze/images/de/worldmap.png      | Bin 386972 -> 387288 bytes
 .../debian-edu-squeeze/images/es/worldmap.png      | Bin 387077 -> 387402 bytes
 .../debian-edu-squeeze/images/fr/worldmap.png      | Bin 387015 -> 387335 bytes
 .../debian-edu-squeeze/images/worldmap.png         | Bin 387010 -> 387327 bytes
 .../debian-edu-wheezy-manual.da.po                 |  16 +-
 .../debian-edu-wheezy-manual.de.po                 |  24 ++-
 .../debian-edu-wheezy-manual.es.po                 |  10 +-
 .../debian-edu-wheezy-manual.fr.po                 |  24 ++-
 .../debian-edu-wheezy-manual.it.po                 | 131 ++++------------
 .../debian-edu-wheezy-manual.nb.po                 | 135 ++++++++--------
 .../debian-edu-wheezy-manual.nl.po                 |  48 +++---
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot |   6 +-
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml |  48 ++++--
 .../debian-edu-wheezy/images/de/worldmap.png       | Bin 386969 -> 387288 bytes
 .../debian-edu-wheezy/images/es/worldmap.png       | Bin 387075 -> 387402 bytes
 .../debian-edu-wheezy/images/fr/worldmap.png       | Bin 387012 -> 387335 bytes
 .../debian-edu-wheezy/images/worldmap.png          | Bin 387007 -> 387327 bytes
 documentation/rosegarden/rosegarden-manual.es.po   |   8 +-
 documentation/rosegarden/rosegarden-manual.fr.po   |  16 +-
 documentation/rosegarden/rosegarden-manual.nb.po   |  16 +-
 documentation/rosegarden/rosegarden-manual.nl.po   | 171 +++++++++++++++++----
 documentation/rosegarden/rosegarden-manual.pot     |   8 +-
 documentation/rosegarden/rosegarden-manual.xml     |  11 ++
 36 files changed, 509 insertions(+), 347 deletions(-)

diff --git a/documentation/audacity/audacity-manual.fr.po b/documentation/audacity/audacity-manual.fr.po
index 90537ca..aebe9f7 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: 2014-05-02 18:19+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\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"
diff --git a/documentation/audacity/audacity-manual.nl.po b/documentation/audacity/audacity-manual.nl.po
index ad4ba50..e657ce5 100644
--- a/documentation/audacity/audacity-manual.nl.po
+++ b/documentation/audacity/audacity-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-06-17 11:19+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\n"
 "PO-Revision-Date: 2014-08-08 15:36+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -485,11 +485,6 @@ msgstr ""
 "Geniet ervan!"
 
 #. 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 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</"
@@ -507,12 +502,6 @@ msgid "Translation copyright and authors"
 msgstr "Auteursrechten en auteurs van vertalingen"
 
 #. type: Content of: <article><section><para>
-#| 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 "
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index de93c7a..e180d47 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-05-11 00:08+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\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/audacity/audacity-manual.xml b/documentation/audacity/audacity-manual.xml
index 2853cd8..94e8fe6 100644
--- a/documentation/audacity/audacity-manual.xml
+++ b/documentation/audacity/audacity-manual.xml
@@ -12,6 +12,7 @@
 </para>
 </section>
 
+
 <section id="Setup">
 <title>Before you start
 </title>
@@ -57,6 +58,7 @@
 </section>
 </section>
 
+
 <section id="Recording">
 <title>Doing some recording
 </title>
@@ -100,6 +102,7 @@
 </para>
 </section>
 
+
 <section id="Importing">
 <title>Importing Audio
 </title>
@@ -152,6 +155,7 @@
 </section>
 </section>
 
+
 <section id="CopyRight">
 <title>Copyright and authors
 </title>
@@ -168,6 +172,7 @@
 </para>
 </section>
 
+
 <section id="Translations">
 <title>Translations of this document
 </title>
@@ -202,6 +207,7 @@
 </section>
 </section>
 
+
 <section id="AppendixA">
 <title>Appendix A - The GNU Public License
 </title><screen><![CDATA[Note to translators: there is no need to translate the GPL license text. ]]></screen>
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 95daa52..c61b42d 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-05-02 18:18+0300\n"
+"POT-Creation-Date: 2014-09-20 10:14+0200\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"
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 f98be46..c11f30b 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-05-01 10:50+0300\n"
+"POT-Creation-Date: 2014-09-20 10:14+0200\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"
@@ -773,8 +773,8 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
-"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
+"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
 "Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
 "Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
 "Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -2089,8 +2089,8 @@ msgstr ""
 "Wenn Sie von einer DVD installieren, enthält die Datei <computeroutput>/etc/"
 "apt/sources.list</computeroutput> nur Quellen von der DVD. Wenn Sie eine "
 "Internetverbindung haben, wird dringend empfohlen, die folgenden Zeilen zu "
-"der Datei hinzuzufügen. Damit stellen Sie sicher, dass (Sicherheits-)"
-"Aktualisierungen installiert werden können."
+"der Datei hinzuzufügen. Damit stellen Sie sicher, dass "
+"(Sicherheits-)Aktualisierungen installiert werden können."
 
 #. type: CDATA
 #, no-wrap
@@ -3074,14 +3074,14 @@ msgstr ""
 "nicht. (Die Generierung der Kennungen kann in der Datei <computeroutput>/etc/"
 "gosa/gosa.conf</computeroutput> angepasst werden; es könnte z.B. die "
 "Voreinstellung <computeroutput>idGenerator=\"{%givenName[3-6]}{%sn[3-6]}\"</"
-"computeroutput> geändert werden in <computeroutput>idGenerator=\"{%givenName"
-"[1]}{%sn[22]}{id!2}\"</computeroutput>. Damit würde für den Benutzer »Peter "
-"Muster« die Kennung <computeroutput>pmuster</computeroutput> und für einen "
-"weiteren Benutzer mit gleichem Namen <computeroutput>pmuster01</"
-"computeroutput> generiert; in diesem Fall wären Kennungen maximal 25 Zeichen "
-"lang. Weitere Details erhalten Sie mittels <computeroutput>man 5 gosa.conf</"
-"computeroutput>. Legen Sie eine Sicherheitskopie von gosa.conf an, bevor Sie "
-"diese verändern!)"
+"computeroutput> geändert werden in <computeroutput>idGenerator="
+"\"{%givenName[1]}{%sn[22]}{id!2}\"</computeroutput>. Damit würde für den "
+"Benutzer »Peter Muster« die Kennung <computeroutput>pmuster</computeroutput> "
+"und für einen weiteren Benutzer mit gleichem Namen "
+"<computeroutput>pmuster01</computeroutput> generiert; in diesem Fall wären "
+"Kennungen maximal 25 Zeichen lang. Weitere Details erhalten Sie mittels "
+"<computeroutput>man 5 gosa.conf</computeroutput>. Legen Sie eine "
+"Sicherheitskopie von gosa.conf an, bevor Sie diese verändern!)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
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 7a40c59..cb50847 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-05-02 18:18+0300\n"
+"POT-Creation-Date: 2014-09-20 10:14+0200\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"
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 53965ef..d8ff82e 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-05-02 18:18+0300\n"
+"POT-Creation-Date: 2014-09-20 10:14+0200\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"
@@ -6552,10 +6552,10 @@ msgid ""
 "address or IP address like this: <computeroutput>[192.168.0.10]</"
 "computeroutput>."
 msgstr ""
-"Les valeurs par défaut sont définies dans la section <computeroutput>"
-"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
-"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
-"computeroutput>."
+"Les valeurs par défaut sont définies dans la section "
+"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
+"indiquez son adresse MAC ou son adresse IP de cette manière : "
+"<computeroutput>[192.168.0.10]</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
index 0b986eb..3d39d4a 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-05-02 18:18+0300\n"
+"POT-Creation-Date: 2014-09-20 10:14+0200\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"
@@ -6402,8 +6402,8 @@ msgid ""
 msgstr ""
 "Il valore di default è definito in <computeroutput>[default]</"
 "computeroutput>, per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: <computeroutput>"
-"[192.168.0.10] </computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: "
+"<computeroutput>[192.168.0.10] </computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -15057,13 +15057,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
@@ -15075,8 +15075,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15084,8 +15084,8 @@ msgstr ""
 #~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15102,8 +15102,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15111,8 +15111,8 @@ msgstr ""
 #~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
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 40f530d..6a5b1c3 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-05-02 18:18+0300\n"
+"POT-Creation-Date: 2014-09-20 10:14+0200\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"
@@ -872,10 +872,10 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
 "Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
@@ -6486,10 +6486,10 @@ msgid ""
 "boots from a diskette or directly from the server using network-PROM (or "
 "PXE) without using a local client hard drive."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. "
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -13067,8 +13067,8 @@ msgstr ""
 #~ "workstation server(s):"
 #~ msgstr ""
 #~ "Forutsatt at de diskløse arbeidsstasjonene kjører <computeroutput>i386</"
-#~ "computeroutput>, må følgende kommandoer utføres på arbeidsstasjonstjener"
-#~ "(ne):"
+#~ "computeroutput>, må følgende kommandoer utføres på "
+#~ "arbeidsstasjonstjener(ne):"
 
 #~ msgid ""
 #~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
@@ -15395,13 +15395,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
@@ -15413,8 +15413,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15422,8 +15422,8 @@ msgstr ""
 #~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15439,8 +15439,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15448,8 +15448,8 @@ msgstr ""
 #~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index f2fd25b..ef7b995 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-05-29 19:54+0300\n"
+"POT-Creation-Date: 2014-09-20 10:14+0200\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-squeeze/debian-edu-squeeze-manual.xml b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
index 11527c4..864f418 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
@@ -38,6 +38,7 @@
 </section>
 </section>
 
+
 <section id="Architecture">
 <title>Architecture
 </title>
@@ -82,7 +83,7 @@
 <para>To ensure security all connections where passwords are transmitted over the network are encrypted, so no passwords are sent over the network as plain text. 
 </para>
 <para>Below is a table of the services that are set up by default in a Skolelinux network and the DNS name of each service. If possible all configuration files will refer to the service by name (without the domain name) thus making it easy for schools to change either their domain (if they have an own DNS domain) or the IP addresses they use. 
-</para><informaltable><tgroup cols="3"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><tbody><row rowsep="1"><entry align="center" colsep="1" namest="col_0" rowsep="1" nameend="col_2">
+</para><informaltable><tgroup cols="3"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><tbody><row rowsep="1"><entry align="center" colsep="1" nameend="col_2" namest="col_0" rowsep="1">
 <para><emphasis role="strong"> Table of services</emphasis>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
 <para> <emphasis role="strong">Service description</emphasis> 
@@ -290,6 +291,7 @@
 </section>
 </section>
 
+
 <section id="Requirements">
 <title>Requirements
 </title>
@@ -405,6 +407,7 @@
 </section>
 </section>
 
+
 <section id="Installation">
 <title>Installation and download options
 </title>
@@ -420,7 +423,7 @@
 </para>
 </section>
 
-<section id="Installation--Download_the_installation_media_for_Debian_Edu_6.0.7.2B-r1_Codename_.22Squeeze.22">
+<section id="Installation--Download_the_installation_media_for_Debian_Edu_6.0.7.2B-r1_Codename_.26quot.3BSqueeze.26quot.3B">
 <title>Download the installation media for Debian Edu 6.0.7+r1 Codename "Squeeze"
 </title>
 
@@ -842,6 +845,7 @@ FIXME Check these numbers for Squeeze.  They are 2012-01-22 for Lenny.
 </section>
 </section>
 
+
 <section id="GettingStarted">
 <title>Getting started
 </title>
@@ -1235,6 +1239,7 @@ enter password: █]]></screen>
 </para>
 </section>
 
+
 <section id="Maintenance">
 <title>Maintenance
 </title>
@@ -1381,6 +1386,7 @@ enter password: █]]></screen>
 </section>
 </section>
 
+
 <section id="Upgrades">
 <title>Upgrades
 </title>
@@ -1456,6 +1462,7 @@ enter password: █]]></screen>
 </para>
 </section>
 
+
 <section id="HowTo">
 <title>HowTo
 </title>
@@ -1480,6 +1487,7 @@ enter password: █]]></screen>
 </para></listitem></itemizedlist>
 </section>
 
+
 <section id="Administration">
 <title>HowTos for general administration
 </title>
@@ -1824,6 +1832,7 @@ apt-get upgrade]]></screen>
 </section>
 </section>
 
+
 <section id="Desktop">
 <title>HowTos for the desktop
 </title>
@@ -1889,6 +1898,7 @@ apt-get update]]></screen>
 </section>
 </section>
 
+
 <section id="NetworkClients">
 <title>HowTos for networked clients
 </title>
@@ -2473,6 +2483,7 @@ logon home = ""]]></screen>
 </section>
 </section>
 
+
 <section id="Samba">
 <title>Samba in Debian Edu
 </title>
@@ -2633,6 +2644,7 @@ logon home = ""]]></screen>
 </section>
 </section>
 
+
 <section id="TeachAndLearn">
 <title>HowTos for teaching and learning
 </title>
@@ -2737,6 +2749,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 </section>
 </section>
 
+
 <section id="Users">
 <title>HowTos for users
 </title>
@@ -2775,6 +2788,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 </section>
 </section>
 
+
 <section id="Contribute">
 <title>Contribute
 </title>
@@ -2823,6 +2837,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </section>
 </section>
 
+
 <section id="Support">
 <title>Support
 </title>
@@ -2903,11 +2918,12 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </section>
 </section>
 
+
 <section id="Features">
 <title>New features in Debian Edu Squeeze
 </title>
 
-<section id="Features--Changes_for_Debian_Edu_6.0.7.2B-r1_Codename_.22Squeeze.22_released_2013-03-03">
+<section id="Features--Changes_for_Debian_Edu_6.0.7.2B-r1_Codename_.26quot.3BSqueeze.26quot.3B_released_2013-03-03">
 <title>Changes for Debian Edu 6.0.7+r1 Codename "Squeeze" released 2013-03-03
 </title>
 <itemizedlist>
@@ -2988,7 +3004,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </para></listitem></itemizedlist></listitem></itemizedlist>
 </section>
 
-<section id="Features--New_features_for_Debian_Edu_6.0.4.2B-r0_Codename_.22Squeeze.22_released_2012-03-11">
+<section id="Features--New_features_for_Debian_Edu_6.0.4.2B-r0_Codename_.26quot.3BSqueeze.26quot.3B_released_2012-03-11">
 <title>New features for Debian Edu 6.0.4+r0 Codename "Squeeze" released 2012-03-11
 </title>
 
@@ -3320,6 +3336,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </section>
 </section>
 
+
 <section id="CopyRight">
 <title>Copyright and authors
 </title>
@@ -3348,6 +3365,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </para>
 </section>
 
+
 <section id="Translations">
 <title>Translations of this document
 </title>
@@ -3389,11 +3407,12 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 </section>
 
+
 <section id="AppendixA">
 <title>Appendix A - The GNU General Public License
 </title><screen><![CDATA[Note to translators: there is no need to translate the GPL license text. ]]></screen>
 
-<section id="AppendixA--Manual_for_Debian_Edu_6.0.7.2B-r1_Codename_.22Squeeze.22">
+<section id="AppendixA--Manual_for_Debian_Edu_6.0.7.2B-r1_Codename_.26quot.3BSqueeze.26quot.3B">
 <title>Manual for Debian Edu 6.0.7+r1 Codename "Squeeze"
 </title>
 <para>Copyright (C) 2007-2013 Holger Levsen < <ulink url="mailto:holger at layer-acht.org">holger at layer-acht.org</ulink> > and others, see the <link linkend="CopyRight">Copyright chapter</link> for the full list of copyright owners. 
@@ -3487,6 +3506,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 </section>
 
+
 <section id="AppendixB">
 <title>Appendix B - no Debian Edu Live CD/DVDs for Squeeze yet
 </title>
@@ -3591,11 +3611,12 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 </section>
 
+
 <section id="AppendixC">
 <title>Appendix C - Features in older releases
 </title>
 
-<section id="AppendixC--New_in_Debian_Edu_5.0.6.2B-edu1_Codename_.22Lenny.22_released_2010-10-05">
+<section id="AppendixC--New_in_Debian_Edu_5.0.6.2B-edu1_Codename_.26quot.3BLenny.26quot.3B_released_2010-10-05">
 <title>New in Debian Edu 5.0.6+edu1 Codename "Lenny" released 2010-10-05
 </title>
 <itemizedlist>
@@ -3622,7 +3643,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </para></listitem></itemizedlist>
 </section>
 
-<section id="AppendixC--New_features_in_Debian_Edu_5.0.4.2B-edu0_Codename_.22Lenny.22_released_2010-02-08">
+<section id="AppendixC--New_features_in_Debian_Edu_5.0.4.2B-edu0_Codename_.26quot.3BLenny.26quot.3B_released_2010-02-08">
 <title>New features in Debian Edu 5.0.4+edu0 Codename "Lenny" released 2010-02-08
 </title>
 <itemizedlist>
@@ -3712,7 +3733,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </para></listitem></itemizedlist>
 </section>
 
-<section id="AppendixC--New_features_in_the_.223.0r1_Terra.22_release_2007-12-05">
+<section id="AppendixC--New_features_in_the_.26quot.3B3.0r1_Terra.26quot.3B_release_2007-12-05">
 <title>New features in the "3.0r1 Terra" release 2007-12-05
 </title>
 <itemizedlist>
@@ -3724,7 +3745,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </para></listitem></itemizedlist>
 </section>
 
-<section id="AppendixC--New_features_in_the_.223.0r0_Terra.22_release_2007-07-22">
+<section id="AppendixC--New_features_in_the_.26quot.3B3.0r0_Terra.26quot.3B_release_2007-07-22">
 <title>New features in the "3.0r0 Terra" release 2007-07-22
 </title>
 <itemizedlist>
@@ -3816,7 +3837,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </para></listitem></itemizedlist>
 </section>
 
-<section id="AppendixC--Features_in_.221.0_Venus.22_release_2004-06-20">
+<section id="AppendixC--Features_in_.26quot.3B1.0_Venus.26quot.3B_release_2004-06-20">
 <title>Features in "1.0 Venus" release 2004-06-20
 </title>
 <itemizedlist>
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 d42b351..a0fcbca 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-05-02 18:18+0300\n"
+"POT-Creation-Date: 2014-09-20 10:14+0200\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"
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index d0ccb40..11d572f 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 b6e35cf..1c67acd 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 56f68e5..e624cb5 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 d1f8aad..661a55a 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.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 104efdf..ab252ba 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: 2014-05-29 19:55+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\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"
@@ -9692,8 +9692,14 @@ msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr "Manual for Debian Edu 7.1+edu0 kodenavn »Wheezy«"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:"
+#| "holger at layer-acht.org\">holger at layer-acht.org</ulink> > and others, "
+#| "see the <link linkend=\"CopyRight\">Copyright chapter</link> for the full "
+#| "list of copyright owners."
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
@@ -10577,8 +10583,12 @@ msgid "Improve preseeding support and documentation"
 msgstr "Forbedr understøttelse og dokumentation vedrørende forudfyldelse"
 
 #. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
+#| "2012-03-11"
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 "Nye funktioner for Debian Edu 6.0.4+r0 kodenavn »Squeeze« udgivet 11-03-2012"
 
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 5bca386..5e54399 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-05-29 19:55+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\n"
 "PO-Revision-Date: 2014-05-30 01:06+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -780,8 +780,8 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
-"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
+"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
 "Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
 "Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
 "Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -9792,8 +9792,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 "
@@ -9845,8 +9845,14 @@ msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr "Handbuch für Debian Edu 7.1+edu0, Codename »Wheezy«"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:"
+#| "holger at layer-acht.org\">holger at layer-acht.org</ulink> > and others, "
+#| "see the <link linkend=\"CopyRight\">Copyright chapter</link> for the full "
+#| "list of copyright owners."
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
@@ -10743,8 +10749,12 @@ msgid "Improve preseeding support and documentation"
 msgstr "Verbesserte Unterstützung von Preseeding, bessere Dokumentation "
 
 #. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
+#| "2012-03-11"
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 "Neuerungen in Debian Edu 6.0.4+r0, Codename »Squeeze«, freigegeben am "
 "11.03.2012"
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 b52c658..4045a90 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: 2014-05-29 19:55+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\n"
 "PO-Revision-Date: 2013-12-02 00:31-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -8986,7 +8986,7 @@ msgstr "Manual para Debian-Edu 7.1+edu0 nombre código \"Wheezy\""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
@@ -9657,8 +9657,12 @@ msgid "Improve preseeding support and documentation"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
+#| "2012-03-11"
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 "Nuevas características en Debian Edu 6.0.4+r0 nombre código \"Squeeze\" "
 "publicado el 11-03-2012"
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 dda35f7..c8e2b93 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: 2014-05-29 19:55+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\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"
@@ -6975,10 +6975,10 @@ msgid ""
 "address or IP address like this: <computeroutput>[192.168.0.10]</"
 "computeroutput>."
 msgstr ""
-"Les valeurs par défaut sont définies dans la section <computeroutput>"
-"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
-"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
-"computeroutput>."
+"Les valeurs par défaut sont définies dans la section "
+"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
+"indiquez son adresse MAC ou son adresse IP de cette manière : "
+"<computeroutput>[192.168.0.10]</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -10000,8 +10000,14 @@ msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr "Manuel de Debian Edu 7.1+edu0 nom de code « Wheezy »"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:"
+#| "holger at layer-acht.org\">holger at layer-acht.org</ulink> > and others, "
+#| "see the <link linkend=\"CopyRight\">Copyright chapter</link> for the full "
+#| "list of copyright owners."
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
@@ -10904,8 +10910,12 @@ msgstr ""
 "amélioration de la prise en charge du préamorçage et de la documentation"
 
 #. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
+#| "2012-03-11"
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 "Nouvelles fonctionnalités de Debian Edu 6.0.4+r0 « Squeeze », publiée le "
 "11 mars 2012"
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 a339e26..b00ca88 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: 2014-05-29 19:55+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\n"
 "PO-Revision-Date: 2014-06-26 19:17+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1472,12 +1472,10 @@ msgstr ""
 "USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Source DVD"
 msgid "Source image"
 msgstr "Immagine sorgente"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "The source DVD is available via"
 msgid "The source image is available via"
 msgstr "L'immagine sorgente è disponibile da"
 
@@ -2183,12 +2181,6 @@ msgid "A note on thin-client-server installations"
 msgstr "Nota sull'installazione dei thin-client-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 "
@@ -2741,11 +2733,6 @@ msgid "Minimum steps to get started"
 msgstr "I passi essenziali per iniziare"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "During installation of the main server a first user account was created. "
-#| "In the following text this account will be referenced as \"first user\". "
-#| "The first user can use <computeroutput>sudo</computeroutput> to become "
-#| "root."
 msgid ""
 "During installation of the main server a first user account was created. In "
 "the following text this account will be referenced as \"first user\". This "
@@ -3908,9 +3895,6 @@ msgid "Updating the software"
 msgstr "Aggiornare il software"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This section explains how to use <computeroutput>aptitude upgrade</"
-#| "computeroutput>."
 msgid ""
 "This section explains how to use <computeroutput>apt-get upgrade</"
 "computeroutput>."
@@ -3992,12 +3976,6 @@ msgstr ""
 "che mandino email ad un indirizzo che si legge regolarmente."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
-#| "email about any packages that can be upgraded. It does not install these "
-#| "upgrades, but does download them (usually in the night), so you don't "
-#| "have to wait for the download when you do <computeroutput>aptitude "
-#| "upgrade</computeroutput>."
 msgid ""
 "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
 "email about any packages that can be upgraded. It does not install these "
@@ -4012,10 +3990,6 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Automatic installation of updates can be done easily if desired, it just "
-#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
-#| "be installed."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
@@ -4045,16 +4019,6 @@ msgid "Keep yourself informed about security updates"
 msgstr "Tenersi informati sugli aggiornamenti di sicurezza "
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Running <computeroutput>cron-apt</computeroutput> as described above is a "
-#| "good way to learn when security updates are available for installed "
-#| "packages.  Another way to stay informed about security updates is to "
-#| "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
-#| "announce/\">Debian security-announce mailinglist</ulink>, which has the "
-#| "benefit of also telling you what the security update is about. The "
-#| "downside (compared to <computeroutput>cron-apt</computeroutput>) is that "
-#| "it also includes information about updates for packages which aren't "
-#| "installed."
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
@@ -4531,12 +4495,6 @@ msgid "General notes on upgrading"
 msgstr "Indicazioni generali sull'aggiornamento"
 
 #. 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 "
@@ -6351,9 +6309,6 @@ msgstr ""
 "workstation senza disco."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The following steps can be used to get back the behaviour from Debian Edu "
-#| "Squeeze:"
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
 "Squeeze, using automount, NFS and a display manager other than ldm:"
@@ -6601,9 +6556,6 @@ msgstr ""
 "dat.local</computeroutput> con i propri valori aggiuntivi per debconf."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "More information about network clients can be found in the <link linkend="
-#| "\"NetworkClients\">Network clients HowTo</link> chapter."
 msgid ""
 "More information about modifying PXE installations can be found in the <link "
 "linkend=\"Installation--Modifying_PXE_installations\">Installation</link> "
@@ -6893,8 +6845,8 @@ msgid ""
 msgstr ""
 "I valori predefiniti sono definiti in <computeroutput>[default]</"
 "computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
-"</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: "
+"<computeroutput>[192.168.0.10]</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7399,9 +7351,6 @@ msgstr ""
 "Skolelinux)."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If for some reason XDMCP is accessible on your server which runs KDM, add "
-#| "the following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgid ""
 "If XDMCP is not accessible on your server which runs KDM, add the following "
 "to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
@@ -8515,14 +8464,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 "
@@ -8563,10 +8504,6 @@ msgid "Teaching Prolog"
 msgstr "Insegnare Prolog"
 
 #. 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, "
@@ -8581,14 +8518,6 @@ msgid "Monitoring pupils"
 msgstr "Monitorare gli allievi"
 
 #. 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."
@@ -8620,11 +8549,6 @@ msgid "Restricting pupils' network access"
 msgstr "Limitare agli allievi l'accesso alla rete"
 
 #. 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/"
@@ -9504,11 +9428,6 @@ msgstr ""
 "divertimento!"
 
 #. 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>! "
@@ -9564,10 +9483,6 @@ msgstr ""
 "successiva."
 
 #. 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 GPL v2 or any "
-#| "later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
 "2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) and "
@@ -9754,7 +9669,7 @@ msgstr ""
 "lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
 
 #.  <remark>
-#. status ignore</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 "
@@ -9806,8 +9721,14 @@ msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr "Manuale per Debian Edu 7.1+edu0 nome in codice Wheezy"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:"
+#| "holger at layer-acht.org\">holger at layer-acht.org</ulink> > and others, "
+#| "see the <link linkend=\"CopyRight\">Copyright chapter</link> for the full "
+#| "list of copyright owners."
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
@@ -10695,8 +10616,12 @@ msgid "Improve preseeding support and documentation"
 msgstr "Migliorato il supporto e la documentazione per la preconfigurazione"
 
 #. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
+#| "2012-03-11"
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 "Nuove caratteristiche in Debian Edu 6.0.4+r0 nome in codice \"Squeeze\" "
 "rilasciata il 11-03-2012"
@@ -16169,13 +16094,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
@@ -16187,8 +16112,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -16196,8 +16121,8 @@ msgstr ""
 #~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -16214,8 +16139,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -16223,8 +16148,8 @@ msgstr ""
 #~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
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 27387f0..56f545e 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2014-05-29 19:55+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\n"
 "PO-Revision-Date: 2014-06-15 16:48+0200\n"
 "Last-Translator: Ole-Erik Yrvin <oeyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -784,10 +784,10 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
 "Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
@@ -2646,29 +2646,29 @@ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 #, fuzzy
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-"edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"lwat-]edituser_squeeze.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-"edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"lwat-]edituser_squeeze.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -2733,43 +2733,43 @@ msgstr ""
 #, fuzzy
 msgid "./images/13-Install+the+base+system.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "13-Install the base system.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/14-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "14-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/17-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "17-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -2800,29 +2800,29 @@ msgstr ""
 #, fuzzy
 msgid "./images/20-Finish_the_Installation.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "20-Finish_the_Installation.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
@@ -3609,8 +3609,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/gosa_systems_list.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² systems listing"
@@ -3620,8 +3620,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/gosa_systems_host_details.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Host details"
@@ -3642,8 +3642,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Add netgroup"
@@ -6417,10 +6417,10 @@ msgid ""
 "boots from a diskette or directly from the server using network-PROM (or "
 "PXE) without using a local client hard drive."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. "
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -6807,8 +6807,9 @@ msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
 "network, when tjener is not a combined server, follow these steps:"
 msgstr ""
-"Å la ltspserver00 betjene diskløse arbeidsstasjoner på hovednettverket"
-"(10.0.0.0 /8), når tjener ikke er en kombinert server, gjør du følgende:"
+"Å la ltspserver00 betjene diskløse arbeidsstasjoner på "
+"hovednettverket(10.0.0.0 /8), når tjener ikke er en kombinert server, gjør "
+"du følgende:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
@@ -8551,8 +8552,8 @@ msgid ""
 "(\"this computer\")"
 msgstr ""
 "Etter omstart, når du har logget inn første gang, klikk på \"Alternativer>> "
-"\"-knappen og velg domenet SKOLELINUX i stedet for det lokale domenet"
-"(\"denne datamaskinen\")"
+"\"-knappen og velg domenet SKOLELINUX i stedet for det lokale "
+"domenet(\"denne datamaskinen\")"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -10031,7 +10032,7 @@ msgstr "Utgivelsesmanual for Debian Edu 7.1+edu0 kodenavn Wheezy"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
@@ -10940,7 +10941,7 @@ msgstr ""
 #. type: Content of: <article><section><section><title>
 #, fuzzy
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 "Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Lenny - utgitt  08.02.2010"
 
@@ -12130,8 +12131,8 @@ msgstr ""
 #, fuzzy
 #~ msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 #~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-#~ "started.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "getting-]started.png\"/></imageobject>"
 
 #, fuzzy
 #~ msgid "FIXME: add wheezy kde desktop screenshot here"
@@ -12154,8 +12155,8 @@ msgstr ""
 #, fuzzy
 #~ msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
 #~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-#~ "edituser_squeeze.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "lwat-]edituser_squeeze.png\"/></imageobject>"
 
 #, fuzzy
 #~| msgid "Set passwords"
@@ -13418,8 +13419,8 @@ msgstr ""
 #~ "workstation server(s):"
 #~ msgstr ""
 #~ "Forutsatt at de diskløse arbeidsstasjonene kjører <computeroutput>i386</"
-#~ "computeroutput>, må følgende kommandoer utføres på arbeidsstasjonstjener"
-#~ "(ne):"
+#~ "computeroutput>, må følgende kommandoer utføres på "
+#~ "arbeidsstasjonstjener(ne):"
 
 #~ msgid ""
 #~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
@@ -15746,13 +15747,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
@@ -15764,8 +15765,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15773,8 +15774,8 @@ msgstr ""
 #~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15790,8 +15791,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15799,8 +15800,8 @@ msgstr ""
 #~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
index 606b9fb..6b9acde 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-05-29 19:55+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\n"
 "PO-Revision-Date: 2014-08-08 17:24+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -780,9 +780,9 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Een thin-clientopstelling laat toe om eenvoudige PC's te gebruiken als (X-)"
-"terminals. Dit houdt in dat de machine wordt opgestart met een diskette of "
-"rechtstreeks vanaf de server met behulp van netwerk-PROM (of PXE) zonder "
+"Een thin-clientopstelling laat toe om eenvoudige PC's te gebruiken als "
+"(X-)terminals. Dit houdt in dat de machine wordt opgestart met een diskette "
+"of rechtstreeks vanaf de server met behulp van netwerk-PROM (of PXE) zonder "
 "gebruik te maken van de lokale harde schijf. Het thin-clientsysteem dat "
 "Skolelinux gebruikt, is dat van het Linux Terminal Server Project (LTSP)."
 
@@ -1135,10 +1135,10 @@ msgid ""
 msgstr ""
 "De vereisten inzake beschikbare opslagruimte zijn afhankelijk van de "
 "gebruikte profielen, maar elke schijf groter dan 25 GB zou moeten volstaan "
-"voor een werkstation of een installatie op een zelfstandige computer, 30 GB voor een thin-"
-"clientserver en tenminste 40 GB voor de hoofdserver. Zoals gewoonlijk met "
-"betrekking tot opslagruimte op een hoofdserver, geldt ook hier \"hoe meer, "
-"hoe beter\"."
+"voor een werkstation of een installatie op een zelfstandige computer, 30 GB "
+"voor een thin-clientserver en tenminste 40 GB voor de hoofdserver. Zoals "
+"gewoonlijk met betrekking tot opslagruimte op een hoofdserver, geldt ook "
+"hier \"hoe meer, hoe beter\"."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6773,9 +6773,6 @@ msgstr ""
 "voor debconf."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "More information about network clients can be found in the <link linkend="
-#| "\"NetworkClients\">Network clients HowTo</link> chapter."
 msgid ""
 "More information about modifying PXE installations can be found in the <link "
 "linkend=\"Installation--Modifying_PXE_installations\">Installation</link> "
@@ -9807,10 +9804,6 @@ msgstr ""
 "licentie GPL v2 of enige latere versie."
 
 #. 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 GPL v2 or any "
-#| "later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
 "2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) and "
@@ -10007,7 +10000,7 @@ msgstr ""
 "over hoe u vertalingen moet bijwerken."
 
 #.  <remark>
-#. status ignore</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 "
@@ -10059,8 +10052,14 @@ msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr "Handleiding voor Debian Edu 7.1+edu0 codenaam Wheezy"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:"
+#| "holger at layer-acht.org\">holger at layer-acht.org</ulink> > and others, "
+#| "see the <link linkend=\"CopyRight\">Copyright chapter</link> for the full "
+#| "list of copyright owners."
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
@@ -10961,8 +10960,12 @@ msgstr ""
 "voorgeprogrammeerde configuratieopties"
 
 #. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
+#| "2012-03-11"
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 "Nieuwe functionaliteit in Debian Edu 6.0.4+r0 codenaam \"Squeeze\" "
 "uitgegeven op 11-03-2012"
@@ -10993,8 +10996,8 @@ msgstr ""
 "Als gebruikers zich voor de eerste keer aanmelden, krijgen ze nu een "
 "welkomstscherm. De standaard openingspagina voor Iceweasel wordt opgehaald "
 "bij LDAP tijdens de installatie en, als het netwerkprofielen betreft, bij "
-"het opstarten van de computer. Voor installaties op een zelfstandige computer is ze ingesteld "
-"op <ulink url=\"http://www.skolelinux.org/\"/>."
+"het opstarten van de computer. Voor installaties op een zelfstandige "
+"computer is ze ingesteld op <ulink url=\"http://www.skolelinux.org/\"/>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -11124,8 +11127,9 @@ msgid ""
 "Simplify partitioning for Standalone installs to only have a separate /home/ "
 "but no seperate /usr anymore."
 msgstr ""
-"Een vereenvoudigde schijfindeling voor installaties op een zelfstandige computer. Enkel /home/ "
-"wordt nog op een aparte partitie geïnstalleerd en /usr niet meer."
+"Een vereenvoudigde schijfindeling voor installaties op een zelfstandige "
+"computer. Enkel /home/ wordt nog op een aparte partitie geïnstalleerd en /"
+"usr niet meer."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 2034726..d4be1f0 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-05-29 19:55+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\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"
@@ -7134,7 +7134,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
@@ -7785,7 +7785,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
+"New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index e381392..78c09bb 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -38,6 +38,7 @@
 </section>
 </section>
 
+
 <section id="Architecture">
 <title>Architecture
 </title>
@@ -84,7 +85,7 @@
 <para>To ensure security all connections where passwords are transmitted over the network are encrypted, so no passwords are sent over the network as plain text. 
 </para>
 <para>Below is a table of the services that are set up by default in a Skolelinux network and the DNS name of each service. If possible all configuration files will refer to the service by name (without the domain name) thus making it easy for schools to change either their domain (if they have an own DNS domain) or the IP addresses they use. 
-</para><informaltable><tgroup cols="3"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><tbody><row rowsep="1"><entry align="center" colsep="1" namest="col_0" rowsep="1" nameend="col_2">
+</para><informaltable><tgroup cols="3"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><tbody><row rowsep="1"><entry align="center" colsep="1" nameend="col_2" namest="col_0" rowsep="1">
 <para><emphasis role="strong"> Table of services</emphasis>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
 <para> <emphasis role="strong">Service description</emphasis> 
@@ -292,6 +293,7 @@
 </section>
 </section>
 
+
 <section id="Requirements">
 <title>Requirements
 </title>
@@ -407,6 +409,7 @@
 </section>
 </section>
 
+
 <section id="Installation">
 <title>Installation and download options
 </title>
@@ -422,7 +425,7 @@
 </para>
 </section>
 
-<section id="Installation--Download_the_installation_media_for_Debian_Edu_7.1.2B-edu0_Codename_.22Wheezy.22">
+<section id="Installation--Download_the_installation_media_for_Debian_Edu_7.1.2B-edu0_Codename_.26quot.3BWheezy.26quot.3B">
 <title>Download the installation media for Debian Edu 7.1+edu0 Codename "Wheezy"
 </title>
 
@@ -821,6 +824,7 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 </section>
 </section>
 
+
 <section id="GettingStarted">
 <title>Getting started
 </title>
@@ -1205,6 +1209,7 @@ enter password: ]]></screen>
 </para>
 </section>
 
+
 <section id="Maintenance">
 <title>Maintenance
 </title>
@@ -1358,6 +1363,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 </section>
 </section>
 
+
 <section id="Upgrades">
 <title>Upgrades
 </title>
@@ -1433,6 +1439,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 </section>
 </section>
 
+
 <section id="HowTo">
 <title>HowTo
 </title>
@@ -1460,6 +1467,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 </para></listitem></itemizedlist>
 </section>
 
+
 <section id="Administration">
 <title>HowTos for general administration
 </title>
@@ -1730,6 +1738,7 @@ apt-get upgrade]]></screen>
 </section>
 </section>
 
+
 <section id="AdvancedAdministration">
 <title>Advanced administration
 </title>
@@ -1903,6 +1912,7 @@ apt-get upgrade]]></screen>
 </section>
 </section>
 
+
 <section id="Desktop">
 <title>HowTos for the desktop
 </title>
@@ -1919,7 +1929,7 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"]]></screen>
 </para>
 </section>
 
-<section id="Desktop--Using_KDE_.22Plasma.22.2C_GNOME_and_LXDE_together">
+<section id="Desktop--Using_KDE_.26quot.3BPlasma.26quot.3B.2C_GNOME_and_LXDE_together">
 <title>Using KDE "Plasma", GNOME and LXDE together
 </title>
 <para>If you want to use GNOME or LXDE instead of KDE "Plasma", follow the <link linkend="Installation--The_installation_process">installation instructions</link>. 
@@ -1968,6 +1978,7 @@ apt-get update]]></screen>
 </section>
 </section>
 
+
 <section id="NetworkClients">
 <title>HowTos for networked clients
 </title>
@@ -2559,6 +2570,7 @@ logon home = ""]]></screen>
 </section>
 </section>
 
+
 <section id="Samba">
 <title>Samba in Debian Edu
 </title>
@@ -2719,6 +2731,7 @@ logon home = ""]]></screen>
 </section>
 </section>
 
+
 <section id="TeachAndLearn">
 <title>HowTos for teaching and learning
 </title>
@@ -2823,6 +2836,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 </section>
 </section>
 
+
 <section id="Users">
 <title>HowTos for users
 </title>
@@ -2887,6 +2901,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 </section>
 </section>
 
+
 <section id="Contribute">
 <title>Contribute
 </title>
@@ -2935,6 +2950,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </section>
 </section>
 
+
 <section id="Support">
 <title>Support
 </title>
@@ -3015,6 +3031,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </section>
 </section>
 
+
 <section id="Features">
 <title>New features in Debian Edu Wheezy
 </title>
@@ -3153,6 +3170,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </section>
 </section>
 
+
 <section id="CopyRight">
 <title>Copyright and authors
 </title>
@@ -3181,6 +3199,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </para>
 </section>
 
+
 <section id="Translations">
 <title>Translations of this document
 </title>
@@ -3227,14 +3246,15 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 </section>
 
+
 <section id="AppendixA">
 <title>Appendix A - The GNU General Public License
 </title><screen><![CDATA[Note to translators: there is no need to translate the GPL license text. ]]></screen>
 
-<section id="AppendixA--Manual_for_Debian_Edu_7.1.2B-edu0_Codename_.22Wheezy.22">
+<section id="AppendixA--Manual_for_Debian_Edu_7.1.2B-edu0_Codename_.26quot.3BWheezy.26quot.3B">
 <title>Manual for Debian Edu 7.1+edu0 Codename "Wheezy"
 </title>
-<para>Copyright (C) 2007-2013 Holger Levsen < <ulink url="mailto:holger at layer-acht.org">holger at layer-acht.org</ulink> > and others, see the <link linkend="CopyRight">Copyright chapter</link> for the full list of copyright owners. 
+<para>Copyright (C) 2007-2014 Holger Levsen < <ulink url="mailto:holger at layer-acht.org">holger at layer-acht.org</ulink> > and others, see the <link linkend="CopyRight">Copyright chapter</link> for the full list of copyright owners. 
 </para>
 <para>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. 
 </para>
@@ -3325,6 +3345,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 </section>
 
+
 <section id="AppendixB">
 <title>Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet
 </title>
@@ -3429,11 +3450,12 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 </section>
 
+
 <section id="AppendixC">
 <title>Appendix C - Features in older releases
 </title>
 
-<section id="AppendixC--Changes_for_Debian_Edu_6.0.7.2B-r1_Codename_.22Squeeze.22_released_2013-03-03">
+<section id="AppendixC--Changes_for_Debian_Edu_6.0.7.2B-r1_Codename_.26quot.3BSqueeze.26quot.3B_released_2013-03-03">
 <title>Changes for Debian Edu 6.0.7+r1 Codename "Squeeze" released 2013-03-03
 </title>
 <itemizedlist>
@@ -3514,8 +3536,8 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </para></listitem></itemizedlist></listitem></itemizedlist>
 </section>
 
-<section id="AppendixC--New_features_for_Debian_Edu_6.0.4.2B-r0_Codename_.22Squeeze.22_released_2012-03-11">
-<title>New features for Debian Edu 6.0.4+r0 Codename "Squeeze" released 2012-03-11
+<section id="AppendixC--New_features_in_Debian_Edu_6.0.4.2B-r0_Codename_.26quot.3BSqueeze.26quot.3B_released_2012-03-11">
+<title>New features in Debian Edu 6.0.4+r0 Codename "Squeeze" released 2012-03-11
 </title>
 
 <section id="AppendixC--User_visible_changes">
@@ -3845,7 +3867,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 </section>
 
-<section id="AppendixC--New_in_Debian_Edu_5.0.6.2B-edu1_Codename_.22Lenny.22_released_2010-10-05">
+<section id="AppendixC--New_in_Debian_Edu_5.0.6.2B-edu1_Codename_.26quot.3BLenny.26quot.3B_released_2010-10-05">
 <title>New in Debian Edu 5.0.6+edu1 Codename "Lenny" released 2010-10-05
 </title>
 <itemizedlist>
@@ -3872,7 +3894,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </para></listitem></itemizedlist>
 </section>
 
-<section id="AppendixC--New_features_in_Debian_Edu_5.0.4.2B-edu0_Codename_.22Lenny.22_released_2010-02-08">
+<section id="AppendixC--New_features_in_Debian_Edu_5.0.4.2B-edu0_Codename_.26quot.3BLenny.26quot.3B_released_2010-02-08">
 <title>New features in Debian Edu 5.0.4+edu0 Codename "Lenny" released 2010-02-08
 </title>
 <itemizedlist>
@@ -3962,7 +3984,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </para></listitem></itemizedlist>
 </section>
 
-<section id="AppendixC--New_features_in_the_.223.0r1_Terra.22_release_2007-12-05">
+<section id="AppendixC--New_features_in_the_.26quot.3B3.0r1_Terra.26quot.3B_release_2007-12-05">
 <title>New features in the "3.0r1 Terra" release 2007-12-05
 </title>
 <itemizedlist>
@@ -3974,7 +3996,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </para></listitem></itemizedlist>
 </section>
 
-<section id="AppendixC--New_features_in_the_.223.0r0_Terra.22_release_2007-07-22">
+<section id="AppendixC--New_features_in_the_.26quot.3B3.0r0_Terra.26quot.3B_release_2007-07-22">
 <title>New features in the "3.0r0 Terra" release 2007-07-22
 </title>
 <itemizedlist>
@@ -4066,7 +4088,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </para></listitem></itemizedlist>
 </section>
 
-<section id="AppendixC--Features_in_.221.0_Venus.22_release_2004-06-20">
+<section id="AppendixC--Features_in_.26quot.3B1.0_Venus.26quot.3B_release_2004-06-20">
 <title>Features in "1.0 Venus" release 2004-06-20
 </title>
 <itemizedlist>
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index d5626e6..11d572f 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 6376f93..1c67acd 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 b69d358..e624cb5 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 ec1d0c8..661a55a 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/rosegarden-manual.es.po b/documentation/rosegarden/rosegarden-manual.es.po
index d573baa..4faa1a6 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: 2014-06-18 16:09+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\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"
@@ -3041,6 +3041,12 @@ msgid ""
 "v2 or any later version."
 msgstr ""
 
+#. type: Content of: <article><section><para>
+msgid ""
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+"released under the GPL v2 or any later version."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
 msgstr ""
diff --git a/documentation/rosegarden/rosegarden-manual.fr.po b/documentation/rosegarden/rosegarden-manual.fr.po
index 995e5cd..f31cc37 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: 2014-06-18 16:09+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\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"
@@ -3394,6 +3394,20 @@ msgstr ""
 "Bonvalle (2009), Thomas Vincent (2012) et l'équipe française de localisation "
 "(2012), 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 Dutch translation is copyrighted by Frans Spiesschaert (2014) 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 "
+"(2012), est distribuée sous GPL2 ou toute version ultérieure."
+
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
 msgstr "Traductions de ce document"
diff --git a/documentation/rosegarden/rosegarden-manual.nb.po b/documentation/rosegarden/rosegarden-manual.nb.po
index 4f34a91..17cd968 100644
--- a/documentation/rosegarden/rosegarden-manual.nb.po
+++ b/documentation/rosegarden/rosegarden-manual.nb.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rosegarden-manual.nb\n"
-"POT-Creation-Date: 2014-06-18 16:09+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\n"
 "PO-Revision-Date: 2014-06-17 15:19+0200\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-no at lister.ping.uio.no>\n"
@@ -3454,6 +3454,20 @@ msgid ""
 "v2 or any later version."
 msgstr ""
 
+#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "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!"
+msgid ""
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+"released under the GPL v2 or any later version."
+msgstr ""
+"Dette dokumentet er skrevet av og opphavsretten innehas av Alf Tonny Bätz "
+"(2008, 2009), og Holger Levsen (2008), og er gitt ut med lisensen GPL2 eller "
+"en senere versjon. Nyt det!"
+
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
 msgstr "Oversettelser av dette dokumentet"
diff --git a/documentation/rosegarden/rosegarden-manual.nl.po b/documentation/rosegarden/rosegarden-manual.nl.po
index 9bf9b34..42dfa5b 100644
--- a/documentation/rosegarden/rosegarden-manual.nl.po
+++ b/documentation/rosegarden/rosegarden-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-05-11 00:08+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\n"
 "PO-Revision-Date: 2014-08-06 23:46+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -168,8 +168,8 @@ msgid ""
 "same device, but of course this device is more expensive than um-1ex."
 msgstr ""
 "Dit apparaat heeft ook een MIDI-interface, zodat u met één apparaat over "
-"alle mogelijkheden beschikt. Maar dit apparaat is uiteraard duurder dan "
-"een UM-1EX."
+"alle mogelijkheden beschikt. Maar dit apparaat is uiteraard duurder dan een "
+"UM-1EX."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -3414,9 +3414,14 @@ msgid "Translation copyright and authors"
 msgstr "Vertalers en auteursrechten van de vertalingen"
 
 #. 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 GPL v2 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 GPL v2 or any later version."
+"The Bokmål translation is copyrighted by Alf Tonny Bätz (2008), Tore Skogly "
+"(2008) and Petter Reinholdtsen (2014) and is released under the GPL v2 or "
+"any later version."
 msgstr ""
 "De auteurs, bij wie ook de auteursrechten berusten, van de vertaling naar "
 "het Noorse Bokmål zijn Alf Tonny Bätz (2008) en Tore Skogly (2008). De "
@@ -3434,6 +3439,20 @@ msgstr ""
 "lokalisatieteam (2012).. De vertaling is uitgebracht onder de GPL-licentie "
 "versie 2 of enige latere versie."
 
+#. 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 GPL v2 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."
+msgstr ""
+"De auteurs, bij wie ook de auteursrechten berusten, van de vertaling naar "
+"het Noorse Bokmål zijn Alf Tonny Bätz (2008) en Tore Skogly (2008). De "
+"vertaling is uitgebracht onder de GPL-licentie versie 2 of enige latere "
+"versie."
+
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
 msgstr "Vertalingen van dit document"
@@ -3451,12 +3470,20 @@ msgid "HowTo translate this document"
 msgstr "Hoe kunt u dit document vertalen"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"Translations of this document are kept in PO files like in many free "
-"software projects, read <computeroutput>usr/share/doc/debian-edu-doc-en/"
-"README.rosegarden-manual-translations</computeroutput> for more information "
-"on this. Please read also read this, if you want to start/help translating "
-"this document."
+#, fuzzy
+#| msgid ""
+#| "Translations of this document are kept in PO files like in many free "
+#| "software projects, read <computeroutput>usr/share/doc/debian-edu-doc-en/"
+#| "README.rosegarden-manual-translations</computeroutput> for more "
+#| "information on this. Please read also read this, if you want to start/"
+#| "help translating this document."
+msgid ""
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
+"<computeroutput>usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-"
+"translations</computeroutput> for more information on this. The Git "
+"repository (see below) contains this file too. Take a look there if you want "
+"to help translating this document."
 msgstr ""
 "Zoals het geval is bij veel projecten van vrije software, worden vertalingen "
 "van dit document bijgehouden in PO-bestanden. Raadpleeg <computeroutput>usr/"
@@ -3466,12 +3493,19 @@ msgstr ""
 "document."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To commit your translations you need to be a member of the Alioth project "
+#| "<computeroutput>debian-edu</computeroutput>. To translate, you just need "
+#| "to check out some files from from Subversion (which can be done "
+#| "anonymously), create patches and send those to <ulink url=\"mailto:debian-"
+#| "edu-doc at packages.qa.debian.org\">debian-edu-doc at packages.qa.debian.org</"
+#| "ulink>."
 msgid ""
 "To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. To translate, you just need to "
-"check out some files from from Subversion (which can be done anonymously), "
-"create patches and send those to <ulink url=\"mailto:debian-edu-doc at packages."
-"qa.debian.org\">debian-edu-doc at packages.qa.debian.org</ulink>."
+"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
+"from your local one, create or edit <computeroutput>~/.ssh/config</"
+"computeroutput>. There should be an entry like:"
 msgstr ""
 "Om uw vertalingen te kunnen vastleggen moet u lid zijn van het Alioth-"
 "project <computeroutput>debian-edu</computeroutput>. Om te kunnen beginnen "
@@ -3481,12 +3515,41 @@ msgstr ""
 "url=\"mailto:debian-edu-doc at packages.qa.debian.org\">debian-edu-doc at packages."
 "qa.debian.org</ulink>."
 
+#. type: CDATA
+#, no-wrap
+msgid ""
+"Host git.debian.org\n"
+"User <your-alioth-username>"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
+"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+"debian-edu/debian-edu-doc.git</computeroutput>"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
-"You can checkout the <computeroutput>debian-edu-doc</computeroutput> source "
+"If you only want to translate, you just need to check out some files from "
+"from Git (which can be done anonymously) and create patches. Please file a "
+"bug against the debian-edu-doc package and attach the PO file to the <ulink "
+"url=\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can "
+"find some <ulink url=\"http://bugs.debian.org\">instructions on how to "
+"submit bugs</ulink> here."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "You can checkout the <computeroutput>debian-edu-doc</computeroutput> "
+#| "source anonymously with the following command (you need to have the "
+#| "<computeroutput>subversion</computeroutput> package installed for this to "
+#| "work):"
+msgid ""
+"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
 "anonymously with the following command (you need to have the "
-"<computeroutput>subversion</computeroutput> package installed for this to "
-"work):"
+"<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 "U kunt anoniem de broncode van het pakket <computeroutput>debian-edu-doc</"
 "computeroutput> ophalen met het hierna vermelde commando. Opdat dit zou "
@@ -3494,18 +3557,28 @@ msgstr ""
 "computeroutput> installeren."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/"
+#| "debian-edu-doc</computeroutput>"
 msgid ""
-"<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
-"edu-doc</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
 "<computeroutput>svn co svn://svn.debian.org/svn/debian-edu/trunk/src/debian-"
 "edu-doc</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"Then edit the <computeroutput>documentation/rosegarden/rosegarden-manual.$CC."
-"po</computeroutput> (where you replace $CC with your language code). There "
-"are many tools for translating available, we suggest to use "
+#, fuzzy
+#| msgid ""
+#| "Then edit the <computeroutput>documentation/rosegarden/rosegarden-manual."
+#| "$CC.po</computeroutput> (where you replace $CC with your language code). "
+#| "There are many tools for translating available, we suggest to use "
+#| "<computeroutput>lokalize</computeroutput>."
+msgid ""
+"Then edit the file <computeroutput>documentation/rosegarden/rosegarden-"
+"manual.$CC.po</computeroutput> (replacing $CC with your language code). "
+"There are many tools for translating available; we suggest using "
 "<computeroutput>lokalize</computeroutput>."
 msgstr ""
 "Begin dan uw vertaling te maken in het bestand <computeroutput>documentation/"
@@ -3515,9 +3588,13 @@ msgstr ""
 "<computeroutput>lokalize</computeroutput> aan."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Then you either commit the file directly to Subversion (if you have the "
+#| "rights to do so) or send the file to the mailinglist."
 msgid ""
-"Then you either commit the file directly to Subversion (if you have the "
-"rights to do so) or send the file to the mailinglist."
+"Then you either commit the file directly to Git (if you have the rights to "
+"do so) or send the file to the bugreport."
 msgstr ""
 "Nadat u klaar bent met vertalen kunt u het bestand onmiddellijk vastleggen "
 "in Subversion (indien u over de rechten beschikt om dit te doen) of u kunt "
@@ -3532,17 +3609,25 @@ msgstr ""
 "commando binnenin de map <computeroutput>debian-edu-doc</computeroutput>:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<computeroutput>svn up</computeroutput>"
+#, fuzzy
+#| msgid "<computeroutput>svn up</computeroutput>"
+msgid "<computeroutput>git pull</computeroutput>"
 msgstr "<computeroutput>svn up</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Read /usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-"
+#| "translations to find information how to create a new PO file for your "
+#| "language if there is none yet, and how to update translations. If you are "
+#| "new to Subversion, look at the <ulink url=\"http://svnbook.org\">Version "
+#| "Control with Subversion</ulink>, it has a chapter on the <ulink url="
+#| "\"http://svnbook.red-bean.com/en/1.0/ch03s05.html\">basic workflow with "
+#| "Subversion</ulink>."
 msgid ""
 "Read /usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-translations "
 "to find information how to create a new PO file for your language if there "
-"is none yet, and how to update translations. If you are new to Subversion, "
-"look at the <ulink url=\"http://svnbook.org\">Version Control with "
-"Subversion</ulink>, it has a chapter on the <ulink url=\"http://svnbook.red-"
-"bean.com/en/1.0/ch03s05.html\">basic workflow with Subversion</ulink>."
+"isn't one yet, and how to update translations."
 msgstr ""
 "Raadpleeg /usr/share/doc/debian-edu-doc-en/README.rosegarden-manual-"
 "translations voor meer informatie over hoe u een nieuw PO-bestand voor uw "
@@ -3552,6 +3637,30 @@ msgstr ""
 "ulink> lezen. Er staat een hoofdstuk in over de <ulink url=\"http://svnbook."
 "red-bean.com/en/1.0/ch03s05.html\">basisbewerkingen in Subversion</ulink>."
 
+#.  <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 "
+"translate any string which contains \" FIXME\"."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Basic information about Alioth (the host where our Git repository is "
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid "Please report any problems."
 msgstr "Gelieve ons te signaleren mocht u problemen ervaren."
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 34f83d2..3dee83f 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-06-18 16:09+0300\n"
+"POT-Creation-Date: 2014-09-20 10:15+0200\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"
@@ -2942,6 +2942,12 @@ msgid ""
 "v2 or any later version."
 msgstr ""
 
+#. type: Content of: <article><section><para>
+msgid ""
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+"released under the GPL v2 or any later version."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
 msgstr ""
diff --git a/documentation/rosegarden/rosegarden-manual.xml b/documentation/rosegarden/rosegarden-manual.xml
index f518950..ccff3bd 100644
--- a/documentation/rosegarden/rosegarden-manual.xml
+++ b/documentation/rosegarden/rosegarden-manual.xml
@@ -12,6 +12,7 @@
 </para>
 </section>
 
+
 <section id="Setup">
 <title>Before you start
 </title>
@@ -243,6 +244,7 @@
 </section>
 </section>
 
+
 <section id="Introduction">
 <title>Rosegarden Audio/Midi Sequencer introductions
 </title>
@@ -1044,6 +1046,7 @@
 </section>
 </section>
 
+
 <section id="Segments">
 <title>how to change, edit, improve a recorded midi segment
 </title>
@@ -1091,6 +1094,7 @@
 </section>
 </section>
 
+
 <section id="Notations">
 <title>Note edit
 </title>
@@ -1181,6 +1185,7 @@
 </section>
 </section>
 
+
 <section id="Tempo">
 <title>Rosegarden timer is unstable
 </title>
@@ -1305,6 +1310,7 @@
 </section>
 </section>
 
+
 <section id="SoundCreation">
 <title>Sound creation for your music project
 </title>
@@ -1379,6 +1385,7 @@
 </section>
 </section>
 
+
 <section id="CopyRight">
 <title>Copyright and authors
 </title>
@@ -1395,8 +1402,11 @@
 </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 GPL v2 or any later version. 
 </para>
+<para>The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is released under the GPL v2 or any later version. 
+</para>
 </section>
 
+
 <section id="Translations">
 <title>Translations of this document
 </title>
@@ -1443,6 +1453,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </section>
 </section>
 
+
 <section id="AppendixA">
 <title>Appendix A - The GNU Public License
 </title><screen><![CDATA[Note to translators: there is no need to translate the GPL license text. ]]></screen>

-- 
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