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

Holger Levsen holger at moszumanska.debian.org
Mon Oct 20 09:39:39 UTC 2014


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

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

commit 8f0473df195e496a0d6f7eaa1784fd1c5941f35e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 20 11:38:35 2014 +0200

    Update manuals and images from the wiki.
---
 debian/changelog                                   |   6 +
 .../debian-edu-jessie-manual.da.po                 | 432 +++++++++++++-------
 .../debian-edu-jessie-manual.de.po                 | 432 +++++++++++++-------
 .../debian-edu-jessie-manual.es.po                 | 432 +++++++++++++-------
 .../debian-edu-jessie-manual.fr.po                 | 432 +++++++++++++-------
 .../debian-edu-jessie-manual.it.po                 | 432 +++++++++++++-------
 .../debian-edu-jessie-manual.nb.po                 | 358 +++++++++++------
 .../debian-edu-jessie-manual.nl.po                 | 434 ++++++++++++++-------
 .../debian-edu-jessie/debian-edu-jessie-manual.pot | 198 +++++++---
 .../debian-edu-jessie/debian-edu-jessie-manual.xml |  50 +--
 .../images/01-Installer_boot_menu.png              | Bin 0 -> 31015 bytes
 .../images/02-select_a_language.png                | Bin 0 -> 37615 bytes
 .../images/03-select_your_location.png             | Bin 0 -> 33240 bytes
 .../images/04-Configure_the_keyboard.png           | Bin 0 -> 30769 bytes
 .../images/05-Detect_and_mount_CD-ROM.png          | Bin 0 -> 18245 bytes
 .../06-Load_installer_components_from_CD.png       | Bin 0 -> 18288 bytes
 .../images/07-Detect_network_hardware.png          | Bin 0 -> 17600 bytes
 .../images/08-Choose_Debian_Edu_profile.png        | Bin 0 -> 46189 bytes
 ...-Really_use_the_automatic_partitioning_tool.png | Bin 0 -> 26996 bytes
 ...lly_use_the_automatic_partitioning_tool-Yes.png | Bin 0 -> 27045 bytes
 .../images/12-Set_up_users_and_passwords.png       | Bin 0 -> 38869 bytes
 .../images/12a-Set_up_users_and_passwords.png      | Bin 0 -> 25934 bytes
 .../images/12b-Set_up_users_and_passwords.png      | Bin 0 -> 23067 bytes
 .../images/12c-Set_up_users_and_passwords.png      | Bin 0 -> 26747 bytes
 .../images/12d-Setting-up-the-partitioner.png      | Bin 0 -> 16597 bytes
 .../images/13-Install+the+base+system.png          | Bin 0 -> 17124 bytes
 .../images/14-Select_and_install_software.png      | Bin 0 -> 18863 bytes
 .../images/17-Select_and_install_software.png      | Bin 0 -> 18967 bytes
 ...Install_the_GRUB_boot_loader_on_a_hard_disk.png | Bin 0 -> 18451 bytes
 .../images/20-Finish_the_Installation.png          | Bin 0 -> 17412 bytes
 ...nish_the_Installation-Installation_complete.png | Bin 0 -> 24676 bytes
 .../images/Installer_advanced_options_a.png        | Bin 0 -> 31782 bytes
 .../images/Installer_advanced_options_b.png        | Bin 0 -> 31871 bytes
 .../debian-edu-jessie/images/Installer_help.png    | Bin 0 -> 9842 bytes
 .../debian-edu-jessie/images/de/worldmap.png       | Bin 387287 -> 387288 bytes
 .../debian-edu-jessie/images/es/worldmap.png       | Bin 387401 -> 387402 bytes
 .../debian-edu-jessie/images/fr/worldmap.png       | Bin 387334 -> 387335 bytes
 .../debian-edu-jessie/images/worldmap.png          | Bin 387326 -> 387327 bytes
 38 files changed, 2141 insertions(+), 1065 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fae680f..513274f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-edu-doc (1.6~20141025~8.0) UNRELEASED; urgency=medium
+
+  * Update manuals and images from the wiki.
+
+ -- Holger Levsen <holger at debian.org>  Mon, 20 Oct 2014 09:37:59 +0000
+
 debian-edu-doc (1.6~20141019~8.0) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index c6510e6..78ee2f4 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2014-10-17 23:58+0200\n"
+"POT-Creation-Date: 2014-10-20 09:36+0000\n"
 "PO-Revision-Date: 2014-10-13 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1537,9 +1537,15 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Vælg installationstype"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Opstartsmenu for installationsprogrammet"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1589,10 +1595,16 @@ msgstr ""
 "<emphasis role=\"strong\">Hjælp</emphasis> har nogle fif til brugen af "
 "installationsprogrammet"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Installationsprogrammets avancerede indstillingsskærm 1"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1645,10 +1657,16 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automatisk installation</emphasis> kræver "
 "en forudfyldt fil (preseed)."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Installationsprogrammets avancerede indstillingsskærm 2"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1701,9 +1719,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit grafisk automatisk installation</emphasis> "
 "kræver en forudfyldt fil (preseed)."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Installationsprogrammets hjælpeskærm"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2459,97 +2483,221 @@ msgstr ""
 "den første opstart af tjener, en PXE-opstart på arbejdsstationsnetværket og "
 "på netværket for de tynde klienter:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "02-select_a_language.png"
+msgid "./images/02-select_a_language.png"
+msgstr "02-select_a_language.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
+msgstr "02-select_a_language.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "03-select_your_location.png"
+msgid "./images/03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment: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 "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>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "{{attachment:08-Choose_Debian_Edu_profile.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:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-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><inlinemediaobject><textobject><phrase>
+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 "./images/06-Load_installer_components_from_CD.png"
+msgstr "06-Load_installer_components_from_CD.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>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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>
+#, 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>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgid "./images/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><inlinemediaobject><textobject><phrase>
+msgid "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>
 msgid "{{attachment: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}}"
-msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12a-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: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 "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>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12c-Set_up_users_and_passwords.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:12d-Setting-up-the-partitioner.png}}"
-msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><inlinemediaobject><textobject><phrase>
+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 "./images/12c-Set_up_users_and_passwords.png"
+msgstr "12c-Set_up_users_and_passwords.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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:12e-creating_ext4.png}}"
 msgstr "{{attachment:12e-creating_ext4.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "13-Install the base system.png"
+msgid "./images/13-Install+the+base+system.png"
+msgstr "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: 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: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 "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><inlinemediaobject><textobject><phrase>
+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 "./images/17-Select_and_install_software.png"
+msgstr "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: Content of: <article><section><section><para>
 msgid "{{attachment: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}}"
-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 "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>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "{{attachment:20-Finish_the_Installation.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: 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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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"
@@ -11718,6 +11866,73 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "{{attachment:02-select_a_language.png}}"
+
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "{{attachment:03-select_your_location.png}}"
+
+#~ msgid "{{attachment: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:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
+#~ msgstr ""
+#~ "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.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: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: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 "new boot framework: systemd"
 #~ msgstr "ny opstartsramme: systemd"
 
@@ -11736,18 +11951,6 @@ msgstr ""
 #~ msgid "{{attachment:alert.png}}"
 #~ msgstr "{{attachment:alert.png}}"
 
-#~ msgid "Installer boot menu"
-#~ msgstr "Opstartsmenu for installationsprogrammet"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Installationsprogrammets avancerede indstillingsskærm 1"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Installationsprogrammets avancerede indstillingsskærm 2"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Installationsprogrammets hjælpeskærm"
-
 #~ msgid ""
 #~ "Since the Wheezy release it is possible to directly copy the CD/DVD/BD "
 #~ "<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
@@ -11765,78 +11968,15 @@ msgstr ""
 #~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 #~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
-#~ msgid "01-Installer_boot_menu.png"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#~ msgid "02-select_a_language.png"
-#~ msgstr "02-select_a_language.png"
-
-#~ msgid "03-select_your_location.png"
-#~ msgstr "03-select_your_location.png"
-
-#~ msgid "04-Configure_the_keyboard.png"
-#~ msgstr "04-Configure_the_keyboard.png"
-
-#~ msgid "05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "06-Load_installer_components_from_CD.png"
-#~ msgstr "06-Load_installer_components_from_CD.png"
-
-#~ msgid "07-Detect_network_hardware.png"
-#~ msgstr "07-Detect_network_hardware.png"
-
-#~ msgid "08-Choose_Debian_Edu_profile.png"
-#~ msgstr "08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
 #~ msgid "11-Participate_in_the_package_usage_survey.png"
 #~ msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#~ msgid "12-Set_up_users_and_passwords.png"
-#~ msgstr "12-Set_up_users_and_passwords.png"
-
-#~ msgid "12a-Set_up_users_and_passwords.png"
-#~ msgstr "12a-Set_up_users_and_passwords.png"
-
-#~ msgid "12b-Set_up_users_and_passwords.png"
-#~ msgstr "12b-Set_up_users_and_passwords.png"
-
-#~ msgid "12c-Set_up_users_and_passwords.png"
-#~ msgstr "12c-Set_up_users_and_passwords.png"
-
-#~ msgid "12d-Setting-up-the-partitioner.png"
-#~ msgstr "12d-Setting-up-the-partitioner.png"
-
 #~ msgid "12e-creating_ext4.png"
 #~ msgstr "12e-creating_ext4.png"
 
-#~ msgid "13-Install the base system.png"
-#~ msgstr "13-Install the base system.png"
-
-#~ msgid "14-Select_and_install_software.png"
-#~ msgstr "14-Select_and_install_software.png"
-
-#~ msgid "17-Select_and_install_software.png"
-#~ msgstr "17-Select_and_install_software.png"
-
 #~ msgid "18-Build LTSP chroot.png"
 #~ msgstr "18-Build LTSP chroot.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 "20-Finish_the_Installation.png"
-#~ msgstr "20-Finish_the_Installation.png"
-
-#~ msgid "21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-
 #~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 #~ msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index ebb26dc..cf1baf9 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 23:58+0200\n"
+"POT-Creation-Date: 2014-10-20 09:36+0000\n"
 "PO-Revision-Date: 2014-10-16 21:16+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1579,9 +1579,15 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Art der Installation auswählen"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Startmenü des Installers"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1631,10 +1637,16 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> bietet einige Hinweise für die "
 "Benutzung des Installationsprogrammes an."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Installer advanced options Bildschirm 1"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1688,10 +1700,16 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> benötigt eine "
 "Preseed-Datei."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Installer advanced options Bildschirm 2"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1743,9 +1761,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
 "benötigt  eine Preseed-Datei."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Hilfe-Bildschirm des Installers"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2510,97 +2534,221 @@ msgstr ""
 "Screenshots nach dem ersten Starten von »tjener«, dem PXE-Start eines "
 "Rechners im Netzwerk für Arbeitsplatzrechner bzw. für Thin Clients."
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "02-select_a_language.png"
+msgid "./images/02-select_a_language.png"
+msgstr "02-select_a_language.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
+msgstr "02-select_a_language.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "03-select_your_location.png"
+msgid "./images/03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment: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 "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>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "{{attachment:08-Choose_Debian_Edu_profile.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:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-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><inlinemediaobject><textobject><phrase>
+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 "./images/06-Load_installer_components_from_CD.png"
+msgstr "06-Load_installer_components_from_CD.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>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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>
+#, 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>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgid "./images/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><inlinemediaobject><textobject><phrase>
+msgid "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>
 msgid "{{attachment: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}}"
-msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12a-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: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 "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>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12c-Set_up_users_and_passwords.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:12d-Setting-up-the-partitioner.png}}"
-msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><inlinemediaobject><textobject><phrase>
+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 "./images/12c-Set_up_users_and_passwords.png"
+msgstr "12c-Set_up_users_and_passwords.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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:12e-creating_ext4.png}}"
 msgstr "{{attachment:12e-creating_ext4.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "13-Install the base system.png"
+msgid "./images/13-Install+the+base+system.png"
+msgstr "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: 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: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 "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><inlinemediaobject><textobject><phrase>
+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 "./images/17-Select_and_install_software.png"
+msgstr "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: Content of: <article><section><section><para>
 msgid "{{attachment: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}}"
-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 "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>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "{{attachment:20-Finish_the_Installation.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: 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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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"
@@ -11987,6 +12135,73 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "{{attachment:02-select_a_language.png}}"
+
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "{{attachment:03-select_your_location.png}}"
+
+#~ msgid "{{attachment: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:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
+#~ msgstr ""
+#~ "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.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: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: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 "new boot framework: systemd"
 #~ msgstr "neues Init-System: systemd"
 
@@ -12005,18 +12220,6 @@ msgstr ""
 #~ msgid "{{attachment:alert.png}}"
 #~ msgstr "{{attachment:alert.png}}"
 
-#~ msgid "Installer boot menu"
-#~ msgstr "Startmenü des Installers"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Installer advanced options Bildschirm 1"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Installer advanced options Bildschirm 2"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Hilfe-Bildschirm des Installers"
-
 #~ msgid ""
 #~ "Since the Wheezy release it is possible to directly copy the CD/DVD/BD "
 #~ "<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
@@ -12034,78 +12237,15 @@ msgstr ""
 #~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 #~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
-#~ msgid "01-Installer_boot_menu.png"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#~ msgid "02-select_a_language.png"
-#~ msgstr "02-select_a_language.png"
-
-#~ msgid "03-select_your_location.png"
-#~ msgstr "03-select_your_location.png"
-
-#~ msgid "04-Configure_the_keyboard.png"
-#~ msgstr "04-Configure_the_keyboard.png"
-
-#~ msgid "05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "06-Load_installer_components_from_CD.png"
-#~ msgstr "06-Load_installer_components_from_CD.png"
-
-#~ msgid "07-Detect_network_hardware.png"
-#~ msgstr "07-Detect_network_hardware.png"
-
-#~ msgid "08-Choose_Debian_Edu_profile.png"
-#~ msgstr "08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
 #~ msgid "11-Participate_in_the_package_usage_survey.png"
 #~ msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#~ msgid "12-Set_up_users_and_passwords.png"
-#~ msgstr "12-Set_up_users_and_passwords.png"
-
-#~ msgid "12a-Set_up_users_and_passwords.png"
-#~ msgstr "12a-Set_up_users_and_passwords.png"
-
-#~ msgid "12b-Set_up_users_and_passwords.png"
-#~ msgstr "12b-Set_up_users_and_passwords.png"
-
-#~ msgid "12c-Set_up_users_and_passwords.png"
-#~ msgstr "12c-Set_up_users_and_passwords.png"
-
-#~ msgid "12d-Setting-up-the-partitioner.png"
-#~ msgstr "12d-Setting-up-the-partitioner.png"
-
 #~ msgid "12e-creating_ext4.png"
 #~ msgstr "12e-creating_ext4.png"
 
-#~ msgid "13-Install the base system.png"
-#~ msgstr "13-Install the base system.png"
-
-#~ msgid "14-Select_and_install_software.png"
-#~ msgstr "14-Select_and_install_software.png"
-
-#~ msgid "17-Select_and_install_software.png"
-#~ msgstr "17-Select_and_install_software.png"
-
 #~ msgid "18-Build LTSP chroot.png"
 #~ msgstr "18-Build LTSP chroot.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 "20-Finish_the_Installation.png"
-#~ msgstr "20-Finish_the_Installation.png"
-
-#~ msgid "21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-
 #~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 #~ msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index 27adb90..26fca79 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-17 23:58+0200\n"
+"POT-Creation-Date: 2014-10-20 09:36+0000\n"
 "PO-Revision-Date: 2013-12-02 00:31-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1576,9 +1576,15 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Seleccione el tipo de instalación"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Menú de carga del instalador"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1628,10 +1634,16 @@ msgstr ""
 "<emphasis role=\"strong\">Ayuda</emphasis> brinda algunos consejos sobre "
 "como usar el instalador."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Pantalla 1 de las opciones avanzadas del instalador"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1686,10 +1698,16 @@ msgstr ""
 "<emphasis role=\"strong\">Instalación automática 64 bits</emphasis> necesita "
 "un archivo preconfigurado."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Pantalla 2 de las opciones avanzadas del instalador"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1742,9 +1760,15 @@ msgstr ""
 "<emphasis role=\"strong\">Instalación automática 64 bits gráfica</emphasis> "
 "necesita un archivo preconfigurado."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Pantalla de ayuda del instalador"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2530,97 +2554,221 @@ msgstr ""
 "ligeros y como se ve la primera vez que inicia tjener, un inicio PXE en la "
 "red de estación de trabajo y en la red de cliente ligero: "
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "02-select_a_language.png"
+msgid "./images/02-select_a_language.png"
+msgstr "02-select_a_language.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
+msgstr "02-select_a_language.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "03-select_your_location.png"
+msgid "./images/03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment: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 "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>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "{{attachment:08-Choose_Debian_Edu_profile.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:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-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><inlinemediaobject><textobject><phrase>
+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 "./images/06-Load_installer_components_from_CD.png"
+msgstr "06-Load_installer_components_from_CD.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>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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>
+#, 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>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgid "./images/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><inlinemediaobject><textobject><phrase>
+msgid "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>
 msgid "{{attachment: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}}"
-msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12a-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: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 "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>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12c-Set_up_users_and_passwords.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:12d-Setting-up-the-partitioner.png}}"
-msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><inlinemediaobject><textobject><phrase>
+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 "./images/12c-Set_up_users_and_passwords.png"
+msgstr "12c-Set_up_users_and_passwords.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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:12e-creating_ext4.png}}"
 msgstr "{{attachment:12e-creating_ext4.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "13-Install the base system.png"
+msgid "./images/13-Install+the+base+system.png"
+msgstr "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: 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: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 "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><inlinemediaobject><textobject><phrase>
+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 "./images/17-Select_and_install_software.png"
+msgstr "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: Content of: <article><section><section><para>
 msgid "{{attachment: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}}"
-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 "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>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "{{attachment:20-Finish_the_Installation.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: 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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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"
@@ -10970,6 +11118,73 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "{{attachment:02-select_a_language.png}}"
+
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "{{attachment:03-select_your_location.png}}"
+
+#~ msgid "{{attachment: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:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
+#~ msgstr ""
+#~ "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.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: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: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 "The following needs to be executed:"
 #~ msgid "FIXME: some of the following version numbers still need updates:"
@@ -10987,18 +11202,6 @@ msgstr ""
 #~ msgid "{{attachment:alert.png}}"
 #~ msgstr "{{attachment:alert.png}}"
 
-#~ msgid "Installer boot menu"
-#~ msgstr "Menú de carga del instalador"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Pantalla 1 de las opciones avanzadas del instalador"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Pantalla 2 de las opciones avanzadas del instalador"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Pantalla de ayuda del instalador"
-
 #~ msgid ""
 #~ "Since the Wheezy release it is possible to directly copy the CD/DVD/BD "
 #~ "<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
@@ -11017,78 +11220,15 @@ msgstr ""
 #~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 #~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
-#~ msgid "01-Installer_boot_menu.png"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#~ msgid "02-select_a_language.png"
-#~ msgstr "02-select_a_language.png"
-
-#~ msgid "03-select_your_location.png"
-#~ msgstr "03-select_your_location.png"
-
-#~ msgid "04-Configure_the_keyboard.png"
-#~ msgstr "04-Configure_the_keyboard.png"
-
-#~ msgid "05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "06-Load_installer_components_from_CD.png"
-#~ msgstr "06-Load_installer_components_from_CD.png"
-
-#~ msgid "07-Detect_network_hardware.png"
-#~ msgstr "07-Detect_network_hardware.png"
-
-#~ msgid "08-Choose_Debian_Edu_profile.png"
-#~ msgstr "08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
 #~ msgid "11-Participate_in_the_package_usage_survey.png"
 #~ msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#~ msgid "12-Set_up_users_and_passwords.png"
-#~ msgstr "12-Set_up_users_and_passwords.png"
-
-#~ msgid "12a-Set_up_users_and_passwords.png"
-#~ msgstr "12a-Set_up_users_and_passwords.png"
-
-#~ msgid "12b-Set_up_users_and_passwords.png"
-#~ msgstr "12b-Set_up_users_and_passwords.png"
-
-#~ msgid "12c-Set_up_users_and_passwords.png"
-#~ msgstr "12c-Set_up_users_and_passwords.png"
-
-#~ msgid "12d-Setting-up-the-partitioner.png"
-#~ msgstr "12d-Setting-up-the-partitioner.png"
-
 #~ msgid "12e-creating_ext4.png"
 #~ msgstr "12e-creating_ext4.png"
 
-#~ msgid "13-Install the base system.png"
-#~ msgstr "13-Install the base system.png"
-
-#~ msgid "14-Select_and_install_software.png"
-#~ msgstr "14-Select_and_install_software.png"
-
-#~ msgid "17-Select_and_install_software.png"
-#~ msgstr "17-Select_and_install_software.png"
-
 #~ msgid "18-Build LTSP chroot.png"
 #~ msgstr "18-Build LTSP chroot.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 "20-Finish_the_Installation.png"
-#~ msgstr "20-Finish_the_Installation.png"
-
-#~ msgid "21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-
 #~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 #~ msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index 0c6e77e..c99d9d2 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-10-17 23:58+0200\n"
+"POT-Creation-Date: 2014-10-20 09:36+0000\n"
 "PO-Revision-Date: 2014-09-23 07:24+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1585,9 +1585,15 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Choisir un type d'installation"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Menu de démarrage de l'installateur"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1637,10 +1643,16 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> donne quelques conseils pour "
 "utiliser l'installateur"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Options avancées de l'installateur (écran 1)"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1696,10 +1708,16 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> a besoin d'un "
 "fichier de configuration."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Options avancées de l'installateur (écran 2)"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1752,9 +1770,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> a "
 "besoin d'un fichier de configuration."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Écran d'aide de l'installateur"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2529,97 +2553,221 @@ msgstr ""
 "PXE sur le réseau des stations de travail et sur le réseau des clients "
 "légers :"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "02-select_a_language.png"
+msgid "./images/02-select_a_language.png"
+msgstr "02-select_a_language.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
+msgstr "02-select_a_language.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "03-select_your_location.png"
+msgid "./images/03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment: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 "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>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "{{attachment:08-Choose_Debian_Edu_profile.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:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-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><inlinemediaobject><textobject><phrase>
+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 "./images/06-Load_installer_components_from_CD.png"
+msgstr "06-Load_installer_components_from_CD.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>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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>
+#, 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>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgid "./images/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><inlinemediaobject><textobject><phrase>
+msgid "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>
 msgid "{{attachment: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}}"
-msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12a-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: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 "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>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12c-Set_up_users_and_passwords.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:12d-Setting-up-the-partitioner.png}}"
-msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><inlinemediaobject><textobject><phrase>
+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 "./images/12c-Set_up_users_and_passwords.png"
+msgstr "12c-Set_up_users_and_passwords.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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:12e-creating_ext4.png}}"
 msgstr "{{attachment:12e-creating_ext4.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "13-Install the base system.png"
+msgid "./images/13-Install+the+base+system.png"
+msgstr "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: 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: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 "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><inlinemediaobject><textobject><phrase>
+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 "./images/17-Select_and_install_software.png"
+msgstr "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: Content of: <article><section><section><para>
 msgid "{{attachment: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}}"
-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 "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>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "{{attachment:20-Finish_the_Installation.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: 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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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"
@@ -12077,6 +12225,73 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "{{attachment:02-select_a_language.png}}"
+
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "{{attachment:03-select_your_location.png}}"
+
+#~ msgid "{{attachment: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:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
+#~ msgstr ""
+#~ "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.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: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: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 "new boot framework: systemd"
 #~ msgstr "nouvelle suite de logiciels d'amorçage : systemd"
 
@@ -12097,18 +12312,6 @@ msgstr ""
 #~ msgid "{{attachment:alert.png}}"
 #~ msgstr "{{attachment:alert.png}}"
 
-#~ msgid "Installer boot menu"
-#~ msgstr "Menu de démarrage de l'installateur"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Options avancées de l'installateur (écran 1)"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Options avancées de l'installateur (écran 2)"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Écran d'aide de l'installateur"
-
 #~ msgid ""
 #~ "Since the Wheezy release it is possible to directly copy the CD/DVD/BD "
 #~ "<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
@@ -12127,78 +12330,15 @@ msgstr ""
 #~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 #~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
-#~ msgid "01-Installer_boot_menu.png"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#~ msgid "02-select_a_language.png"
-#~ msgstr "02-select_a_language.png"
-
-#~ msgid "03-select_your_location.png"
-#~ msgstr "03-select_your_location.png"
-
-#~ msgid "04-Configure_the_keyboard.png"
-#~ msgstr "04-Configure_the_keyboard.png"
-
-#~ msgid "05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "06-Load_installer_components_from_CD.png"
-#~ msgstr "06-Load_installer_components_from_CD.png"
-
-#~ msgid "07-Detect_network_hardware.png"
-#~ msgstr "07-Detect_network_hardware.png"
-
-#~ msgid "08-Choose_Debian_Edu_profile.png"
-#~ msgstr "08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
 #~ msgid "11-Participate_in_the_package_usage_survey.png"
 #~ msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#~ msgid "12-Set_up_users_and_passwords.png"
-#~ msgstr "12-Set_up_users_and_passwords.png"
-
-#~ msgid "12a-Set_up_users_and_passwords.png"
-#~ msgstr "12a-Set_up_users_and_passwords.png"
-
-#~ msgid "12b-Set_up_users_and_passwords.png"
-#~ msgstr "12b-Set_up_users_and_passwords.png"
-
-#~ msgid "12c-Set_up_users_and_passwords.png"
-#~ msgstr "12c-Set_up_users_and_passwords.png"
-
-#~ msgid "12d-Setting-up-the-partitioner.png"
-#~ msgstr "12d-Setting-up-the-partitioner.png"
-
 #~ msgid "12e-creating_ext4.png"
 #~ msgstr "12e-creating_ext4.png"
 
-#~ msgid "13-Install the base system.png"
-#~ msgstr "13-Install the base system.png"
-
-#~ msgid "14-Select_and_install_software.png"
-#~ msgstr "14-Select_and_install_software.png"
-
-#~ msgid "17-Select_and_install_software.png"
-#~ msgstr "17-Select_and_install_software.png"
-
 #~ msgid "18-Build LTSP chroot.png"
 #~ msgstr "18-Build LTSP chroot.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 "20-Finish_the_Installation.png"
-#~ msgstr "20-Finish_the_Installation.png"
-
-#~ msgid "21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-
 #~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 #~ msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index 451367b..5dc22b8 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2014-10-17 23:58+0200\n"
+"POT-Creation-Date: 2014-10-20 09:36+0000\n"
 "PO-Revision-Date: 2014-06-26 19:17+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1558,9 +1558,15 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Selezionare il tipo d'installazione"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Menu di avvio dell'installatore"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1610,10 +1616,16 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> dà alcuni suggerimenti "
 "sull'utilizzo dell'installatore"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Schermata 1 delle opzioni avanzate dell'installatore"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1669,10 +1681,16 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> ha bisogno di "
 "un file di preconfigurazione."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Schermata 2 delle opzioni avanzate dell'installatore"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1725,9 +1743,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> ha "
 "bisogno di un file di preconfigurazione."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Schermata di aiuto dell'installatore"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2488,97 +2512,221 @@ msgstr ""
 "server tjener, un avvio via PXE su una rete delle workstation e sulla rete "
 "dei thin-client:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "02-select_a_language.png"
+msgid "./images/02-select_a_language.png"
+msgstr "02-select_a_language.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
+msgstr "02-select_a_language.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "03-select_your_location.png"
+msgid "./images/03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment: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 "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>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "{{attachment:08-Choose_Debian_Edu_profile.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:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-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><inlinemediaobject><textobject><phrase>
+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 "./images/06-Load_installer_components_from_CD.png"
+msgstr "06-Load_installer_components_from_CD.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>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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>
+#, 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>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgid "./images/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><inlinemediaobject><textobject><phrase>
+msgid "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>
 msgid "{{attachment: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}}"
-msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12a-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: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 "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>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12c-Set_up_users_and_passwords.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:12d-Setting-up-the-partitioner.png}}"
-msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><inlinemediaobject><textobject><phrase>
+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 "./images/12c-Set_up_users_and_passwords.png"
+msgstr "12c-Set_up_users_and_passwords.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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:12e-creating_ext4.png}}"
 msgstr "{{attachment:12e-creating_ext4.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "13-Install the base system.png"
+msgid "./images/13-Install+the+base+system.png"
+msgstr "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: 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: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 "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><inlinemediaobject><textobject><phrase>
+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 "./images/17-Select_and_install_software.png"
+msgstr "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: Content of: <article><section><section><para>
 msgid "{{attachment: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}}"
-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 "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>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "{{attachment:20-Finish_the_Installation.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: 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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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"
@@ -11888,6 +12036,73 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "{{attachment:02-select_a_language.png}}"
+
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "{{attachment:03-select_your_location.png}}"
+
+#~ msgid "{{attachment: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:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
+#~ msgstr ""
+#~ "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.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: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: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 "The following needs to be executed:"
 #~ msgid "FIXME: some of the following version numbers still need updates:"
@@ -11905,18 +12120,6 @@ msgstr ""
 #~ msgid "{{attachment:alert.png}}"
 #~ msgstr "{{attachment:alert.png}}"
 
-#~ msgid "Installer boot menu"
-#~ msgstr "Menu di avvio dell'installatore"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Schermata 1 delle opzioni avanzate dell'installatore"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Schermata 2 delle opzioni avanzate dell'installatore"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Schermata di aiuto dell'installatore"
-
 #~ msgid ""
 #~ "Since the Wheezy release it is possible to directly copy the CD/DVD/BD "
 #~ "<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
@@ -11934,78 +12137,15 @@ msgstr ""
 #~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 #~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
-#~ msgid "01-Installer_boot_menu.png"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#~ msgid "02-select_a_language.png"
-#~ msgstr "02-select_a_language.png"
-
-#~ msgid "03-select_your_location.png"
-#~ msgstr "03-select_your_location.png"
-
-#~ msgid "04-Configure_the_keyboard.png"
-#~ msgstr "04-Configure_the_keyboard.png"
-
-#~ msgid "05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "06-Load_installer_components_from_CD.png"
-#~ msgstr "06-Load_installer_components_from_CD.png"
-
-#~ msgid "07-Detect_network_hardware.png"
-#~ msgstr "07-Detect_network_hardware.png"
-
-#~ msgid "08-Choose_Debian_Edu_profile.png"
-#~ msgstr "08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
 #~ msgid "11-Participate_in_the_package_usage_survey.png"
 #~ msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#~ msgid "12-Set_up_users_and_passwords.png"
-#~ msgstr "12-Set_up_users_and_passwords.png"
-
-#~ msgid "12a-Set_up_users_and_passwords.png"
-#~ msgstr "12a-Set_up_users_and_passwords.png"
-
-#~ msgid "12b-Set_up_users_and_passwords.png"
-#~ msgstr "12b-Set_up_users_and_passwords.png"
-
-#~ msgid "12c-Set_up_users_and_passwords.png"
-#~ msgstr "12c-Set_up_users_and_passwords.png"
-
-#~ msgid "12d-Setting-up-the-partitioner.png"
-#~ msgstr "12d-Setting-up-the-partitioner.png"
-
 #~ msgid "12e-creating_ext4.png"
 #~ msgstr "12e-creating_ext4.png"
 
-#~ msgid "13-Install the base system.png"
-#~ msgstr "13-Install the base system.png"
-
-#~ msgid "14-Select_and_install_software.png"
-#~ msgstr "14-Select_and_install_software.png"
-
-#~ msgid "17-Select_and_install_software.png"
-#~ msgstr "17-Select_and_install_software.png"
-
 #~ msgid "18-Build LTSP chroot.png"
 #~ msgstr "18-Build LTSP chroot.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 "20-Finish_the_Installation.png"
-#~ msgstr "20-Finish_the_Installation.png"
-
-#~ msgid "21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-
 #~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 #~ msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index c4babc5..9d1564f 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2014-10-17 23:58+0200\n"
+"POT-Creation-Date: 2014-10-20 09:36+0000\n"
 "PO-Revision-Date: 2014-06-15 16:48+0200\n"
 "Last-Translator: Ole-Erik Yrvin <oeyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -1601,11 +1601,16 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Velg type installasjon"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/01-Installer_boot_menu.png"
 msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "Installer boot menu"
+msgstr "Installasjonsvalg i detalj"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 msgid ""
@@ -1658,11 +1663,16 @@ msgstr ""
 "<computeroutput>64-bit installasjon</computeroutput> kjører en 64-bit "
 "installasjon i tekstmodus. "
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "Installer advanced options screen 1"
+msgstr "Installasjonsvalg i detalj"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 msgid ""
@@ -1712,11 +1722,16 @@ msgid ""
 "preseed file."
 msgstr "<emphasis role='strong'>Lokalkode</emphasis>"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "Installer advanced options screen 2"
+msgstr "Installasjonsvalg i detalj"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 msgid ""
@@ -1763,10 +1778,15 @@ msgid ""
 "needs a preseed file."
 msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_help.png"
+msgstr "./images/sad.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "Installer help screen"
+msgstr "Installasjonsvalg i detalj"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
@@ -2559,48 +2579,101 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "01-Installer_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:02-select_a_language.png}}"
+msgid "./images/02-select_a_language.png"
 msgstr "{{attachment:02-select_a_language.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "02-select_a_language.png"
+msgstr "{{attachment:02-select_a_language.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "./images/03-select_your_location.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "{{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 "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
-msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+msgid "04-Configure_the_keyboard.png"
+msgstr "04-Configure_the_keyboard.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "{{attachment:06-Load_installer_components_from_CD.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 "{{attachment:07-Detect_network_hardware.png}}"
-msgstr "{{attachment:07-Detect_network_hardware.png}}"
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr "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>
 #, fuzzy
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "{{attachment:08-Choose_Debian_Edu_profile.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 "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+msgid "06-Load_installer_components_from_CD.png"
+msgstr "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>
+#, fuzzy
+msgid "./images/07-Detect_network_hardware.png"
+msgstr "07-Detect_network_hardware.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+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 "./images/08-Choose_Debian_Edu_profile.png"
+msgstr "08-Choose_Debian_Edu_profile.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+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 "./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"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
+msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]wheezy-07-partitioning.png\"/></imageobject>"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
 "edu-]wheezy-07-partitioning.png\"/></imageobject>"
@@ -2612,28 +2685,53 @@ msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 "lwat-]edituser_wheezy.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. 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 "Sett passord"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+msgid "12-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+msgid "12a-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/12b-Set_up_users_and_passwords.png"
+msgstr "Sett passord"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr "Sett passord"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/12c-Set_up_users_and_passwords.png"
+msgstr "Sett passord"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr "Sett passord"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/12d-Setting-up-the-partitioner.png"
+msgstr "./images/pxe-tjener.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>
@@ -2643,23 +2741,44 @@ msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"{{attachment:debian-"
 "edu-}}squeeze-10-basesystem.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:13-Install the base system.png}}"
+msgid "./images/13-Install+the+base+system.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
 "edu-]wheezy-10-basesystem.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "{{attachment:14-Select_and_install_software.png}}"
+msgid "13-Install the base system.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]wheezy-10-basesystem.png\"/></imageobject>"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/14-Select_and_install_software.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 "getting-]started.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "{{attachment:17-Select_and_install_software.png}}"
+msgid "14-Select_and_install_software.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/17-Select_and_install_software.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "17-Select_and_install_software.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 "getting-]started.png\"/></imageobject>"
@@ -2671,23 +2790,44 @@ msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"{{attachment:debian-"
 "edu-}}squeeze-10-basesystem.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. 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 ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
 "arch.]png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "{{attachment:20-Finish_the_Installation.png}}"
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+"arch.]png\"/></imageobject>"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/20-Finish_the_Installation.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 "getting-]started.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+msgid "20-Finish_the_Installation.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 "getting-]started.png\"/></imageobject>"
@@ -11996,124 +12136,116 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
 #, fuzzy
-#~ msgid "FIXME: some of the following version numbers still need updates:"
-#~ msgstr "Følgende må utføres:"
-
-#~ msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-#~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
-
-#~ msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
-#~ msgstr "{{attachment:Debian_Edu_Network_Jessie.png}}"
-
-#, fuzzy
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr "Installasjonsvalg i detalj"
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
 #, fuzzy
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr "Installasjonsvalg i detalj"
+#~ msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#~ msgstr "{{attachment:04-Configure_the_keyboard.png}}"
 
 #, fuzzy
-#~ msgid "Installer help screen"
-#~ msgstr "Installasjonsvalg i detalj"
+#~ msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#~ msgstr "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
 
 #, fuzzy
-#~ msgid "{{attachment:pxe-tjener.png}}"
-#~ msgstr "{{attachment:pxe-tjener.png}}"
-
-#, fuzzy
-#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-#~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#~ msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
 
 #, fuzzy
-#~ msgid "04-Configure_the_keyboard.png"
-#~ msgstr "04-Configure_the_keyboard.png"
+#~ msgid "{{attachment:07-Detect_network_hardware.png}}"
+#~ msgstr "{{attachment:07-Detect_network_hardware.png}}"
 
 #, fuzzy
-#~ msgid "05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "05-Detect_and_mount_CD-ROM.png"
+#~ msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#~ msgstr "{{attachment:08-Choose_Debian_Edu_profile.png}}"
 
 #, fuzzy
-#~ msgid "06-Load_installer_components_from_CD.png"
-#~ msgstr "06-Load_installer_components_from_CD.png"
+#~ msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#~ msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
 
 #, fuzzy
-#~ msgid "07-Detect_network_hardware.png"
-#~ msgstr "07-Detect_network_hardware.png"
-
-#, fuzzy
-#~ msgid "08-Choose_Debian_Edu_profile.png"
-#~ msgstr "08-Choose_Debian_Edu_profile.png"
-
-#, fuzzy
-#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#, fuzzy
-#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+#~ msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
 #~ msgstr ""
 #~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
 #~ "edu-]wheezy-07-partitioning.png\"/></imageobject>"
 
 #, fuzzy
-#~ msgid "11-Participate_in_the_package_usage_survey.png"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "lwat-]edituser_wheezy.png\"/></imageobject>"
-
-#, fuzzy
-#~ msgid "12-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
 #~ msgstr "Sett passord"
 
 #, fuzzy
-#~ msgid "12a-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
 #~ msgstr "Sett passord"
 
 #, fuzzy
-#~ msgid "12b-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
 #~ msgstr "Sett passord"
 
 #, fuzzy
-#~ msgid "12c-Set_up_users_and_passwords.png"
+#~ msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
 #~ msgstr "Sett passord"
 
 #, fuzzy
-#~ msgid "13-Install the base system.png"
+#~ msgid "{{attachment:13-Install the base system.png}}"
 #~ msgstr ""
 #~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
 #~ "edu-]wheezy-10-basesystem.png\"/></imageobject>"
 
 #, fuzzy
-#~ msgid "14-Select_and_install_software.png"
+#~ msgid "{{attachment:14-Select_and_install_software.png}}"
 #~ msgstr ""
 #~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 #~ "getting-]started.png\"/></imageobject>"
 
 #, fuzzy
-#~ msgid "17-Select_and_install_software.png"
+#~ msgid "{{attachment:17-Select_and_install_software.png}}"
 #~ msgstr ""
 #~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 #~ "getting-]started.png\"/></imageobject>"
 
 #, 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 ""
 #~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
 #~ "arch.]png\"/></imageobject>"
 
 #, fuzzy
-#~ msgid "20-Finish_the_Installation.png"
+#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
 #~ msgstr ""
 #~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 #~ "getting-]started.png\"/></imageobject>"
 
 #, fuzzy
-#~ msgid "21-Finish_the_Installation-Installation_complete.png"
+#~ msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 #~ msgstr ""
 #~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 #~ "getting-]started.png\"/></imageobject>"
 
 #, fuzzy
+#~ msgid "FIXME: some of the following version numbers still need updates:"
+#~ msgstr "Følgende må utføres:"
+
+#~ msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+
+#~ msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
+#~ msgstr "{{attachment:Debian_Edu_Network_Jessie.png}}"
+
+#, fuzzy
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "{{attachment:pxe-tjener.png}}"
+
+#, fuzzy
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+
+#, fuzzy
+#~ msgid "11-Participate_in_the_package_usage_survey.png"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "lwat-]edituser_wheezy.png\"/></imageobject>"
+
+#, fuzzy
 #~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
 #~ msgstr ""
 #~ "<inlinemediaobject><imageobject><imagedata fileref=\"{{attachment:debian-"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index cef340e..0be4658 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-10-17 23:58+0200\n"
+"POT-Creation-Date: 2014-10-20 09:36+0000\n"
 "PO-Revision-Date: 2014-10-15 21:53+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -1601,9 +1601,15 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Een type van installatie kiezen"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
+msgstr "Opstartmenu van het installatieprogramma"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1656,10 +1662,16 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> geeft aanwijzingen bij het gebruik "
 "van het installatieprogramma. "
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/Installer_advanced_options_a.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
+msgstr "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 1"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
@@ -1717,10 +1729,16 @@ msgstr ""
 "bestand nodig waarmee een aantal configuratieopties aan het "
 "installatieprogramma doorgegeven worden op een 64-bitcomputer."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_b.png}}"
+msgid "./images/Installer_advanced_options_b.png"
 msgstr "{{attachment:Installer_advanced_options_b.png}}"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
+msgstr "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 2"
+
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
@@ -1777,9 +1795,15 @@ msgstr ""
 "heeft een bestand nodig waarmee een aantal configuratieopties aan het "
 "installatieprogramma doorgegeven worden."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/Installer_help.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr "Installatieprogramma - hulpscherm"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -2570,97 +2594,221 @@ msgstr ""
 "van het scherm dat u ziet bij het opstarten via PXE van een computer op "
 "respectievelijk het netwerk voor werkstations en dat voor thin clients:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
-msgstr "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
+msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
-msgstr "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "02-select_a_language.png"
+msgid "./images/02-select_a_language.png"
+msgstr "02-select_a_language.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
-msgstr "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
+msgstr "02-select_a_language.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "03-select_your_location.png"
+msgid "./images/03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
-msgstr "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment: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 "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>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
-msgstr "{{attachment:08-Choose_Debian_Edu_profile.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:09-Really_use_the_automatic_partitioning_tool.png}}"
-msgstr "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-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><inlinemediaobject><textobject><phrase>
+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 "./images/06-Load_installer_components_from_CD.png"
+msgstr "06-Load_installer_components_from_CD.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>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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>
+#, 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>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgid "./images/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><inlinemediaobject><textobject><phrase>
+msgid "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>
 msgid "{{attachment: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}}"
-msgstr "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12a-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: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 "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>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
-msgstr "{{attachment:12c-Set_up_users_and_passwords.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:12d-Setting-up-the-partitioner.png}}"
-msgstr "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><inlinemediaobject><textobject><phrase>
+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 "./images/12c-Set_up_users_and_passwords.png"
+msgstr "12c-Set_up_users_and_passwords.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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:12e-creating_ext4.png}}"
 msgstr "{{attachment:12e-creating_ext4.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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "13-Install the base system.png"
+msgid "./images/13-Install+the+base+system.png"
+msgstr "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: 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: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 "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><inlinemediaobject><textobject><phrase>
+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 "./images/17-Select_and_install_software.png"
+msgstr "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: Content of: <article><section><section><para>
 msgid "{{attachment: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}}"
-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 "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>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
-msgstr "{{attachment:20-Finish_the_Installation.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: 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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "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><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>
+#, fuzzy
+#| msgid "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><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"
@@ -12259,6 +12407,73 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid "{{attachment:02-select_a_language.png}}"
+#~ msgstr "{{attachment:02-select_a_language.png}}"
+
+#~ msgid "{{attachment:03-select_your_location.png}}"
+#~ msgstr "{{attachment:03-select_your_location.png}}"
+
+#~ msgid "{{attachment: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:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
+#~ msgstr ""
+#~ "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.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: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: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 "new boot framework: systemd"
 #~ msgstr "nieuw raamwerk voor het opstarten van computers: systemd"
 
@@ -12279,20 +12494,6 @@ msgstr ""
 #~ msgid "{{attachment:alert.png}}"
 #~ msgstr "{{attachment:alert.png}}"
 
-#~ msgid "Installer boot menu"
-#~ msgstr "Opstartmenu van het installatieprogramma"
-
-#~ msgid "Installer advanced options screen 1"
-#~ msgstr ""
-#~ "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 1"
-
-#~ msgid "Installer advanced options screen 2"
-#~ msgstr ""
-#~ "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 2"
-
-#~ msgid "Installer help screen"
-#~ msgstr "Installatieprogramma - hulpscherm"
-
 #~ msgid ""
 #~ "Since the Wheezy release it is possible to directly copy the CD/DVD/BD "
 #~ "<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
@@ -12311,78 +12512,15 @@ msgstr ""
 #~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 #~ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
-#~ msgid "01-Installer_boot_menu.png"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#~ msgid "02-select_a_language.png"
-#~ msgstr "02-select_a_language.png"
-
-#~ msgid "03-select_your_location.png"
-#~ msgstr "03-select_your_location.png"
-
-#~ msgid "04-Configure_the_keyboard.png"
-#~ msgstr "04-Configure_the_keyboard.png"
-
-#~ msgid "05-Detect_and_mount_CD-ROM.png"
-#~ msgstr "05-Detect_and_mount_CD-ROM.png"
-
-#~ msgid "06-Load_installer_components_from_CD.png"
-#~ msgstr "06-Load_installer_components_from_CD.png"
-
-#~ msgid "07-Detect_network_hardware.png"
-#~ msgstr "07-Detect_network_hardware.png"
-
-#~ msgid "08-Choose_Debian_Edu_profile.png"
-#~ msgstr "08-Choose_Debian_Edu_profile.png"
-
-#~ msgid "09-Really_use_the_automatic_partitioning_tool.png"
-#~ msgstr "09-Really_use_the_automatic_partitioning_tool.png"
-
-#~ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-#~ msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-
 #~ msgid "11-Participate_in_the_package_usage_survey.png"
 #~ msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#~ msgid "12-Set_up_users_and_passwords.png"
-#~ msgstr "12-Set_up_users_and_passwords.png"
-
-#~ msgid "12a-Set_up_users_and_passwords.png"
-#~ msgstr "12a-Set_up_users_and_passwords.png"
-
-#~ msgid "12b-Set_up_users_and_passwords.png"
-#~ msgstr "12b-Set_up_users_and_passwords.png"
-
-#~ msgid "12c-Set_up_users_and_passwords.png"
-#~ msgstr "12c-Set_up_users_and_passwords.png"
-
-#~ msgid "12d-Setting-up-the-partitioner.png"
-#~ msgstr "12d-Setting-up-the-partitioner.png"
-
 #~ msgid "12e-creating_ext4.png"
 #~ msgstr "12e-creating_ext4.png"
 
-#~ msgid "13-Install the base system.png"
-#~ msgstr "13-Install the base system.png"
-
-#~ msgid "14-Select_and_install_software.png"
-#~ msgstr "14-Select_and_install_software.png"
-
-#~ msgid "17-Select_and_install_software.png"
-#~ msgstr "17-Select_and_install_software.png"
-
 #~ msgid "18-Build LTSP chroot.png"
 #~ msgstr "18-Build LTSP chroot.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 "20-Finish_the_Installation.png"
-#~ msgstr "20-Finish_the_Installation.png"
-
-#~ msgid "21-Finish_the_Installation-Installation_complete.png"
-#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-
 #~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 #~ msgstr "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 4b1f585..fd16994 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-17 23:58+0200\n"
+"POT-Creation-Date: 2014-10-20 09:36+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"
@@ -1156,8 +1156,12 @@ msgstr ""
 msgid "Select type of installation"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01-Installer_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer boot menu"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1196,8 +1200,12 @@ msgid ""
 "installer"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_advanced_options_a.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 1"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1240,8 +1248,12 @@ msgid ""
 "preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_advanced_options_b.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer advanced options screen 2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1282,8 +1294,12 @@ msgid ""
 "needs a preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Installer_help.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1812,96 +1828,180 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/02-select_a_language.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/03-select_your_location.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:07-Detect_network_hardware.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:08-Choose_Debian_Edu_profile.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:09-Really_use_the_automatic_partitioning_tool.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:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "05-Detect_and_mount_CD-ROM.png"
+msgstr ""
+
+#. 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><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: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "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}}"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12-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:12a-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:12b-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:12c-Set_up_users_and_passwords.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:12d-Setting-up-the-partitioner.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><inlinemediaobject><textobject><phrase>
+msgid "12b-Set_up_users_and_passwords.png"
+msgstr ""
+
+#. 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><inlinemediaobject><textobject><phrase>
+msgid "12c-Set_up_users_and_passwords.png"
+msgstr ""
+
+#. 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><inlinemediaobject><textobject><phrase>
+msgid "12d-Setting-up-the-partitioner.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid "{{attachment:12e-creating_ext4.png}}"
 msgstr ""
 
-#. 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>
+msgid "./images/13-Install+the+base+system.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:14-Select_and_install_software.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:17-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 ""
+
+#. 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: Content of: <article><section><section><para>
 msgid "{{attachment:18-Build LTSP chroot.png}}"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.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 ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#. 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>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index d09317b..f4f9696 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -488,7 +488,7 @@
 <section id="Installation--Select_type_of_installation">
 <title>Select type of installation
 </title><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para>{{attachment:01-Installer_boot_menu.png}}
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>Installer boot menu</phrase></textobject></inlinemediaobject>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para> <emphasis role="strong">Install</emphasis> is the default text mode installation on i386 and amd64.
 </para>
@@ -502,7 +502,7 @@
 </para>
 <para><emphasis role="strong">Help</emphasis> gives some hints on using the installer
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para>{{attachment:Installer_advanced_options_a.png}}
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_advanced_options_a.png"/></imageobject><textobject><phrase>Installer advanced options screen 1</phrase></textobject></inlinemediaobject>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para><emphasis role="strong">Back..</emphasis> brings back to the main menu.
 </para>
@@ -518,7 +518,7 @@
 </para>
 <para> <emphasis role="strong">64 bit automated install</emphasis> needs a preseed file.
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para>{{attachment:Installer_advanced_options_b.png}}
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_advanced_options_b.png"/></imageobject><textobject><phrase>Installer advanced options screen 2</phrase></textobject></inlinemediaobject>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para><emphasis role="strong">Graphical expert install</emphasis> gives access to all available questions in graphical mode.
 </para>
@@ -532,7 +532,7 @@
 </para>
 <para> <emphasis role="strong">64 bit graphical automated install</emphasis> needs a preseed file.
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para>{{attachment:Installer_help.png}}
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_help.png"/></imageobject><textobject><phrase>Installer help screen</phrase></textobject></inlinemediaobject>
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1" valign="top">
 <para> This Help screen is self explaining and enables the <F>-keys on the keyboard for getting more detailed help on the topics described.
 </para></entry></row></tbody></tgroup></informaltable>
@@ -760,53 +760,53 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
 </para>
 <para>So here is a screenshot tour through a graphical Main-Server + Workstation + Thin Client Server installation and how it looks at the first boot of the tjener, a PXE boot on the workstation network and on the thinclient network: 
 </para>
-<para>{{attachment:01-Installer_boot_menu.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>01-Installer_boot_menu.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:02-select_a_language.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/02-select_a_language.png"/></imageobject><textobject><phrase>02-select_a_language.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:03-select_your_location.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/03-select_your_location.png"/></imageobject><textobject><phrase>03-select_your_location.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:04-Configure_the_keyboard.png}} 
+<para><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><inlinemediaobject><imageobject><imagedata fileref="./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"/></imageobject><textobject><phrase>10-Really_use_the_automatic_partitioning_tool-Yes.png</phrase></textobject></inlinemediaobject> 
 </para>
 <para>{{attachment:11-Participate_in_the_package_usage_survey.png}} 
 </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>
-<para>{{attachment:13-Install the base system.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:14-Select_and_install_software.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:17-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:18-Build LTSP chroot.png}} 
 </para>
-<para>{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.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:20-Finish_the_Installation.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:21-Finish_the_Installation-Installation_complete.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><inlinemediaobject><imageobject><imagedata fileref="./images/22-Tjener_GRUB_boot_menu.png"/></imageobject><textobject><phrase>22-Tjener_GRUB_boot_menu.png</phrase></textobject></inlinemediaobject> 
 </para>
diff --git a/documentation/debian-edu-jessie/images/01-Installer_boot_menu.png b/documentation/debian-edu-jessie/images/01-Installer_boot_menu.png
new file mode 100644
index 0000000..af2dddb
Binary files /dev/null and b/documentation/debian-edu-jessie/images/01-Installer_boot_menu.png differ
diff --git a/documentation/debian-edu-jessie/images/02-select_a_language.png b/documentation/debian-edu-jessie/images/02-select_a_language.png
new file mode 100644
index 0000000..e24050b
Binary files /dev/null and b/documentation/debian-edu-jessie/images/02-select_a_language.png differ
diff --git a/documentation/debian-edu-jessie/images/03-select_your_location.png b/documentation/debian-edu-jessie/images/03-select_your_location.png
new file mode 100644
index 0000000..849b9fe
Binary files /dev/null and b/documentation/debian-edu-jessie/images/03-select_your_location.png differ
diff --git a/documentation/debian-edu-jessie/images/04-Configure_the_keyboard.png b/documentation/debian-edu-jessie/images/04-Configure_the_keyboard.png
new file mode 100644
index 0000000..367b7ef
Binary files /dev/null and b/documentation/debian-edu-jessie/images/04-Configure_the_keyboard.png differ
diff --git a/documentation/debian-edu-jessie/images/05-Detect_and_mount_CD-ROM.png b/documentation/debian-edu-jessie/images/05-Detect_and_mount_CD-ROM.png
new file mode 100644
index 0000000..37f0f15
Binary files /dev/null and b/documentation/debian-edu-jessie/images/05-Detect_and_mount_CD-ROM.png differ
diff --git a/documentation/debian-edu-jessie/images/06-Load_installer_components_from_CD.png b/documentation/debian-edu-jessie/images/06-Load_installer_components_from_CD.png
new file mode 100644
index 0000000..9a7802b
Binary files /dev/null and b/documentation/debian-edu-jessie/images/06-Load_installer_components_from_CD.png differ
diff --git a/documentation/debian-edu-jessie/images/07-Detect_network_hardware.png b/documentation/debian-edu-jessie/images/07-Detect_network_hardware.png
new file mode 100644
index 0000000..e62b987
Binary files /dev/null and b/documentation/debian-edu-jessie/images/07-Detect_network_hardware.png differ
diff --git a/documentation/debian-edu-jessie/images/08-Choose_Debian_Edu_profile.png b/documentation/debian-edu-jessie/images/08-Choose_Debian_Edu_profile.png
new file mode 100644
index 0000000..4b3f146
Binary files /dev/null and b/documentation/debian-edu-jessie/images/08-Choose_Debian_Edu_profile.png differ
diff --git a/documentation/debian-edu-jessie/images/09-Really_use_the_automatic_partitioning_tool.png b/documentation/debian-edu-jessie/images/09-Really_use_the_automatic_partitioning_tool.png
new file mode 100644
index 0000000..98e6b5e
Binary files /dev/null and b/documentation/debian-edu-jessie/images/09-Really_use_the_automatic_partitioning_tool.png differ
diff --git a/documentation/debian-edu-jessie/images/10-Really_use_the_automatic_partitioning_tool-Yes.png b/documentation/debian-edu-jessie/images/10-Really_use_the_automatic_partitioning_tool-Yes.png
new file mode 100644
index 0000000..a1faaea
Binary files /dev/null and b/documentation/debian-edu-jessie/images/10-Really_use_the_automatic_partitioning_tool-Yes.png differ
diff --git a/documentation/debian-edu-jessie/images/12-Set_up_users_and_passwords.png b/documentation/debian-edu-jessie/images/12-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..45aae0c
Binary files /dev/null and b/documentation/debian-edu-jessie/images/12-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-jessie/images/12a-Set_up_users_and_passwords.png b/documentation/debian-edu-jessie/images/12a-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..4f766d7
Binary files /dev/null and b/documentation/debian-edu-jessie/images/12a-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-jessie/images/12b-Set_up_users_and_passwords.png b/documentation/debian-edu-jessie/images/12b-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..7c760d6
Binary files /dev/null and b/documentation/debian-edu-jessie/images/12b-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-jessie/images/12c-Set_up_users_and_passwords.png b/documentation/debian-edu-jessie/images/12c-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..f03033b
Binary files /dev/null and b/documentation/debian-edu-jessie/images/12c-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-jessie/images/12d-Setting-up-the-partitioner.png b/documentation/debian-edu-jessie/images/12d-Setting-up-the-partitioner.png
new file mode 100644
index 0000000..a377f5f
Binary files /dev/null and b/documentation/debian-edu-jessie/images/12d-Setting-up-the-partitioner.png differ
diff --git a/documentation/debian-edu-jessie/images/13-Install+the+base+system.png b/documentation/debian-edu-jessie/images/13-Install+the+base+system.png
new file mode 100644
index 0000000..d5d0e00
Binary files /dev/null and b/documentation/debian-edu-jessie/images/13-Install+the+base+system.png differ
diff --git a/documentation/debian-edu-jessie/images/14-Select_and_install_software.png b/documentation/debian-edu-jessie/images/14-Select_and_install_software.png
new file mode 100644
index 0000000..28619da
Binary files /dev/null and b/documentation/debian-edu-jessie/images/14-Select_and_install_software.png differ
diff --git a/documentation/debian-edu-jessie/images/17-Select_and_install_software.png b/documentation/debian-edu-jessie/images/17-Select_and_install_software.png
new file mode 100644
index 0000000..874aa9d
Binary files /dev/null and b/documentation/debian-edu-jessie/images/17-Select_and_install_software.png differ
diff --git a/documentation/debian-edu-jessie/images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png b/documentation/debian-edu-jessie/images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png
new file mode 100644
index 0000000..d6a5783
Binary files /dev/null and b/documentation/debian-edu-jessie/images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png differ
diff --git a/documentation/debian-edu-jessie/images/20-Finish_the_Installation.png b/documentation/debian-edu-jessie/images/20-Finish_the_Installation.png
new file mode 100644
index 0000000..228e5bb
Binary files /dev/null and b/documentation/debian-edu-jessie/images/20-Finish_the_Installation.png differ
diff --git a/documentation/debian-edu-jessie/images/21-Finish_the_Installation-Installation_complete.png b/documentation/debian-edu-jessie/images/21-Finish_the_Installation-Installation_complete.png
new file mode 100644
index 0000000..804f94f
Binary files /dev/null and b/documentation/debian-edu-jessie/images/21-Finish_the_Installation-Installation_complete.png differ
diff --git a/documentation/debian-edu-jessie/images/Installer_advanced_options_a.png b/documentation/debian-edu-jessie/images/Installer_advanced_options_a.png
new file mode 100644
index 0000000..f29c107
Binary files /dev/null and b/documentation/debian-edu-jessie/images/Installer_advanced_options_a.png differ
diff --git a/documentation/debian-edu-jessie/images/Installer_advanced_options_b.png b/documentation/debian-edu-jessie/images/Installer_advanced_options_b.png
new file mode 100644
index 0000000..6d2a977
Binary files /dev/null and b/documentation/debian-edu-jessie/images/Installer_advanced_options_b.png differ
diff --git a/documentation/debian-edu-jessie/images/Installer_help.png b/documentation/debian-edu-jessie/images/Installer_help.png
new file mode 100644
index 0000000..1b31291
Binary files /dev/null and b/documentation/debian-edu-jessie/images/Installer_help.png differ
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index 98daf8f..9e354e5 100644
Binary files a/documentation/debian-edu-jessie/images/de/worldmap.png and b/documentation/debian-edu-jessie/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/es/worldmap.png b/documentation/debian-edu-jessie/images/es/worldmap.png
index 5a2f45e..11ed46d 100644
Binary files a/documentation/debian-edu-jessie/images/es/worldmap.png and b/documentation/debian-edu-jessie/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/fr/worldmap.png b/documentation/debian-edu-jessie/images/fr/worldmap.png
index e27ebdd..fc79817 100644
Binary files a/documentation/debian-edu-jessie/images/fr/worldmap.png and b/documentation/debian-edu-jessie/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/worldmap.png b/documentation/debian-edu-jessie/images/worldmap.png
index 57ef65e..3df25f3 100644
Binary files a/documentation/debian-edu-jessie/images/worldmap.png and b/documentation/debian-edu-jessie/images/worldmap.png differ

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



More information about the debian-edu-commits mailing list