[debian-edu-commits] debian-edu/ 01/01: jessie manual: update from the wiki

Holger Levsen holger at moszumanska.debian.org
Thu Oct 16 17:46:21 UTC 2014


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 a130d0b0756ed389c266f1a273c7a9c2f0335eaa
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Oct 16 19:45:22 2014 +0200

    jessie manual: update from the wiki
---
 .../debian-edu-jessie-manual.da.po                 |  46 +++++--
 .../debian-edu-jessie-manual.de.po                 |  50 ++++---
 .../debian-edu-jessie-manual.es.po                 |  29 ++--
 .../debian-edu-jessie-manual.fr.po                 |  54 +++++---
 .../debian-edu-jessie-manual.it.po                 |  62 +++++----
 .../debian-edu-jessie-manual.nb.po                 | 150 +++++++++++----------
 .../debian-edu-jessie-manual.nl.po                 |  52 ++++---
 .../debian-edu-jessie/debian-edu-jessie-manual.pot |  24 ++--
 .../debian-edu-jessie/debian-edu-jessie-manual.xml |  12 +-
 .../images/slbackup-php_maintenance.png            | Bin 0 -> 15130 bytes
 10 files changed, 292 insertions(+), 187 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 a2e9afa..49ebe25 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: 2014-10-16 15:21+0300\n"
+"POT-Creation-Date: 2014-10-16 17:38+0000\n"
 "PO-Revision-Date: 2014-10-13 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1822,8 +1822,8 @@ msgstr ""
 #| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
 #| "parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
-"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 "boot parameters."
 msgstr ""
 "For at installere <emphasis role=\"strong\">Xfce</emphasis>-skrivebordet i "
@@ -3981,10 +3981,16 @@ msgstr ""
 "(vedligeholdelse) i menuen på siden for sikkerhedskopiering og vælg det "
 "ældste øjebliksbillede du ønsker at bevare:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Vedligeholdelse for slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Serverovervågning"
@@ -5753,9 +5759,14 @@ msgstr ""
 "link> i denne manual."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This example uses 'nas-server.intern' as the server name. Once 'nas-"
+#| "server.intern' ist configured, check if the NFS export points on the new "
+#| "storage server are exported to the relevant subnets or machines:"
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
-"intern' ist configured, check if the NFS export points on the new storage "
+"intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
 "Dette eksempel bruger »nas-server.intern« som servernavn. Når først »nas-"
@@ -8997,7 +9008,9 @@ msgid "User visible changes"
 msgstr "Brugersynlige ændringer"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: Mate"
+#, fuzzy
+#| msgid "new optional desktop environment: Mate"
+msgid "new optional desktop environment: MATE"
 msgstr "ny valgfrit skrivebordsmiljø: Mate"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9035,9 +9048,14 @@ msgid "Linux kernel 3.16.x"
 msgstr "Linuxkerne version 3.16.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
+"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
 "the others see this manual.)"
 msgstr ""
 "Skrivebordsmiljøet KDE »Plasma« 4.11.12, GNOME 3.4, Xfce 4.10 og LXDE 0.5.6 "
@@ -9069,8 +9087,10 @@ msgid "LTSP 5.5.3"
 msgstr "LTSP 5.5.3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "new boot framework: systemd"
-msgstr "ny opstartsramme: systemd"
+msgid ""
+"new boot framework: systemd. More information is available in the <ulink url="
+"\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</ulink>."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Debian Jessie includes about 42000 packages available for installation."
@@ -11698,6 +11718,9 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "new boot framework: systemd"
+#~ msgstr "ny opstartsramme: systemd"
+
 #~ msgid "FIXME: some of the following version numbers still need updates:"
 #~ msgstr "FIXME: some of the following version numbers still need updates:"
 
@@ -11862,9 +11885,6 @@ msgstr ""
 #~ msgid "{{attachment:gosa_systems_add_netgroup.png}}"
 #~ msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
 
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Vedligeholdelse for slbackup-php"
-
 #~ msgid ""
 #~ "With the introduction of <computeroutput>etckeeper</computeroutput> in "
 #~ "Debian Edu Wheezy (previous versions used <computeroutput>etcinsvk</"
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 fbd26f6..d8666d6 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: 2014-10-16 15:21+0300\n"
+"POT-Creation-Date: 2014-10-16 17:38+0000\n"
 "PO-Revision-Date: 2014-10-13 18:05+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -781,8 +781,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)."
@@ -1864,8 +1864,8 @@ msgstr ""
 #| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
 #| "parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
-"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 "boot parameters."
 msgstr ""
 "Um alternativ den <emphasis role=\"strong\">Xfce</emphasis>-Desktop zu "
@@ -4073,10 +4073,16 @@ msgstr ""
 "»Wartung« (Maintenance) im Menü auf der Backup-Seite und wählen dort den "
 "ältesten zu bewahrenden Zustand (snapshot):"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "slbackup-php Maintenance"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Serverüberwachung (Monitoring)"
@@ -5902,9 +5908,14 @@ msgstr ""
 "beschrieben."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This example uses 'nas-server.intern' as the server name. Once 'nas-"
+#| "server.intern' ist configured, check if the NFS export points on the new "
+#| "storage server are exported to the relevant subnets or machines:"
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
-"intern' ist configured, check if the NFS export points on the new storage "
+"intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
 "In diesem Beispiel wird 'nas-server.intern' als Servername verwendet. Sobald "
@@ -9235,7 +9246,9 @@ msgid "User visible changes"
 msgstr "Für den Benutzer wahrnehmbare Änderungen"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: Mate"
+#, fuzzy
+#| msgid "new optional desktop environment: Mate"
+msgid "new optional desktop environment: MATE"
 msgstr "neue optionale Desktop-Umgebung: Mate"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9273,9 +9286,14 @@ msgid "Linux kernel 3.16.x"
 msgstr "Linux-Kernel in der Version 3.16.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
+"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
 "the others see this manual.)"
 msgstr ""
 "Desktop-Umgebungen KDE »Plasma« 4.11.12, GNOME 3.14, Xfce 4.10 und LXDE "
@@ -9307,8 +9325,10 @@ msgid "LTSP 5.5.3"
 msgstr "LTSP 5.5.3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "new boot framework: systemd"
-msgstr "neues Init-System: systemd"
+msgid ""
+"new boot framework: systemd. More information is available in the <ulink url="
+"\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</ulink>."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Debian Jessie includes about 42000 packages available for installation."
@@ -11983,6 +12003,9 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "new boot framework: systemd"
+#~ msgstr "neues Init-System: systemd"
+
 #~ msgid "FIXME: some of the following version numbers still need updates:"
 #~ msgstr "FIXME: some of the following version numbers still need updates:"
 
@@ -12147,9 +12170,6 @@ msgstr ""
 #~ msgid "{{attachment:gosa_systems_add_netgroup.png}}"
 #~ msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
 
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "slbackup-php Maintenance"
-
 #~ msgid ""
 #~ "With the introduction of <computeroutput>etckeeper</computeroutput> in "
 #~ "Debian Edu Wheezy (previous versions used <computeroutput>etcinsvk</"
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 00d9877..adfc0f2 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: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 15:21+0300\n"
+"POT-Creation-Date: 2014-10-16 17:38+0000\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"
@@ -1864,8 +1864,8 @@ msgstr ""
 #| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
 #| "parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
-"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 "boot parameters."
 msgstr ""
 "Para instalar el escritorio <emphasis role=\"strong\">Xfce</emphasis>, "
@@ -3997,10 +3997,16 @@ msgstr ""
 "menú de la página respaldo y seleccione la instantánea más vieja que desee "
 "conservar:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Mantenimiento de slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Monitorización del servidor"
@@ -5635,7 +5641,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
-"intern' ist configured, check if the NFS export points on the new storage "
+"intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
 
@@ -8457,7 +8463,7 @@ msgid "User visible changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: Mate"
+msgid "new optional desktop environment: MATE"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8501,7 +8507,7 @@ msgstr "Versión del kernel linux 2.6.18"
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
+"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
 "the others see this manual.)"
 msgstr ""
 
@@ -8530,7 +8536,9 @@ msgid "LTSP 5.5.3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "new boot framework: systemd"
+msgid ""
+"new boot framework: systemd. More information is available in the <ulink url="
+"\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -11129,9 +11137,6 @@ msgstr ""
 #~ msgid "{{attachment:gosa_systems_add_netgroup.png}}"
 #~ msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
 
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Mantenimiento de slbackup-php"
-
 #~ msgid ""
 #~ "With the introduction of <computeroutput>etckeeper</computeroutput> in "
 #~ "Debian Edu Wheezy (previous versions used <computeroutput>etcinsvk</"
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 cd8073b..d6789bb 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: 2014-10-16 15:21+0300\n"
+"POT-Creation-Date: 2014-10-16 17:38+0000\n"
 "PO-Revision-Date: 2014-09-23 07:24+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1873,8 +1873,8 @@ msgstr ""
 #| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
 #| "parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
-"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 "boot parameters."
 msgstr ""
 "Pour installer le bureau<emphasis role=\"strong\">LXDE</emphasis> à la "
@@ -4097,10 +4097,16 @@ msgstr ""
 "« Maintenance » dans le menu de la page des sauvegarde et choisissez le "
 "dernier instantané à garder :"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Maintenance de slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Surveillance des serveurs"
@@ -5928,9 +5934,14 @@ msgstr ""
 "Machine_Management_with_GOsa.2BALI-\">Démarrage rapide</link> de ce manuel."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This example uses 'nas-server.intern' as the server name. Once 'nas-"
+#| "server.intern' ist configured, check if the NFS export points on the new "
+#| "storage server are exported to the relevant subnets or machines:"
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
-"intern' ist configured, check if the NFS export points on the new storage "
+"intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
 "Cet exemple utilise « serveur-nas.intern » comme nom du serveur. Une fois "
@@ -6862,10 +6873,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 ""
@@ -9286,7 +9297,9 @@ msgid "User visible changes"
 msgstr "Changements visibles pour l'utilisateur"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: Mate"
+#, fuzzy
+#| msgid "new optional desktop environment: Mate"
+msgid "new optional desktop environment: MATE"
 msgstr "nouvel environnement de bureau proposé en option : Mate"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9324,9 +9337,14 @@ msgid "Linux kernel 3.16.x"
 msgstr "Noyau Linux version 3.16.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
+"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
 "the others see this manual.)"
 msgstr ""
 "Environnements de bureau KDE « Plasma » 4.11.12, GNOME 3.14, Xfce 4.10, "
@@ -9358,8 +9376,10 @@ msgid "LTSP 5.5.3"
 msgstr "LSTP 5.5.3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "new boot framework: systemd"
-msgstr "nouvelle suite de logiciels d'amorçage : systemd"
+msgid ""
+"new boot framework: systemd. More information is available in the <ulink url="
+"\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</ulink>."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Debian Jessie includes about 42000 packages available for installation."
@@ -12057,6 +12077,9 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid "new boot framework: systemd"
+#~ msgstr "nouvelle suite de logiciels d'amorçage : systemd"
+
 #, fuzzy
 #~| msgid "The following needs to be executed:"
 #~ msgid "FIXME: some of the following version numbers still need updates:"
@@ -12224,9 +12247,6 @@ msgstr ""
 #~ msgid "{{attachment:gosa_systems_add_netgroup.png}}"
 #~ msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
 
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Maintenance de slbackup-php"
-
 #~ msgid ""
 #~ "With the introduction of <computeroutput>etckeeper</computeroutput> in "
 #~ "Debian Edu Wheezy (previous versions used <computeroutput>etcinsvk</"
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 e3d9124..b27ee04 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: 2014-10-16 15:21+0300\n"
+"POT-Creation-Date: 2014-10-16 17:38+0000\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"
@@ -1848,8 +1848,8 @@ msgstr ""
 #| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
 #| "parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
-"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 "boot parameters."
 msgstr ""
 "Per installare il desktop <emphasis role=\"strong\">Xfce</emphasis>, "
@@ -4031,10 +4031,16 @@ msgstr ""
 "Se si desidera eliminare vecchi backup, scegliere \"Maintenance\" nel menu "
 "della pagina di backup e selezionare l'istantanea più vecchia da conservare:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Manutenzione di slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Monitorare il server"
@@ -5829,9 +5835,14 @@ msgstr ""
 "\">Getting started</link> di questo manuale."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This example uses 'nas-server.intern' as the server name. Once 'nas-"
+#| "server.intern' ist configured, check if the NFS export points on the new "
+#| "storage server are exported to the relevant subnets or machines:"
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
-"intern' ist configured, check if the NFS export points on the new storage "
+"intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
 "Questo esempio usa come nome del server \"nas-server.intern\". Una volta "
@@ -6747,8 +6758,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 ""
@@ -9123,7 +9134,7 @@ msgid "User visible changes"
 msgstr "Cambiamenti evidenti per gli utenti"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: Mate"
+msgid "new optional desktop environment: MATE"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9170,7 +9181,7 @@ msgstr "Linux kernel 3.2.x"
 #| "or LXDE: see manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
+"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
 "the others see this manual.)"
 msgstr ""
 "Ambienti desktop KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6 e LXDE 0.5.5 "
@@ -9212,7 +9223,9 @@ msgid "LTSP 5.5.3"
 msgstr "LTSP 5.4.2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "new boot framework: systemd"
+msgid ""
+"new boot framework: systemd. More information is available in the <ulink url="
+"\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -12041,9 +12054,6 @@ msgstr ""
 #~ msgid "{{attachment:gosa_systems_add_netgroup.png}}"
 #~ msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
 
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Manutenzione di slbackup-php"
-
 #~ msgid ""
 #~ "With the introduction of <computeroutput>etckeeper</computeroutput> in "
 #~ "Debian Edu Wheezy (previous versions used <computeroutput>etcinsvk</"
@@ -16580,13 +16590,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 ""
@@ -16598,8 +16608,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"
@@ -16607,8 +16617,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"
@@ -16625,8 +16635,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"
@@ -16634,8 +16644,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-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index c705dca..915f67c 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2014-10-16 15:21+0300\n"
+"POT-Creation-Date: 2014-10-16 17:38+0000\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"
@@ -787,10 +787,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>
@@ -1891,8 +1891,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
-"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 "boot parameters."
 msgstr ""
 "for å installere <emphasis role=\"strong\">GNOME</emphasis> skrivebordsmiljø "
@@ -2602,15 +2602,15 @@ msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
 #, fuzzy
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"wheezy-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]wheezy-07-partitioning.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-"edituser_wheezy.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"lwat-]edituser_wheezy.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -2647,22 +2647,22 @@ msgstr ""
 #, fuzzy
 msgid "{{attachment:13-Install the base system.png}}"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"wheezy-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]wheezy-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid "{{attachment: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>
 #, fuzzy
 msgid "{{attachment: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>
 #, fuzzy
@@ -2682,15 +2682,15 @@ msgstr ""
 #, fuzzy
 msgid "{{attachment: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>
 #, 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>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
@@ -3477,8 +3477,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"
@@ -3488,8 +3488,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"
@@ -3510,8 +3510,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"
@@ -4074,11 +4074,16 @@ msgstr ""
 "Hvis du ønsker å kvitte deg med eldre sikkerhetskopier, velg \"Vedlikehold\" "
 "i menyen på sikkerhetskopi-siden og velg å beholde det eldste bildet:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "slbackup-php Maintenance"
+msgstr "slbackup-php Vedlikehold"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Tjenerovervåkning"
@@ -5949,7 +5954,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
-"intern' ist configured, check if the NFS export points on the new storage "
+"intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
 "Dette eksemplet bruker 'nas-server.intern' som navn på server. Så snart 'nas-"
@@ -6280,10 +6285,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>"
@@ -6670,8 +6675,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
@@ -8426,8 +8432,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
@@ -9358,7 +9364,7 @@ msgid "User visible changes"
 msgstr "Bruker synlige endringer"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: Mate"
+msgid "new optional desktop environment: MATE"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9403,7 +9409,7 @@ msgstr "Linux kjerneversjon 2.6.18"
 #, fuzzy
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
+"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
 "the others see this manual.)"
 msgstr ""
 "Skrivebordsmiljøene KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, og "
@@ -9441,7 +9447,9 @@ msgid "LTSP 5.5.3"
 msgstr "LTSP 5.4.2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "new boot framework: systemd"
+msgid ""
+"new boot framework: systemd. More information is available in the <ulink url="
+"\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -12050,8 +12058,8 @@ msgstr ""
 #, fuzzy
 #~ msgid "11-Participate_in_the_package_usage_survey.png"
 #~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-#~ "edituser_wheezy.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "lwat-]edituser_wheezy.png\"/></imageobject>"
 
 #, fuzzy
 #~ msgid "12-Set_up_users_and_passwords.png"
@@ -12078,14 +12086,14 @@ msgstr ""
 #, 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>"
 
 #, 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>"
 
 #, fuzzy
 #~ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -12096,14 +12104,14 @@ msgstr ""
 #, 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>"
 
 #, 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>"
 
 #, fuzzy
 #~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
@@ -12190,10 +12198,6 @@ msgstr ""
 #~ "edu-]wheezy-10-basesystem.png\"/></imageobject>"
 
 #, fuzzy
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "slbackup-php Vedlikehold"
-
-#, fuzzy
 #~ msgid ""
 #~ "With the introduction of <computeroutput>etckeeper</computeroutput> in "
 #~ "Debian Edu Wheezy (previous versions used <computeroutput>etcinsvk</"
@@ -12539,8 +12543,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 jessie kde desktop screenshot here"
@@ -12563,8 +12567,8 @@ msgstr ""
 #, fuzzy
 #~ msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
 #~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-#~ "edituser_wheezy.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "lwat-]edituser_wheezy.png\"/></imageobject>"
 
 #, fuzzy
 #~| msgid "Set passwords"
@@ -13836,8 +13840,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"
@@ -16164,13 +16168,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 ""
@@ -16182,8 +16186,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"
@@ -16191,8 +16195,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"
@@ -16208,8 +16212,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"
@@ -16217,8 +16221,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-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 32c316d..fdab3d8 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: 2014-10-16 15:21+0300\n"
+"POT-Creation-Date: 2014-10-16 17:38+0000\n"
 "PO-Revision-Date: 2014-10-15 21:53+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"
@@ -781,9 +781,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)."
 
@@ -1904,8 +1904,8 @@ msgstr ""
 #| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
 #| "parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
-"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 "boot parameters."
 msgstr ""
 "Om de <emphasis role=\"strong\">Xfce</emphasis> bureaubladomgeving te "
@@ -4162,10 +4162,16 @@ msgstr ""
 "webpagina van de back-updienst het item \"Onderhoud.\" Geef vervolgens op "
 "welke de oudste back-up is die u wenst te behouden:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Beheer van slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Servers opvolgen"
@@ -6029,9 +6035,14 @@ msgstr ""
 "handleiding."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This example uses 'nas-server.intern' as the server name. Once 'nas-"
+#| "server.intern' ist configured, check if the NFS export points on the new "
+#| "storage server are exported to the relevant subnets or machines:"
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
-"intern' ist configured, check if the NFS export points on the new storage "
+"intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
 "In dit voorbeeld gebruiken we 'nas-server.intern' als naam voor de server. "
@@ -9430,7 +9441,9 @@ msgid "User visible changes"
 msgstr "Wijzigingen die zichtbaar zijn voor de gebruiker"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: Mate"
+#, fuzzy
+#| msgid "new optional desktop environment: Mate"
+msgid "new optional desktop environment: MATE"
 msgstr "nieuwe optionele bureaubladomgeving: Mate"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9469,9 +9482,14 @@ msgid "Linux kernel 3.16.x"
 msgstr "Linux kernel versie 3.16.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
+"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
 "the others see this manual.)"
 msgstr ""
 "Bureaubladomgevingen KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
@@ -9503,8 +9521,10 @@ msgid "LTSP 5.5.3"
 msgstr "LTSP 5.5.3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "new boot framework: systemd"
-msgstr "nieuw raamwerk voor het opstarten van computers: systemd"
+msgid ""
+"new boot framework: systemd. More information is available in the <ulink url="
+"\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</ulink>."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Debian Jessie includes about 42000 packages available for installation."
@@ -12239,6 +12259,9 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "new boot framework: systemd"
+#~ msgstr "nieuw raamwerk voor het opstarten van computers: systemd"
+
 #, fuzzy
 #~| msgid "The following needs to be executed:"
 #~ msgid "FIXME: some of the following version numbers still need updates:"
@@ -12408,9 +12431,6 @@ msgstr ""
 #~ msgid "{{attachment:gosa_systems_add_netgroup.png}}"
 #~ msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
 
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Beheer van slbackup-php"
-
 #~ msgid ""
 #~ "With the introduction of <computeroutput>etckeeper</computeroutput> in "
 #~ "Debian Edu Wheezy (previous versions used <computeroutput>etcinsvk</"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 61ec91f..5038580 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: 2014-10-16 15:21+0300\n"
+"POT-Creation-Date: 2014-10-16 17:38+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"
@@ -1366,8 +1366,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"And to install the <emphasis role=\"strong\">Mate</emphasis> desktop "
-"instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel "
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 "boot parameters."
 msgstr ""
 
@@ -2971,8 +2971,12 @@ msgid ""
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/slbackup-php_maintenance.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4264,7 +4268,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
-"intern' ist configured, check if the NFS export points on the new storage "
+"intern' is configured, check if the NFS export points on the new storage "
 "server are exported to the relevant subnets or machines:"
 msgstr ""
 
@@ -6648,7 +6652,7 @@ msgid "User visible changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: Mate"
+msgid "new optional desktop environment: MATE"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6685,7 +6689,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and Mate 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
+"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
 "the others see this manual.)"
 msgstr ""
 
@@ -6714,7 +6718,9 @@ msgid "LTSP 5.5.3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "new boot framework: systemd"
+msgid ""
+"new boot framework: systemd. More information is available in the <ulink url="
+"\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index dce16cd..ecc3f6b 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -571,7 +571,7 @@
 <para>To install the <emphasis role="strong">Xfce</emphasis> desktop instead, add <computeroutput>desktop=xfce</computeroutput> to the kernel boot parameters. 
 </para></listitem>
 <listitem>
-<para>And to install the <emphasis role="strong">Mate</emphasis> desktop instead, add <computeroutput>desktop=Mate</computeroutput> to the kernel boot parameters. 
+<para>And to install the <emphasis role="strong">MATE</emphasis> desktop instead, add <computeroutput>desktop=mate</computeroutput> to the kernel boot parameters. 
 </para></listitem></itemizedlist>
 </section>
 </section>
@@ -1269,7 +1269,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 </para>
 <para>If you want to get rid of older backups, choose "Maintenance" in the menu on the backup page and select the oldest snapshot to keep: 
 </para>
-<para>{{attachment:slbackup-php_maintenance.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/slbackup-php_maintenance.png"/></imageobject><textobject><phrase>slbackup-php Maintenance</phrase></textobject></inlinemediaobject> 
 </para>
 </section>
 
@@ -1874,7 +1874,7 @@ apt-get upgrade]]></screen>
 <para>Add a new system of type server using GOsa² as outlined in the <link linkend="GettingStarted--Machine_Management_with_GOsa.2BALI-">Getting started</link> chapter of this manual. 
 </para>
 <itemizedlist><listitem override="none">
-<para>This example uses 'nas-server.intern' as the server name. Once 'nas-server.intern' ist configured, check if the NFS export points on the new storage server are exported to the relevant subnets or machines: 
+<para>This example uses 'nas-server.intern' as the server name. Once 'nas-server.intern' is configured, check if the NFS export points on the new storage server are exported to the relevant subnets or machines: 
 </para><screen><![CDATA[    root at tjener:~# showmount -e nas-server
     Export list for nas-server:
     /storage         10.0.0.0/8
@@ -3053,7 +3053,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </title>
 <itemizedlist>
 <listitem>
-<para>new optional desktop environment: Mate 
+<para>new optional desktop environment: MATE 
 </para></listitem>
 <listitem>
 <para>new manual translation: Dutch 
@@ -3084,7 +3084,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>Linux kernel 3.16.x 
 </para></listitem>
 <listitem>
-<para>Desktop environments KDE "Plasma" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE 0.5.6 and Mate 1.8 (KDE "Plasma" is installed by default; to choose one of the others see this manual.) 
+<para>Desktop environments KDE "Plasma" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE 0.5.6 and MATE 1.8 (KDE "Plasma" is installed by default; to choose one of the others see this manual.) 
 </para></listitem>
 <listitem>
 <para>the browsers Iceweasel 31 ESR and Chromium 37  
@@ -3105,7 +3105,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>LTSP 5.5.3 
 </para></listitem>
 <listitem>
-<para>new boot framework: systemd 
+<para>new boot framework: systemd. More information is available in the <ulink url="http://www.freedesktop.org/wiki/Software/systemd/">systemd manual</ulink>. 
 </para></listitem>
 <listitem>
 <para>Debian Jessie includes about 42000 packages available for installation. 
diff --git a/documentation/debian-edu-jessie/images/slbackup-php_maintenance.png b/documentation/debian-edu-jessie/images/slbackup-php_maintenance.png
new file mode 100644
index 0000000..5ce7d0a
Binary files /dev/null and b/documentation/debian-edu-jessie/images/slbackup-php_maintenance.png differ

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