[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Jessie manual from the wiki.

Holger Levsen holger at moszumanska.debian.org
Sat May 2 12:50:43 UTC 2015


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-doc.

commit bb4983a965982caaa55e73173bd4fe8fc88465da
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 2 14:50:23 2015 +0200

    Update Debian Edu Jessie manual from the wiki.
---
 .../debian-edu-jessie-manual.da.po                 | 118 ++++++++++++--------
 .../debian-edu-jessie-manual.de.po                 | 119 ++++++++++++--------
 .../debian-edu-jessie-manual.es.po                 |  69 +++++-------
 .../debian-edu-jessie-manual.fr.po                 | 118 ++++++++++++--------
 .../debian-edu-jessie-manual.it.po                 | 119 ++++++++++++--------
 .../debian-edu-jessie-manual.nb.po                 | 120 ++++++++++++---------
 .../debian-edu-jessie-manual.nl.po                 | 118 ++++++++++++--------
 .../debian-edu-jessie/debian-edu-jessie-manual.pot |  69 +++++-------
 .../debian-edu-jessie/debian-edu-jessie-manual.xml |  50 ++-------
 9 files changed, 492 insertions(+), 408 deletions(-)

diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index d362442..b0a27d1 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2015-05-02 12:07+0000\n"
+"POT-Creation-Date: 2015-05-02 12:49+0000\n"
 "PO-Revision-Date: 2015-04-21 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -9988,26 +9988,22 @@ msgstr ""
 "spansk."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LDAP related changes"
-msgstr "LDAP-relaterede ændringer"
+msgid "Other changes compared to the previous release"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "TBD"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Andre ændringer"
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Squid"
-msgstr "Squid"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Shutdown and reboot of the main server takes longer due to a new default "
-"setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
-"example the delay could be set to 10 seconds by appending the line "
+#, fuzzy
+#| msgid ""
+#| "Shutdown and reboot of the main server takes longer due to a new default "
+#| "setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As "
+#| "an example the delay could be set to 10 seconds by appending the line "
+#| "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
+#| "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
+msgid ""
+"<emphasis>squid</emphasis>: Shutdown and reboot of the main server takes "
+"longer than before due to a new default setting "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example "
+"the delay could be set to 10 seconds by appending the line "
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
@@ -10017,49 +10013,45 @@ msgstr ""
 "ved at tilføje linjen <computeroutput>shutdown_lifetime 10 seconds</"
 "computeroutput> til <computeroutput>/etc/squid3/squid.conf</computeroutput>."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "SSH"
-msgstr "SSH"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The root user is no longer allowed to login via SSH with password. The "
+#| "default <computeroutput>PermitRootLogin yes</computeroutput> has been "
+#| "replaced with <computeroutput>PermitRootLogin without-password</"
+#| "computeroutput>, so ssh-keys will work."
 msgid ""
-"The root user is no longer allowed to login via SSH with password. The "
-"default <computeroutput>PermitRootLogin yes</computeroutput> has been "
-"replaced with <computeroutput>PermitRootLogin without-password</"
-"computeroutput>, so ssh-keys will work."
+"<emphasis>ssh</emphasis>: The root user is no longer allowed to login via "
+"SSH with password. The old default <computeroutput>PermitRootLogin yes</"
+"computeroutput> has been replaced with <computeroutput>PermitRootLogin "
+"without-password</computeroutput>, so ssh-keys will still work."
 msgstr ""
 "Rootbrugeren kan ikke længere logge ind via SSH med adgangskode. Standarden "
 "<computeroutput>PermitRootLogin yes</computeroutput> er blevet erstattet med "
 "<computeroutput>PermitRootLogin without-password</computeroutput>, så ssh-"
 "keys vil fungere."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Backup (slbackup-php)"
-msgstr "Sikkerhedskopi (slbackup-php)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To be able to use the slbackup-php site (which uses root logins via ssh), "
+#| "<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
+#| "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgid ""
-"To be able to use the slbackup-php site (which uses root logins via ssh), "
-"<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
-"temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+"<emphasis>slbackup-php</emphasis>: To be able to use the slbackup-php site "
+"(which uses root logins via ssh), <computeroutput>PermitRootLogin yes</"
+"computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/"
+"sshd_config</computeroutput>."
 msgstr ""
 "For at kunne se slbackup-php-siden (som bruger rootlogind via ssh), skal "
 "<computeroutput>PermitRootLogin yes</computeroutput> sættes midlertidigt i "
 "<computeroutput>/etc/ssh/sshd_config</computeroutput>."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "gnash (flash player)"
-msgstr "gnash (flashafspiller)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The free flash player <computeroutput>gnash</computeroutput> is not "
-"available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
-"free flash player</link> from Adobe is still possible however."
+"<emphasis>sugar</emphasis>: As the Sugar desktop was removed from Debian "
+"Jessie, it is also not available in Debian Edu jessie."
 msgstr ""
-"Den frie flashafspiller <computeroutput>gnash</computeroutput> er ikke "
-"tilgængelig for Jessie. <link linkend=\"Desktop--Flash\">Installation af den "
-"ikke-frie flashafspiller</link> fra Adobe kan stadig udføres."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
@@ -11313,6 +11305,10 @@ msgstr ""
 "Manualen for Debian Edu Wheezy er fuldt oversat til tysk, fransk, italiensk "
 "og dansk. Delvist oversatte versioner findes for norsk bokmål og spansk."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "LDAP related changes"
+msgstr "LDAP-relaterede ændringer"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
@@ -11323,6 +11319,10 @@ msgstr ""
 "imellem når der tilføjes systemer i GOsa. Nu kan systemer være af typerne "
 "server, arbejdsstation, printer, terminal eller netdevice (netenhed)."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Andre ændringer"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr "Ny Xfce-skrivebordsopgave."
@@ -12699,6 +12699,30 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "TBD"
+#~ msgstr "TBD"
+
+#~ msgid "Squid"
+#~ msgstr "Squid"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Backup (slbackup-php)"
+#~ msgstr "Sikkerhedskopi (slbackup-php)"
+
+#~ msgid "gnash (flash player)"
+#~ msgstr "gnash (flashafspiller)"
+
+#~ msgid ""
+#~ "The free flash player <computeroutput>gnash</computeroutput> is not "
+#~ "available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
+#~ "free flash player</link> from Adobe is still possible however."
+#~ msgstr ""
+#~ "Den frie flashafspiller <computeroutput>gnash</computeroutput> er ikke "
+#~ "tilgængelig for Jessie. <link linkend=\"Desktop--Flash\">Installation af "
+#~ "den ikke-frie flashafspiller</link> fra Adobe kan stadig udføres."
+
 #~ msgid ""
 #~ "Install additional package to make PXE work (Debian bug <ulink url="
 #~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 29c72d8..fbf3fba 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-02 12:07+0000\n"
+"POT-Creation-Date: 2015-05-02 12:49+0000\n"
 "PO-Revision-Date: 2015-05-01 19:10+0200\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -10187,26 +10187,22 @@ msgstr ""
 "Bokmål übersetzt. Eine teilweise übersetzte Version gibt es in Spanisch."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LDAP related changes"
-msgstr "Änderungen mit Bezug auf LDAP"
+msgid "Other changes compared to the previous release"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "Noch zu bearbeiten."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Sonstige Änderungen"
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Squid"
-msgstr "Squid"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Shutdown and reboot of the main server takes longer due to a new default "
-"setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
-"example the delay could be set to 10 seconds by appending the line "
+#, fuzzy
+#| msgid ""
+#| "Shutdown and reboot of the main server takes longer due to a new default "
+#| "setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As "
+#| "an example the delay could be set to 10 seconds by appending the line "
+#| "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
+#| "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
+msgid ""
+"<emphasis>squid</emphasis>: Shutdown and reboot of the main server takes "
+"longer than before due to a new default setting "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example "
+"the delay could be set to 10 seconds by appending the line "
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
@@ -10217,50 +10213,46 @@ msgstr ""
 "computeroutput> an die Datei <computeroutput>/etc/squid3/squid.conf</"
 "computeroutput> angehängt wird."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "SSH"
-msgstr "SSH"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The root user is no longer allowed to login via SSH with password. The "
+#| "default <computeroutput>PermitRootLogin yes</computeroutput> has been "
+#| "replaced with <computeroutput>PermitRootLogin without-password</"
+#| "computeroutput>, so ssh-keys will work."
 msgid ""
-"The root user is no longer allowed to login via SSH with password. The "
-"default <computeroutput>PermitRootLogin yes</computeroutput> has been "
-"replaced with <computeroutput>PermitRootLogin without-password</"
-"computeroutput>, so ssh-keys will work."
+"<emphasis>ssh</emphasis>: The root user is no longer allowed to login via "
+"SSH with password. The old default <computeroutput>PermitRootLogin yes</"
+"computeroutput> has been replaced with <computeroutput>PermitRootLogin "
+"without-password</computeroutput>, so ssh-keys will still work."
 msgstr ""
 "Der Benutzer »root«\" kann sich nicht mehr via SSH mit Passwort anmelden. "
 "Die Voreinstellung <computeroutput>PermitRootLogin yes</computeroutput> "
 "wurde ersetzt durch <computeroutput>PermitRootLogin without-password</"
 "computeroutput>, damit funktionieren ssh-keys."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Backup (slbackup-php)"
-msgstr "Backup (slbackup-php)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To be able to use the slbackup-php site (which uses root logins via ssh), "
+#| "<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
+#| "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgid ""
-"To be able to use the slbackup-php site (which uses root logins via ssh), "
-"<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
-"temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+"<emphasis>slbackup-php</emphasis>: To be able to use the slbackup-php site "
+"(which uses root logins via ssh), <computeroutput>PermitRootLogin yes</"
+"computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/"
+"sshd_config</computeroutput>."
 msgstr ""
 "Um die Webseiten von slbackup-php (die Logins von »root« via ssh erfordern) "
 "benutzen zu können , muss in der Datei <computeroutput>/etc/ssh/sshd_config</"
 "computeroutput> vorübergehend <computeroutput>PermitRootLogin yes</"
 "computeroutput> gesetzt werden."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "gnash (flash player)"
-msgstr "gnash (Flashplayer)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The free flash player <computeroutput>gnash</computeroutput> is not "
-"available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
-"free flash player</link> from Adobe is still possible however."
+"<emphasis>sugar</emphasis>: As the Sugar desktop was removed from Debian "
+"Jessie, it is also not available in Debian Edu jessie."
 msgstr ""
-"Der freie Flashplayer <computeroutput>gnash</computeroutput> ist für Jessie "
-"nicht vorhanden. Es ist aber noch möglich, <link linkend=\"Desktop--Flash"
-"\">den unfreien Flashplayer von Adobe zu installieren</link>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
@@ -11508,6 +11500,10 @@ msgstr ""
 "Französische, Italienische und Dänische übersetzt. Teilweise übersetzte "
 "Versionen gibt es in Norwegisch Bokmål und Spanisch."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "LDAP related changes"
+msgstr "Änderungen mit Bezug auf LDAP"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
@@ -11519,6 +11515,10 @@ msgstr ""
 "Typ Server, Arbeitsplatzrechner, Netzwerkdrucker, Terminal oder "
 "Netzwerkgerät sein. "
 
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Sonstige Änderungen"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr "Neue graphische Arbeitsumgebung Xfce als Option verfügbar."
@@ -12907,3 +12907,28 @@ msgstr ""
 "Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
+
+#~ msgid "TBD"
+#~ msgstr "Noch zu bearbeiten."
+
+#~ msgid "Squid"
+#~ msgstr "Squid"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Backup (slbackup-php)"
+#~ msgstr "Backup (slbackup-php)"
+
+#~ msgid "gnash (flash player)"
+#~ msgstr "gnash (Flashplayer)"
+
+#~ msgid ""
+#~ "The free flash player <computeroutput>gnash</computeroutput> is not "
+#~ "available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
+#~ "free flash player</link> from Adobe is still possible however."
+#~ msgstr ""
+#~ "Der freie Flashplayer <computeroutput>gnash</computeroutput> ist für "
+#~ "Jessie nicht vorhanden. Es ist aber noch möglich, <link linkend="
+#~ "\"Desktop--Flash\">den unfreien Flashplayer von Adobe zu installieren</"
+#~ "link>."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index 6ec7712..3a9679b 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-02 12:07+0000\n"
+"POT-Creation-Date: 2015-05-02 12:49+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -8669,62 +8669,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LDAP related changes"
+msgid "Other changes compared to the previous release"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Squid"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Shutdown and reboot of the main server takes longer due to a new default "
-"setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
-"example the delay could be set to 10 seconds by appending the line "
+"<emphasis>squid</emphasis>: Shutdown and reboot of the main server takes "
+"longer than before due to a new default setting "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example "
+"the delay could be set to 10 seconds by appending the line "
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "SSH"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The root user is no longer allowed to login via SSH with password. The "
-"default <computeroutput>PermitRootLogin yes</computeroutput> has been "
-"replaced with <computeroutput>PermitRootLogin without-password</"
-"computeroutput>, so ssh-keys will work."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Backup (slbackup-php)"
+"<emphasis>ssh</emphasis>: The root user is no longer allowed to login via "
+"SSH with password. The old default <computeroutput>PermitRootLogin yes</"
+"computeroutput> has been replaced with <computeroutput>PermitRootLogin "
+"without-password</computeroutput>, so ssh-keys will still work."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To be able to use the slbackup-php site (which uses root logins via ssh), "
-"<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
-"temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+"<emphasis>slbackup-php</emphasis>: To be able to use the slbackup-php site "
+"(which uses root logins via ssh), <computeroutput>PermitRootLogin yes</"
+"computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/"
+"sshd_config</computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "gnash (flash player)"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The free flash player <computeroutput>gnash</computeroutput> is not "
-"available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
-"free flash player</link> from Adobe is still possible however."
+"<emphasis>sugar</emphasis>: As the Sugar desktop was removed from Debian "
+"Jessie, it is also not available in Debian Edu jessie."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -9627,6 +9604,10 @@ msgid ""
 "Spanish."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><title>
+msgid "LDAP related changes"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
@@ -9634,6 +9615,10 @@ msgid ""
 "printer, terminal or netdevice."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index aa98079..70ba5c7 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-05-02 12:07+0000\n"
+"POT-Creation-Date: 2015-05-02 12:49+0000\n"
 "PO-Revision-Date: 2015-04-21 15:45+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -10313,26 +10313,22 @@ msgstr ""
 "partielle existe en espagnol."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LDAP related changes"
-msgstr "Changements liés à LDAP"
+msgid "Other changes compared to the previous release"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "à déterminer"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Autres changements"
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Squid"
-msgstr "Squid"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Shutdown and reboot of the main server takes longer due to a new default "
-"setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
-"example the delay could be set to 10 seconds by appending the line "
+#, fuzzy
+#| msgid ""
+#| "Shutdown and reboot of the main server takes longer due to a new default "
+#| "setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As "
+#| "an example the delay could be set to 10 seconds by appending the line "
+#| "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
+#| "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
+msgid ""
+"<emphasis>squid</emphasis>: Shutdown and reboot of the main server takes "
+"longer than before due to a new default setting "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example "
+"the delay could be set to 10 seconds by appending the line "
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
@@ -10343,50 +10339,46 @@ msgstr ""
 "10 seconds</computeroutput> à la fin du fichier <computeroutput>/etc/squid3/"
 "squid.conf</computeroutput>."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "SSH"
-msgstr "SSH"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The root user is no longer allowed to login via SSH with password. The "
+#| "default <computeroutput>PermitRootLogin yes</computeroutput> has been "
+#| "replaced with <computeroutput>PermitRootLogin without-password</"
+#| "computeroutput>, so ssh-keys will work."
 msgid ""
-"The root user is no longer allowed to login via SSH with password. The "
-"default <computeroutput>PermitRootLogin yes</computeroutput> has been "
-"replaced with <computeroutput>PermitRootLogin without-password</"
-"computeroutput>, so ssh-keys will work."
+"<emphasis>ssh</emphasis>: The root user is no longer allowed to login via "
+"SSH with password. The old default <computeroutput>PermitRootLogin yes</"
+"computeroutput> has been replaced with <computeroutput>PermitRootLogin "
+"without-password</computeroutput>, so ssh-keys will still work."
 msgstr ""
 "Le superutilisateur n'est plus autorisé à se connecter par SSH avec un mot "
 "de passe. L'option par défaut <computeroutput>PermitRootLogin yes</"
 "computeroutput> a été remplacée par <computeroutput>PermitRootLogin without-"
 "password</computeroutput>, ce qui permet l'utilisation de clés SSH."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Backup (slbackup-php)"
-msgstr "Sauvegarde (slbackup-php)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To be able to use the slbackup-php site (which uses root logins via ssh), "
+#| "<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
+#| "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgid ""
-"To be able to use the slbackup-php site (which uses root logins via ssh), "
-"<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
-"temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+"<emphasis>slbackup-php</emphasis>: To be able to use the slbackup-php site "
+"(which uses root logins via ssh), <computeroutput>PermitRootLogin yes</"
+"computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/"
+"sshd_config</computeroutput>."
 msgstr ""
 "Afin d'utiliser le site de slbackup-php (qui nécessite des connexions par "
 "SSH du superutilisateur), <computeroutput>PermitRootLogin yest</"
 "computeroutput> doit être activé temporairement dans <computeroutput>/etc/"
 "ssh/sshd_config</computeroutput>."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "gnash (flash player)"
-msgstr "gnash (lecteur flash)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The free flash player <computeroutput>gnash</computeroutput> is not "
-"available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
-"free flash player</link> from Adobe is still possible however."
+"<emphasis>sugar</emphasis>: As the Sugar desktop was removed from Debian "
+"Jessie, it is also not available in Debian Edu jessie."
 msgstr ""
-"Le lecteur flash libre <computeroutput>gnash</computeroutput> n'est pas "
-"disponible dans Jessie. <link linkend=\"Desktop--Flash\">Installer le "
-"lecteur flash non libre</link> d'Adobe est cependant toujours possible."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
@@ -11651,6 +11643,10 @@ msgstr ""
 "français, italien et danois. Des traductions partielles existent en espagnol "
 "et norvégien Bokmål."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "LDAP related changes"
+msgstr "Changements liés à LDAP"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
@@ -11662,6 +11658,10 @@ msgstr ""
 "Désormais, les systèmes peuvent être du type serveur, station de travail, "
 "imprimante, terminal ou périphérique réseau."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Autres changements"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr "Nouvelle tâche Xfce."
@@ -13096,6 +13096,30 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid "TBD"
+#~ msgstr "à déterminer"
+
+#~ msgid "Squid"
+#~ msgstr "Squid"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Backup (slbackup-php)"
+#~ msgstr "Sauvegarde (slbackup-php)"
+
+#~ msgid "gnash (flash player)"
+#~ msgstr "gnash (lecteur flash)"
+
+#~ msgid ""
+#~ "The free flash player <computeroutput>gnash</computeroutput> is not "
+#~ "available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
+#~ "free flash player</link> from Adobe is still possible however."
+#~ msgstr ""
+#~ "Le lecteur flash libre <computeroutput>gnash</computeroutput> n'est pas "
+#~ "disponible dans Jessie. <link linkend=\"Desktop--Flash\">Installer le "
+#~ "lecteur flash non libre</link> d'Adobe est cependant toujours possible."
+
 #~ msgid ""
 #~ "Install additional package to make PXE work (Debian bug <ulink url="
 #~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index 3a727ba..5159ce8 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2015-05-02 12:07+0000\n"
+"POT-Creation-Date: 2015-05-02 12:49+0000\n"
 "PO-Revision-Date: 2015-04-26 19:19+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -10098,26 +10098,22 @@ msgstr ""
 "tradotte esiste in spagnolo."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LDAP related changes"
-msgstr "Modifiche relative a LDAP"
+msgid "Other changes compared to the previous release"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "TBD"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Altre modifiche"
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Squid"
-msgstr "Squid"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Shutdown and reboot of the main server takes longer due to a new default "
-"setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
-"example the delay could be set to 10 seconds by appending the line "
+#, fuzzy
+#| msgid ""
+#| "Shutdown and reboot of the main server takes longer due to a new default "
+#| "setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As "
+#| "an example the delay could be set to 10 seconds by appending the line "
+#| "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
+#| "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
+msgid ""
+"<emphasis>squid</emphasis>: Shutdown and reboot of the main server takes "
+"longer than before due to a new default setting "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example "
+"the delay could be set to 10 seconds by appending the line "
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
@@ -10127,50 +10123,46 @@ msgstr ""
 "aggiungendo la linea <computeroutput>shutdown_lifetime 10 seconds</"
 "computeroutput> a <computeroutput>/etc/squid3/squid.conf</computeroutput>."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "SSH"
-msgstr "SSH"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The root user is no longer allowed to login via SSH with password. The "
+#| "default <computeroutput>PermitRootLogin yes</computeroutput> has been "
+#| "replaced with <computeroutput>PermitRootLogin without-password</"
+#| "computeroutput>, so ssh-keys will work."
 msgid ""
-"The root user is no longer allowed to login via SSH with password. The "
-"default <computeroutput>PermitRootLogin yes</computeroutput> has been "
-"replaced with <computeroutput>PermitRootLogin without-password</"
-"computeroutput>, so ssh-keys will work."
+"<emphasis>ssh</emphasis>: The root user is no longer allowed to login via "
+"SSH with password. The old default <computeroutput>PermitRootLogin yes</"
+"computeroutput> has been replaced with <computeroutput>PermitRootLogin "
+"without-password</computeroutput>, so ssh-keys will still work."
 msgstr ""
 "All'utente root non è più consentito di effettuare il  login via SSH con "
 "password. L'impostazione predefinita <computeroutput>PermitRootLogin yes</"
 "computeroutput> è stata sostituita con <computeroutput>PermitRootLogin "
 "without-password</computeroutput>, quindi le chiavi ssh non funzioneranno."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Backup (slbackup-php)"
-msgstr "Backup (slbackup-php)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To be able to use the slbackup-php site (which uses root logins via ssh), "
+#| "<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
+#| "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgid ""
-"To be able to use the slbackup-php site (which uses root logins via ssh), "
-"<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
-"temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+"<emphasis>slbackup-php</emphasis>: To be able to use the slbackup-php site "
+"(which uses root logins via ssh), <computeroutput>PermitRootLogin yes</"
+"computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/"
+"sshd_config</computeroutput>."
 msgstr ""
 "Per poter utilizzare il sito slbackup-php (che utilizza gli account di "
 "accesso di root tramite ssh), bisogna impostare temporaneamente "
 "<computeroutput>PermitRootLogin yes</computeroutput> in <computeroutput>/etc/"
 "ssh/sshd_config</computeroutput>."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "gnash (flash player)"
-msgstr "gnash (flash player)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The free flash player <computeroutput>gnash</computeroutput> is not "
-"available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
-"free flash player</link> from Adobe is still possible however."
+"<emphasis>sugar</emphasis>: As the Sugar desktop was removed from Debian "
+"Jessie, it is also not available in Debian Edu jessie."
 msgstr ""
-"Il plugin libero per flash player <computeroutput>gnash</computeroutput> non "
-"è più disponibile in Jessie. É ancora possibile però l'<link linkend="
-"\"Desktop--Flash\">installazione di flash player non-libero</link> da Adobe."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
@@ -11427,6 +11419,10 @@ msgstr ""
 "italiano e danese. Versioni parzialmente tradotte esistono in Bokmål "
 "norvegese e spagnolo."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "LDAP related changes"
+msgstr "Modifiche relative a LDAP"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
@@ -11437,6 +11433,10 @@ msgstr ""
 "quando si aggiungono i sistemi in GOsa. Ora i sistemi possono essere di tipo "
 "server, workstation, stampante, terminale o netdevice."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Altre modifiche"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr "Nuova attività per desktop Xfce"
@@ -12831,6 +12831,31 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "TBD"
+#~ msgstr "TBD"
+
+#~ msgid "Squid"
+#~ msgstr "Squid"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Backup (slbackup-php)"
+#~ msgstr "Backup (slbackup-php)"
+
+#~ msgid "gnash (flash player)"
+#~ msgstr "gnash (flash player)"
+
+#~ msgid ""
+#~ "The free flash player <computeroutput>gnash</computeroutput> is not "
+#~ "available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
+#~ "free flash player</link> from Adobe is still possible however."
+#~ msgstr ""
+#~ "Il plugin libero per flash player <computeroutput>gnash</computeroutput> "
+#~ "non è più disponibile in Jessie. É ancora possibile però l'<link linkend="
+#~ "\"Desktop--Flash\">installazione di flash player non-libero</link> da "
+#~ "Adobe."
+
 #~ msgid ""
 #~ "Install additional package to make PXE work (Debian bug <ulink url="
 #~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index c15954f..e428af6 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-05-02 12:07+0000\n"
+"POT-Creation-Date: 2015-05-02 12:49+0000\n"
 "PO-Revision-Date: 2015-04-19 12:34+0000\n"
 "Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -9993,26 +9993,22 @@ msgstr ""
 "spansk."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LDAP related changes"
-msgstr "LDAP-relaterte endringer"
+msgid "Other changes compared to the previous release"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "TBD"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Andre endringer"
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Squid"
-msgstr "Squid"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Shutdown and reboot of the main server takes longer due to a new default "
-"setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
-"example the delay could be set to 10 seconds by appending the line "
+#, fuzzy
+#| msgid ""
+#| "Shutdown and reboot of the main server takes longer due to a new default "
+#| "setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As "
+#| "an example the delay could be set to 10 seconds by appending the line "
+#| "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
+#| "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
+msgid ""
+"<emphasis>squid</emphasis>: Shutdown and reboot of the main server takes "
+"longer than before due to a new default setting "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example "
+"the delay could be set to 10 seconds by appending the line "
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
@@ -10022,16 +10018,18 @@ msgstr ""
 "oppsettstfilen <computeroutput>/etc/squid3/squid.conf</computeroutput>: "
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput>"
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "SSH"
-msgstr "SSH"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The root user is no longer allowed to login via SSH with password. The "
+#| "default <computeroutput>PermitRootLogin yes</computeroutput> has been "
+#| "replaced with <computeroutput>PermitRootLogin without-password</"
+#| "computeroutput>, so ssh-keys will work."
 msgid ""
-"The root user is no longer allowed to login via SSH with password. The "
-"default <computeroutput>PermitRootLogin yes</computeroutput> has been "
-"replaced with <computeroutput>PermitRootLogin without-password</"
-"computeroutput>, so ssh-keys will work."
+"<emphasis>ssh</emphasis>: The root user is no longer allowed to login via "
+"SSH with password. The old default <computeroutput>PermitRootLogin yes</"
+"computeroutput> has been replaced with <computeroutput>PermitRootLogin "
+"without-password</computeroutput>, so ssh-keys will still work."
 msgstr ""
 "Brukeren root tillates ikke lenger å logge inn via SSH med bruk av passord "
 "som autentiseringsmetode. Standardinnstillingen "
@@ -10039,35 +10037,28 @@ msgstr ""
 "<computeroutput>PermitRootLogin without-password</computeroutput> slik at "
 "root kan logge inn ved hjelp av nøkler."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Backup (slbackup-php)"
-msgstr "Sikkerhetskopering (slbackup-php)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To be able to use the slbackup-php site (which uses root logins via ssh), "
+#| "<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
+#| "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgid ""
-"To be able to use the slbackup-php site (which uses root logins via ssh), "
-"<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
-"temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+"<emphasis>slbackup-php</emphasis>: To be able to use the slbackup-php site "
+"(which uses root logins via ssh), <computeroutput>PermitRootLogin yes</"
+"computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/"
+"sshd_config</computeroutput>."
 msgstr ""
 "For å kunne bruke administrasjonsverktøyet slbackup-php (som bruker "
 "innlogging av root via SSH), må <computeroutput>PermitRootLogin yes</"
 "computeroutput> settes midlertidig i <computeroutput>/etc/ssh/sshd_config</"
 "computeroutput>."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "gnash (flash player)"
-msgstr "Gnash (Flash-avspiller)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The free flash player <computeroutput>gnash</computeroutput> is not "
-"available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
-"free flash player</link> from Adobe is still possible however."
+"<emphasis>sugar</emphasis>: As the Sugar desktop was removed from Debian "
+"Jessie, it is also not available in Debian Edu jessie."
 msgstr ""
-"Flash-avspilleren <computeroutput>gnash</computeroutput>, som er fri "
-"programvare, er ikke tilgjengelig i Jessie. Det er fremdeles mulig å "
-"installere <link linkend=\"Desktop--Flash\">en lukket Flash-avspiller</link> "
-"fra Adobe."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
@@ -11334,6 +11325,10 @@ msgstr ""
 "Debian Edu Wheezy Manual er oversatt til tysk, fransk, italiensk og dansk. "
 "Delvis oversatte versjoner finnes på norsk bokmål og spansk."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "LDAP related changes"
+msgstr "LDAP-relaterte endringer"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
@@ -11345,6 +11340,10 @@ msgstr ""
 "arbeidsstasjon, skriver, terminal eller netdevice (Linux Programmerer "
 "Håndbok)."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Andre endringer"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr "Ny Xfce desktop/skrivebord oppgave."
@@ -12717,6 +12716,31 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#~ msgid "TBD"
+#~ msgstr "TBD"
+
+#~ msgid "Squid"
+#~ msgstr "Squid"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Backup (slbackup-php)"
+#~ msgstr "Sikkerhetskopering (slbackup-php)"
+
+#~ msgid "gnash (flash player)"
+#~ msgstr "Gnash (Flash-avspiller)"
+
+#~ msgid ""
+#~ "The free flash player <computeroutput>gnash</computeroutput> is not "
+#~ "available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
+#~ "free flash player</link> from Adobe is still possible however."
+#~ msgstr ""
+#~ "Flash-avspilleren <computeroutput>gnash</computeroutput>, som er fri "
+#~ "programvare, er ikke tilgjengelig i Jessie. Det er fremdeles mulig å "
+#~ "installere <link linkend=\"Desktop--Flash\">en lukket Flash-avspiller</"
+#~ "link> fra Adobe."
+
 #~ msgid ""
 #~ "Install additional package to make PXE work (Debian bug <ulink url="
 #~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 8eb4de6..716cff0 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2015-05-02 12:07+0000\n"
+"POT-Creation-Date: 2015-05-02 12:49+0000\n"
 "PO-Revision-Date: 2015-04-30 21:07+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -10422,26 +10422,22 @@ msgstr ""
 "bestaat een gedeeltelijke vertaling voor het Spaans."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LDAP related changes"
-msgstr "LDAP-gerelateerde wijzigingen"
+msgid "Other changes compared to the previous release"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "TBD"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr "Overige wijzigingen"
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Squid"
-msgstr "Squid"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Shutdown and reboot of the main server takes longer due to a new default "
-"setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
-"example the delay could be set to 10 seconds by appending the line "
+#, fuzzy
+#| msgid ""
+#| "Shutdown and reboot of the main server takes longer due to a new default "
+#| "setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As "
+#| "an example the delay could be set to 10 seconds by appending the line "
+#| "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
+#| "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
+msgid ""
+"<emphasis>squid</emphasis>: Shutdown and reboot of the main server takes "
+"longer than before due to a new default setting "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example "
+"the delay could be set to 10 seconds by appending the line "
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
@@ -10452,16 +10448,18 @@ msgstr ""
 "computeroutput> een regel <computeroutput>shutdown_lifetime 10 seconds</"
 "computeroutput> toe te voegen."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "SSH"
-msgstr "SSH"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The root user is no longer allowed to login via SSH with password. The "
+#| "default <computeroutput>PermitRootLogin yes</computeroutput> has been "
+#| "replaced with <computeroutput>PermitRootLogin without-password</"
+#| "computeroutput>, so ssh-keys will work."
 msgid ""
-"The root user is no longer allowed to login via SSH with password. The "
-"default <computeroutput>PermitRootLogin yes</computeroutput> has been "
-"replaced with <computeroutput>PermitRootLogin without-password</"
-"computeroutput>, so ssh-keys will work."
+"<emphasis>ssh</emphasis>: The root user is no longer allowed to login via "
+"SSH with password. The old default <computeroutput>PermitRootLogin yes</"
+"computeroutput> has been replaced with <computeroutput>PermitRootLogin "
+"without-password</computeroutput>, so ssh-keys will still work."
 msgstr ""
 "Het is niet langer toegelaten aan de systeembeheerder om zich via SSH met "
 "een wachtwoord aan te melden. De standaardinstelling "
@@ -10469,15 +10467,17 @@ msgstr ""
 "<computeroutput>PermitRootLogin without-password</computeroutput>, hetgeen "
 "inhoudt dat ssh-sleutels wel werken."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Backup (slbackup-php)"
-msgstr "Back-up (slbackup-php)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To be able to use the slbackup-php site (which uses root logins via ssh), "
+#| "<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
+#| "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgid ""
-"To be able to use the slbackup-php site (which uses root logins via ssh), "
-"<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
-"temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+"<emphasis>slbackup-php</emphasis>: To be able to use the slbackup-php site "
+"(which uses root logins via ssh), <computeroutput>PermitRootLogin yes</"
+"computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/"
+"sshd_config</computeroutput>."
 msgstr ""
 "Om de site slbackup-php (die gebruik maakt van aanmeldingen van de "
 "systeembeheerder via ssh) te kunnen gebruiken, moet in het bestand "
@@ -10485,19 +10485,11 @@ msgstr ""
 "tijdelijk op <computeroutput>PermitRootLogin yes</computeroutput> gezet "
 "worden."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "gnash (flash player)"
-msgstr "gnash (flash player)"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The free flash player <computeroutput>gnash</computeroutput> is not "
-"available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
-"free flash player</link> from Adobe is still possible however."
+"<emphasis>sugar</emphasis>: As the Sugar desktop was removed from Debian "
+"Jessie, it is also not available in Debian Edu jessie."
 msgstr ""
-"De vrije flash-player <computeroutput>gnash</computeroutput> is in Jessie "
-"niet beschikbaar. <link linkend=\"Desktop--Flash\">Installeren van de niet-"
-"vrijeflash-player</link> van Adobe is evenwel nog altijd mogelijk."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
@@ -11771,6 +11763,10 @@ msgstr ""
 "het Frans, het Italiaans en het Deens. Er bestaan gedeeltelijke vertalingen "
 "voor het Noors Bokmål en voor het Spaans."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "LDAP related changes"
+msgstr "LDAP-gerelateerde wijzigingen"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
@@ -11782,6 +11778,10 @@ msgstr ""
 "apparaten in GOsa. Nu kunnen er systemen bestaan van het type server, "
 "werkstation, printer, terminal of netwerkapparaat."
 
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr "Overige wijzigingen"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr "Nieuwe grafische werkomgeving Xfce als keuzemogelijkheid beschikbaar."
@@ -13243,6 +13243,30 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "TBD"
+#~ msgstr "TBD"
+
+#~ msgid "Squid"
+#~ msgstr "Squid"
+
+#~ msgid "SSH"
+#~ msgstr "SSH"
+
+#~ msgid "Backup (slbackup-php)"
+#~ msgstr "Back-up (slbackup-php)"
+
+#~ msgid "gnash (flash player)"
+#~ msgstr "gnash (flash player)"
+
+#~ msgid ""
+#~ "The free flash player <computeroutput>gnash</computeroutput> is not "
+#~ "available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
+#~ "free flash player</link> from Adobe is still possible however."
+#~ msgstr ""
+#~ "De vrije flash-player <computeroutput>gnash</computeroutput> is in Jessie "
+#~ "niet beschikbaar. <link linkend=\"Desktop--Flash\">Installeren van de "
+#~ "niet-vrijeflash-player</link> van Adobe is evenwel nog altijd mogelijk."
+
 #~ msgid ""
 #~ "Install additional package to make PXE work (Debian bug <ulink url="
 #~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index e1fab44..22127a9 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-02 12:07+0000\n"
+"POT-Creation-Date: 2015-05-02 12:49+0000\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"
@@ -7386,62 +7386,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LDAP related changes"
+msgid "Other changes compared to the previous release"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other changes"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Squid"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Shutdown and reboot of the main server takes longer due to a new default "
-"setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
-"example the delay could be set to 10 seconds by appending the line "
+"<emphasis>squid</emphasis>: Shutdown and reboot of the main server takes "
+"longer than before due to a new default setting "
+"<computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example "
+"the delay could be set to 10 seconds by appending the line "
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "SSH"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The root user is no longer allowed to login via SSH with password. The "
-"default <computeroutput>PermitRootLogin yes</computeroutput> has been "
-"replaced with <computeroutput>PermitRootLogin without-password</"
-"computeroutput>, so ssh-keys will work."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Backup (slbackup-php)"
+"<emphasis>ssh</emphasis>: The root user is no longer allowed to login via "
+"SSH with password. The old default <computeroutput>PermitRootLogin yes</"
+"computeroutput> has been replaced with <computeroutput>PermitRootLogin "
+"without-password</computeroutput>, so ssh-keys will still work."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To be able to use the slbackup-php site (which uses root logins via ssh), "
-"<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
-"temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+"<emphasis>slbackup-php</emphasis>: To be able to use the slbackup-php site "
+"(which uses root logins via ssh), <computeroutput>PermitRootLogin yes</"
+"computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/"
+"sshd_config</computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "gnash (flash player)"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The free flash player <computeroutput>gnash</computeroutput> is not "
-"available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
-"free flash player</link> from Adobe is still possible however."
+"<emphasis>sugar</emphasis>: As the Sugar desktop was removed from Debian "
+"Jessie, it is also not available in Debian Edu jessie."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -8339,6 +8316,10 @@ msgid ""
 "Spanish."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><title>
+msgid "LDAP related changes"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
@@ -8346,6 +8327,10 @@ msgid ""
 "printer, terminal or netdevice."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><title>
+msgid "Other changes"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 7977d9c..39c463a 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -3415,55 +3415,23 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </para></listitem></itemizedlist>
 </section>
 
-<section id="Features--LDAP_related_changes">
-<title>LDAP related changes
+<section id="Features--Other_changes_compared_to_the_previous_release">
+<title>Other changes compared to the previous release
 </title>
 <itemizedlist>
 <listitem>
-<para>TBD 
-</para></listitem></itemizedlist>
-</section>
-
-<section id="Features--Other_changes">
-<title>Other changes
-</title>
-
-<section id="Features--Squid">
-<title>Squid
-</title>
-<itemizedlist>
-<listitem>
-<para>Shutdown and reboot of the main server takes longer due to a new default setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example the delay could be set to 10 seconds by appending the line <computeroutput>shutdown_lifetime 10 seconds</computeroutput> to <computeroutput>/etc/squid3/squid.conf</computeroutput>. 
-</para></listitem></itemizedlist>
-</section>
-
-<section id="Features--SSH">
-<title>SSH
-</title>
-<itemizedlist>
+<para><emphasis>squid</emphasis>: Shutdown and reboot of the main server takes longer than before due to a new default setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an example the delay could be set to 10 seconds by appending the line <computeroutput>shutdown_lifetime 10 seconds</computeroutput> to <computeroutput>/etc/squid3/squid.conf</computeroutput>. 
+</para></listitem>
 <listitem>
-<para>The root user is no longer allowed to login via SSH with password. The default <computeroutput>PermitRootLogin yes</computeroutput> has been replaced with <computeroutput>PermitRootLogin without-password</computeroutput>, so ssh-keys will work. 
-</para></listitem></itemizedlist>
-</section>
-
-<section id="Features--Backup_.28slbackup-php.29">
-<title>Backup (slbackup-php)
-</title>
-<itemizedlist>
+<para><emphasis>ssh</emphasis>: The root user is no longer allowed to login via SSH with password. The old default <computeroutput>PermitRootLogin yes</computeroutput> has been replaced with <computeroutput>PermitRootLogin without-password</computeroutput>, so ssh-keys will still work. 
+</para></listitem>
 <listitem>
-<para>To be able to use the slbackup-php site (which uses root logins via ssh), <computeroutput>PermitRootLogin yes</computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>. 
-</para></listitem></itemizedlist>
-</section>
-
-<section id="Features--gnash_.28flash_player.29">
-<title>gnash (flash player)
-</title>
-<itemizedlist>
+<para><emphasis>slbackup-php</emphasis>: To be able to use the slbackup-php site (which uses root logins via ssh), <computeroutput>PermitRootLogin yes</computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>. 
+</para></listitem>
 <listitem>
-<para>The free flash player <computeroutput>gnash</computeroutput> is not available for Jessie. <link linkend="Desktop--Flash">Installing the non-free flash player</link> from Adobe is still possible however. 
+<para><emphasis>sugar</emphasis>: As the Sugar desktop was removed from Debian Jessie, it is also not available in Debian Edu jessie. 
 </para></listitem></itemizedlist>
 </section>
-</section>
 
 <section id="Features--Known_issues">
 <title>Known issues

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