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

Holger Levsen holger at layer-acht.org
Sat Nov 5 14:36:34 UTC 2016


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 b23f7498042abf648c34b32900aaceb6a58698c9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Nov 5 15:36:09 2016 +0100

    Update Debian Edu Stretch manual from the wiki.
---
 debian/changelog                                   |   2 +-
 debian/copyright                                   |  12 -
 .../debian-edu-stretch-manual.da.po                | 141 ++++++++---
 .../debian-edu-stretch-manual.de.po                | 186 +++++++++------
 .../debian-edu-stretch-manual.es.po                | 156 +++++++-----
 .../debian-edu-stretch-manual.fr.po                | 190 +++++++++------
 .../debian-edu-stretch-manual.it.po                | 190 +++++++++------
 .../debian-edu-stretch-manual.ja.po                | 141 ++++++++---
 .../debian-edu-stretch-manual.nb.po                | 264 ++++++++++++---------
 .../debian-edu-stretch-manual.nl.po                | 202 +++++++++-------
 .../debian-edu-stretch-manual.pl.po                | 100 ++++++--
 .../debian-edu-stretch-manual.pot                  |  86 +++++--
 .../debian-edu-stretch-manual.xml                  |  34 ++-
 .../images/01-Installer_boot_menu.png              | Bin 0 -> 13376 bytes
 .../images/02-select_a_language.png                | Bin 0 -> 50246 bytes
 .../images/03-select_your_location.png             | Bin 0 -> 50246 bytes
 .../debian-edu-stretch/images/23-Tjener-Login.png  | Bin 0 -> 292663 bytes
 .../images/28-Diskless-WS-GRUB_Boot_menu-PXE.png   | Bin 0 -> 137350 bytes
 .../images/Installer_advanced_options_a.png        | Bin 0 -> 13088 bytes
 .../images/Installer_advanced_options_b.png        | Bin 0 -> 13234 bytes
 .../debian-edu-stretch/images/Installer_help.png   | Bin 0 -> 9859 bytes
 .../debian-edu-stretch/images/pxe-tjener.png       | Bin 0 -> 134959 bytes
 22 files changed, 1097 insertions(+), 607 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e009ef0..d0bdf06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 debian-edu-doc (1.910~20161104) UNRELEASED; urgency=medium
 
-  * …
+  * Update Debian Edu Stretch manual from the wiki.
 
  -- Holger Levsen <holger at debian.org>  Thu, 03 Nov 2016 13:19:59 +0100
 
diff --git a/debian/copyright b/debian/copyright
index e06d39f..9da8108 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -77,10 +77,6 @@ Files: documentation/audacity/audacity-manual.nl.po
 Copyright: 2014 Frans Spiesschaert
 License: GPL-2+
 
-Files: documentation/audacity/audacity-manual.sv.po
-Copyright: 2016 Erik Sundin
-License: GPL-2+
-
 Files: documentation/debian-edu-itil/debian-edu-itil-manual.xml documentation/debian-edu-itil/debian-edu-itil-manual.pot
 Copyright: 2006 Knut Yrvin
   2006 Andreas Johansen
@@ -186,10 +182,6 @@ Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
 Copyright: 2014, 2015, 2016 Frans Spiesschaert
 License: GPL-2+
 
-Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.pl.po
-Copyright: 2016 Stanisław Krukowski
-License: GPL-2+
-
 Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.xml documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
 Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Holger Levsen
   2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014 Petter Reinholdtsen
@@ -281,10 +273,6 @@ Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
 Copyright: 2016 victory
 License: GPL-2+
 
-Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
-Copyright: 2016 Stanisław Krukowski
-License: GPL-2+
-
 Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
 Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Holger Levsen
   2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014 Petter Reinholdtsen
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index 367b924..de7c787 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+0000\n"
 "PO-Revision-Date: 2016-10-06 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -31,9 +31,15 @@ msgstr "Manual for Debian Edu / Skolelinux Stretch 9+edu0"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Manual for Debian Edu 9+edu0 kodenavn Stretch"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/23-Tjener-Login.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid "This is the manual for the Debian Edu Stretch 9+edu0 release."
@@ -1522,10 +1528,16 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Vælg installationstype"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/01-Installer_boot_menu.png"
 msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
@@ -1574,8 +1586,16 @@ msgstr ""
 "<emphasis role=\"strong\">Hjælp</emphasis> har nogle fif til brugen af "
 "installationsprogrammet"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
+msgstr "{{attachment:Installer_advanced_options_a.png}}"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "Installer advanced options screen 1"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1630,10 +1650,18 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automatisk installation</emphasis> kræver "
 "en forudfyldt fil (preseed)."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "Installer advanced options screen 2"
+msgstr "{{attachment:Installer_advanced_options_a.png}}"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1686,9 +1714,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit grafisk automatisk installation</emphasis> "
 "kræver en forudfyldt fil (preseed)."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2239,9 +2273,15 @@ msgstr ""
 "Det er sådan her at PXE-menuen ser ud kun med profilen for <emphasis role="
 "\"strong\">hovedserveren</emphasis>:"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "{{attachment:pxe-tjener.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/edit_user.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/edit_user.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2253,8 +2293,10 @@ msgstr ""
 "\">hovedserveren</emphasis> og <emphasis role=\"strong\">Serveren for tynde "
 "klienter</emphasis>:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2431,12 +2473,34 @@ msgstr ""
 "den første opstart af tjener, en PXE-opstart på arbejdsstationsnetværket og "
 "på netværket for de tynde klienter:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "01-Installer_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:02-select_a_language.png}}"
+msgid "./images/02-select_a_language.png"
 msgstr "{{attachment:02-select_a_language.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:02-select_a_language.png}}"
+msgid "02-select_a_language.png"
+msgstr "{{attachment:02-select_a_language.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:03-select_your_location.png}}"
+msgid "./images/03-select_your_location.png"
+msgstr "{{attachment:03-select_your_location.png}}"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:03-select_your_location.png}}"
+msgid "03-select_your_location.png"
 msgstr "{{attachment:03-select_your_location.png}}"
 
 #. type: Content of: <article><section><section><para>
@@ -2528,23 +2592,37 @@ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "{{attachment:24-Tjener-KDE_Start.png}}"
+#, fuzzy
+#| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+msgid "{{attachment:23-Tjener-Login.png}}"
+msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+#, fuzzy
+#| msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
 msgstr "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#, fuzzy
+#| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 msgstr "{{attachment:27-Tjener-KDE_Desktop.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 msgstr "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#, fuzzy
+#| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><title>
@@ -12266,6 +12344,15 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "{{attachment:pxe-tjener.png}}"
+
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "{{attachment:24-Tjener-KDE_Start.png}}"
+
 #~ msgid "Modifying the KDM login screen"
 #~ msgstr "Ændring af KDM-logindskærmen"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index a0d9573..edd8d17 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-10 11:19+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+0000\n"
 "PO-Revision-Date: 2016-10-10 11:26+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -40,9 +40,15 @@ msgstr "Handbuch für Debian Edu / Skolelinux Stretch 9+edu0"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Handbuch für Debian Edu 9+edu0, Codename Stretch"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "./images/23-Tjener-Login.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Debian-Edu Anmeldung"
 
 #. type: Content of: <article><section><para>
 msgid "This is the manual for the Debian Edu Stretch 9+edu0 release."
@@ -1562,9 +1568,13 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Art der Installation auswählen"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Startmenü des Installers"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1614,10 +1624,16 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> bietet einige Hinweise für die "
 "Benutzung des Installationsprogrammes an."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Installer advanced options Bildschirm 1"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1671,10 +1687,16 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> benötigt eine "
 "Preseed-Datei."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Installer advanced options Bildschirm 2"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1726,9 +1748,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
 "benötigt  eine Preseed-Datei."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Hilfe-Bildschirm des Installers"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2292,9 +2320,15 @@ msgstr ""
 "So sieht das PXE-Menü mit dem <emphasis role=\"strong\">Hauptserver</"
 "emphasis> als alleinigem Profil aus:"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "{{attachment:pxe-tjener.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/edit_user.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/edit_user.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2306,9 +2340,9 @@ msgstr ""
 "emphasis>- und <emphasis role=\"strong\">Terminal-Server</emphasis>-Profil "
 "aus:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2485,13 +2519,31 @@ msgstr ""
 "Screenshots nach dem ersten Starten von »tjener«, dem PXE-Start eines "
 "Rechners im Netzwerk für Arbeitsplatzrechner bzw. für Thin Clients."
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/02-select_a_language.png"
+msgid "02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/03-select_your_location.png"
+msgid "03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:04-Configure_the_keyboard.png}}"
@@ -2582,23 +2634,37 @@ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "{{attachment:24-Tjener-KDE_Start.png}}"
+#, fuzzy
+#| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+msgid "{{attachment:23-Tjener-Login.png}}"
+msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+#, fuzzy
+#| msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
 msgstr "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#, fuzzy
+#| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 msgstr "{{attachment:27-Tjener-KDE_Desktop.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 msgstr "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#, fuzzy
+#| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><title>
@@ -10041,8 +10107,8 @@ msgstr ""
 "translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
 "Übersetzungen aktualisieren wollen."
 
-#. <remark>
-#. status ignore</remark>
+#.  <remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -12555,6 +12621,27 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "{{attachment:pxe-tjener.png}}"
+
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "{{attachment:02-select_a_language.png}}"
+
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "{{attachment:03-select_your_location.png}}"
+
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "{{attachment:24-Tjener-KDE_Start.png}}"
+
 #~ msgid "Modifying the KDM login screen"
 #~ msgstr "Bearbeiten des KDM-Anmeldebildschirms"
 
@@ -12720,9 +12807,6 @@ msgstr ""
 #~ msgid "Manual for Debian Edu 9+edu0 Codename \"Stretch\""
 #~ msgstr "Handbuch für Debian Edu 9+edu0, Codename »Stretch«"
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Debian-Edu Anmeldung"
-
 #~ msgid ""
 #~ "Sources are available from the Debian archive, see <ulink url=\"http://"
 #~ "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
@@ -12732,33 +12816,6 @@ msgstr ""
 #~ "Optionen siehe <ulink url=\"http://cdimage.debian.org/debian-cd/8.4.0/"
 #~ "source/iso-dvd/\"/>."
 
-#~ msgid "./images/01-Installer_boot_menu.png"
-#~ msgstr "./images/01-Installer_boot_menu.png"
-
-#~ msgid "Installer boot menu"
-#~ msgstr "Startmenü des Installers"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Installer advanced options Bildschirm 1"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Installer advanced options Bildschirm 2"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Hilfe-Bildschirm des Installers"
-
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#~ msgid "./images/02-select_a_language.png"
-#~ msgstr "./images/02-select_a_language.png"
-
-#~ msgid "./images/03-select_your_location.png"
-#~ msgstr "./images/03-select_your_location.png"
-
 #~ msgid "./images/04-Configure_the_keyboard.png"
 #~ msgstr "./images/04-Configure_the_keyboard.png"
 
@@ -12822,9 +12879,6 @@ msgstr ""
 #~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
 #~ msgid "tjener KDM Login"
 #~ msgstr "KDM-Login von tjener"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index ca7e994..c7c0b4f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+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"
@@ -38,11 +38,15 @@ msgstr "Manual de Debian Edu / Skolelinux Jessie 8.0+edu0"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Manual para Debian-Edu 8.0+edu0 nombre código \"Jessie\""
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "./images/23-Tjener-Login.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Inicio de sesión de Debian Edu"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -1604,11 +1608,15 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Seleccione el tipo de instalación"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "01-Installer_boot_menu.png"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "01-Installer_boot_menu.png"
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Menú de carga del instalador"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1658,12 +1666,18 @@ msgstr ""
 "<emphasis role=\"strong\">Ayuda</emphasis> brinda algunos consejos sobre "
 "como usar el instalador."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "Installer advanced options screen 1"
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "Pantalla 1 de las opciones avanzadas del instalador"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer advanced options screen 2"
+msgid "Installer advanced options screen 1"
+msgstr "Pantalla 2 de las opciones avanzadas del instalador"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1718,12 +1732,16 @@ msgstr ""
 "<emphasis role=\"strong\">Instalación automática 64 bits</emphasis> necesita "
 "un archivo preconfigurado."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "Installer advanced options screen 1"
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "Pantalla 1 de las opciones avanzadas del instalador"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Pantalla 2 de las opciones avanzadas del instalador"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1776,9 +1794,15 @@ msgstr ""
 "<emphasis role=\"strong\">Instalación automática 64 bits gráfica</emphasis> "
 "necesita un archivo preconfigurado."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Pantalla de ayuda del instalador"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2317,11 +2341,15 @@ msgid ""
 "Server</emphasis> profile only:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/pxe-tjener.png"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "./images/pxe-tjener.png"
+#| msgid "./images/smile.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2330,11 +2358,9 @@ msgid ""
 "emphasis> profiles:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2523,16 +2549,34 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "02-select_a_language.png"
-msgid "{{attachment:02-select_a_language.png}}"
+msgid "./images/02-select_a_language.png"
 msgstr "02-select_a_language.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "02-select_a_language.png"
+msgid "02-select_a_language.png"
+msgstr "02-select_a_language.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "03-select_your_location.png"
+msgid "./images/03-select_your_location.png"
+msgstr "03-select_your_location.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "03-select_your_location.png"
-msgid "{{attachment:03-select_your_location.png}}"
+msgid "03-select_your_location.png"
 msgstr "03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para>
@@ -2669,22 +2713,28 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "./images/24-Tjener-KDE_Start.png"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "./images/24-Tjener-KDE_Start.png"
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "{{attachment:23-Tjener-Login.png}}"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
@@ -2694,7 +2744,7 @@ msgstr "./images/29-Diskless-WS-LDM_Login.png"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -10693,6 +10743,21 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#, fuzzy
+#~| msgid "./images/pxe-tjener.png"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "./images/pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "./images/24-Tjener-KDE_Start.png"
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "./images/24-Tjener-KDE_Start.png"
+
 #~ msgid "Modifying the KDM login screen"
 #~ msgstr "Modificar la pantalla de inicio de KDM"
 
@@ -10796,27 +10861,6 @@ msgstr ""
 #~ msgid "Manual for Debian Edu 9+edu0 Codename \"Stretch\""
 #~ msgstr "Manual para Debian-Edu 8.0+edu0 nombre código \"Jessie\""
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Inicio de sesión de Debian Edu"
-
-#~ msgid "Installer boot menu"
-#~ msgstr "Menú de carga del instalador"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Pantalla 2 de las opciones avanzadas del instalador"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Pantalla de ayuda del instalador"
-
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
 #~ msgid "tjener KDM Login"
 #~ msgstr "Inicio de sesión KDM en tjener"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index b7884cc..009e892 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+0000\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -36,11 +36,15 @@ msgstr "Manuel de Debian Edu/Skolelinux Jessie 8+edu0"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Manuel de Debian Edu 8+edu0 nom de code Jessie"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "./images/23-Tjener-Login.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Connexion à Debian Edu"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -1635,11 +1639,13 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Choisir un type d'installation"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "01-Installer_boot_menu.png"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "01-Installer_boot_menu.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Menu de démarrage de l'installateur"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1689,12 +1695,16 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> donne quelques conseils pour "
 "utiliser l'installateur"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Installer_advanced_options_a.png"
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Options avancées de l'installateur (écran 1)"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1750,12 +1760,16 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> a besoin d'un "
 "fichier de configuration."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Installer_advanced_options_b.png"
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "./images/Installer_advanced_options_b.png"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Options avancées de l'installateur (écran 2)"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1808,11 +1822,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> a "
 "besoin d'un fichier de configuration."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/Installer_help.png"
-msgid "{{attachment:Installer_help.png}}"
-msgstr "./images/Installer_help.png"
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Écran d'aide de l'installateur"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2386,11 +2404,15 @@ msgstr ""
 "Voici à quoi ressemble le menu PXE avec uniquement le profil <emphasis role="
 "\"strong\">Serveur principal</emphasis> :"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/pxe-tjener.png"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "./images/pxe-tjener.png"
+#| msgid "./images/smile.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2402,11 +2424,9 @@ msgstr ""
 "\">Serveur principal</emphasis> et <emphasis role=\"strong\">Serveur de "
 "clients légers</emphasis> :"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2592,17 +2612,31 @@ msgstr ""
 "PXE sur le réseau des stations de travail et sur le réseau des clients "
 "légers :"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "02-select_a_language.png"
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "02-select_a_language.png"
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/02-select_a_language.png"
+msgid "02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "03-select_your_location.png"
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "03-select_your_location.png"
+#| msgid "./images/03-select_your_location.png"
+msgid "03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -2738,22 +2772,28 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "./images/24-Tjener-KDE_Start.png"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "./images/24-Tjener-KDE_Start.png"
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "{{attachment:23-Tjener-Login.png}}"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
@@ -2763,7 +2803,7 @@ msgstr "./images/29-Diskless-WS-LDM_Login.png"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -13035,6 +13075,41 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#, fuzzy
+#~| msgid "01-Installer_boot_menu.png"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "01-Installer_boot_menu.png"
+
+#, fuzzy
+#~| msgid "./images/Installer_help.png"
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "./images/Installer_help.png"
+
+#, fuzzy
+#~| msgid "./images/pxe-tjener.png"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "./images/pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "02-select_a_language.png"
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "02-select_a_language.png"
+
+#, fuzzy
+#~| msgid "03-select_your_location.png"
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "03-select_your_location.png"
+
+#, fuzzy
+#~| msgid "./images/24-Tjener-KDE_Start.png"
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "./images/24-Tjener-KDE_Start.png"
+
 #~ msgid "Modifying the KDM login screen"
 #~ msgstr "Modification de l'écran de connexion de KDM"
 
@@ -13209,9 +13284,6 @@ msgstr ""
 #~ msgid "Manual for Debian Edu 9+edu0 Codename \"Stretch\""
 #~ msgstr "Manuel de Debian Edu 8+edu0 nom de code « Jessie »"
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Connexion à Debian Edu"
-
 #~ msgid ""
 #~ "Sources are available from the Debian archive, see <ulink url=\"http://"
 #~ "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
@@ -13221,33 +13293,6 @@ msgstr ""
 #~ "url=\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> pour "
 #~ "plusieurs options de téléchargement."
 
-#~ msgid "./images/01-Installer_boot_menu.png"
-#~ msgstr "./images/01-Installer_boot_menu.png"
-
-#~ msgid "Installer boot menu"
-#~ msgstr "Menu de démarrage de l'installateur"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Options avancées de l'installateur (écran 1)"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Options avancées de l'installateur (écran 2)"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Écran d'aide de l'installateur"
-
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#~ msgid "./images/02-select_a_language.png"
-#~ msgstr "./images/02-select_a_language.png"
-
-#~ msgid "./images/03-select_your_location.png"
-#~ msgstr "./images/03-select_your_location.png"
-
 #~ msgid "./images/04-Configure_the_keyboard.png"
 #~ msgstr "./images/04-Configure_the_keyboard.png"
 
@@ -13311,9 +13356,6 @@ msgstr ""
 #~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
 #~ msgid "tjener KDM Login"
 #~ msgstr "Invite KDM sur tjener"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index 33c3b22..e0905ed 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+0000\n"
 "PO-Revision-Date: 2015-05-04 19:34+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -33,11 +33,15 @@ msgstr "Manuale di Debian Edu / Skolelinux Jessie 8+edu0"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Manuale per Debian Edu 8+edu0 Nome in codice Jessie"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "./images/23-Tjener-Login.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Login di Debian Edu"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -1607,11 +1611,13 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Selezionare il tipo d'installazione"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "01-Installer_boot_menu.png"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "01-Installer_boot_menu.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Menu di avvio dell'installatore"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1661,12 +1667,16 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> dà alcuni suggerimenti "
 "sull'utilizzo dell'installatore"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Installer_advanced_options_a.png"
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Schermata 1 delle opzioni avanzate dell'installatore"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1722,12 +1732,16 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> ha bisogno di "
 "un file di preconfigurazione."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Installer_advanced_options_b.png"
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "./images/Installer_advanced_options_b.png"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Schermata 2 delle opzioni avanzate dell'installatore"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1780,11 +1794,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> ha "
 "bisogno di un file di preconfigurazione."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/Installer_help.png"
-msgid "{{attachment:Installer_help.png}}"
-msgstr "./images/Installer_help.png"
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Schermata di aiuto dell'installatore"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2351,11 +2369,15 @@ msgstr ""
 "Così appare il menu PXE solo con il profilo <emphasis role=\"strong\">Main-"
 "Server</emphasis>:"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/pxe-tjener.png"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "./images/pxe-tjener.png"
+#| msgid "./images/smile.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2366,11 +2388,9 @@ msgstr ""
 "Così appare il menu PXE con i profili <emphasis role=\"strong\">Main-Server "
 "</emphasis> e <emphasis role=\"strong\">Thin-Client-Server</emphasis>:"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2549,17 +2569,31 @@ msgstr ""
 "server tjener, un avvio via PXE su una rete delle workstation e sulla rete "
 "dei thin-client:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "02-select_a_language.png"
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "02-select_a_language.png"
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/02-select_a_language.png"
+msgid "02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "03-select_your_location.png"
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "03-select_your_location.png"
+#| msgid "./images/03-select_your_location.png"
+msgid "03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -2695,22 +2729,28 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "./images/24-Tjener-KDE_Start.png"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "./images/24-Tjener-KDE_Start.png"
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "{{attachment:23-Tjener-Login.png}}"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
@@ -2720,7 +2760,7 @@ msgstr "./images/29-Diskless-WS-LDM_Login.png"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -12780,6 +12820,41 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#, fuzzy
+#~| msgid "01-Installer_boot_menu.png"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "01-Installer_boot_menu.png"
+
+#, fuzzy
+#~| msgid "./images/Installer_help.png"
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "./images/Installer_help.png"
+
+#, fuzzy
+#~| msgid "./images/pxe-tjener.png"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "./images/pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "02-select_a_language.png"
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "02-select_a_language.png"
+
+#, fuzzy
+#~| msgid "03-select_your_location.png"
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "03-select_your_location.png"
+
+#, fuzzy
+#~| msgid "./images/24-Tjener-KDE_Start.png"
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "./images/24-Tjener-KDE_Start.png"
+
 #~ msgid "Modifying the KDM login screen"
 #~ msgstr "Modificare la schermata di login di KDM"
 
@@ -12950,9 +13025,6 @@ msgstr ""
 #~ msgid "Manual for Debian Edu 9+edu0 Codename \"Stretch\""
 #~ msgstr "Manuale per Debian Edu 8+edu0 nome in codice Jessie"
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Login di Debian Edu"
-
 #~ msgid ""
 #~ "Sources are available from the Debian archive, see <ulink url=\"http://"
 #~ "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
@@ -12962,33 +13034,6 @@ msgstr ""
 #~ "\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> per altre "
 #~ "opzioni di download."
 
-#~ msgid "./images/01-Installer_boot_menu.png"
-#~ msgstr "./images/01-Installer_boot_menu.png"
-
-#~ msgid "Installer boot menu"
-#~ msgstr "Menu di avvio dell'installatore"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Schermata 1 delle opzioni avanzate dell'installatore"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Schermata 2 delle opzioni avanzate dell'installatore"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Schermata di aiuto dell'installatore"
-
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#~ msgid "./images/02-select_a_language.png"
-#~ msgstr "./images/02-select_a_language.png"
-
-#~ msgid "./images/03-select_your_location.png"
-#~ msgstr "./images/03-select_your_location.png"
-
 #~ msgid "./images/04-Configure_the_keyboard.png"
 #~ msgstr "./images/04-Configure_the_keyboard.png"
 
@@ -13052,9 +13097,6 @@ msgstr ""
 #~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
 #~ msgid "tjener KDM Login"
 #~ msgstr "Login KDM su tjener"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index 4a377e2..dde4b68 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+0000\n"
 "PO-Revision-Date: 2016-07-20 23:17+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -29,9 +29,15 @@ msgstr "Debian Edu / Skolelinux Stretch 9+edu0 マニュアル"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Debian Edu 9+edu0 コード名 Stretch 用マニュアル"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/23-Tjener-Login.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid "This is the manual for the Debian Edu Stretch 9+edu0 release."
@@ -1495,10 +1501,16 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "インストールの選択"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/01-Installer_boot_menu.png"
 msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
@@ -1547,8 +1559,16 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> でインストーラの使用に関するいくら"
 "かのヒントを提供します。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
+msgstr "{{attachment:Installer_advanced_options_a.png}}"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "Installer advanced options screen 1"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1605,10 +1625,18 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> には preseed "
 "ファイルが必要です。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "Installer advanced options screen 2"
+msgstr "{{attachment:Installer_advanced_options_a.png}}"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1661,9 +1689,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> には "
 "preseed ファイルが必要です。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2218,9 +2252,15 @@ msgstr ""
 "<emphasis role=\"strong\">中心サーバ</emphasis>プロファイルだけの場合 PXE メ"
 "ニューはこんな感じになります:"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "{{attachment:pxe-tjener.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2232,8 +2272,10 @@ msgstr ""
 "ンクライアントサーバ</emphasis>プロファイルの場合 PXE メニューはこんな感じに"
 "なります:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2404,12 +2446,34 @@ msgstr ""
 "トワーク及びシンクライアントネットワークでの PXE ブートのスクリーンショットで"
 "す:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "01-Installer_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:02-select_a_language.png}}"
+msgid "./images/02-select_a_language.png"
 msgstr "{{attachment:02-select_a_language.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:02-select_a_language.png}}"
+msgid "02-select_a_language.png"
+msgstr "{{attachment:02-select_a_language.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:03-select_your_location.png}}"
+msgid "./images/03-select_your_location.png"
+msgstr "{{attachment:03-select_your_location.png}}"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:03-select_your_location.png}}"
+msgid "03-select_your_location.png"
 msgstr "{{attachment:03-select_your_location.png}}"
 
 #. type: Content of: <article><section><section><para>
@@ -2501,23 +2565,37 @@ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "{{attachment:24-Tjener-KDE_Start.png}}"
+#, fuzzy
+#| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+msgid "{{attachment:23-Tjener-Login.png}}"
+msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+#, fuzzy
+#| msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
 msgstr "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#, fuzzy
+#| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 msgstr "{{attachment:27-Tjener-KDE_Desktop.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 msgstr "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#, fuzzy
+#| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><title>
@@ -11783,6 +11861,15 @@ msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
 
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "{{attachment:pxe-tjener.png}}"
+
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "{{attachment:24-Tjener-KDE_Start.png}}"
+
 #~ msgid "Modifying the KDM login screen"
 #~ msgstr "KDM ログイン画面の変更"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index 6e2b306..7030628 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+0000\n"
 "PO-Revision-Date: 2016-11-02 05:28+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -49,11 +49,15 @@ msgstr "Debian Edu / Skolelinux Jessie 8.0+edu0 utgivelseshåndbok"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Utgivelseshåndbok for Debian Edu 8.0+edu0 kodenavn Jessie"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "./images/23-Tjener-Login.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Skolelinux innlogging"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -1065,8 +1069,8 @@ msgid ""
 "The purpose of the different profiles is explained in the <link linkend="
 "\"Architecture\">network architecture</link> chapter."
 msgstr ""
-"Egenskapene til de ulike profilene forklares i kapittelet <link url=\""
-"Architecture\">nettverksarkitektur</link>."
+"Egenskapene til de ulike profilene forklares i kapittelet <link url="
+"\"Architecture\">nettverksarkitektur</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
@@ -1206,9 +1210,8 @@ msgid ""
 "A list of tested hardware is provided at <ulink url=\"http://wiki.debian.org/"
 "DebianEdu/Hardware/\"/> . This list is not nearly complete"
 msgstr ""
-"En liste over testet maskinvare kan finnes på <ulink url=\""
-"http://wiki.debian.org/DebianEdu/Hardware/\"/>. Denne listen er på ingen "
-"måte komplett."
+"En liste over testet maskinvare kan finnes på <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Hardware/\"/>. Denne listen er på ingen måte komplett."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/smile.png"
@@ -1597,11 +1600,13 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Velg type installasjon"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "01-Installer_boot_menu.png"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "01-Installer_boot_menu.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Installasjons-oppstartmeny"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1651,12 +1656,16 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> gir noen hint i bruk av "
 "installasjonsprosessen"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Installer_advanced_options_a.png"
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Installer avanserte alternativer skjermbilde1"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1711,12 +1720,16 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> trenger en "
 "«preseed»-fil (for automatisk installasjon)."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Installer_advanced_options_b.png"
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "./images/Installer_advanced_options_b.png"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Avanserte installasjonsvalg på skjerm 2"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1769,11 +1782,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
 "trenger en «preseed»-fil."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/Installer_help.png"
-msgid "{{attachment:Installer_help.png}}"
-msgstr "./images/Installer_help.png"
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Installasjons-hjelpeskjerm"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1859,10 +1876,10 @@ msgid ""
 "the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
-"For å installere skrivebordsmiljøet <emphasis role=\"strong\""
-">GNOME</emphasis> i stedet for <emphasis role=\"strong\">KDE "
-"«Plasma»</emphasis>, legg til <computeroutput>desktop=gnome</computeroutput> "
-"i kjernens oppstartsparametere."
+"For å installere skrivebordsmiljøet <emphasis role=\"strong\">GNOME</"
+"emphasis> i stedet for <emphasis role=\"strong\">KDE «Plasma»</emphasis>, "
+"legg til <computeroutput>desktop=gnome</computeroutput> i kjernens "
+"oppstartsparametere."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2050,16 +2067,17 @@ msgid ""
 "server or as a thin client server to become usefull after the installation."
 msgstr ""
 "Profilene til <emphasis role=\"strong\">hovedtjener </emphasis>, <emphasis "
-"role=\"strong \">arbeidsstasjon</emphasis> og <emphasis role=\"strong\""
-">tynnklient</emphasis> er forhåndsvalgt. Disse profilene kan være installert "
-"sammen på en maskin hvis du ønsker å installere en såkalt <emphasis> "
-"kombinert hovedtjener</emphasis>. Da vil hovedtjeneren være både en tjener "
-"for tynnklienter, og bli brukt som en arbeidsstasjon. Dette er "
-"forhåndsvalgt, fordi vi regner med at de fleste senere vil installere dette <"
-"link linkend=\"Installation--Installation_over_the_network_.28PXE."
-"29_and_booting_diskless_clients\">via PXE</link>. Vær oppmerksom på at du må "
-"ha to nettverkskort installert i en maskin som skal gjøres til en kombinert "
-"hovedtjener om den skal komme til nytte etter installasjon."
+"role=\"strong \">arbeidsstasjon</emphasis> og <emphasis role=\"strong"
+"\">tynnklient</emphasis> er forhåndsvalgt. Disse profilene kan være "
+"installert sammen på en maskin hvis du ønsker å installere en såkalt "
+"<emphasis> kombinert hovedtjener</emphasis>. Da vil hovedtjeneren være både "
+"en tjener for tynnklienter, og bli brukt som en arbeidsstasjon. Dette er "
+"forhåndsvalgt, fordi vi regner med at de fleste senere vil installere dette "
+"<link linkend=\"Installation--"
+"Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
+"PXE</link>. Vær oppmerksom på at du må ha to nettverkskort installert i en "
+"maskin som skal gjøres til en kombinert hovedtjener om den skal komme til "
+"nytte etter installasjon."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2095,10 +2113,10 @@ msgid ""
 "should be kept for future releases.  Although you don't have to, it is a "
 "simple way for you to help."
 msgstr ""
-"Velg gjerne ja for å sende informasjon til <ulink url=\""
-"http://popcon.skolelinux.org/\"/>for å tillate oss å få tilsendt informasjon "
-"om hvilke pakker som er populære, og som bør beholdes i fremtidige "
-"utgivelser - dette er selvfølgelig frivillig."
+"Velg gjerne ja for å sende informasjon til <ulink url=\"http://popcon."
+"skolelinux.org/\"/>for å tillate oss å få tilsendt informasjon om hvilke "
+"pakker som er populære, og som bør beholdes i fremtidige utgivelser - dette "
+"er selvfølgelig frivillig."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2324,14 +2342,18 @@ msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
 "Server</emphasis> profile only:"
 msgstr ""
-"Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong\""
-">hovedtjener</emphasis> tilgjengelig:"
+"Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong"
+"\">hovedtjener</emphasis> tilgjengelig:"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/pxe-tjener.png"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "./images/pxe-tjener.png"
+#| msgid "./images/smile.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2342,11 +2364,9 @@ msgstr ""
 "Slik ser PXE-menyen ut når man har  <emphasis role=\"strong\">hovedtjener</"
 "emphasis> og <emphasis role=\"strong\">tynnklienttjener</emphasis>profilene:"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2524,17 +2544,31 @@ msgstr ""
 "første oppstart av tjener, en PXE-start både på arbeidsstasjonens og "
 "tynnklientens nettverk:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "02-select_a_language.png"
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "02-select_a_language.png"
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "03-select_your_location.png"
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "03-select_your_location.png"
+#| msgid "./images/02-select_a_language.png"
+msgid "02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/03-select_your_location.png"
+msgid "03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -2670,22 +2704,28 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "./images/24-Tjener-KDE_Start.png"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "./images/24-Tjener-KDE_Start.png"
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "{{attachment:23-Tjener-Login.png}}"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
@@ -2695,7 +2735,7 @@ msgstr "./images/29-Diskless-WS-LDM_Login.png"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -6834,8 +6874,8 @@ msgid ""
 "etc/debian-edu/www/debian-edu-install.dat.local</computeroutput>:"
 msgstr ""
 "For å legge til et tilpasset arkiv legg inn noe slikt som dette i "
-"<computeroutput>/etc/debian-edu/www/debian-edu-"
-"install.dat.local</computeroutput>:"
+"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</"
+"computeroutput>:"
 
 #. type: CDATA
 #, no-wrap
@@ -9906,10 +9946,10 @@ msgstr ""
 "Opphavsretten for oversettelsen til norsk bokmål tilhører Petter "
 "Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore "
 "Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik "
-"Yrvin (2014), Ingrid Yrvin (2014, 2015), Hans Arthur Kielland Aanesen (2014)"
-", Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen "
-"(2014) og Ragnar Wisløff (2014), og er utgitt under GPL2 eller en senere "
-"versjon."
+"Yrvin (2014), Ingrid Yrvin (2014, 2015), Hans Arthur Kielland Aanesen "
+"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"Lauridsen (2014) og Ragnar Wisløff (2014), og er utgitt under GPL2 eller en "
+"senere versjon."
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -9956,10 +9996,10 @@ msgid ""
 "l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
 "version."
 msgstr ""
-"Den franske oversettelsen er rettighetsbeskyttet av  Christophe Masson (2008)"
-", Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-"
-"Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), og det "
-"franske l10n team (2009, 2010, 2012), og er utgitt under GPL2 eller en "
+"Den franske oversettelsen er rettighetsbeskyttet av  Christophe Masson "
+"(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), "
+"Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), og "
+"det franske l10n team (2009, 2010, 2012), og er utgitt under GPL2 eller en "
 "senere versjon."
 
 #. type: Content of: <article><section><para>
@@ -10092,8 +10132,8 @@ msgid ""
 "<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 "Du kan hente ut kilden for <computeroutput>debian-edu-doc</computeroutput> "
-"anonymt med denne kommandoen (du må ha pakken "
-"<computeroutput>git</computeroutput> installert for at dette skal fungere):"
+"anonymt med denne kommandoen (du må ha pakken <computeroutput>git</"
+"computeroutput> installert for at dette skal fungere):"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -12632,6 +12672,41 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#, fuzzy
+#~| msgid "01-Installer_boot_menu.png"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "01-Installer_boot_menu.png"
+
+#, fuzzy
+#~| msgid "./images/Installer_help.png"
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "./images/Installer_help.png"
+
+#, fuzzy
+#~| msgid "./images/pxe-tjener.png"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "./images/pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "02-select_a_language.png"
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "02-select_a_language.png"
+
+#, fuzzy
+#~| msgid "03-select_your_location.png"
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "03-select_your_location.png"
+
+#, fuzzy
+#~| msgid "./images/24-Tjener-KDE_Start.png"
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "./images/24-Tjener-KDE_Start.png"
+
 #~ msgid "Modifying the KDM login screen"
 #~ msgstr "Modifisere innloggingskjermen KDM"
 
@@ -12801,9 +12876,6 @@ msgstr ""
 #~ msgid "Manual for Debian Edu 9+edu0 Codename \"Stretch\""
 #~ msgstr "Utgivelseshåndbok for Debian Edu 8.0+edu0 kodenavn «Jessie»"
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Skolelinux innlogging"
-
 #, fuzzy
 #~| msgid ""
 #~| "Sources are available from the Debian archive, see <ulink url=\"http://"
@@ -12816,33 +12888,6 @@ msgstr ""
 #~ "Kildekode er tilgjengelig fra Debian-arkivet, se <ulink url=\"http://ftp."
 #~ "debian.org/debian-cd/8.0.0/source/\"/> for noen nedlastingsalternativer."
 
-#~ msgid "./images/01-Installer_boot_menu.png"
-#~ msgstr "./images/01-Installer_boot_menu.png"
-
-#~ msgid "Installer boot menu"
-#~ msgstr "Installasjons-oppstartmeny"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Installer avanserte alternativer skjermbilde1"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Avanserte installasjonsvalg på skjerm 2"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Installasjons-hjelpeskjerm"
-
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#~ msgid "./images/02-select_a_language.png"
-#~ msgstr "./images/02-select_a_language.png"
-
-#~ msgid "./images/03-select_your_location.png"
-#~ msgstr "./images/03-select_your_location.png"
-
 #~ msgid "./images/04-Configure_the_keyboard.png"
 #~ msgstr "./images/04-Configure_the_keyboard.png"
 
@@ -12906,9 +12951,6 @@ msgstr ""
 #~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
 #~ msgid "tjener KDM Login"
 #~ msgstr "KDM-innlogging på tjener"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index 0ea1572..a35afb7 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+0000\n"
 "PO-Revision-Date: 2016-10-03 16:16+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"
@@ -29,9 +29,15 @@ msgstr "Handleiding Debian Edu/Skolelinux Stretch 9+edu0"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Handleiding voor Debian Edu 9+edu0 codenaam Stretch"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "./images/23-Tjener-Login.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Aanmelden bij Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid "This is the manual for the Debian Edu Stretch 9+edu0 release."
@@ -1596,9 +1602,13 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Een type van installatie kiezen"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Opstartmenu van het installatieprogramma"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1651,9 +1661,13 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> geeft aanwijzingen bij het gebruik "
 "van het installatieprogramma. "
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
-msgstr "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_advanced_options_a.png"
+msgstr "./images/Installer_advanced_options_a.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 1"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1712,9 +1726,13 @@ msgstr ""
 "bestand nodig waarmee een aantal configuratieopties aan het "
 "installatieprogramma doorgegeven worden op een 64-bitcomputer."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
-msgstr "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_advanced_options_b.png"
+msgstr "./images/Installer_advanced_options_b.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 2"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1772,9 +1790,13 @@ msgstr ""
 "heeft een bestand nodig waarmee een aantal configuratieopties aan het "
 "installatieprogramma doorgegeven worden."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_help.png"
+msgstr "./images/Installer_help.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Installatieprogramma - hulpscherm"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2355,9 +2377,13 @@ msgstr ""
 "Indien u koos voor een <emphasis role=\"strong\">Hoofdserver</emphasis> met "
 "uitsluitend het hoofdserverprofiel, ziet het menu van PXE er zo uit:"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "{{attachment:pxe-tjener.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/pxe-tjener.png"
+msgstr "./images/pxe-tjener.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2369,9 +2395,9 @@ msgstr ""
 "emphasis> als een <emphasis role=\"strong\">Thin-clientserver-</"
 "emphasis>profiel, ziet het menu van PXE er als volgt uit:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2556,13 +2582,25 @@ msgstr ""
 "van het scherm dat u ziet bij het opstarten via PXE van een computer op "
 "respectievelijk het netwerk voor werkstations en dat voor thin clients:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
+msgstr "02-select_a_language.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:04-Configure_the_keyboard.png}}"
@@ -2653,23 +2691,35 @@ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "{{attachment:24-Tjener-KDE_Start.png}}"
+#, fuzzy
+#| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+msgid "{{attachment:23-Tjener-Login.png}}"
+msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+#, fuzzy
+#| msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
 msgstr "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#, fuzzy
+#| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 msgstr "{{attachment:27-Tjener-KDE_Desktop.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 msgstr "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#, fuzzy
+#| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><title>
@@ -12839,6 +12889,33 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#~ msgid "{{attachment:Installer_advanced_options_a.png}}"
+#~ msgstr "{{attachment:Installer_advanced_options_a.png}}"
+
+#~ msgid "{{attachment:Installer_advanced_options_b.png}}"
+#~ msgstr "{{attachment:Installer_advanced_options_b.png}}"
+
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "{{attachment:pxe-tjener.png}}"
+
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "{{attachment:02-select_a_language.png}}"
+
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "{{attachment:03-select_your_location.png}}"
+
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "{{attachment:24-Tjener-KDE_Start.png}}"
+
 #~ msgid "Modifying the KDM login screen"
 #~ msgstr "Het KDM-aanmeldscherm aanpassen"
 
@@ -13029,12 +13106,6 @@ msgstr ""
 #~ msgid "Manual for Debian Edu 9+edu0 Codename \"Stretch\""
 #~ msgstr "Handleiding voor Debian Edu 8+edu0 codenaam Jessie"
 
-#~ msgid "./images/23-Tjener-KDM_Login.png"
-#~ msgstr "./images/23-Tjener-KDM_Login.png"
-
-#~ msgid "Debian Edu login"
-#~ msgstr "Aanmelden bij Debian Edu"
-
 #~ msgid ""
 #~ "Sources are available from the Debian archive, see <ulink url=\"http://"
 #~ "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
@@ -13044,56 +13115,6 @@ msgstr ""
 #~ "\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> voor een "
 #~ "aantal downloadopties."
 
-#~ msgid "./images/01-Installer_boot_menu.png"
-#~ msgstr "./images/01-Installer_boot_menu.png"
-
-#~ msgid "Installer boot menu"
-#~ msgstr "Opstartmenu van het installatieprogramma"
-
-#~ msgid "./images/Installer_advanced_options_a.png"
-#~ msgstr "./images/Installer_advanced_options_a.png"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr ""
-#~ "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 1"
-
-#~ msgid "./images/Installer_advanced_options_b.png"
-#~ msgstr "./images/Installer_advanced_options_b.png"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr ""
-#~ "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 2"
-
-#~ msgid "./images/Installer_help.png"
-#~ msgstr "./images/Installer_help.png"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Installatieprogramma - hulpscherm"
-
-#~ msgid "./images/pxe-tjener.png"
-#~ msgstr "./images/pxe-tjener.png"
-
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#~ msgid "01-Installer_boot_menu.png"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#~ msgid "./images/02-select_a_language.png"
-#~ msgstr "./images/02-select_a_language.png"
-
-#~ msgid "02-select_a_language.png"
-#~ msgstr "02-select_a_language.png"
-
-#~ msgid "./images/03-select_your_location.png"
-#~ msgstr "./images/03-select_your_location.png"
-
-#~ msgid "03-select_your_location.png"
-#~ msgstr "03-select_your_location.png"
-
 #~ msgid "./images/04-Configure_the_keyboard.png"
 #~ msgstr "./images/04-Configure_the_keyboard.png"
 
@@ -13247,9 +13268,6 @@ msgstr ""
 #~ msgid "KDE Desktop"
 #~ msgstr "Bureaublad van KDE"
 
-#~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
 #~ msgid "./images/29-Diskless-WS-LDM_Login.png"
 #~ msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index e336b1f..812cc1a 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+0000\n"
 "PO-Revision-Date: 2016-10-26 08:52+0000\n"
 "Last-Translator: Stanisław Krukowski <dfk0077 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -35,12 +35,16 @@ msgstr "Podręcznik Debian Edu / Skolelinux Jessie 8+edu1"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Podręcznik dla Debiana Edu 8+edu1 Nazwa kodowa Jessie"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+msgid "./images/23-Tjener-Login.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr ""
+
 #. type: Content of: <article><section><para>
 #, fuzzy
 #| msgid "This is the manual for the Debian Edu Jessie 8+edu1 release."
@@ -1268,8 +1272,12 @@ msgstr ""
 msgid "Select type of installation"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01-Installer_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1308,8 +1316,12 @@ msgid ""
 "installer"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_advanced_options_a.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1352,8 +1364,12 @@ msgid ""
 "preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_advanced_options_b.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1394,8 +1410,12 @@ msgid ""
 "needs a preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_help.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1787,8 +1807,12 @@ msgid ""
 "Server</emphasis> profile only:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:pxe-tjener.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/pxe-tjener.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1798,8 +1822,8 @@ msgid ""
 "emphasis> profiles:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1919,12 +1943,24 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/02-select_a_language.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/03-select_your_location.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2016,15 +2052,25 @@ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr ""
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "{{attachment:23-Tjener-Login.png}}"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
-msgstr ""
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgstr "./images/23-Tjener-KDM_Login.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2032,8 +2078,10 @@ msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgstr ""
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 666ecb1..eb855a9 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2016-11-05 14:33+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"
@@ -28,8 +28,12 @@ msgstr ""
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/23-Tjener-Login.png"
+msgstr ""
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -1141,8 +1145,12 @@ msgstr ""
 msgid "Select type of installation"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01-Installer_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1181,8 +1189,12 @@ msgid ""
 "installer"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_advanced_options_a.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1225,8 +1237,12 @@ msgid ""
 "preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_advanced_options_b.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1267,8 +1283,12 @@ msgid ""
 "needs a preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_help.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1660,8 +1680,12 @@ msgid ""
 "Server</emphasis> profile only:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:pxe-tjener.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/pxe-tjener.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1671,8 +1695,8 @@ msgid ""
 "emphasis> profiles:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1792,12 +1816,24 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/02-select_a_language.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/03-select_your_location.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1889,15 +1925,19 @@ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+msgid "{{attachment:23-Tjener-Login.png}}"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -1905,7 +1945,7 @@ msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 msgstr ""
 
 #. type: Content of: <article><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index cdd8a44..fbf4823 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -4,7 +4,7 @@
 <section id="AboutDebianEdu">
 <title>Manual for Debian Edu 9+edu0 Codename Stretch
 </title>
-<para>{{attachment:23-Tjener-KDM_Login.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/23-Tjener-Login.png"/></imageobject><textobject><phrase>Debian Edu login</phrase></textobject></inlinemediaobject> 
 </para>
 <para>This is the manual for the Debian Edu Stretch 9+edu0 release.  
 </para>
@@ -487,7 +487,7 @@
 <section id="Installation--Select_type_of_installation">
 <title>Select type of installation
 </title><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para>{{attachment:01-Installer_boot_menu.png}}
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>Installer boot menu</phrase></textobject></inlinemediaobject>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para> <emphasis role="strong">Install</emphasis> is the default text mode installation on i386 and amd64.
 </para>
@@ -501,7 +501,7 @@
 </para>
 <para><emphasis role="strong">Help</emphasis> gives some hints on using the installer
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para>{{attachment:Installer_advanced_options_a.png}}
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_advanced_options_a.png"/></imageobject><textobject><phrase>Installer advanced options screen 1</phrase></textobject></inlinemediaobject>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para><emphasis role="strong">Back..</emphasis> brings back to the main menu.
 </para>
@@ -517,7 +517,7 @@
 </para>
 <para> <emphasis role="strong">64 bit automated install</emphasis> needs a preseed file.
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para>{{attachment:Installer_advanced_options_b.png}}
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_advanced_options_b.png"/></imageobject><textobject><phrase>Installer advanced options screen 2</phrase></textobject></inlinemediaobject>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para><emphasis role="strong">Graphical expert install</emphasis> gives access to all available questions in graphical mode.
 </para>
@@ -531,7 +531,7 @@
 </para>
 <para> <emphasis role="strong">64 bit graphical automated install</emphasis> needs a preseed file.
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para>{{attachment:Installer_help.png}}
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_help.png"/></imageobject><textobject><phrase>Installer help screen</phrase></textobject></inlinemediaobject>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para> This Help screen is self explaining and enables the <F>-keys on the keyboard for getting more detailed help on the topics described.
 </para></entry></row></tbody></tgroup></informaltable>
@@ -712,11 +712,11 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> profile only: 
 </para>
-<para>{{attachment:pxe-tjener.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/pxe-tjener.png"/></imageobject><textobject><phrase>width=400</phrase></textobject></inlinemediaobject> 
 </para>
 <para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> and <emphasis role="strong">Thin-Client-Server</emphasis> profiles: 
 </para>
-<para>{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>width=400</phrase></textobject></inlinemediaobject> 
 </para>
 <para>This setup also allows diskless workstations and thin clients to be booted on the main network. Unlike workstations, diskless workstations don't have to be added to LDAP with GOsa², but can be, for example if you want to force the hostname. 
 </para>
@@ -758,11 +758,11 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para>So here is a screenshot tour through a graphical Main-Server + Workstation + Thin Client Server installation and how it looks at the first boot of the tjener, a PXE boot on the workstation network and on the thinclient network: 
 </para>
-<para>{{attachment:01-Installer_boot_menu.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>01-Installer_boot_menu.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:02-select_a_language.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/02-select_a_language.png"/></imageobject><textobject><phrase>02-select_a_language.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:03-select_your_location.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/03-select_your_location.png"/></imageobject><textobject><phrase>03-select_your_location.png</phrase></textobject></inlinemediaobject> 
 </para>
 <para>{{attachment:04-Configure_the_keyboard.png}} 
 </para>
@@ -808,19 +808,17 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para>{{attachment:22-Tjener_GRUB_boot_menu.png}} 
 </para>
-<para>{{attachment:23-Tjener-KDM_Login.png}} 
+<para>{{attachment:23-Tjener-Login.png}} 
 </para>
-<para>{{attachment:24-Tjener-KDE_Start.png}} 
+<para>{{attachment:26-Tjener-MATE_Desktop_Browser.png}} 
 </para>
-<para>{{attachment:26-Tjener-KDE_Desktop_Browser.png}} 
+<para>{{attachment:27-Tjener-MATE_Desktop.png}} 
 </para>
-<para>{{attachment:27-Tjener-KDE_Desktop.png}} 
-</para>
-<para>{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>28-Diskless-WS-GRUB_Boot_menu-PXE.png</phrase></textobject></inlinemediaobject> 
 </para>
 <para>{{attachment:29-Diskless-WS-LDM_Login.png}} 
 </para>
-<para>{{attachment:31-ThinClient-KDE_Desktop.png}} 
+<para>{{attachment:31-ThinClient-MATE_Desktop.png}} 
 </para>
 </section>
 </section>
@@ -854,7 +852,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para>The <link linkend="HowTo">HowTo</link> chapter covers more tips and tricks and some frequently asked questions. 
 </para>
-<para>{{attachment:27-Tjener-KDE_Desktop.png}} 
+<para>{{attachment:27-Tjener-MATE_Desktop.png}} 
 </para>
 
 <section id="GettingStarted--Services_running_on_the_main_server">
diff --git a/documentation/debian-edu-stretch/images/01-Installer_boot_menu.png b/documentation/debian-edu-stretch/images/01-Installer_boot_menu.png
new file mode 100644
index 0000000..9590b5c
Binary files /dev/null and b/documentation/debian-edu-stretch/images/01-Installer_boot_menu.png differ
diff --git a/documentation/debian-edu-stretch/images/02-select_a_language.png b/documentation/debian-edu-stretch/images/02-select_a_language.png
new file mode 100644
index 0000000..4ce49d6
Binary files /dev/null and b/documentation/debian-edu-stretch/images/02-select_a_language.png differ
diff --git a/documentation/debian-edu-stretch/images/03-select_your_location.png b/documentation/debian-edu-stretch/images/03-select_your_location.png
new file mode 100644
index 0000000..4ce49d6
Binary files /dev/null and b/documentation/debian-edu-stretch/images/03-select_your_location.png differ
diff --git a/documentation/debian-edu-stretch/images/23-Tjener-Login.png b/documentation/debian-edu-stretch/images/23-Tjener-Login.png
new file mode 100644
index 0000000..50abb43
Binary files /dev/null and b/documentation/debian-edu-stretch/images/23-Tjener-Login.png differ
diff --git a/documentation/debian-edu-stretch/images/28-Diskless-WS-GRUB_Boot_menu-PXE.png b/documentation/debian-edu-stretch/images/28-Diskless-WS-GRUB_Boot_menu-PXE.png
new file mode 100644
index 0000000..bdf8e80
Binary files /dev/null and b/documentation/debian-edu-stretch/images/28-Diskless-WS-GRUB_Boot_menu-PXE.png differ
diff --git a/documentation/debian-edu-stretch/images/Installer_advanced_options_a.png b/documentation/debian-edu-stretch/images/Installer_advanced_options_a.png
new file mode 100644
index 0000000..63d148e
Binary files /dev/null and b/documentation/debian-edu-stretch/images/Installer_advanced_options_a.png differ
diff --git a/documentation/debian-edu-stretch/images/Installer_advanced_options_b.png b/documentation/debian-edu-stretch/images/Installer_advanced_options_b.png
new file mode 100644
index 0000000..9fb2e5a
Binary files /dev/null and b/documentation/debian-edu-stretch/images/Installer_advanced_options_b.png differ
diff --git a/documentation/debian-edu-stretch/images/Installer_help.png b/documentation/debian-edu-stretch/images/Installer_help.png
new file mode 100644
index 0000000..e240cc9
Binary files /dev/null and b/documentation/debian-edu-stretch/images/Installer_help.png differ
diff --git a/documentation/debian-edu-stretch/images/pxe-tjener.png b/documentation/debian-edu-stretch/images/pxe-tjener.png
new file mode 100644
index 0000000..1af7833
Binary files /dev/null and b/documentation/debian-edu-stretch/images/pxe-tjener.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