[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Stretch manual and new images from the wiki. Thanks to Wolfgang Schweer for taking all those screenshots!

Sat Nov 5 15:24:03 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 7848064535a0569b1cbc6d5a4e4b34ffdd91fc7c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Nov 5 16:23:46 2016 +0100

    Update Debian Edu Stretch manual and new images from the wiki. Thanks to Wolfgang Schweer for taking all those screenshots!
---
 debian/changelog                                   |   3 +-
 .../debian-edu-stretch-manual.da.po                | 300 ++++++++++---
 .../debian-edu-stretch-manual.de.po                | 417 ++++++++++++------
 .../debian-edu-stretch-manual.es.po                | 268 +++++++++---
 .../debian-edu-stretch-manual.fr.po                | 451 ++++++++++++-------
 .../debian-edu-stretch-manual.it.po                | 451 ++++++++++++-------
 .../debian-edu-stretch-manual.ja.po                | 300 ++++++++++---
 .../debian-edu-stretch-manual.nb.po                | 451 ++++++++++++-------
 .../debian-edu-stretch-manual.nl.po                | 487 +++++++++++----------
 .../debian-edu-stretch-manual.pl.po                | 213 ++++++---
 .../debian-edu-stretch-manual.pot                  | 200 ++++++---
 .../debian-edu-stretch-manual.xml                  |  52 ++-
 .../images/04-Configure_the_keyboard.png           | Bin 0 -> 43498 bytes
 .../images/05-Detect_and_mount_CD-ROM.png          | Bin 0 -> 27795 bytes
 .../06-Load_installer_components_from_CD.png       | Bin 0 -> 25922 bytes
 .../images/07-Detect_network_hardware.png          | Bin 0 -> 25700 bytes
 .../images/08-Choose_Debian_Edu_profile.png        | Bin 0 -> 59250 bytes
 ...-Really_use_the_automatic_partitioning_tool.png | Bin 0 -> 38645 bytes
 .../11-Participate_in_the_package_usage_survey.png | Bin 0 -> 42744 bytes
 .../images/12-Set_up_users_and_passwords.png       | Bin 0 -> 53735 bytes
 .../images/12a-Set_up_users_and_passwords.png      | Bin 0 -> 37347 bytes
 .../images/12b-Set_up_users_and_passwords.png      | Bin 0 -> 33836 bytes
 .../images/12c-Set_up_users_and_passwords.png      | Bin 0 -> 41113 bytes
 .../images/12d-Setting-up-the-partitioner.png      | Bin 0 -> 24920 bytes
 .../images/13-Install+the+base+system.png          | Bin 0 -> 24926 bytes
 .../images/14-Select_and_install_software.png      | Bin 0 -> 27176 bytes
 .../images/17-Select_and_install_software.png      | Bin 0 -> 27302 bytes
 .../images/18-Build+LTSP+chroot.png                | Bin 0 -> 24315 bytes
 ...Install_the_GRUB_boot_loader_on_a_hard_disk.png | Bin 0 -> 26494 bytes
 .../images/20-Finish_the_Installation.png          | Bin 0 -> 25181 bytes
 ...nish_the_Installation-Installation_complete.png | Bin 0 -> 34872 bytes
 .../images/22-Tjener_GRUB_boot_menu.png            | Bin 0 -> 23673 bytes
 .../images/26-Tjener-MATE_Desktop_Browser.png      | Bin 0 -> 232796 bytes
 .../images/27-Tjener-MATE_Desktop.png              | Bin 0 -> 360797 bytes
 .../images/29-Diskless-WS-LDM_Login.png            | Bin 0 -> 31814 bytes
 .../images/31-ThinClient-MATE_Desktop.png          | Bin 0 -> 352200 bytes
 36 files changed, 2408 insertions(+), 1185 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0bdf06..5655470 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 debian-edu-doc (1.910~20161104) UNRELEASED; urgency=medium
 
-  * Update Debian Edu Stretch manual from the wiki.
+  * Update Debian Edu Stretch manual and new images from the wiki. Thanks to
+    Wolfgang Schweer for taking all those screenshots!
 
  -- Holger Levsen <holger at debian.org>  Thu, 03 Nov 2016 13:19:59 +0100
 
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 de7c787..0555514 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +31,7 @@ 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: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/alert.png"
 msgid "./images/23-Tjener-Login.png"
@@ -2503,126 +2503,298 @@ msgstr "{{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>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:04-Configure_the_keyboard.png}}"
+msgid "./images/04-Configure_the_keyboard.png"
 msgstr "{{attachment:04-Configure_the_keyboard.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:04-Configure_the_keyboard.png}}"
+msgid "04-Configure_the_keyboard.png"
+msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:07-Detect_network_hardware.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+msgid "06-Load_installer_components_from_CD.png"
+msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:07-Detect_network_hardware.png}}"
+msgid "./images/07-Detect_network_hardware.png"
 msgstr "{{attachment:07-Detect_network_hardware.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:07-Detect_network_hardware.png}}"
+msgid "07-Detect_network_hardware.png"
+msgstr "{{attachment:07-Detect_network_hardware.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
 
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+msgid "11-Participate_in_the_package_usage_survey.png"
+msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+msgid "12-Set_up_users_and_passwords.png"
+msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "{{attachment:12a-Set_up_users_and_passwords.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+msgid "12a-Set_up_users_and_passwords.png"
+msgstr "{{attachment:12a-Set_up_users_and_passwords.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "{{attachment:12b-Set_up_users_and_passwords.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr "{{attachment:12b-Set_up_users_and_passwords.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "{{attachment:12c-Set_up_users_and_passwords.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr "{{attachment:12c-Set_up_users_and_passwords.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12e-creating_ext4.png}}"
-msgstr "{{attachment:12e-creating_ext4.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+msgid "12d-Setting-up-the-partitioner.png"
+msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:13-Install the base system.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/13-Install+the+base+system.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:13-Install the base system.png}}"
+msgid "13-Install the base system.png"
 msgstr "{{attachment:13-Install the base system.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:14-Select_and_install_software.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:14-Select_and_install_software.png}}"
+msgid "./images/14-Select_and_install_software.png"
 msgstr "{{attachment:14-Select_and_install_software.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:17-Select_and_install_software.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:14-Select_and_install_software.png}}"
+msgid "14-Select_and_install_software.png"
+msgstr "{{attachment:14-Select_and_install_software.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:17-Select_and_install_software.png}}"
+msgid "./images/17-Select_and_install_software.png"
 msgstr "{{attachment:17-Select_and_install_software.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:18-Build LTSP chroot.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:17-Select_and_install_software.png}}"
+msgid "17-Select_and_install_software.png"
+msgstr "{{attachment:17-Select_and_install_software.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:18-Build LTSP chroot.png}}"
+msgid "./images/18-Build+LTSP+chroot.png"
 msgstr "{{attachment:18-Build LTSP chroot.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:18-Build LTSP chroot.png}}"
+msgid "18-Build LTSP chroot.png"
+msgstr "{{attachment:18-Build LTSP chroot.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:20-Finish_the_Installation.png}}"
+msgid "./images/20-Finish_the_Installation.png"
 msgstr "{{attachment:20-Finish_the_Installation.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:20-Finish_the_Installation.png}}"
+msgid "20-Finish_the_Installation.png"
+msgstr "{{attachment:20-Finish_the_Installation.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgid "{{attachment:23-Tjener-Login.png}}"
-msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+#| msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
-msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgstr "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgid "./images/27-Tjener-MATE_Desktop.png"
 msgstr "{{attachment:27-Tjener-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
+#| msgid "XFCE desktop"
+msgid "KDE Desktop"
+msgstr "XFCE-skrivebord"
+
+#. 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}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Diskless workstations"
+msgid "Diskless Workstation Login"
+msgstr "Diskløse arbejdsstationer"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><title>
@@ -2720,6 +2892,12 @@ msgstr ""
 "Kapitlet <link linkend=\"HowTo\">Hjælp</link> dækker flere fif og ideer og "
 "nogle ofte stillede spørgsmål."
 
+#. type: Content of: <article><section><section><para>
+#, 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><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -12344,6 +12522,14 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:12e-creating_ext4.png}}"
+#~ msgstr "{{attachment:12e-creating_ext4.png}}"
+
+#, fuzzy
+#~| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgid "{{attachment:23-Tjener-Login.png}}"
+#~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+
 #~ msgid "{{attachment:Installer_help.png}}"
 #~ msgstr "{{attachment:Installer_help.png}}"
 
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 edd8d17..9e15a14 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +40,7 @@ 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: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "./images/23-Tjener-Login.png"
@@ -2545,126 +2545,256 @@ msgstr "./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}}"
-msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
-msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/04-Configure_the_keyboard.png"
+msgid "04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:07-Detect_network_hardware.png}}"
-msgstr "{{attachment:07-Detect_network_hardware.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/05-Detect_and_mount_CD-ROM.png"
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/06-Load_installer_components_from_CD.png"
+msgid "06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/07-Detect_network_hardware.png"
+msgid "07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
-msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgid "11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/12-Set_up_users_and_passwords.png"
+msgid "12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
-msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/12a-Set_up_users_and_passwords.png"
+msgid "12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12e-creating_ext4.png}}"
-msgstr "{{attachment:12e-creating_ext4.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:13-Install the base system.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/12b-Set_up_users_and_passwords.png"
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/12c-Set_up_users_and_passwords.png"
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12d-Setting-up-the-partitioner.png"
+msgstr "./images/12d-Setting-up-the-partitioner.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/12d-Setting-up-the-partitioner.png"
+msgid "12d-Setting-up-the-partitioner.png"
+msgstr "./images/12d-Setting-up-the-partitioner.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/13-Install+the+base+system.png"
+msgstr "./images/13-Install+the+base+system.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:13-Install the base system.png}}"
+msgid "13-Install the base system.png"
 msgstr "{{attachment:13-Install the base system.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:14-Select_and_install_software.png}}"
-msgstr "{{attachment:14-Select_and_install_software.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:17-Select_and_install_software.png}}"
-msgstr "{{attachment:17-Select_and_install_software.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/14-Select_and_install_software.png"
+msgid "14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:18-Build LTSP chroot.png}}"
-msgstr "{{attachment:18-Build LTSP chroot.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/17-Select_and_install_software.png"
+msgid "17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "{{attachment:20-Finish_the_Installation.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/18-Build+LTSP+chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
-msgstr "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/18-Build+LTSP+chroot.png"
+msgid "18-Build LTSP chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/20-Finish_the_Installation.png"
+msgid "20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgid "{{attachment:23-Tjener-Login.png}}"
-msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+#| msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "KDM-Login von tjener"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
-msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgstr "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE und Browser"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgid "./images/27-Tjener-MATE_Desktop.png"
 msgstr "{{attachment:27-Tjener-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "KDE-Desktop"
+
+#. 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}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Diskless Workstation Login"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><title>
@@ -2764,6 +2894,12 @@ msgstr ""
 "Im Kapitel <link linkend=\"HowTo\">HowTo</link> gibt es mehr Tipps und "
 "Tricks, sowie Antworten auf häufig gestellte Fragen."
 
+#. type: Content of: <article><section><section><para>
+#, 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><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -12621,6 +12757,68 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#~ msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+
+#~ msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#~ msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+
+#~ msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#~ msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+
+#~ msgid "{{attachment:07-Detect_network_hardware.png}}"
+#~ msgstr "{{attachment:07-Detect_network_hardware.png}}"
+
+#~ msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#~ msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+
+#~ msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#~ msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+
+#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#~ msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+
+#~ msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#~ msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+
+#~ msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#~ msgstr "{{attachment:12a-Set_up_users_and_passwords.png}}"
+
+#~ msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#~ msgstr "{{attachment:12b-Set_up_users_and_passwords.png}}"
+
+#~ msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#~ msgstr "{{attachment:12c-Set_up_users_and_passwords.png}}"
+
+#~ msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#~ msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+
+#~ msgid "{{attachment:12e-creating_ext4.png}}"
+#~ msgstr "{{attachment:12e-creating_ext4.png}}"
+
+#~ msgid "{{attachment:14-Select_and_install_software.png}}"
+#~ msgstr "{{attachment:14-Select_and_install_software.png}}"
+
+#~ msgid "{{attachment:17-Select_and_install_software.png}}"
+#~ msgstr "{{attachment:17-Select_and_install_software.png}}"
+
+#~ msgid "{{attachment:18-Build LTSP chroot.png}}"
+#~ msgstr "{{attachment:18-Build LTSP chroot.png}}"
+
+#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#~ msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+
+#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
+#~ msgstr "{{attachment:20-Finish_the_Installation.png}}"
+
+#~ msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#~ msgstr "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+
+#, fuzzy
+#~| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgid "{{attachment:23-Tjener-Login.png}}"
+#~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+
 #~ msgid "{{attachment:01-Installer_boot_menu.png}}"
 #~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
@@ -12816,84 +13014,15 @@ msgstr ""
 #~ "Optionen siehe <ulink url=\"http://cdimage.debian.org/debian-cd/8.4.0/"
 #~ "source/iso-dvd/\"/>."
 
-#~ msgid "./images/04-Configure_the_keyboard.png"
-#~ msgstr "./images/04-Configure_the_keyboard.png"
-
-#~ msgid "./images/05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "./images/05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "./images/06-Load_installer_components_from_CD.png"
-#~ msgstr "./images/06-Load_installer_components_from_CD.png"
-
-#~ msgid "./images/07-Detect_network_hardware.png"
-#~ msgstr "./images/07-Detect_network_hardware.png"
-
-#~ msgid "./images/08-Choose_Debian_Edu_profile.png"
-#~ msgstr "./images/08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
-
 #~ msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 #~ msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#~ msgid "./images/11-Participate_in_the_package_usage_survey.png"
-#~ msgstr "./images/11-Participate_in_the_package_usage_survey.png"
-
-#~ msgid "./images/12-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12a-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12a-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12b-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12b-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12c-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12c-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12d-Setting-up-the-partitioner.png"
-#~ msgstr "./images/12d-Setting-up-the-partitioner.png"
-
 #~ msgid "./images/12e-creating_ext4.png"
 #~ msgstr "./images/12e-creating_ext4.png"
 
-#~ msgid "./images/13-Install+the+base+system.png"
-#~ msgstr "./images/13-Install+the+base+system.png"
-
-#~ msgid "./images/14-Select_and_install_software.png"
-#~ msgstr "./images/14-Select_and_install_software.png"
-
-#~ msgid "./images/17-Select_and_install_software.png"
-#~ msgstr "./images/17-Select_and_install_software.png"
-
-#~ msgid "./images/18-Build+LTSP+chroot.png"
-#~ msgstr "./images/18-Build+LTSP+chroot.png"
-
-#~ msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-#~ msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#~ msgid "./images/20-Finish_the_Installation.png"
-#~ msgstr "./images/20-Finish_the_Installation.png"
-
-#~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "KDM-Login von tjener"
-
 #~ msgid "KDE starting..."
 #~ msgstr "KDE startet ..."
 
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE und Browser"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "KDE-Desktop"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Diskless Workstation Login"
-
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "Debian-Edu KDE-Desktop"
 
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 c7c0b4f..15cb014 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +38,7 @@ 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: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "./images/23-Tjener-Login.png"
@@ -2579,40 +2579,76 @@ msgstr "03-select_your_location.png"
 msgid "03-select_your_location.png"
 msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "04-Configure_the_keyboard.png"
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
+msgid "./images/04-Configure_the_keyboard.png"
 msgstr "04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "04-Configure_the_keyboard.png"
+msgid "04-Configure_the_keyboard.png"
+msgstr "04-Configure_the_keyboard.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "05-Detect_and_mount_CD-ROM.png"
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr "05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "05-Detect_and_mount_CD-ROM.png"
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr "05-Detect_and_mount_CD-ROM.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "06-Load_installer_components_from_CD.png"
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr "06-Load_installer_components_from_CD.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "06-Load_installer_components_from_CD.png"
+msgid "06-Load_installer_components_from_CD.png"
+msgstr "06-Load_installer_components_from_CD.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "07-Detect_network_hardware.png"
-msgid "{{attachment:07-Detect_network_hardware.png}}"
+msgid "./images/07-Detect_network_hardware.png"
 msgstr "07-Detect_network_hardware.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "07-Detect_network_hardware.png"
+msgid "07-Detect_network_hardware.png"
+msgstr "07-Detect_network_hardware.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "08-Choose_Debian_Edu_profile.png"
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr "08-Choose_Debian_Edu_profile.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "08-Choose_Debian_Edu_profile.png"
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr "08-Choose_Debian_Edu_profile.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para>
@@ -2621,130 +2657,218 @@ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "11-Participate_in_the_package_usage_survey.png"
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "11-Participate_in_the_package_usage_survey.png"
+msgid "11-Participate_in_the_package_usage_survey.png"
+msgstr "11-Participate_in_the_package_usage_survey.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "12-Set_up_users_and_passwords.png"
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "12-Set_up_users_and_passwords.png"
+msgid "12-Set_up_users_and_passwords.png"
+msgstr "12-Set_up_users_and_passwords.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "12a-Set_up_users_and_passwords.png"
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "12a-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "12a-Set_up_users_and_passwords.png"
+msgid "12a-Set_up_users_and_passwords.png"
+msgstr "12a-Set_up_users_and_passwords.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "12b-Set_up_users_and_passwords.png"
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "12b-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "12b-Set_up_users_and_passwords.png"
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr "12b-Set_up_users_and_passwords.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "12c-Set_up_users_and_passwords.png"
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "12c-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "12c-Set_up_users_and_passwords.png"
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr "12c-Set_up_users_and_passwords.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "12d-Setting-up-the-partitioner.png"
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr "12d-Setting-up-the-partitioner.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12e-creating_ext4.png"
-msgid "{{attachment:12e-creating_ext4.png}}"
-msgstr "12e-creating_ext4.png"
+#| msgid "12d-Setting-up-the-partitioner.png"
+msgid "12d-Setting-up-the-partitioner.png"
+msgstr "12d-Setting-up-the-partitioner.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "./images/13-Install+the+base+system.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "13-Install the base system.png"
-msgid "{{attachment:13-Install the base system.png}}"
+msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "14-Select_and_install_software.png"
-msgid "{{attachment:14-Select_and_install_software.png}}"
+msgid "./images/14-Select_and_install_software.png"
 msgstr "14-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "14-Select_and_install_software.png"
+msgid "14-Select_and_install_software.png"
+msgstr "14-Select_and_install_software.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "17-Select_and_install_software.png"
-msgid "{{attachment:17-Select_and_install_software.png}}"
+msgid "./images/17-Select_and_install_software.png"
 msgstr "17-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "17-Select_and_install_software.png"
+msgid "17-Select_and_install_software.png"
+msgstr "17-Select_and_install_software.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "18-Build LTSP chroot.png"
-msgid "{{attachment:18-Build LTSP chroot.png}}"
+msgid "./images/18-Build+LTSP+chroot.png"
 msgstr "18-Build LTSP chroot.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "18-Build LTSP chroot.png"
+msgid "18-Build LTSP chroot.png"
+msgstr "18-Build LTSP chroot.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "20-Finish_the_Installation.png"
-msgid "{{attachment:20-Finish_the_Installation.png}}"
+msgid "./images/20-Finish_the_Installation.png"
 msgstr "20-Finish_the_Installation.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "20-Finish_the_Installation.png"
+msgid "20-Finish_the_Installation.png"
+msgstr "20-Finish_the_Installation.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "21-Finish_the_Installation-Installation_complete.png"
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "21-Finish_the_Installation-Installation_complete.png"
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#| msgid "22-Tjener_GRUB_boot_menu.png"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "Inicio de sesión KDM en tjener"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE y el navegador"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgid "./images/27-Tjener-MATE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "Escritorio KDE"
+
+#. 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>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Inicio de sesión de estaciones sin disco"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -2834,6 +2958,12 @@ msgstr ""
 "El capítulo  <link linkend=\"HowTo\">HowTo</link> describe más trucos, "
 "pistas y algunas preguntas de uso frecuente."
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "./images/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><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -10744,6 +10874,16 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #, fuzzy
+#~| msgid "12e-creating_ext4.png"
+#~ msgid "{{attachment:12e-creating_ext4.png}}"
+#~ msgstr "12e-creating_ext4.png"
+
+#, fuzzy
+#~| msgid "./images/23-Tjener-KDM_Login.png"
+#~ msgid "{{attachment:23-Tjener-Login.png}}"
+#~ msgstr "./images/23-Tjener-KDM_Login.png"
+
+#, fuzzy
 #~| msgid "./images/pxe-tjener.png"
 #~ msgid "{{attachment:pxe-tjener.png}}"
 #~ msgstr "./images/pxe-tjener.png"
@@ -10861,21 +11001,9 @@ msgstr ""
 #~ msgid "Manual for Debian Edu 9+edu0 Codename \"Stretch\""
 #~ msgstr "Manual para Debian-Edu 8.0+edu0 nombre código \"Jessie\""
 
-#~ msgid "tjener KDM Login"
-#~ msgstr "Inicio de sesión KDM en tjener"
-
 #~ msgid "KDE starting..."
 #~ msgstr "Iniciando KDE.."
 
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE y el navegador"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "Escritorio KDE"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Inicio de sesión de estaciones sin disco"
-
 #, fuzzy
 #~| msgid "apt-get install killer"
 #~ msgid "apt-get -y install killer"
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 009e892..1c73be2 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +36,7 @@ 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: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "./images/23-Tjener-Login.png"
@@ -2638,41 +2638,65 @@ msgstr "./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>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "04-Configure_the_keyboard.png"
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "04-Configure_the_keyboard.png"
+#| msgid "./images/04-Configure_the_keyboard.png"
+msgid "04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "05-Detect_and_mount_CD-ROM.png"
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
-msgstr "05-Detect_and_mount_CD-ROM.png"
+#| msgid "./images/05-Detect_and_mount_CD-ROM.png"
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "06-Load_installer_components_from_CD.png"
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "06-Load_installer_components_from_CD.png"
+#| msgid "./images/06-Load_installer_components_from_CD.png"
+msgid "06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "07-Detect_network_hardware.png"
-msgid "{{attachment:07-Detect_network_hardware.png}}"
-msgstr "07-Detect_network_hardware.png"
+#| msgid "./images/07-Detect_network_hardware.png"
+msgid "07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "08-Choose_Debian_Edu_profile.png"
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "08-Choose_Debian_Edu_profile.png"
+#| msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+#| msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -2680,130 +2704,192 @@ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "11-Participate_in_the_package_usage_survey.png"
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
-msgstr "11-Participate_in_the_package_usage_survey.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12-Set_up_users_and_passwords.png"
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
-msgstr "12-Set_up_users_and_passwords.png"
+#| msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgid "11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12a-Set_up_users_and_passwords.png"
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "12a-Set_up_users_and_passwords.png"
+#| msgid "./images/12-Set_up_users_and_passwords.png"
+msgid "12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12b-Set_up_users_and_passwords.png"
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
-msgstr "12b-Set_up_users_and_passwords.png"
+#| msgid "./images/12a-Set_up_users_and_passwords.png"
+msgid "12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12c-Set_up_users_and_passwords.png"
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "12c-Set_up_users_and_passwords.png"
+#| msgid "./images/12b-Set_up_users_and_passwords.png"
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12d-Setting-up-the-partitioner.png"
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
-msgstr "12d-Setting-up-the-partitioner.png"
+#| msgid "./images/12c-Set_up_users_and_passwords.png"
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12d-Setting-up-the-partitioner.png"
+msgstr "./images/12d-Setting-up-the-partitioner.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12e-creating_ext4.png"
-msgid "{{attachment:12e-creating_ext4.png}}"
-msgstr "12e-creating_ext4.png"
+#| msgid "./images/12d-Setting-up-the-partitioner.png"
+msgid "12d-Setting-up-the-partitioner.png"
+msgstr "./images/12d-Setting-up-the-partitioner.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/13-Install+the+base+system.png"
+msgstr "./images/13-Install+the+base+system.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "13-Install the base system.png"
-msgid "{{attachment:13-Install the base system.png}}"
+msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "14-Select_and_install_software.png"
-msgid "{{attachment:14-Select_and_install_software.png}}"
-msgstr "14-Select_and_install_software.png"
+#| msgid "./images/14-Select_and_install_software.png"
+msgid "14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "17-Select_and_install_software.png"
-msgid "{{attachment:17-Select_and_install_software.png}}"
-msgstr "17-Select_and_install_software.png"
+#| msgid "./images/17-Select_and_install_software.png"
+msgid "17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/18-Build+LTSP+chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "18-Build LTSP chroot.png"
-msgid "{{attachment:18-Build LTSP chroot.png}}"
-msgstr "18-Build LTSP chroot.png"
+#| msgid "./images/18-Build+LTSP+chroot.png"
+msgid "18-Build LTSP chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#| msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "20-Finish_the_Installation.png"
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "20-Finish_the_Installation.png"
+#| msgid "./images/20-Finish_the_Installation.png"
+msgid "20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "21-Finish_the_Installation-Installation_complete.png"
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
+#| msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#| msgid "22-Tjener_GRUB_boot_menu.png"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "Invite KDM sur tjener"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE et un navigateur Internet"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgid "./images/27-Tjener-MATE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "Bureau KDE"
+
+#. 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>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Invite de connexion sur une station de travail sans disque dur"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -2914,6 +3000,12 @@ msgstr ""
 "Le chapitre <link linkend=\"HowTo\">Manuels (HowTo)</link> fournit davantage "
 "d'astuces et de réponses à des questions courantes."
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "./images/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><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -13076,6 +13168,106 @@ msgstr ""
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
 #, fuzzy
+#~| msgid "04-Configure_the_keyboard.png"
+#~ msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#~ msgstr "04-Configure_the_keyboard.png"
+
+#, fuzzy
+#~| msgid "05-Detect_and_mount_CD-ROM.png"
+#~ msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#~ msgstr "05-Detect_and_mount_CD-ROM.png"
+
+#, fuzzy
+#~| msgid "06-Load_installer_components_from_CD.png"
+#~ msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#~ msgstr "06-Load_installer_components_from_CD.png"
+
+#, fuzzy
+#~| msgid "07-Detect_network_hardware.png"
+#~ msgid "{{attachment:07-Detect_network_hardware.png}}"
+#~ msgstr "07-Detect_network_hardware.png"
+
+#, fuzzy
+#~| msgid "08-Choose_Debian_Edu_profile.png"
+#~ msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#~ msgstr "08-Choose_Debian_Edu_profile.png"
+
+#, fuzzy
+#~| msgid "09-Really_use_the_automatic_partitioning_tool.png"
+#~ msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#, fuzzy
+#~| msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#~ msgstr "11-Participate_in_the_package_usage_survey.png"
+
+#, fuzzy
+#~| msgid "12-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12a-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#~ msgstr "12a-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12b-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#~ msgstr "12b-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12c-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#~ msgstr "12c-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12d-Setting-up-the-partitioner.png"
+#~ msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#~ msgstr "12d-Setting-up-the-partitioner.png"
+
+#, fuzzy
+#~| msgid "12e-creating_ext4.png"
+#~ msgid "{{attachment:12e-creating_ext4.png}}"
+#~ msgstr "12e-creating_ext4.png"
+
+#, fuzzy
+#~| msgid "14-Select_and_install_software.png"
+#~ msgid "{{attachment:14-Select_and_install_software.png}}"
+#~ msgstr "14-Select_and_install_software.png"
+
+#, fuzzy
+#~| msgid "17-Select_and_install_software.png"
+#~ msgid "{{attachment:17-Select_and_install_software.png}}"
+#~ msgstr "17-Select_and_install_software.png"
+
+#, fuzzy
+#~| msgid "18-Build LTSP chroot.png"
+#~ msgid "{{attachment:18-Build LTSP chroot.png}}"
+#~ msgstr "18-Build LTSP chroot.png"
+
+#, fuzzy
+#~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#, fuzzy
+#~| msgid "20-Finish_the_Installation.png"
+#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
+#~ msgstr "20-Finish_the_Installation.png"
+
+#, fuzzy
+#~| msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#, fuzzy
+#~| msgid "./images/23-Tjener-KDM_Login.png"
+#~ msgid "{{attachment:23-Tjener-Login.png}}"
+#~ msgstr "./images/23-Tjener-KDM_Login.png"
+
+#, fuzzy
 #~| msgid "01-Installer_boot_menu.png"
 #~ msgid "{{attachment:01-Installer_boot_menu.png}}"
 #~ msgstr "01-Installer_boot_menu.png"
@@ -13293,84 +13485,15 @@ msgstr ""
 #~ "url=\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> pour "
 #~ "plusieurs options de téléchargement."
 
-#~ msgid "./images/04-Configure_the_keyboard.png"
-#~ msgstr "./images/04-Configure_the_keyboard.png"
-
-#~ msgid "./images/05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "./images/05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "./images/06-Load_installer_components_from_CD.png"
-#~ msgstr "./images/06-Load_installer_components_from_CD.png"
-
-#~ msgid "./images/07-Detect_network_hardware.png"
-#~ msgstr "./images/07-Detect_network_hardware.png"
-
-#~ msgid "./images/08-Choose_Debian_Edu_profile.png"
-#~ msgstr "./images/08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
-
 #~ msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 #~ msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#~ msgid "./images/11-Participate_in_the_package_usage_survey.png"
-#~ msgstr "./images/11-Participate_in_the_package_usage_survey.png"
-
-#~ msgid "./images/12-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12a-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12a-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12b-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12b-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12c-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12c-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12d-Setting-up-the-partitioner.png"
-#~ msgstr "./images/12d-Setting-up-the-partitioner.png"
-
 #~ msgid "./images/12e-creating_ext4.png"
 #~ msgstr "./images/12e-creating_ext4.png"
 
-#~ msgid "./images/13-Install+the+base+system.png"
-#~ msgstr "./images/13-Install+the+base+system.png"
-
-#~ msgid "./images/14-Select_and_install_software.png"
-#~ msgstr "./images/14-Select_and_install_software.png"
-
-#~ msgid "./images/17-Select_and_install_software.png"
-#~ msgstr "./images/17-Select_and_install_software.png"
-
-#~ msgid "./images/18-Build+LTSP+chroot.png"
-#~ msgstr "./images/18-Build+LTSP+chroot.png"
-
-#~ msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-#~ msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#~ msgid "./images/20-Finish_the_Installation.png"
-#~ msgstr "./images/20-Finish_the_Installation.png"
-
-#~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "Invite KDM sur tjener"
-
 #~ msgid "KDE starting..."
 #~ msgstr "Démarrage de KDE..."
 
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE et un navigateur Internet"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "Bureau KDE"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Invite de connexion sur une station de travail sans disque dur"
-
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "bureau Debian Edu KDE"
 
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 e0905ed..37be3fe 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +33,7 @@ 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: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "./images/23-Tjener-Login.png"
@@ -2595,41 +2595,65 @@ msgstr "./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>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "04-Configure_the_keyboard.png"
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "04-Configure_the_keyboard.png"
+#| msgid "./images/04-Configure_the_keyboard.png"
+msgid "04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "05-Detect_and_mount_CD-ROM.png"
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
-msgstr "05-Detect_and_mount_CD-ROM.png"
+#| msgid "./images/05-Detect_and_mount_CD-ROM.png"
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "06-Load_installer_components_from_CD.png"
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "06-Load_installer_components_from_CD.png"
+#| msgid "./images/06-Load_installer_components_from_CD.png"
+msgid "06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "07-Detect_network_hardware.png"
-msgid "{{attachment:07-Detect_network_hardware.png}}"
-msgstr "07-Detect_network_hardware.png"
+#| msgid "./images/07-Detect_network_hardware.png"
+msgid "07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "08-Choose_Debian_Edu_profile.png"
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "08-Choose_Debian_Edu_profile.png"
+#| msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+#| msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -2637,130 +2661,192 @@ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "11-Participate_in_the_package_usage_survey.png"
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
-msgstr "11-Participate_in_the_package_usage_survey.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12-Set_up_users_and_passwords.png"
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
-msgstr "12-Set_up_users_and_passwords.png"
+#| msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgid "11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12a-Set_up_users_and_passwords.png"
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "12a-Set_up_users_and_passwords.png"
+#| msgid "./images/12-Set_up_users_and_passwords.png"
+msgid "12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12b-Set_up_users_and_passwords.png"
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
-msgstr "12b-Set_up_users_and_passwords.png"
+#| msgid "./images/12a-Set_up_users_and_passwords.png"
+msgid "12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12c-Set_up_users_and_passwords.png"
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "12c-Set_up_users_and_passwords.png"
+#| msgid "./images/12b-Set_up_users_and_passwords.png"
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12d-Setting-up-the-partitioner.png"
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
-msgstr "12d-Setting-up-the-partitioner.png"
+#| msgid "./images/12c-Set_up_users_and_passwords.png"
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12d-Setting-up-the-partitioner.png"
+msgstr "./images/12d-Setting-up-the-partitioner.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12e-creating_ext4.png"
-msgid "{{attachment:12e-creating_ext4.png}}"
-msgstr "12e-creating_ext4.png"
+#| msgid "./images/12d-Setting-up-the-partitioner.png"
+msgid "12d-Setting-up-the-partitioner.png"
+msgstr "./images/12d-Setting-up-the-partitioner.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/13-Install+the+base+system.png"
+msgstr "./images/13-Install+the+base+system.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "13-Install the base system.png"
-msgid "{{attachment:13-Install the base system.png}}"
+msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "14-Select_and_install_software.png"
-msgid "{{attachment:14-Select_and_install_software.png}}"
-msgstr "14-Select_and_install_software.png"
+#| msgid "./images/14-Select_and_install_software.png"
+msgid "14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "17-Select_and_install_software.png"
-msgid "{{attachment:17-Select_and_install_software.png}}"
-msgstr "17-Select_and_install_software.png"
+#| msgid "./images/17-Select_and_install_software.png"
+msgid "17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/18-Build+LTSP+chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "18-Build LTSP chroot.png"
-msgid "{{attachment:18-Build LTSP chroot.png}}"
-msgstr "18-Build LTSP chroot.png"
+#| msgid "./images/18-Build+LTSP+chroot.png"
+msgid "18-Build LTSP chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#| msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "20-Finish_the_Installation.png"
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "20-Finish_the_Installation.png"
+#| msgid "./images/20-Finish_the_Installation.png"
+msgid "20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "21-Finish_the_Installation-Installation_complete.png"
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
+#| msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#| msgid "22-Tjener_GRUB_boot_menu.png"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "Login KDM su tjener"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE e il browser"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgid "./images/27-Tjener-MATE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "Desktop KDE"
+
+#. 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>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Login su workstation senza dischi"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -2867,6 +2953,12 @@ msgstr ""
 "La sezione <link linkend=\"NetworkClients\">HowTo</link> descrive altri "
 "accorgimenti e trucchi e alcune risposte alle domande frequenti."
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "./images/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><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -12821,6 +12913,106 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #, fuzzy
+#~| msgid "04-Configure_the_keyboard.png"
+#~ msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#~ msgstr "04-Configure_the_keyboard.png"
+
+#, fuzzy
+#~| msgid "05-Detect_and_mount_CD-ROM.png"
+#~ msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#~ msgstr "05-Detect_and_mount_CD-ROM.png"
+
+#, fuzzy
+#~| msgid "06-Load_installer_components_from_CD.png"
+#~ msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#~ msgstr "06-Load_installer_components_from_CD.png"
+
+#, fuzzy
+#~| msgid "07-Detect_network_hardware.png"
+#~ msgid "{{attachment:07-Detect_network_hardware.png}}"
+#~ msgstr "07-Detect_network_hardware.png"
+
+#, fuzzy
+#~| msgid "08-Choose_Debian_Edu_profile.png"
+#~ msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#~ msgstr "08-Choose_Debian_Edu_profile.png"
+
+#, fuzzy
+#~| msgid "09-Really_use_the_automatic_partitioning_tool.png"
+#~ msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#, fuzzy
+#~| msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#~ msgstr "11-Participate_in_the_package_usage_survey.png"
+
+#, fuzzy
+#~| msgid "12-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12a-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#~ msgstr "12a-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12b-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#~ msgstr "12b-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12c-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#~ msgstr "12c-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12d-Setting-up-the-partitioner.png"
+#~ msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#~ msgstr "12d-Setting-up-the-partitioner.png"
+
+#, fuzzy
+#~| msgid "12e-creating_ext4.png"
+#~ msgid "{{attachment:12e-creating_ext4.png}}"
+#~ msgstr "12e-creating_ext4.png"
+
+#, fuzzy
+#~| msgid "14-Select_and_install_software.png"
+#~ msgid "{{attachment:14-Select_and_install_software.png}}"
+#~ msgstr "14-Select_and_install_software.png"
+
+#, fuzzy
+#~| msgid "17-Select_and_install_software.png"
+#~ msgid "{{attachment:17-Select_and_install_software.png}}"
+#~ msgstr "17-Select_and_install_software.png"
+
+#, fuzzy
+#~| msgid "18-Build LTSP chroot.png"
+#~ msgid "{{attachment:18-Build LTSP chroot.png}}"
+#~ msgstr "18-Build LTSP chroot.png"
+
+#, fuzzy
+#~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#, fuzzy
+#~| msgid "20-Finish_the_Installation.png"
+#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
+#~ msgstr "20-Finish_the_Installation.png"
+
+#, fuzzy
+#~| msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#, fuzzy
+#~| msgid "./images/23-Tjener-KDM_Login.png"
+#~ msgid "{{attachment:23-Tjener-Login.png}}"
+#~ msgstr "./images/23-Tjener-KDM_Login.png"
+
+#, fuzzy
 #~| msgid "01-Installer_boot_menu.png"
 #~ msgid "{{attachment:01-Installer_boot_menu.png}}"
 #~ msgstr "01-Installer_boot_menu.png"
@@ -13034,84 +13226,15 @@ msgstr ""
 #~ "\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> per altre "
 #~ "opzioni di download."
 
-#~ msgid "./images/04-Configure_the_keyboard.png"
-#~ msgstr "./images/04-Configure_the_keyboard.png"
-
-#~ msgid "./images/05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "./images/05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "./images/06-Load_installer_components_from_CD.png"
-#~ msgstr "./images/06-Load_installer_components_from_CD.png"
-
-#~ msgid "./images/07-Detect_network_hardware.png"
-#~ msgstr "./images/07-Detect_network_hardware.png"
-
-#~ msgid "./images/08-Choose_Debian_Edu_profile.png"
-#~ msgstr "./images/08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
-
 #~ msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 #~ msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#~ msgid "./images/11-Participate_in_the_package_usage_survey.png"
-#~ msgstr "./images/11-Participate_in_the_package_usage_survey.png"
-
-#~ msgid "./images/12-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12a-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12a-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12b-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12b-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12c-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12c-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12d-Setting-up-the-partitioner.png"
-#~ msgstr "./images/12d-Setting-up-the-partitioner.png"
-
 #~ msgid "./images/12e-creating_ext4.png"
 #~ msgstr "./images/12e-creating_ext4.png"
 
-#~ msgid "./images/13-Install+the+base+system.png"
-#~ msgstr "./images/13-Install+the+base+system.png"
-
-#~ msgid "./images/14-Select_and_install_software.png"
-#~ msgstr "./images/14-Select_and_install_software.png"
-
-#~ msgid "./images/17-Select_and_install_software.png"
-#~ msgstr "./images/17-Select_and_install_software.png"
-
-#~ msgid "./images/18-Build+LTSP+chroot.png"
-#~ msgstr "./images/18-Build+LTSP+chroot.png"
-
-#~ msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-#~ msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#~ msgid "./images/20-Finish_the_Installation.png"
-#~ msgstr "./images/20-Finish_the_Installation.png"
-
-#~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "Login KDM su tjener"
-
 #~ msgid "KDE starting..."
 #~ msgstr "Avvio di KDE..."
 
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE e il browser"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "Desktop KDE"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Login su workstation senza dischi"
-
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "Desktop KDE di Debian Edu"
 
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 dde4b68..eb5ca2a 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +29,7 @@ msgstr "Debian Edu / Skolelinux Stretch 9+edu0 マニュアル"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Debian Edu 9+edu0 コード名 Stretch 用マニュアル"
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/alert.png"
 msgid "./images/23-Tjener-Login.png"
@@ -2476,126 +2476,298 @@ msgstr "{{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>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:04-Configure_the_keyboard.png}}"
+msgid "./images/04-Configure_the_keyboard.png"
 msgstr "{{attachment:04-Configure_the_keyboard.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:04-Configure_the_keyboard.png}}"
+msgid "04-Configure_the_keyboard.png"
+msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:07-Detect_network_hardware.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+msgid "06-Load_installer_components_from_CD.png"
+msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:07-Detect_network_hardware.png}}"
+msgid "./images/07-Detect_network_hardware.png"
 msgstr "{{attachment:07-Detect_network_hardware.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:07-Detect_network_hardware.png}}"
+msgid "07-Detect_network_hardware.png"
+msgstr "{{attachment:07-Detect_network_hardware.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
 
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+msgid "11-Participate_in_the_package_usage_survey.png"
+msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+msgid "12-Set_up_users_and_passwords.png"
+msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "{{attachment:12a-Set_up_users_and_passwords.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+msgid "12a-Set_up_users_and_passwords.png"
+msgstr "{{attachment:12a-Set_up_users_and_passwords.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "{{attachment:12b-Set_up_users_and_passwords.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr "{{attachment:12b-Set_up_users_and_passwords.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "{{attachment:12c-Set_up_users_and_passwords.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr "{{attachment:12c-Set_up_users_and_passwords.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12e-creating_ext4.png}}"
-msgstr "{{attachment:12e-creating_ext4.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+msgid "12d-Setting-up-the-partitioner.png"
+msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:13-Install the base system.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/13-Install+the+base+system.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:13-Install the base system.png}}"
+msgid "13-Install the base system.png"
 msgstr "{{attachment:13-Install the base system.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:14-Select_and_install_software.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:14-Select_and_install_software.png}}"
+msgid "./images/14-Select_and_install_software.png"
 msgstr "{{attachment:14-Select_and_install_software.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:17-Select_and_install_software.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:14-Select_and_install_software.png}}"
+msgid "14-Select_and_install_software.png"
+msgstr "{{attachment:14-Select_and_install_software.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:17-Select_and_install_software.png}}"
+msgid "./images/17-Select_and_install_software.png"
 msgstr "{{attachment:17-Select_and_install_software.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:18-Build LTSP chroot.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:17-Select_and_install_software.png}}"
+msgid "17-Select_and_install_software.png"
+msgstr "{{attachment:17-Select_and_install_software.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:18-Build LTSP chroot.png}}"
+msgid "./images/18-Build+LTSP+chroot.png"
 msgstr "{{attachment:18-Build LTSP chroot.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:18-Build LTSP chroot.png}}"
+msgid "18-Build LTSP chroot.png"
+msgstr "{{attachment:18-Build LTSP chroot.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:20-Finish_the_Installation.png}}"
+msgid "./images/20-Finish_the_Installation.png"
 msgstr "{{attachment:20-Finish_the_Installation.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:20-Finish_the_Installation.png}}"
+msgid "20-Finish_the_Installation.png"
+msgstr "{{attachment:20-Finish_the_Installation.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgid "{{attachment:23-Tjener-Login.png}}"
-msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+#| msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
-msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgstr "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgid "./images/27-Tjener-MATE_Desktop.png"
 msgstr "{{attachment:27-Tjener-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
+#| msgid "XFCE desktop"
+msgid "KDE Desktop"
+msgstr "XFCE デスクトップ"
+
+#. 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}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "{{attachment:29-Diskless-WS-LDM_Login.png}}"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Diskless workstations"
+msgid "Diskless Workstation Login"
+msgstr "ディスクレスワークステーション"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><title>
@@ -2689,6 +2861,12 @@ msgstr ""
 "<link linkend=\"HowTo\">HowTo</link> の章ではさらなるコツや小技、それによく聞"
 "かれる疑問もいくらか扱っています。"
 
+#. type: Content of: <article><section><section><para>
+#, 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><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -11861,6 +12039,14 @@ msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
 
+#~ msgid "{{attachment:12e-creating_ext4.png}}"
+#~ msgstr "{{attachment:12e-creating_ext4.png}}"
+
+#, fuzzy
+#~| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgid "{{attachment:23-Tjener-Login.png}}"
+#~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+
 #~ msgid "{{attachment:Installer_help.png}}"
 #~ msgstr "{{attachment:Installer_help.png}}"
 
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 7030628..2e90416 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +49,7 @@ 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: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "./images/23-Tjener-Login.png"
@@ -2570,41 +2570,65 @@ msgstr "./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>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "04-Configure_the_keyboard.png"
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "04-Configure_the_keyboard.png"
+#| msgid "./images/04-Configure_the_keyboard.png"
+msgid "04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "05-Detect_and_mount_CD-ROM.png"
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
-msgstr "05-Detect_and_mount_CD-ROM.png"
+#| msgid "./images/05-Detect_and_mount_CD-ROM.png"
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "06-Load_installer_components_from_CD.png"
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "06-Load_installer_components_from_CD.png"
+#| msgid "./images/06-Load_installer_components_from_CD.png"
+msgid "06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "07-Detect_network_hardware.png"
-msgid "{{attachment:07-Detect_network_hardware.png}}"
-msgstr "07-Detect_network_hardware.png"
+#| msgid "./images/07-Detect_network_hardware.png"
+msgid "07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "08-Choose_Debian_Edu_profile.png"
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "08-Choose_Debian_Edu_profile.png"
+#| msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+#| msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -2612,130 +2636,192 @@ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "11-Participate_in_the_package_usage_survey.png"
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
-msgstr "11-Participate_in_the_package_usage_survey.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12-Set_up_users_and_passwords.png"
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
-msgstr "12-Set_up_users_and_passwords.png"
+#| msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgid "11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12a-Set_up_users_and_passwords.png"
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "12a-Set_up_users_and_passwords.png"
+#| msgid "./images/12-Set_up_users_and_passwords.png"
+msgid "12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12b-Set_up_users_and_passwords.png"
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
-msgstr "12b-Set_up_users_and_passwords.png"
+#| msgid "./images/12a-Set_up_users_and_passwords.png"
+msgid "12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12c-Set_up_users_and_passwords.png"
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "12c-Set_up_users_and_passwords.png"
+#| msgid "./images/12b-Set_up_users_and_passwords.png"
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12d-Setting-up-the-partitioner.png"
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
-msgstr "12d-Setting-up-the-partitioner.png"
+#| msgid "./images/12c-Set_up_users_and_passwords.png"
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12d-Setting-up-the-partitioner.png"
+msgstr "./images/12d-Setting-up-the-partitioner.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "12e-creating_ext4.png"
-msgid "{{attachment:12e-creating_ext4.png}}"
-msgstr "12e-creating_ext4.png"
+#| msgid "./images/12d-Setting-up-the-partitioner.png"
+msgid "12d-Setting-up-the-partitioner.png"
+msgstr "./images/12d-Setting-up-the-partitioner.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/13-Install+the+base+system.png"
+msgstr "./images/13-Install+the+base+system.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "13-Install the base system.png"
-msgid "{{attachment:13-Install the base system.png}}"
+msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "14-Select_and_install_software.png"
-msgid "{{attachment:14-Select_and_install_software.png}}"
-msgstr "14-Select_and_install_software.png"
+#| msgid "./images/14-Select_and_install_software.png"
+msgid "14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "17-Select_and_install_software.png"
-msgid "{{attachment:17-Select_and_install_software.png}}"
-msgstr "17-Select_and_install_software.png"
+#| msgid "./images/17-Select_and_install_software.png"
+msgid "17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/18-Build+LTSP+chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "18-Build LTSP chroot.png"
-msgid "{{attachment:18-Build LTSP chroot.png}}"
-msgstr "18-Build LTSP chroot.png"
+#| msgid "./images/18-Build+LTSP+chroot.png"
+msgid "18-Build LTSP chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#| msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "20-Finish_the_Installation.png"
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "20-Finish_the_Installation.png"
+#| msgid "./images/20-Finish_the_Installation.png"
+msgid "20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "21-Finish_the_Installation-Installation_complete.png"
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
+#| msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#| msgid "22-Tjener_GRUB_boot_menu.png"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "KDM-innlogging på tjener"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE og nettleser"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgid "./images/27-Tjener-MATE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "KDE Desktop"
+
+#. 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>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Diskløs Arbeidstasjoner Innlogging"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -2841,6 +2927,12 @@ msgstr ""
 "hyppige stilte spørsmål.\n"
 " "
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "./images/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><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -12673,6 +12765,106 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
 #, fuzzy
+#~| msgid "04-Configure_the_keyboard.png"
+#~ msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#~ msgstr "04-Configure_the_keyboard.png"
+
+#, fuzzy
+#~| msgid "05-Detect_and_mount_CD-ROM.png"
+#~ msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#~ msgstr "05-Detect_and_mount_CD-ROM.png"
+
+#, fuzzy
+#~| msgid "06-Load_installer_components_from_CD.png"
+#~ msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#~ msgstr "06-Load_installer_components_from_CD.png"
+
+#, fuzzy
+#~| msgid "07-Detect_network_hardware.png"
+#~ msgid "{{attachment:07-Detect_network_hardware.png}}"
+#~ msgstr "07-Detect_network_hardware.png"
+
+#, fuzzy
+#~| msgid "08-Choose_Debian_Edu_profile.png"
+#~ msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#~ msgstr "08-Choose_Debian_Edu_profile.png"
+
+#, fuzzy
+#~| msgid "09-Really_use_the_automatic_partitioning_tool.png"
+#~ msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#, fuzzy
+#~| msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#~ msgstr "11-Participate_in_the_package_usage_survey.png"
+
+#, fuzzy
+#~| msgid "12-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#~ msgstr "12-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12a-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#~ msgstr "12a-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12b-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#~ msgstr "12b-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12c-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#~ msgstr "12c-Set_up_users_and_passwords.png"
+
+#, fuzzy
+#~| msgid "12d-Setting-up-the-partitioner.png"
+#~ msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#~ msgstr "12d-Setting-up-the-partitioner.png"
+
+#, fuzzy
+#~| msgid "12e-creating_ext4.png"
+#~ msgid "{{attachment:12e-creating_ext4.png}}"
+#~ msgstr "12e-creating_ext4.png"
+
+#, fuzzy
+#~| msgid "14-Select_and_install_software.png"
+#~ msgid "{{attachment:14-Select_and_install_software.png}}"
+#~ msgstr "14-Select_and_install_software.png"
+
+#, fuzzy
+#~| msgid "17-Select_and_install_software.png"
+#~ msgid "{{attachment:17-Select_and_install_software.png}}"
+#~ msgstr "17-Select_and_install_software.png"
+
+#, fuzzy
+#~| msgid "18-Build LTSP chroot.png"
+#~ msgid "{{attachment:18-Build LTSP chroot.png}}"
+#~ msgstr "18-Build LTSP chroot.png"
+
+#, fuzzy
+#~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#, fuzzy
+#~| msgid "20-Finish_the_Installation.png"
+#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
+#~ msgstr "20-Finish_the_Installation.png"
+
+#, fuzzy
+#~| msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#, fuzzy
+#~| msgid "./images/23-Tjener-KDM_Login.png"
+#~ msgid "{{attachment:23-Tjener-Login.png}}"
+#~ msgstr "./images/23-Tjener-KDM_Login.png"
+
+#, fuzzy
 #~| msgid "01-Installer_boot_menu.png"
 #~ msgid "{{attachment:01-Installer_boot_menu.png}}"
 #~ msgstr "01-Installer_boot_menu.png"
@@ -12888,84 +13080,15 @@ 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/04-Configure_the_keyboard.png"
-#~ msgstr "./images/04-Configure_the_keyboard.png"
-
-#~ msgid "./images/05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "./images/05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "./images/06-Load_installer_components_from_CD.png"
-#~ msgstr "./images/06-Load_installer_components_from_CD.png"
-
-#~ msgid "./images/07-Detect_network_hardware.png"
-#~ msgstr "./images/07-Detect_network_hardware.png"
-
-#~ msgid "./images/08-Choose_Debian_Edu_profile.png"
-#~ msgstr "./images/08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
-
 #~ msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 #~ msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#~ msgid "./images/11-Participate_in_the_package_usage_survey.png"
-#~ msgstr "./images/11-Participate_in_the_package_usage_survey.png"
-
-#~ msgid "./images/12-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12a-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12a-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12b-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12b-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12c-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12c-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12d-Setting-up-the-partitioner.png"
-#~ msgstr "./images/12d-Setting-up-the-partitioner.png"
-
 #~ msgid "./images/12e-creating_ext4.png"
 #~ msgstr "./images/12e-creating_ext4.png"
 
-#~ msgid "./images/13-Install+the+base+system.png"
-#~ msgstr "./images/13-Install+the+base+system.png"
-
-#~ msgid "./images/14-Select_and_install_software.png"
-#~ msgstr "./images/14-Select_and_install_software.png"
-
-#~ msgid "./images/17-Select_and_install_software.png"
-#~ msgstr "./images/17-Select_and_install_software.png"
-
-#~ msgid "./images/18-Build+LTSP+chroot.png"
-#~ msgstr "./images/18-Build+LTSP+chroot.png"
-
-#~ msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-#~ msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#~ msgid "./images/20-Finish_the_Installation.png"
-#~ msgstr "./images/20-Finish_the_Installation.png"
-
-#~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "KDM-innlogging på tjener"
-
 #~ msgid "KDE starting..."
 #~ msgstr "KDE starter..."
 
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE og nettleser"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "KDE Desktop"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Diskløs Arbeidstasjoner Innlogging"
-
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "Debian Edu KDE desktop"
 
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 a35afb7..5bed690 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +29,7 @@ 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: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/23-Tjener-Login.png"
@@ -2602,125 +2602,211 @@ msgstr "./images/03-select_your_location.png"
 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}}"
-msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
-msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "04-Configure_the_keyboard.png"
+msgstr "04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:07-Detect_network_hardware.png}}"
-msgstr "{{attachment:07-Detect_network_hardware.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr "05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "06-Load_installer_components_from_CD.png"
+msgstr "06-Load_installer_components_from_CD.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "07-Detect_network_hardware.png"
+msgstr "07-Detect_network_hardware.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr "08-Choose_Debian_Edu_profile.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
-msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "11-Participate_in_the_package_usage_survey.png"
+msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12-Set_up_users_and_passwords.png"
+msgstr "12-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
-msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12a-Set_up_users_and_passwords.png"
+msgstr "12a-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12e-creating_ext4.png}}"
-msgstr "{{attachment:12e-creating_ext4.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:13-Install the base system.png}}"
-msgstr "{{attachment:13-Install the base system.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr "12b-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:14-Select_and_install_software.png}}"
-msgstr "{{attachment:14-Select_and_install_software.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:17-Select_and_install_software.png}}"
-msgstr "{{attachment:17-Select_and_install_software.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr "12c-Set_up_users_and_passwords.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:18-Build LTSP chroot.png}}"
-msgstr "{{attachment:18-Build LTSP chroot.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12d-Setting-up-the-partitioner.png"
+msgstr "./images/12d-Setting-up-the-partitioner.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12d-Setting-up-the-partitioner.png"
+msgstr "12d-Setting-up-the-partitioner.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "{{attachment:20-Finish_the_Installation.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/13-Install+the+base+system.png"
+msgstr "./images/13-Install+the+base+system.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
-msgstr "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "13-Install the base system.png"
+msgstr "13-Install the base system.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
-msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
-#, 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><inlinemediaobject><textobject><phrase>
+msgid "14-Select_and_install_software.png"
+msgstr "14-Select_and_install_software.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "17-Select_and_install_software.png"
+msgstr "17-Select_and_install_software.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/18-Build+LTSP+chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "18-Build LTSP chroot.png"
+msgstr "18-Build LTSP chroot.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "20-Finish_the_Installation.png"
+msgstr "20-Finish_the_Installation.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr "21-Finish_the_Installation-Installation_complete.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "KDM-aanmeldscherm op tjener"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, 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}}"
+#| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE met browser"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
-msgstr "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#| msgid "./images/27-Tjener-KDE_Desktop.png"
+msgid "./images/27-Tjener-MATE_Desktop.png"
+msgstr "./images/27-Tjener-KDE_Desktop.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "Bureaublad van KDE"
 
 #. 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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Aanmeldscherm op een schijfloos werkstation"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
-msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#| msgid "./images/31-ThinClient-KDE_Desktop.png"
+msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2822,6 +2908,12 @@ msgstr ""
 "Het hoofdstuk <link linkend=\"HowTo\">HowTo</link> geeft nog meer handige "
 "wenken en behandelt ook enkele veel voorkomende vragen."
 
+#. type: Content of: <article><section><section><para>
+#, 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><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -12889,6 +12981,87 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#~ msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+
+#~ msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#~ msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+
+#~ msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#~ msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+
+#~ msgid "{{attachment:07-Detect_network_hardware.png}}"
+#~ msgstr "{{attachment:07-Detect_network_hardware.png}}"
+
+#~ msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#~ msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+
+#~ msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#~ msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+
+#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#~ msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+
+#~ msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#~ msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+
+#~ msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#~ msgstr "{{attachment:12a-Set_up_users_and_passwords.png}}"
+
+#~ msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#~ msgstr "{{attachment:12b-Set_up_users_and_passwords.png}}"
+
+#~ msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#~ msgstr "{{attachment:12c-Set_up_users_and_passwords.png}}"
+
+#~ msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#~ msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+
+#~ msgid "{{attachment:12e-creating_ext4.png}}"
+#~ msgstr "{{attachment:12e-creating_ext4.png}}"
+
+#~ msgid "{{attachment:13-Install the base system.png}}"
+#~ msgstr "{{attachment:13-Install the base system.png}}"
+
+#~ msgid "{{attachment:14-Select_and_install_software.png}}"
+#~ msgstr "{{attachment:14-Select_and_install_software.png}}"
+
+#~ msgid "{{attachment:17-Select_and_install_software.png}}"
+#~ msgstr "{{attachment:17-Select_and_install_software.png}}"
+
+#~ msgid "{{attachment:18-Build LTSP chroot.png}}"
+#~ msgstr "{{attachment:18-Build LTSP chroot.png}}"
+
+#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#~ msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+
+#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
+#~ msgstr "{{attachment:20-Finish_the_Installation.png}}"
+
+#~ msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#~ msgstr "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+
+#~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#~ msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+
+#, fuzzy
+#~| msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgid "{{attachment:23-Tjener-Login.png}}"
+#~ msgstr "{{attachment:23-Tjener-KDM_Login.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}}"
+
+#~ msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+#~ msgstr "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+
+#, fuzzy
+#~| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#~ msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+#~ msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+
 #~ msgid "{{attachment:01-Installer_boot_menu.png}}"
 #~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
@@ -13115,168 +13288,24 @@ msgstr ""
 #~ "\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> voor een "
 #~ "aantal downloadopties."
 
-#~ msgid "./images/04-Configure_the_keyboard.png"
-#~ msgstr "./images/04-Configure_the_keyboard.png"
-
-#~ msgid "04-Configure_the_keyboard.png"
-#~ msgstr "04-Configure_the_keyboard.png"
-
-#~ msgid "./images/05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "./images/05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "./images/06-Load_installer_components_from_CD.png"
-#~ msgstr "./images/06-Load_installer_components_from_CD.png"
-
-#~ msgid "06-Load_installer_components_from_CD.png"
-#~ msgstr "06-Load_installer_components_from_CD.png"
-
-#~ msgid "./images/07-Detect_network_hardware.png"
-#~ msgstr "./images/07-Detect_network_hardware.png"
-
-#~ msgid "07-Detect_network_hardware.png"
-#~ msgstr "07-Detect_network_hardware.png"
-
-#~ msgid "./images/08-Choose_Debian_Edu_profile.png"
-#~ msgstr "./images/08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "08-Choose_Debian_Edu_profile.png"
-#~ msgstr "08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
-
-#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
 #~ msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 #~ msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
 #~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 #~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#~ msgid "./images/11-Participate_in_the_package_usage_survey.png"
-#~ msgstr "./images/11-Participate_in_the_package_usage_survey.png"
-
-#~ msgid "11-Participate_in_the_package_usage_survey.png"
-#~ msgstr "11-Participate_in_the_package_usage_survey.png"
-
-#~ msgid "./images/12-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12-Set_up_users_and_passwords.png"
-
-#~ msgid "12-Set_up_users_and_passwords.png"
-#~ msgstr "12-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12a-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12a-Set_up_users_and_passwords.png"
-
-#~ msgid "12a-Set_up_users_and_passwords.png"
-#~ msgstr "12a-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12b-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12b-Set_up_users_and_passwords.png"
-
-#~ msgid "12b-Set_up_users_and_passwords.png"
-#~ msgstr "12b-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12c-Set_up_users_and_passwords.png"
-#~ msgstr "./images/12c-Set_up_users_and_passwords.png"
-
-#~ msgid "12c-Set_up_users_and_passwords.png"
-#~ msgstr "12c-Set_up_users_and_passwords.png"
-
-#~ msgid "./images/12d-Setting-up-the-partitioner.png"
-#~ msgstr "./images/12d-Setting-up-the-partitioner.png"
-
-#~ msgid "12d-Setting-up-the-partitioner.png"
-#~ msgstr "12d-Setting-up-the-partitioner.png"
-
 #~ msgid "./images/12e-creating_ext4.png"
 #~ msgstr "./images/12e-creating_ext4.png"
 
 #~ msgid "12e-creating_ext4.png"
 #~ msgstr "12e-creating_ext4.png"
 
-#~ msgid "./images/13-Install+the+base+system.png"
-#~ msgstr "./images/13-Install+the+base+system.png"
-
-#~ msgid "13-Install the base system.png"
-#~ msgstr "13-Install the base system.png"
-
-#~ msgid "./images/14-Select_and_install_software.png"
-#~ msgstr "./images/14-Select_and_install_software.png"
-
-#~ msgid "14-Select_and_install_software.png"
-#~ msgstr "14-Select_and_install_software.png"
-
-#~ msgid "./images/17-Select_and_install_software.png"
-#~ msgstr "./images/17-Select_and_install_software.png"
-
-#~ msgid "17-Select_and_install_software.png"
-#~ msgstr "17-Select_and_install_software.png"
-
-#~ msgid "./images/18-Build+LTSP+chroot.png"
-#~ msgstr "./images/18-Build+LTSP+chroot.png"
-
-#~ msgid "18-Build LTSP chroot.png"
-#~ msgstr "18-Build LTSP chroot.png"
-
-#~ msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-#~ msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#~ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#~ msgid "./images/20-Finish_the_Installation.png"
-#~ msgstr "./images/20-Finish_the_Installation.png"
-
-#~ msgid "20-Finish_the_Installation.png"
-#~ msgstr "20-Finish_the_Installation.png"
-
-#~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
-
-#~ msgid "21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "KDM-aanmeldscherm op tjener"
-
 #~ msgid "./images/24-Tjener-KDE_Start.png"
 #~ msgstr "./images/24-Tjener-KDE_Start.png"
 
 #~ msgid "KDE starting..."
 #~ msgstr "Opstarten van KDE..."
 
-#~ msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-#~ msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
-
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE met browser"
-
-#~ msgid "./images/27-Tjener-KDE_Desktop.png"
-#~ msgstr "./images/27-Tjener-KDE_Desktop.png"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "Bureaublad van KDE"
-
-#~ msgid "./images/29-Diskless-WS-LDM_Login.png"
-#~ msgstr "./images/29-Diskless-WS-LDM_Login.png"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Aanmeldscherm op een schijfloos werkstation"
-
-#~ msgid "./images/31-ThinClient-KDE_Desktop.png"
-#~ msgstr "./images/31-ThinClient-KDE_Desktop.png"
-
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "Het KDE-bureaublad van Debian Edu"
 
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 812cc1a..e7c7e32 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +35,7 @@ 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: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/23-Tjener-Login.png"
@@ -1963,124 +1963,218 @@ msgstr ""
 msgid "03-select_your_location.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/04-Configure_the_keyboard.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "04-Configure_the_keyboard.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:07-Detect_network_hardware.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "06-Load_installer_components_from_CD.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/Debian_Edu_Network_Jessie.png"
+msgid "./images/07-Detect_network_hardware.png"
+msgstr "./images/Debian_Edu_Network_Jessie.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "07-Detect_network_hardware.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/Debian_Edu_Network_Jessie.png"
+msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgstr "./images/Debian_Edu_Network_Jessie.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12a-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12e-creating_ext4.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:13-Install the base system.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12b-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:14-Select_and_install_software.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:17-Select_and_install_software.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12c-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:18-Build LTSP chroot.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/13-Install+the+base+system.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "13-Install the base system.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/14-Select_and_install_software.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "14-Select_and_install_software.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/17-Select_and_install_software.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "17-Select_and_install_software.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/18-Build+LTSP+chroot.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "18-Build LTSP chroot.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/20-Finish_the_Installation.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "20-Finish_the_Installation.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-Login.png}}"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgid "./images/27-Tjener-MATE_Desktop.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+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>
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><title>
@@ -2151,6 +2245,12 @@ msgid ""
 "and some frequently asked questions."
 msgstr ""
 
+#. type: Content of: <article><section><section><para>
+#, 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><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -9294,3 +9394,8 @@ msgid ""
 "More information on even older releases can be found at <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgstr ""
+
+#, fuzzy
+#~| msgid "./images/23-Tjener-KDM_Login.png"
+#~ msgid "{{attachment:23-Tjener-Login.png}}"
+#~ msgstr "./images/23-Tjener-KDM_Login.png"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index eb855a9..0f65f8d 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-11-05 14:33+0000\n"
+"POT-Creation-Date: 2016-11-05 15:21+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,7 +28,7 @@ msgstr ""
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/23-Tjener-Login.png"
 msgstr ""
 
@@ -1836,116 +1836,204 @@ msgstr ""
 msgid "03-select_your_location.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/04-Configure_the_keyboard.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "04-Configure_the_keyboard.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:07-Detect_network_hardware.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "06-Load_installer_components_from_CD.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/07-Detect_network_hardware.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "07-Detect_network_hardware.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "08-Choose_Debian_Edu_profile.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12a-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12e-creating_ext4.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:13-Install the base system.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12b-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:14-Select_and_install_software.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:17-Select_and_install_software.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12c-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:18-Build LTSP chroot.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/13-Install+the+base+system.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "13-Install the base system.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/14-Select_and_install_software.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:23-Tjener-Login.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "14-Select_and_install_software.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:26-Tjener-MATE_Desktop_Browser.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/17-Select_and_install_software.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "17-Select_and_install_software.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/18-Build+LTSP+chroot.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "18-Build LTSP chroot.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/20-Finish_the_Installation.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "20-Finish_the_Installation.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/27-Tjener-MATE_Desktop.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
 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>
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -2016,6 +2104,10 @@ msgid ""
 "and some frequently asked questions."
 msgstr ""
 
+#. type: Content of: <article><section><section><para>
+msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index fbf4823..bc8f43b 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -764,61 +764,59 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <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><inlinemediaobject><imageobject><imagedata fileref="./images/04-Configure_the_keyboard.png"/></imageobject><textobject><phrase>04-Configure_the_keyboard.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:05-Detect_and_mount_CD-ROM.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/05-Detect_and_mount_CD-ROM.png"/></imageobject><textobject><phrase>05-Detect_and_mount_CD-ROM.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:06-Load_installer_components_from_CD.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/06-Load_installer_components_from_CD.png"/></imageobject><textobject><phrase>06-Load_installer_components_from_CD.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:07-Detect_network_hardware.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/07-Detect_network_hardware.png"/></imageobject><textobject><phrase>07-Detect_network_hardware.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:08-Choose_Debian_Edu_profile.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/08-Choose_Debian_Edu_profile.png"/></imageobject><textobject><phrase>08-Choose_Debian_Edu_profile.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:09-Really_use_the_automatic_partitioning_tool.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/09-Really_use_the_automatic_partitioning_tool.png"/></imageobject><textobject><phrase>09-Really_use_the_automatic_partitioning_tool.png</phrase></textobject></inlinemediaobject> 
 </para>
 <para>{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}} 
 </para>
-<para>{{attachment:11-Participate_in_the_package_usage_survey.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/11-Participate_in_the_package_usage_survey.png"/></imageobject><textobject><phrase>11-Participate_in_the_package_usage_survey.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:12-Set_up_users_and_passwords.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/12-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:12a-Set_up_users_and_passwords.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/12a-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12a-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:12b-Set_up_users_and_passwords.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/12b-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12b-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:12c-Set_up_users_and_passwords.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/12c-Set_up_users_and_passwords.png"/></imageobject><textobject><phrase>12c-Set_up_users_and_passwords.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:12d-Setting-up-the-partitioner.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/12d-Setting-up-the-partitioner.png"/></imageobject><textobject><phrase>12d-Setting-up-the-partitioner.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:12e-creating_ext4.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/13-Install+the+base+system.png"/></imageobject><textobject><phrase>13-Install the base system.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:13-Install the base system.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/14-Select_and_install_software.png"/></imageobject><textobject><phrase>14-Select_and_install_software.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:14-Select_and_install_software.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/17-Select_and_install_software.png"/></imageobject><textobject><phrase>17-Select_and_install_software.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:17-Select_and_install_software.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/18-Build+LTSP+chroot.png"/></imageobject><textobject><phrase>18-Build LTSP chroot.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:18-Build LTSP chroot.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"/></imageobject><textobject><phrase>19-Install_the_GRUB_boot_loader_on_a_hard_disk.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/20-Finish_the_Installation.png"/></imageobject><textobject><phrase>20-Finish_the_Installation.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:20-Finish_the_Installation.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/21-Finish_the_Installation-Installation_complete.png"/></imageobject><textobject><phrase>21-Finish_the_Installation-Installation_complete.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:21-Finish_the_Installation-Installation_complete.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/22-Tjener_GRUB_boot_menu.png"/></imageobject><textobject><phrase>22-Tjener_GRUB_boot_menu.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:22-Tjener_GRUB_boot_menu.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/23-Tjener-Login.png"/></imageobject><textobject><phrase>tjener KDM Login</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:23-Tjener-Login.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/26-Tjener-MATE_Desktop_Browser.png"/></imageobject><textobject><phrase>KDE and Browser</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:26-Tjener-MATE_Desktop_Browser.png}} 
-</para>
-<para>{{attachment:27-Tjener-MATE_Desktop.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-MATE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop</phrase></textobject></inlinemediaobject> 
 </para>
 <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><inlinemediaobject><imageobject><imagedata fileref="./images/29-Diskless-WS-LDM_Login.png"/></imageobject><textobject><phrase>Diskless Workstation Login</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:31-ThinClient-MATE_Desktop.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/31-ThinClient-MATE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop</phrase></textobject></inlinemediaobject> 
 </para>
 </section>
 </section>
diff --git a/documentation/debian-edu-stretch/images/04-Configure_the_keyboard.png b/documentation/debian-edu-stretch/images/04-Configure_the_keyboard.png
new file mode 100644
index 0000000..d9c2e9c
Binary files /dev/null and b/documentation/debian-edu-stretch/images/04-Configure_the_keyboard.png differ
diff --git a/documentation/debian-edu-stretch/images/05-Detect_and_mount_CD-ROM.png b/documentation/debian-edu-stretch/images/05-Detect_and_mount_CD-ROM.png
new file mode 100644
index 0000000..dbababc
Binary files /dev/null and b/documentation/debian-edu-stretch/images/05-Detect_and_mount_CD-ROM.png differ
diff --git a/documentation/debian-edu-stretch/images/06-Load_installer_components_from_CD.png b/documentation/debian-edu-stretch/images/06-Load_installer_components_from_CD.png
new file mode 100644
index 0000000..96128fb
Binary files /dev/null and b/documentation/debian-edu-stretch/images/06-Load_installer_components_from_CD.png differ
diff --git a/documentation/debian-edu-stretch/images/07-Detect_network_hardware.png b/documentation/debian-edu-stretch/images/07-Detect_network_hardware.png
new file mode 100644
index 0000000..fdb1266
Binary files /dev/null and b/documentation/debian-edu-stretch/images/07-Detect_network_hardware.png differ
diff --git a/documentation/debian-edu-stretch/images/08-Choose_Debian_Edu_profile.png b/documentation/debian-edu-stretch/images/08-Choose_Debian_Edu_profile.png
new file mode 100644
index 0000000..26e056b
Binary files /dev/null and b/documentation/debian-edu-stretch/images/08-Choose_Debian_Edu_profile.png differ
diff --git a/documentation/debian-edu-stretch/images/09-Really_use_the_automatic_partitioning_tool.png b/documentation/debian-edu-stretch/images/09-Really_use_the_automatic_partitioning_tool.png
new file mode 100644
index 0000000..6ea963e
Binary files /dev/null and b/documentation/debian-edu-stretch/images/09-Really_use_the_automatic_partitioning_tool.png differ
diff --git a/documentation/debian-edu-stretch/images/11-Participate_in_the_package_usage_survey.png b/documentation/debian-edu-stretch/images/11-Participate_in_the_package_usage_survey.png
new file mode 100644
index 0000000..b1ebba8
Binary files /dev/null and b/documentation/debian-edu-stretch/images/11-Participate_in_the_package_usage_survey.png differ
diff --git a/documentation/debian-edu-stretch/images/12-Set_up_users_and_passwords.png b/documentation/debian-edu-stretch/images/12-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..d277b4e
Binary files /dev/null and b/documentation/debian-edu-stretch/images/12-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-stretch/images/12a-Set_up_users_and_passwords.png b/documentation/debian-edu-stretch/images/12a-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..26f700d
Binary files /dev/null and b/documentation/debian-edu-stretch/images/12a-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-stretch/images/12b-Set_up_users_and_passwords.png b/documentation/debian-edu-stretch/images/12b-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..83106ca
Binary files /dev/null and b/documentation/debian-edu-stretch/images/12b-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-stretch/images/12c-Set_up_users_and_passwords.png b/documentation/debian-edu-stretch/images/12c-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..56243b6
Binary files /dev/null and b/documentation/debian-edu-stretch/images/12c-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-stretch/images/12d-Setting-up-the-partitioner.png b/documentation/debian-edu-stretch/images/12d-Setting-up-the-partitioner.png
new file mode 100644
index 0000000..c3bdff4
Binary files /dev/null and b/documentation/debian-edu-stretch/images/12d-Setting-up-the-partitioner.png differ
diff --git a/documentation/debian-edu-stretch/images/13-Install+the+base+system.png b/documentation/debian-edu-stretch/images/13-Install+the+base+system.png
new file mode 100644
index 0000000..f662c39
Binary files /dev/null and b/documentation/debian-edu-stretch/images/13-Install+the+base+system.png differ
diff --git a/documentation/debian-edu-stretch/images/14-Select_and_install_software.png b/documentation/debian-edu-stretch/images/14-Select_and_install_software.png
new file mode 100644
index 0000000..92edab0
Binary files /dev/null and b/documentation/debian-edu-stretch/images/14-Select_and_install_software.png differ
diff --git a/documentation/debian-edu-stretch/images/17-Select_and_install_software.png b/documentation/debian-edu-stretch/images/17-Select_and_install_software.png
new file mode 100644
index 0000000..d3bde64
Binary files /dev/null and b/documentation/debian-edu-stretch/images/17-Select_and_install_software.png differ
diff --git a/documentation/debian-edu-stretch/images/18-Build+LTSP+chroot.png b/documentation/debian-edu-stretch/images/18-Build+LTSP+chroot.png
new file mode 100644
index 0000000..0c01921
Binary files /dev/null and b/documentation/debian-edu-stretch/images/18-Build+LTSP+chroot.png differ
diff --git a/documentation/debian-edu-stretch/images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png b/documentation/debian-edu-stretch/images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png
new file mode 100644
index 0000000..2a30315
Binary files /dev/null and b/documentation/debian-edu-stretch/images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png differ
diff --git a/documentation/debian-edu-stretch/images/20-Finish_the_Installation.png b/documentation/debian-edu-stretch/images/20-Finish_the_Installation.png
new file mode 100644
index 0000000..9c6726c
Binary files /dev/null and b/documentation/debian-edu-stretch/images/20-Finish_the_Installation.png differ
diff --git a/documentation/debian-edu-stretch/images/21-Finish_the_Installation-Installation_complete.png b/documentation/debian-edu-stretch/images/21-Finish_the_Installation-Installation_complete.png
new file mode 100644
index 0000000..71374bc
Binary files /dev/null and b/documentation/debian-edu-stretch/images/21-Finish_the_Installation-Installation_complete.png differ
diff --git a/documentation/debian-edu-stretch/images/22-Tjener_GRUB_boot_menu.png b/documentation/debian-edu-stretch/images/22-Tjener_GRUB_boot_menu.png
new file mode 100644
index 0000000..b3021c2
Binary files /dev/null and b/documentation/debian-edu-stretch/images/22-Tjener_GRUB_boot_menu.png differ
diff --git a/documentation/debian-edu-stretch/images/26-Tjener-MATE_Desktop_Browser.png b/documentation/debian-edu-stretch/images/26-Tjener-MATE_Desktop_Browser.png
new file mode 100644
index 0000000..082e698
Binary files /dev/null and b/documentation/debian-edu-stretch/images/26-Tjener-MATE_Desktop_Browser.png differ
diff --git a/documentation/debian-edu-stretch/images/27-Tjener-MATE_Desktop.png b/documentation/debian-edu-stretch/images/27-Tjener-MATE_Desktop.png
new file mode 100644
index 0000000..2915a6c
Binary files /dev/null and b/documentation/debian-edu-stretch/images/27-Tjener-MATE_Desktop.png differ
diff --git a/documentation/debian-edu-stretch/images/29-Diskless-WS-LDM_Login.png b/documentation/debian-edu-stretch/images/29-Diskless-WS-LDM_Login.png
new file mode 100644
index 0000000..c136e41
Binary files /dev/null and b/documentation/debian-edu-stretch/images/29-Diskless-WS-LDM_Login.png differ
diff --git a/documentation/debian-edu-stretch/images/31-ThinClient-MATE_Desktop.png b/documentation/debian-edu-stretch/images/31-ThinClient-MATE_Desktop.png
new file mode 100644
index 0000000..8da6b96
Binary files /dev/null and b/documentation/debian-edu-stretch/images/31-ThinClient-MATE_Desktop.png differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git

