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

Tue Nov 8 16:25:36 UTC 2016

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

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

commit a7a8ecef4ae3a91e41166cad76e0b6059c159c52
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Nov 8 17:14:43 2016 +0100

    Update Debian Edu Stretch manual and new images from the wiki. Thanks to Wolfgang Schweer for taking all those screenshots!
---
 .../debian-edu-stretch-manual.da.po                | 441 ++++++++++--------
 .../debian-edu-stretch-manual.de.po                | 469 ++++++++++++-------
 .../debian-edu-stretch-manual.es.po                | 427 ++++++++++-------
 .../debian-edu-stretch-manual.fr.po                | 454 ++++++++++--------
 .../debian-edu-stretch-manual.it.po                | 458 ++++++++++--------
 .../debian-edu-stretch-manual.ja.po                | 440 ++++++++++--------
 .../debian-edu-stretch-manual.nb.po                | 451 ++++++++++--------
 .../debian-edu-stretch-manual.nl.po                | 509 ++++++++++++---------
 .../debian-edu-stretch-manual.pl.po                | 222 ++++-----
 .../debian-edu-stretch-manual.pot                  | 191 +++-----
 .../debian-edu-stretch-manual.xml                  | 100 ++--
 .../images/01-Installer_64bit_boot_menu.png        | Bin 0 -> 13376 bytes
 .../01a-Installer_64bit_advanced_options.png       | Bin 0 -> 13088 bytes
 .../images/01b-Installer_32bit_boot_menu.png       | Bin 0 -> 13137 bytes
 .../images/01c-Installer_help.png                  | Bin 0 -> 9859 bytes
 15 files changed, 2376 insertions(+), 1786 deletions(-)

diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index 1e3ae4c..ff86ba4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+0000\n"
 "PO-Revision-Date: 2016-10-06 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1525,36 +1525,28 @@ msgstr ""
 "vores brugere, bør vores standarder være okay."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
-msgstr "Vælg installationstype"
-
-#. 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}}"
+#| msgid "Installation and download options"
+msgid "Installation types and options"
+msgstr "Indstillinger for installation og hentning"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Installer boot menu on 64-bit Hardware"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
-msgstr ""
-"<emphasis role=\"strong\">Installation</emphasis> er standardinstallationen "
-"for teksttilstand på i386 og amd64."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/01-Installer_64bit_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
-msgstr ""
-"<emphasis role=\"strong\">64 bit installation</emphasis> udfører en amd64-"
-"installation i teksttilstand."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "64-bit Installer boot menu"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1562,169 +1554,168 @@ msgstr ""
 "<emphasis role=\"strong\">Grafisk installation</emphasis> bruger GTK-"
 "installationsprogrammet, hvor du kan bruge musen."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
+#| "mode install."
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit grafisk intallation</emphasis> bruger amd64 "
-"GTK-installationsprogrammet, hvor du kan bruge musen."
+"<emphasis role=\"strong\">64 bit installation</emphasis> udfører en amd64-"
+"installation i teksttilstand."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
+#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Avancerede indstillinger ></emphasis> har en "
 "undermenu med flere detaljerede indstillinger at vælge fra"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
+#| "installation on i386 and amd64."
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+"<emphasis role=\"strong\">Installation</emphasis> er standardinstallationen "
+"for teksttilstand på i386 og amd64."
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
+#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Hjælp</emphasis> har nogle fif til brugen af "
 "installationsprogrammet"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><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"
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "{{attachment:Installer_advanced_options_a.png}}"
-msgid "Installer advanced options screen 1"
+msgid "64-bit Installer advanced options screen 1"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr "<emphasis role=\"strong\">Tilbage..</emphasis> gå til hovedmenuen."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
+#| "access to all available questions in graphical mode."
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
-"<emphasis role=\"strong\">Ekspertinstallation</emphasis> giver adgang til "
-"alle tilgængelige spørgsmål i teksttilstand."
+"<emphasis role=\"strong\">Grafisk ekspertinstallation</emphasis> giver "
+"adgang til alle tilgængelige spørgsmål i grafisk tilstand."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 "<emphasis role=\"strong\">Redningstilstand</emphasis> omdanner dette "
 "installationsmedie til en redningsdisk i tilfælde af nedbrud."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Automatisk installation</emphasis> kræver en "
-"forudfyldt fil (preseed)."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
-msgstr ""
-"<emphasis role=\"strong\">64 bit ekspertinstallation</emphasis> giver adgang "
-"til alle tilgængelige spørgsmål i teksttilstand på amd64."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
-msgstr ""
-"<emphasis role=\"strong\">64 bit redningstilstand</emphasis> omdanner dette "
-"installationsmedie til en redningsdisk i tilfælde af nedbrud på amd64."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
 msgstr ""
-"<emphasis role=\"strong\">64 bit automatisk installation</emphasis> kræver "
+"<emphasis role=\"strong\">Grafisk automatisk installation</emphasis> kræver "
 "en forudfyldt fil (preseed)."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "{{attachment:Installer_advanced_options_b.png}}"
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "{{attachment:Installer_advanced_options_b.png}}"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "{{attachment:Installer_advanced_options_a.png}}"
-msgid "Installer advanced options screen 2"
-msgstr "{{attachment:Installer_advanced_options_a.png}}"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">Grafisk ekspertinstallation</emphasis> giver "
-"adgang til alle tilgængelige spørgsmål i grafisk tilstand."
+"<emphasis role=\"strong\">Ekspertinstallation</emphasis> giver adgang til "
+"alle tilgængelige spørgsmål i teksttilstand."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">Grafisk redningstilstand</emphasis> omdanner dette "
-"installationsmedie til en redningsdisk i tilfælde af nedbrud med et grafisk "
-"GTK-udseende."
+"<emphasis role=\"strong\">Redningstilstand</emphasis> omdanner dette "
+"installationsmedie til en redningsdisk i tilfælde af nedbrud."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
+#| "file."
 msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Grafisk automatisk installation</emphasis> kræver "
-"en forudfyldt fil (preseed)."
+"<emphasis role=\"strong\">Automatisk installation</emphasis> kræver en "
+"forudfyldt fil (preseed)."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Installer boot menu on 32-bit Hardware"
 msgstr ""
-"<emphasis role=\"strong\">64 bit grafisk ekspertinstallation</emphasis> "
-"giver adgang til alle tilgængelige spørgsmål i grafisk tilstand på amd64."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "32-bit Installer boot menu"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">64 bit grafisk redningstilstand</emphasis> "
-"omdanner dette installationsmedie til en redningsdisk i tilfælde af nedbrud "
-"på amd64 med et grafisk GTK-udseende."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Help screen"
 msgstr ""
-"<emphasis role=\"strong\">64 bit grafisk automatisk installation</emphasis> "
-"kræver en forudfyldt fil (preseed)."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/alert.png"
-msgid "./images/Installer_help.png"
+msgid "./images/01c-Installer_help.png"
 msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1737,8 +1728,12 @@ msgid "Additional boot parameters for installations"
 msgstr "Yderligere opstartsparametre for installationer"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
+#| "boot menu."
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 "På i386/amd64 kan opstartsindstillinger redigeres ved at trykke på TAB-"
@@ -1746,43 +1741,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-"USB-drevet for flere arktitekturer / Blu-ray-diskaftrykket har som standard "
-"amd64-installgui på 64-bit x86-maskiner og installgui på 32-bit x86-maskiner."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-"Hvis du ønsker at opstarte amd64-teksttilstanden med aftrykket for flere "
-"arkitekturer, så skal du bruge <computeroutput>amd64-install</"
-"computeroutput>."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-"På samme måde kan du vælge <computeroutput>amd64-expertgui</computeroutput> "
-"for den grafiske brugerfladeversion på amd64."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-"Hvis du ønsker at opstarte i386-tilstanden med aftrykket for flere "
-"arkitekturer på en amd64-maskine, så skal du manuelt vælge "
-"<computeroutput>installation</computeroutput> (teksttilstand) eller "
-"<computeroutput>expertgui</computeroutput> (grafisk tilstand)."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1812,7 +1770,7 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "For at installere <emphasis role=\"strong\">GNOME</emphasis>-skrivebordet i "
@@ -2484,11 +2442,11 @@ 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><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgid "01-Installer_boot_menu.png"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#| msgid "{{attachment:Installer_help.png}}"
+msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgstr "{{attachment:Installer_help.png}}"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -6371,19 +6329,28 @@ msgid "HowTos for the desktop"
 msgstr "Hjælp for skrivebordet"
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr "Brug af KDE »Plasma«, GNOME, LXDE, Xfce og/eller MATE sammen"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To install other desktop environments after installation, simply use apt-"
+#| "get:"
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 "For at installere andre skrivebordsmiljøer efter installation, så brug apt-"
 "get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
@@ -6405,11 +6372,17 @@ msgstr ""
 "linkend=\"NetworkClients\">netværksklienter</link> for detaljer."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you don't want to do installations with the default desktop KDE "
+#| "\"Plasma\", you can also <link linkend=\"Installation--"
+#| "The_installation_process\">install with one of the four alternative "
+#| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 "Hvis du ikke ønsker at udføre installationer med standardskrivebordet KDE "
 "»Plasma«, så kan du også <link linkend=\"Installation--"
@@ -6545,7 +6518,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -12539,6 +12512,115 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Select type of installation"
+#~ msgstr "Vælg installationstype"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
+#~ "amd64 GTK installer where you can use the mouse."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit grafisk intallation</emphasis> bruger "
+#~ "amd64 GTK-installationsprogrammet, hvor du kan bruge musen."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access "
+#~ "to all available questions in text mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit ekspertinstallation</emphasis> giver "
+#~ "adgang til alle tilgængelige spørgsmål i teksttilstand på amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit redningstilstand</emphasis> omdanner "
+#~ "dette installationsmedie til en redningsdisk i tilfælde af nedbrud på "
+#~ "amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+#~ "preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit automatisk installation</emphasis> "
+#~ "kræver en forudfyldt fil (preseed)."
+
+#, fuzzy
+#~| msgid "{{attachment:Installer_advanced_options_b.png}}"
+#~ msgid "./images/Installer_advanced_options_b.png"
+#~ msgstr "{{attachment:Installer_advanced_options_b.png}}"
+
+#, fuzzy
+#~| msgid "{{attachment:Installer_advanced_options_a.png}}"
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "{{attachment:Installer_advanced_options_a.png}}"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks with a graphical "
+#~ "GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Grafisk redningstilstand</emphasis> omdanner "
+#~ "dette installationsmedie til en redningsdisk i tilfælde af nedbrud med et "
+#~ "grafisk GTK-udseende."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "gives access to all available questions in graphical mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit grafisk ekspertinstallation</emphasis> "
+#~ "giver adgang til alle tilgængelige spørgsmål i grafisk tilstand på amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes "
+#~ "this install medium become a rescue disk for emergency tasks on amd64 "
+#~ "with a graphical GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit grafisk redningstilstand</emphasis> "
+#~ "omdanner dette installationsmedie til en redningsdisk i tilfælde af "
+#~ "nedbrud på amd64 med et grafisk GTK-udseende."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "needs a preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit grafisk automatisk installation</"
+#~ "emphasis> kræver en forudfyldt fil (preseed)."
+
+#~ msgid ""
+#~ "The multi-architecture USB flash drive / Blu-ray disc image defaults to "
+#~ "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit "
+#~ "x86 machines."
+#~ msgstr ""
+#~ "USB-drevet for flere arktitekturer / Blu-ray-diskaftrykket har som "
+#~ "standard amd64-installgui på 64-bit x86-maskiner og installgui på 32-bit "
+#~ "x86-maskiner."
+
+#~ msgid ""
+#~ "If you want to boot the amd64 text mode with the multi-architecture "
+#~ "image, that would be <computeroutput>amd64-install</computeroutput>."
+#~ msgstr ""
+#~ "Hvis du ønsker at opstarte amd64-teksttilstanden med aftrykket for flere "
+#~ "arkitekturer, så skal du bruge <computeroutput>amd64-install</"
+#~ "computeroutput>."
+
+#~ msgid ""
+#~ "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> "
+#~ "to get the GUI version on amd64."
+#~ msgstr ""
+#~ "På samme måde kan du vælge <computeroutput>amd64-expertgui</"
+#~ "computeroutput> for den grafiske brugerfladeversion på amd64."
+
+#~ msgid ""
+#~ "If you want to boot the i386 mode with the multi-arch image on an amd64 "
+#~ "machine you need to manually select <computeroutput>install</"
+#~ "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#~ "(graphical mode)."
+#~ msgstr ""
+#~ "Hvis du ønsker at opstarte i386-tilstanden med aftrykket for flere "
+#~ "arkitekturer på en amd64-maskine, så skal du manuelt vælge "
+#~ "<computeroutput>installation</computeroutput> (teksttilstand) eller "
+#~ "<computeroutput>expertgui</computeroutput> (grafisk tilstand)."
+
 #, fuzzy
 #~| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
@@ -12556,9 +12638,6 @@ msgstr ""
 #~ msgid "{{attachment:23-Tjener-Login.png}}"
 #~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
-#~ msgid "{{attachment:Installer_help.png}}"
-#~ msgstr "{{attachment:Installer_help.png}}"
-
 #~ msgid "{{attachment:pxe-tjener.png}}"
 #~ msgstr "{{attachment:pxe-tjener.png}}"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index f365d52..b63ce30 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+0000\n"
 "PO-Revision-Date: 2016-11-06 13:04+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1563,34 +1563,30 @@ msgstr ""
 "passen."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
-msgstr "Art der Installation auswählen"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+#, fuzzy
+#| msgid "Installation and download options"
+msgid "Installation types and options"
+msgstr "Installation und Optionen für das Herunterladen"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 64-bit Hardware"
 msgstr "Startmenü des Installers"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
-msgstr ""
-"<emphasis role=\"strong\">Install</emphasis> ist die Standard-Installation "
-"im Textmodus für i386 und amd64."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01-Installer_64bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
-msgstr ""
-"<emphasis role=\"strong\">64 bit install</emphasis> führt eine Installation "
-"für amd64 im Textmodus aus."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "64-bit Installer boot menu"
+msgstr "Startmenü des Installers"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1598,159 +1594,173 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis> benutzt das "
 "graphische Installationsprogramm mit Maus."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
+#| "mode install."
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> benutzt das "
-"graphische Installationsprogramm für amd64 mit Maus."
+"<emphasis role=\"strong\">64 bit install</emphasis> führt eine Installation "
+"für amd64 im Textmodus aus."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
+#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> stellt ein "
 "Untermenü mit weiteren Optionen zur Verfügung."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
+#| "installation on i386 and amd64."
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+"<emphasis role=\"strong\">Install</emphasis> ist die Standard-Installation "
+"im Textmodus für i386 und amd64."
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
+#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> bietet einige Hinweise für die "
 "Benutzung des Installationsprogrammes an."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/Installer_advanced_options_a.png"
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer advanced options screen 1"
+msgid "64-bit Installer advanced options screen 1"
 msgstr "Installer advanced options Bildschirm 1"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 "<emphasis role=\"strong\">Back..</emphasis> führt zum Hauptmenü zurück."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
+#| "access to all available questions in graphical mode."
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
-"<emphasis role=\"strong\">Expert install</emphasis> zeigt alle verfügbaren "
-"Fragen für den Textmodus an."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> zeigt alle "
+"verfügbaren Fragen für den Textmodus für amd64 an."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> verwendet dieses "
 "Installationsmedium als Rettungswerkzeug für Notfälle."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Automated install</emphasis> benötigt eine Preseed-"
-"Datei."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> benötigt  "
+"eine Preseed-Datei."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> zeigt alle "
-"verfügbaren Fragen für den Textmodus für amd64 an."
+"<emphasis role=\"strong\">Expert install</emphasis> zeigt alle verfügbaren "
+"Fragen für den Textmodus an."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> verwendet dieses "
-"Installationsmedium als Rettungswerkzeug für Notfälle (amd64)."
+"<emphasis role=\"strong\">Rescue mode</emphasis> verwendet dieses "
+"Installationsmedium als Rettungswerkzeug für Notfälle."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
+#| "file."
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
 msgstr ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> benötigt eine "
-"Preseed-Datei."
-
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "./images/Installer_advanced_options_b.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "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 "
-"to all available questions in graphical mode."
-msgstr ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> zeigt alle "
-"verfügbaren Fragen für den Textmodus für amd64 an."
+"<emphasis role=\"strong\">Automated install</emphasis> benötigt eine Preseed-"
+"Datei."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
-msgstr ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> verwendet dieses "
-"Installationsmedium als Rettungswerkzeug für Notfälle im graphischen Modus."
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 32-bit Hardware"
+msgstr "Startmenü des Installers"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
-"preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> benötigt  "
-"eine Preseed-Datei."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> zeigt "
-"alle verfügbaren Fragen für den graphischen Expertenmodus für amd64 an."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "32-bit Installer boot menu"
+msgstr "Startmenü des Installers"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> verwendet "
-"dieses Installationsmedium als Rettungswerkzeug für Notfälle im graphischen "
-"Modus für amd64."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"benötigt  eine Preseed-Datei."
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer help screen"
+msgid "Help screen"
+msgstr "Hilfe-Bildschirm des Installers"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/Installer_help.png"
+msgid "./images/01c-Installer_help.png"
 msgstr "./images/Installer_help.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1763,8 +1773,12 @@ msgid "Additional boot parameters for installations"
 msgstr "Zusätzliche Boot-Parameter für die Installation"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
+#| "boot menu."
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 "Für i386/amd64 können die Boot-Optionen eingegeben werden, wenn im Boot-Menü "
@@ -1772,43 +1786,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-"Das Multiarch-USB-Stick / Blu-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
-"voreingestellt »amd64-installgui« und auf x86-32-Bit-Rechnern »installgui« "
-"aus."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-"Wenn Sie das amd64-Installationsprogramm im Text-Modus mit dem Multiarch-"
-"Image booten wollen, wählen Sie <computeroutput>amd64-install</"
-"computeroutput> aus."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-"Genauso können Sie <computeroutput>amd64-expertgui</computeroutput> wählen, "
-"um zur amd64-Expertenversion mit graphischer Benutzeroberfläche zu gelangen."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-"Wenn Sie mit dem Multiarch-Image den i386-Modus auf einer amd64-Maschine "
-"booten wollen, wählen Sie manuell: <computeroutput>install</computeroutput> "
-"(text mode) oder <computeroutput>expertgui</computeroutput> (Graphikmodus)."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1830,9 +1807,15 @@ msgstr ""
 "der Proxy des Hauptservers benutzt wird."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Um den <emphasis role=\"strong\">GNOME</emphasis>-Desktop anstatt des "
@@ -2509,9 +2492,9 @@ 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><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -6397,19 +6380,28 @@ msgid "HowTos for the desktop"
 msgstr "HowTos für die graphische Arbeitsumgebung"
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr "KDE »Plasma«, GNOME, LXDE, Xfce und/oder MATE nebeneinander benutzen"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To install other desktop environments after installation, simply use apt-"
+#| "get:"
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 "Um nach der Installation andere graphische Arbeitsumgebungen zu "
 "installieren, verwenden Sie einfach apt-get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
@@ -6432,11 +6424,17 @@ msgstr ""
 "\"NetworkClients\">Netzwerk-Rechner</link>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you don't want to do installations with the default desktop KDE "
+#| "\"Plasma\", you can also <link linkend=\"Installation--"
+#| "The_installation_process\">install with one of the four alternative "
+#| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 "Falls Installationen nicht mit dem voreingestellten KDE \"Plasma\" Desktop "
 "erfolgen sollen, dann kann die <link linkend=\"Installation--"
@@ -6554,7 +6552,18 @@ msgid "To use www.deb-multimedia.org do the following:"
 msgstr "Um www.deb-multimedia.org zu verwenden, führen Sie das Folgende aus:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# install the debian-keyring securely:\n"
+#| "apt-get install debian-keyring\n"
+#| "# fetch the deb-multimedia key insecurely:\n"
+#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#| "# add repository to sources.list - please check the homepages for mirrors!\n"
+#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+#| "# update the list of available packages:\n"
+#| "apt-get update"
 msgid ""
 "# install the debian-keyring securely:\n"
 "apt-get install debian-keyring\n"
@@ -6563,7 +6572,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -12693,6 +12702,115 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "Select type of installation"
+#~ msgstr "Art der Installation auswählen"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
+#~ "amd64 GTK installer where you can use the mouse."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> benutzt das "
+#~ "graphische Installationsprogramm für amd64 mit Maus."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access "
+#~ "to all available questions in text mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> zeigt alle "
+#~ "verfügbaren Fragen für den Textmodus für amd64 an."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> verwendet dieses "
+#~ "Installationsmedium als Rettungswerkzeug für Notfälle (amd64)."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+#~ "preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> benötigt "
+#~ "eine Preseed-Datei."
+
+#~ msgid "./images/Installer_advanced_options_b.png"
+#~ msgstr "./images/Installer_advanced_options_b.png"
+
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Installer advanced options Bildschirm 2"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks with a graphical "
+#~ "GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> verwendet "
+#~ "dieses Installationsmedium als Rettungswerkzeug für Notfälle im "
+#~ "graphischen Modus."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "gives access to all available questions in graphical mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "zeigt alle verfügbaren Fragen für den graphischen Expertenmodus für amd64 "
+#~ "an."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes "
+#~ "this install medium become a rescue disk for emergency tasks on amd64 "
+#~ "with a graphical GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> "
+#~ "verwendet dieses Installationsmedium als Rettungswerkzeug für Notfälle im "
+#~ "graphischen Modus für amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "needs a preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "benötigt  eine Preseed-Datei."
+
+#~ msgid ""
+#~ "The multi-architecture USB flash drive / Blu-ray disc image defaults to "
+#~ "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit "
+#~ "x86 machines."
+#~ msgstr ""
+#~ "Das Multiarch-USB-Stick / Blu-ray-Disc-Image führt auf x86-64-Bit-"
+#~ "Rechnern voreingestellt »amd64-installgui« und auf x86-32-Bit-Rechnern "
+#~ "»installgui« aus."
+
+#~ msgid ""
+#~ "If you want to boot the amd64 text mode with the multi-architecture "
+#~ "image, that would be <computeroutput>amd64-install</computeroutput>."
+#~ msgstr ""
+#~ "Wenn Sie das amd64-Installationsprogramm im Text-Modus mit dem Multiarch-"
+#~ "Image booten wollen, wählen Sie <computeroutput>amd64-install</"
+#~ "computeroutput> aus."
+
+#~ msgid ""
+#~ "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> "
+#~ "to get the GUI version on amd64."
+#~ msgstr ""
+#~ "Genauso können Sie <computeroutput>amd64-expertgui</computeroutput> "
+#~ "wählen, um zur amd64-Expertenversion mit graphischer Benutzeroberfläche "
+#~ "zu gelangen."
+
+#~ msgid ""
+#~ "If you want to boot the i386 mode with the multi-arch image on an amd64 "
+#~ "machine you need to manually select <computeroutput>install</"
+#~ "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#~ "(graphical mode)."
+#~ msgstr ""
+#~ "Wenn Sie mit dem Multiarch-Image den i386-Modus auf einer amd64-Maschine "
+#~ "booten wollen, wählen Sie manuell: <computeroutput>install</"
+#~ "computeroutput> (text mode) oder <computeroutput>expertgui</"
+#~ "computeroutput> (Graphikmodus)."
+
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "01-Installer_boot_menu.png"
+
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 #~ msgstr "{{attachment:27-Tjener-MATE_Desktop.png}}"
 
@@ -12762,9 +12880,6 @@ msgstr ""
 #~ msgid "{{attachment:23-Tjener-Login.png}}"
 #~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
-#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
-#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
-
 #~ msgid "{{attachment:Installer_help.png}}"
 #~ msgstr "{{attachment:Installer_help.png}}"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index fca3873..9560207 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1605,36 +1605,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
-msgstr "Seleccione el tipo de instalación"
+#, fuzzy
+#| msgid "Installation and download options"
+msgid "Installation types and options"
+msgstr "Instalación y opciones de descarga"
 
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 64-bit Hardware"
+msgstr "Menú de carga del instalador"
+
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01-Installer_64bit_boot_menu.png"
 msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "64-bit Installer boot menu"
 msgstr "Menú de carga del instalador"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
-msgstr ""
-"<emphasis role=\"strong\">Instalar</emphasis> es el modo de instalación "
-"predeterminado en formato texto para i386 y amd64."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
-msgstr ""
-"<emphasis role=\"strong\">Instalar 64 bit</emphasis> realiza la instalación "
-"en modo texto para amd64."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1642,169 +1636,174 @@ msgstr ""
 "<emphasis role=\"string\">Instalador gráfico</emphasis> usa el instalador "
 "GTK donde puede usar el ratón. "
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
+#| "mode install."
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"<emphasis role=\"strong\">Instalador gráfico para 64 bits</emphasis> usa el "
-"instalador GTK de 64bits donde puede usar el ratón."
+"<emphasis role=\"strong\">Instalar 64 bit</emphasis> realiza la instalación "
+"en modo texto para amd64."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
+#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Opciones avanzadas ></emphasis> brinda un "
 "submenú con opciones más detalladas que puede elegir"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
+#| "installation on i386 and amd64."
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+"<emphasis role=\"strong\">Instalar</emphasis> es el modo de instalación "
+"predeterminado en formato texto para i386 y amd64."
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
+#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Ayuda</emphasis> brinda algunos consejos sobre "
 "como usar el instalador."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "Installer advanced options screen 1"
-msgid "./images/Installer_advanced_options_a.png"
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "Pantalla 1 de las opciones avanzadas del instalador"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "Installer advanced options screen 2"
-msgid "Installer advanced options screen 1"
+msgid "64-bit Installer advanced options screen 1"
 msgstr "Pantalla 2 de las opciones avanzadas del instalador"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 "<emphasis role=\"strong\">Regresar..</emphasis> lo lleva de nuevo al menú "
 "principal."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
+#| "access to all available questions in graphical mode."
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
-"<emphasis role=\"strong\">Instalación experta</emphasis> le da acceso a "
-"todas las opciones disponibles en modo texto."
+"<emphasis role=\"strong\">Instalación experta gráfica</emphasis> le da "
+"acceso a todas las opciones disponibles en modo gráfico."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 "<emphasis role=\"strong\">Modo de rescate</emphasis> lo convierte en un "
 "disco de rescate para tareas de emergencia."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Instalación automática</emphasis> necesita un "
-"archivo preconfigurado."
+"<emphasis role=\"strong\">Instalación automática gráfica</emphasis> necesita "
+"un archivo preconfigurado."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">Instalación experta 64 bits </emphasis> le da "
-"acceso a todas las opciones disponibles en modo texto en computadoras amd64."
+"<emphasis role=\"strong\">Instalación experta</emphasis> le da acceso a "
+"todas las opciones disponibles en modo texto."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">Modo de rescate 64 bits</emphasis> lo convierte en "
-"un disco de rescate para tareas de emergencia compatible con amd64."
+"<emphasis role=\"strong\">Modo de rescate</emphasis> lo convierte en un "
+"disco de rescate para tareas de emergencia."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
+#| "file."
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Instalación automática 64 bits</emphasis> necesita "
-"un archivo preconfigurado."
+"<emphasis role=\"strong\">Instalación automática</emphasis> necesita un "
+"archivo preconfigurado."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "Installer advanced options screen 1"
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "Pantalla 1 de las opciones avanzadas del instalador"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "Pantalla 2 de las opciones avanzadas del instalador"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
-msgstr ""
-"<emphasis role=\"strong\">Instalación experta gráfica</emphasis> le da "
-"acceso a todas las opciones disponibles en modo gráfico."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
-msgstr ""
-"<emphasis role=\"strong\">Modo de rescate gráfico</emphasis> lo convierte en "
-"un disco de rescate para tareas de emergencia con una interfaz gráfica GTK."
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 32-bit Hardware"
+msgstr "Menú de carga del instalador"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
-"preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Instalación automática gráfica</emphasis> necesita "
-"un archivo preconfigurado."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
-msgstr ""
-"<emphasis role=\"strong\">Instalación experta gráfica para 64 bits</"
-"emphasis> le da acceso a todas las opciones disponibles en modo gráfico "
-"compatible con amd64."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "32-bit Installer boot menu"
+msgstr "Menú de carga del instalador"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">Modo de rescate 64 bits gráfico</emphasis> lo "
-"convierte en un disco de rescate para tareas de emergencia con una interfaz "
-"gráfica GTK compatible con amd64."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Instalación automática 64 bits gráfica</emphasis> "
-"necesita un archivo preconfigurado."
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer help screen"
+msgid "Help screen"
+msgstr "Pantalla de ayuda del instalador"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/alert.png"
-msgid "./images/Installer_help.png"
+msgid "./images/01c-Installer_help.png"
 msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1817,8 +1816,12 @@ msgid "Additional boot parameters for installations"
 msgstr "Parámetros adicionales de carga para instalaciones"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
+#| "boot menu."
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 "Para equipos i386/amd64, las opciones de inicio pueden ser editadas "
@@ -1826,44 +1829,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-"La imagen DVD multiarquitectura tiene como predeterminado, el modo de "
-"instalación amd64 modo gráfico en ordenadores x86-64 bits e instalación "
-"gráfica en x86 32-bits."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-"Si desea iniciar en modo texto para un equipo amd64 con la imagen "
-"multiarquitectura, debe seleccionar <computeroutput> amd64-install</"
-"computeroutput>."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-"Aunque también, puede seleccionar el <computeroutput>modo experto gráfico "
-"amd64</computeroutput> para utilizar el modo gráfico para amd64."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-"Si desea iniciar el modo i386 con la imagen multiarquitectura en un "
-"ordenador amd64, necesitará seleccionar el  <computeroutput>instalar</"
-"computeroutput> (modo texto) o <computeroutput>modo gráfico experto</"
-"computeroutput> (modo gráfico)."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1893,7 +1858,7 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Para instalar el escritorio <emphasis role=\"strong\">GNOME</emphasis> en "
@@ -2563,10 +2528,10 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid "01-Installer_boot_menu.png"
-msgid "01-Installer_boot_menu.png"
+msgid "{{attachment:01-Installer_boot_menu.png}}"
 msgstr "01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -5954,19 +5919,25 @@ msgid "HowTos for the desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To install other desktop environments after installation, simply use apt-"
+#| "get:"
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 "Para instalar otros entornos de escritorio después de una instalación, "
 "solamente use apt-get:"
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5984,10 +5955,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6087,7 +6058,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -10893,6 +10864,114 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Select type of installation"
+#~ msgstr "Seleccione el tipo de instalación"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
+#~ "amd64 GTK installer where you can use the mouse."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Instalador gráfico para 64 bits</emphasis> usa "
+#~ "el instalador GTK de 64bits donde puede usar el ratón."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access "
+#~ "to all available questions in text mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Instalación experta 64 bits </emphasis> le da "
+#~ "acceso a todas las opciones disponibles en modo texto en computadoras "
+#~ "amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Modo de rescate 64 bits</emphasis> lo convierte "
+#~ "en un disco de rescate para tareas de emergencia compatible con amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+#~ "preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Instalación automática 64 bits</emphasis> "
+#~ "necesita un archivo preconfigurado."
+
+#, fuzzy
+#~| msgid "Installer advanced options screen 1"
+#~ msgid "./images/Installer_advanced_options_b.png"
+#~ 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 ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks with a graphical "
+#~ "GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Modo de rescate gráfico</emphasis> lo convierte "
+#~ "en un disco de rescate para tareas de emergencia con una interfaz gráfica "
+#~ "GTK."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "gives access to all available questions in graphical mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Instalación experta gráfica para 64 bits</"
+#~ "emphasis> le da acceso a todas las opciones disponibles en modo gráfico "
+#~ "compatible con amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes "
+#~ "this install medium become a rescue disk for emergency tasks on amd64 "
+#~ "with a graphical GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Modo de rescate 64 bits gráfico</emphasis> lo "
+#~ "convierte en un disco de rescate para tareas de emergencia con una "
+#~ "interfaz gráfica GTK compatible con amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "needs a preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Instalación automática 64 bits gráfica</"
+#~ "emphasis> necesita un archivo preconfigurado."
+
+#~ msgid ""
+#~ "The multi-architecture USB flash drive / Blu-ray disc image defaults to "
+#~ "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit "
+#~ "x86 machines."
+#~ msgstr ""
+#~ "La imagen DVD multiarquitectura tiene como predeterminado, el modo de "
+#~ "instalación amd64 modo gráfico en ordenadores x86-64 bits e instalación "
+#~ "gráfica en x86 32-bits."
+
+#~ msgid ""
+#~ "If you want to boot the amd64 text mode with the multi-architecture "
+#~ "image, that would be <computeroutput>amd64-install</computeroutput>."
+#~ msgstr ""
+#~ "Si desea iniciar en modo texto para un equipo amd64 con la imagen "
+#~ "multiarquitectura, debe seleccionar <computeroutput> amd64-install</"
+#~ "computeroutput>."
+
+#~ msgid ""
+#~ "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> "
+#~ "to get the GUI version on amd64."
+#~ msgstr ""
+#~ "Aunque también, puede seleccionar el <computeroutput>modo experto gráfico "
+#~ "amd64</computeroutput> para utilizar el modo gráfico para amd64."
+
+#~ msgid ""
+#~ "If you want to boot the i386 mode with the multi-arch image on an amd64 "
+#~ "machine you need to manually select <computeroutput>install</"
+#~ "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#~ "(graphical mode)."
+#~ msgstr ""
+#~ "Si desea iniciar el modo i386 con la imagen multiarquitectura en un "
+#~ "ordenador amd64, necesitará seleccionar el  <computeroutput>instalar</"
+#~ "computeroutput> (modo texto) o <computeroutput>modo gráfico experto</"
+#~ "computeroutput> (modo gráfico)."
+
 #, fuzzy
 #~| msgid "./images/27-Tjener-KDE_Desktop.png"
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index 081e13a..73867c7 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+0000\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1636,34 +1636,30 @@ msgstr ""
 "choix par défaut conviendront à la plupart des utilisateurs."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
-msgstr "Choisir un type d'installation"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+#, fuzzy
+#| msgid "Installation and download options"
+msgid "Installation types and options"
+msgstr "Options de téléchargement et d'installation"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 64-bit Hardware"
 msgstr "Menu de démarrage de l'installateur"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
-msgstr ""
-"<emphasis role=\"strong\">Install</emphasis> est l'installation en mode "
-"texte par défaut sur i386 et amd64."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01-Installer_64bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
-msgstr ""
-"<emphasis role=\"strong\">64 bit install</emphasis> effectue une "
-"installation amd64 en mode texte."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "64-bit Installer boot menu"
+msgstr "Menu de démarrage de l'installateur"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1671,168 +1667,174 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis> utilise "
 "l'installateur GTK dans lequel vous pouvez utiliser la souris."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
+#| "mode install."
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> utilise "
-"l'installateur amd64 GTK dans lequel vous pouvez utiliser la souris."
+"<emphasis role=\"strong\">64 bit install</emphasis> effectue une "
+"installation amd64 en mode texte."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
+#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> affiche un sous-"
 "menu d'options détaillées à choisir"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
+#| "installation on i386 and amd64."
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+"<emphasis role=\"strong\">Install</emphasis> est l'installation en mode "
+"texte par défaut sur i386 et amd64."
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
+#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> donne quelques conseils pour "
 "utiliser l'installateur"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Installer_advanced_options_a.png"
-msgid "./images/Installer_advanced_options_a.png"
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer advanced options screen 1"
+msgid "64-bit 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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 "<emphasis role=\"strong\">Back..</emphasis> affiche de nouveau le menu "
 "principal."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
+#| "access to all available questions in graphical mode."
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
-"<emphasis role=\"strong\">Expert install</emphasis> affiche toutes les "
-"questions en mode texte."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> affiche toutes "
+"les questions en mode graphique."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> transforme le support "
 "d'installation en disque de secours pour les cas de détresse."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Automated install</emphasis> a besoin d'un fichier "
-"de configuration."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> a besoin "
+"d'un fichier de configuration."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> affiche toutes "
-"les questions en mode texte sur amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> affiche toutes les "
+"questions en mode texte."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> transforme le "
-"support d'installation en disque de secours pour les cas de détresse sur "
-"amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> transforme le support "
+"d'installation en disque de secours pour les cas de détresse."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
+#| "file."
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
 msgstr ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> a besoin d'un "
-"fichier de configuration."
+"<emphasis role=\"strong\">Automated install</emphasis> a besoin d'un fichier "
+"de configuration."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "./images/Installer_advanced_options_b.png"
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "./images/Installer_advanced_options_b.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "Options avancées de l'installateur (écran 2)"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
-msgstr ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> affiche toutes "
-"les questions en mode graphique."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
-msgstr ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> transforme le "
-"support d'installation en disque de secours pour les cas de détresse avec un "
-"affichage GTK."
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 32-bit Hardware"
+msgstr "Menu de démarrage de l'installateur"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
-"preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> a besoin "
-"d'un fichier de configuration."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> affiche "
-"toutes les questions en mode graphique sur amd64."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "32-bit 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 ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> transforme "
-"le support d'installation en disque de secours pour les cas de détresse avec "
-"un affichage GTK."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> a "
-"besoin d'un fichier de configuration."
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer help screen"
+msgid "Help screen"
+msgstr "Écran d'aide de l'installateur"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/01-Installer_boot_menu.png"
-msgid "./images/Installer_help.png"
+msgid "./images/01c-Installer_help.png"
 msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1845,8 +1847,12 @@ msgid "Additional boot parameters for installations"
 msgstr "Paramètres de démarrage additionnels pour les installations"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
+#| "boot menu."
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 "Sur i386 et amd64, les options de démarrage peuvent être éditées en appuyant "
@@ -1854,43 +1860,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-"Par défaut, l'image multiarchitecture pour clé USB ou disque Blu-ray utilise "
-"amd64-installgui sur les machines x86 64 bits et installgui sur les machines "
-"x86 32 bits."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-"Si vous voulez amorcer en mode texte amd64 avec l’image multiarchitecture, "
-"entrez <computeroutput>amd64-install</computeroutput>."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-"De même, vous pouvez choisir <computeroutput>amd64-expertgui</"
-"computeroutput> pour activer la version graphique sur amd64."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-"Si vous voulez amorcer en mode texte i386 avec l’image multiarchitecture sur "
-"une machine amd64, vous devez sélectionner vous-même "
-"<computeroutput>install</computeroutput> (mode texte) ou "
-"<computeroutput>expertgui</computeroutput> (mode graphique)."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1920,7 +1889,7 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Pour installer le bureau <emphasis role=\"strong\">GNOME</emphasis> au lieu "
@@ -2623,11 +2592,11 @@ 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><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "./images/01-Installer_boot_menu.png"
-msgid "01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+#| msgid "01-Installer_boot_menu.png"
+msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgstr "01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -6685,19 +6654,28 @@ msgid "HowTos for the desktop"
 msgstr "Manuels pour le bureau"
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr "Utiliser KDE « Plasma », GNOME, LXDE, Xfce et/ou MATE ensemble"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To install other desktop environments after installation, simply use apt-"
+#| "get:"
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 "Pour installer d'autres environnements de bureau après l'installation, "
 "utilisez simplement apt-get :"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
@@ -6720,11 +6698,17 @@ msgstr ""
 "link> pour plus d'informations."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you don't want to do installations with the default desktop KDE "
+#| "\"Plasma\", you can also <link linkend=\"Installation--"
+#| "The_installation_process\">install with one of the four alternative "
+#| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 "Si vous ne souhaitez pas installer le bureau par défaut KDE « Plasma », vous "
 "pouvez procéder à <link linkend=\"Installation--The_installation_process"
@@ -6857,7 +6841,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -13182,6 +13166,117 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid "Select type of installation"
+#~ msgstr "Choisir un type d'installation"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
+#~ "amd64 GTK installer where you can use the mouse."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> utilise "
+#~ "l'installateur amd64 GTK dans lequel vous pouvez utiliser la souris."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access "
+#~ "to all available questions in text mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> affiche toutes "
+#~ "les questions en mode texte sur amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> transforme le "
+#~ "support d'installation en disque de secours pour les cas de détresse sur "
+#~ "amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+#~ "preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> a besoin "
+#~ "d'un fichier de configuration."
+
+#, fuzzy
+#~| msgid "./images/Installer_advanced_options_b.png"
+#~ msgid "./images/Installer_advanced_options_b.png"
+#~ msgstr "./images/Installer_advanced_options_b.png"
+
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Options avancées de l'installateur (écran 2)"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks with a graphical "
+#~ "GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> transforme le "
+#~ "support d'installation en disque de secours pour les cas de détresse avec "
+#~ "un affichage GTK."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "gives access to all available questions in graphical mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "affiche toutes les questions en mode graphique sur amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes "
+#~ "this install medium become a rescue disk for emergency tasks on amd64 "
+#~ "with a graphical GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> "
+#~ "transforme le support d'installation en disque de secours pour les cas de "
+#~ "détresse avec un affichage GTK."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "needs a preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> a "
+#~ "besoin d'un fichier de configuration."
+
+#~ msgid ""
+#~ "The multi-architecture USB flash drive / Blu-ray disc image defaults to "
+#~ "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit "
+#~ "x86 machines."
+#~ msgstr ""
+#~ "Par défaut, l'image multiarchitecture pour clé USB ou disque Blu-ray "
+#~ "utilise amd64-installgui sur les machines x86 64 bits et installgui sur "
+#~ "les machines x86 32 bits."
+
+#~ msgid ""
+#~ "If you want to boot the amd64 text mode with the multi-architecture "
+#~ "image, that would be <computeroutput>amd64-install</computeroutput>."
+#~ msgstr ""
+#~ "Si vous voulez amorcer en mode texte amd64 avec l’image "
+#~ "multiarchitecture, entrez <computeroutput>amd64-install</computeroutput>."
+
+#~ msgid ""
+#~ "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> "
+#~ "to get the GUI version on amd64."
+#~ msgstr ""
+#~ "De même, vous pouvez choisir <computeroutput>amd64-expertgui</"
+#~ "computeroutput> pour activer la version graphique sur amd64."
+
+#~ msgid ""
+#~ "If you want to boot the i386 mode with the multi-arch image on an amd64 "
+#~ "machine you need to manually select <computeroutput>install</"
+#~ "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#~ "(graphical mode)."
+#~ msgstr ""
+#~ "Si vous voulez amorcer en mode texte i386 avec l’image multiarchitecture "
+#~ "sur une machine amd64, vous devez sélectionner vous-même "
+#~ "<computeroutput>install</computeroutput> (mode texte) ou "
+#~ "<computeroutput>expertgui</computeroutput> (mode graphique)."
+
+#, fuzzy
+#~| msgid "./images/01-Installer_boot_menu.png"
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "./images/01-Installer_boot_menu.png"
+
 #, fuzzy
 #~| msgid "./images/27-Tjener-KDE_Desktop.png"
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
@@ -13293,11 +13388,6 @@ msgstr ""
 #~ msgstr "./images/23-Tjener-KDM_Login.png"
 
 #, fuzzy
-#~| msgid "01-Installer_boot_menu.png"
-#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#, fuzzy
 #~| msgid "./images/Installer_help.png"
 #~ msgid "{{attachment:Installer_help.png}}"
 #~ msgstr "./images/Installer_help.png"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index 3e82e84..5f1304f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+0000\n"
 "PO-Revision-Date: 2015-05-04 19:34+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1608,34 +1608,30 @@ msgstr ""
 "dovrebbero andar bene."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
-msgstr "Selezionare il tipo d'installazione"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+#, fuzzy
+#| msgid "Installation and download options"
+msgid "Installation types and options"
+msgstr "Installare e scaricare"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 64-bit Hardware"
 msgstr "Menu di avvio dell'installatore"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
-msgstr ""
-"<emphasis role=\"strong\">Install</emphasis> è la modalità testuale "
-"predefinita per l'installazione su i386 e amd64."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01-Installer_64bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
-msgstr ""
-"<emphasis role=\"strong\">64 bit install</emphasis> installa amd64 in "
-"modalità testuale."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "64-bit Installer boot menu"
+msgstr "Menu di avvio dell'installatore"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1643,168 +1639,175 @@ msgstr ""
 "Selezionare <emphasis role=\"strong\">Graphical install</emphasis> per usare "
 "l'installatore GTK in cui si può usare il mouse."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
+#| "mode install."
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"Selezionare <emphasis role=\"strong\">64 bit graphical install</emphasis> "
-"per usare l'installatore GTK per amd64 in cui si può usare il mouse."
+"<emphasis role=\"strong\">64 bit install</emphasis> installa amd64 in "
+"modalità testuale."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
+#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> porta a un sotto "
 "menu con maggiori opzioni da scegliere"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
+#| "installation on i386 and amd64."
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+"<emphasis role=\"strong\">Install</emphasis> è la modalità testuale "
+"predefinita per l'installazione su i386 e amd64."
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
+#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> dà alcuni suggerimenti "
 "sull'utilizzo dell'installatore"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Installer_advanced_options_a.png"
-msgid "./images/Installer_advanced_options_a.png"
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer advanced options screen 1"
+msgid "64-bit 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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 "<emphasis role=\"strong\">Back..</emphasis> riporta al menu principale."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
+#| "access to all available questions in graphical mode."
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
-"<emphasis role=\"strong\">Expert install</emphasis> dà accesso a tutte le "
-"domande disponibili in modalità testuale."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> dà accesso a "
+"tutte le domande disponibili in modalità grafica."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> permette di utilizzare "
 "questo supporto di installazione come disco di ripristino per le attività di "
 "emergenza."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Automated install</emphasis> ha bisogno di un file "
-"di preconfigurazione."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> ha bisogno "
+"di un file di preconfigurazione."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> dà accesso a "
-"tutte le domande disponibili in modalità testuale su amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> dà accesso a tutte le "
+"domande disponibili in modalità testuale."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> permette di "
-"utilizzare questo suppporto di installazione come disco di ripristino per le "
-"attività di emergenza su amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> permette di utilizzare "
+"questo supporto di installazione come disco di ripristino per le attività di "
+"emergenza."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
+#| "file."
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
 msgstr ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> ha bisogno di "
-"un file di preconfigurazione."
+"<emphasis role=\"strong\">Automated install</emphasis> ha bisogno di un file "
+"di preconfigurazione."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "./images/Installer_advanced_options_b.png"
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "./images/Installer_advanced_options_b.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "Schermata 2 delle opzioni avanzate dell'installatore"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
-msgstr ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> dà accesso a "
-"tutte le domande disponibili in modalità grafica."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
-msgstr ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> permette di "
-"utilizzare questo supporto di installazione come disco di ripristino per le "
-"attività di emergenza in un ambiente grafico GTK."
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 32-bit Hardware"
+msgstr "Menu di avvio dell'installatore"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
-"preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> ha bisogno "
-"di un file di preconfigurazione."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> dà "
-"accesso a tutte le domande disponibili in modalità grafica per amd64."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "32-bit Installer boot menu"
+msgstr "Menu di avvio dell'installatore"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> permette "
-"di utilizzare questo supporto di installazione come disco di ripristino per "
-"le attività di emergenza in un ambiente grafico GTK su amd64."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> ha "
-"bisogno di un file di preconfigurazione."
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer help screen"
+msgid "Help screen"
+msgstr "Schermata di aiuto dell'installatore"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/01-Installer_boot_menu.png"
-msgid "./images/Installer_help.png"
+msgid "./images/01c-Installer_help.png"
 msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1818,8 +1821,12 @@ msgid "Additional boot parameters for installations"
 msgstr "Ulteriori parametri di avvio per le installazioni"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
+#| "boot menu."
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 "Le opzioni di avvio su i386/amd64 possono essere modificate premendo "
@@ -1827,44 +1834,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-"L'immagine multiarchitettura su flash drive USB / Blu-ray disc usa in modo "
-"predefinito amd64-installgui su macchine x86 a 64-bit e installgui su "
-"macchine x86 a 32-bit."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-"Se si vuole avviare la modalità testuale amd64 con l'immagine "
-"multiarchitettura, occorre scegliere <computeroutput>amd64-install</"
-"computeroutput>."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-"Si può scegliere anche la versione grafica per amd64 con "
-"<computeroutput>amd64-expertgui</computeroutput>."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-"Se si vuole avviare i386 con il DVD multiarchitettura su una macchina amd64 "
-"occorre selezionare manualmente <computeroutput>install</computeroutput> "
-"(modalità testuale) o <computeroutput>expertgui</computeroutput> (modalità "
-"grafica). "
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1894,7 +1863,7 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Per installare il desktop <emphasis role=\"strong\">GNOME</emphasis> al "
@@ -2580,11 +2549,11 @@ 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><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "./images/01-Installer_boot_menu.png"
-msgid "01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+#| msgid "01-Installer_boot_menu.png"
+msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgstr "01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -6556,19 +6525,28 @@ msgid "HowTos for the desktop"
 msgstr "HowTo per il desktop"
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr "Usare insieme KDE \"Plasma\", GNOME, LXDE, Xfce e MATE"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To install other desktop environments after installation, simply use apt-"
+#| "get:"
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 "Per installare altri ambienti di desktop dopo l'installazione, usare "
 "semplicemente apt-get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
@@ -6590,11 +6568,17 @@ msgstr ""
 "per i dettagli <link linkend=\"NetworkClients\">client di rete</link>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you don't want to do installations with the default desktop KDE "
+#| "\"Plasma\", you can also <link linkend=\"Installation--"
+#| "The_installation_process\">install with one of the four alternative "
+#| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 "Se non si vuol fare l'installazione con l'ambiente desktop predefinito KDE "
 "\"Plasma\", si può anche <link linkend=\"Installation--"
@@ -6725,7 +6709,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -12927,6 +12911,119 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Select type of installation"
+#~ msgstr "Selezionare il tipo d'installazione"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
+#~ "amd64 GTK installer where you can use the mouse."
+#~ msgstr ""
+#~ "Selezionare <emphasis role=\"strong\">64 bit graphical install</emphasis> "
+#~ "per usare l'installatore GTK per amd64 in cui si può usare il mouse."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access "
+#~ "to all available questions in text mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> dà accesso a "
+#~ "tutte le domande disponibili in modalità testuale su amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> permette di "
+#~ "utilizzare questo suppporto di installazione come disco di ripristino per "
+#~ "le attività di emergenza su amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+#~ "preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> ha bisogno "
+#~ "di un file di preconfigurazione."
+
+#, fuzzy
+#~| msgid "./images/Installer_advanced_options_b.png"
+#~ msgid "./images/Installer_advanced_options_b.png"
+#~ msgstr "./images/Installer_advanced_options_b.png"
+
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Schermata 2 delle opzioni avanzate dell'installatore"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks with a graphical "
+#~ "GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> permette di "
+#~ "utilizzare questo supporto di installazione come disco di ripristino per "
+#~ "le attività di emergenza in un ambiente grafico GTK."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "gives access to all available questions in graphical mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> dà "
+#~ "accesso a tutte le domande disponibili in modalità grafica per amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes "
+#~ "this install medium become a rescue disk for emergency tasks on amd64 "
+#~ "with a graphical GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> "
+#~ "permette di utilizzare questo supporto di installazione come disco di "
+#~ "ripristino per le attività di emergenza in un ambiente grafico GTK su "
+#~ "amd64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "needs a preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "ha bisogno di un file di preconfigurazione."
+
+#~ msgid ""
+#~ "The multi-architecture USB flash drive / Blu-ray disc image defaults to "
+#~ "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit "
+#~ "x86 machines."
+#~ msgstr ""
+#~ "L'immagine multiarchitettura su flash drive USB / Blu-ray disc usa in "
+#~ "modo predefinito amd64-installgui su macchine x86 a 64-bit e installgui "
+#~ "su macchine x86 a 32-bit."
+
+#~ msgid ""
+#~ "If you want to boot the amd64 text mode with the multi-architecture "
+#~ "image, that would be <computeroutput>amd64-install</computeroutput>."
+#~ msgstr ""
+#~ "Se si vuole avviare la modalità testuale amd64 con l'immagine "
+#~ "multiarchitettura, occorre scegliere <computeroutput>amd64-install</"
+#~ "computeroutput>."
+
+#~ msgid ""
+#~ "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> "
+#~ "to get the GUI version on amd64."
+#~ msgstr ""
+#~ "Si può scegliere anche la versione grafica per amd64 con "
+#~ "<computeroutput>amd64-expertgui</computeroutput>."
+
+#~ msgid ""
+#~ "If you want to boot the i386 mode with the multi-arch image on an amd64 "
+#~ "machine you need to manually select <computeroutput>install</"
+#~ "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#~ "(graphical mode)."
+#~ msgstr ""
+#~ "Se si vuole avviare i386 con il DVD multiarchitettura su una macchina "
+#~ "amd64 occorre selezionare manualmente <computeroutput>install</"
+#~ "computeroutput> (modalità testuale) o <computeroutput>expertgui</"
+#~ "computeroutput> (modalità grafica). "
+
+#, fuzzy
+#~| msgid "./images/01-Installer_boot_menu.png"
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "./images/01-Installer_boot_menu.png"
+
 #, fuzzy
 #~| msgid "./images/27-Tjener-KDE_Desktop.png"
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
@@ -13038,11 +13135,6 @@ msgstr ""
 #~ msgstr "./images/23-Tjener-KDM_Login.png"
 
 #, fuzzy
-#~| msgid "01-Installer_boot_menu.png"
-#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#, fuzzy
 #~| msgid "./images/Installer_help.png"
 #~ msgid "{{attachment:Installer_help.png}}"
 #~ msgstr "./images/Installer_help.png"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index c096349..55c0005 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+0000\n"
 "PO-Revision-Date: 2016-07-20 23:17+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -1498,36 +1498,28 @@ msgstr ""
 "とってはデフォルトが有効なはずです。"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
-msgstr "インストールの選択"
-
-#. 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}}"
+#| msgid "Installation and download options"
+msgid "Installation types and options"
+msgstr "インストールとダウンロードの選択肢"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Installer boot menu on 64-bit Hardware"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
-msgstr ""
-"<emphasis role=\"strong\">install</emphasis> は i386 及び amd64 向けのデフォ"
-"ルトのテキストモードでのインストールを行います。"
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/01-Installer_64bit_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
-msgstr ""
-"<emphasis role=\"strong\">64 bit install</emphasis> では amd64 のテキストモー"
-"ドのインストールを行います。"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "64-bit Installer boot menu"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1535,171 +1527,170 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis>は GTK を利用したインス"
 "トーラで、マウスを利用できます。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
+#| "mode install."
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis>は GTK を利用し"
-"た amd64 のインストーラで、マウスを利用できます。"
+"<emphasis role=\"strong\">64 bit install</emphasis> では amd64 のテキストモー"
+"ドのインストールを行います。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
+#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> ではもっと詳細なオ"
 "プションを選択できるサブメニューを提示します。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
+#| "installation on i386 and amd64."
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+"<emphasis role=\"strong\">install</emphasis> は i386 及び amd64 向けのデフォ"
+"ルトのテキストモードでのインストールを行います。"
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
+#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> でインストーラの使用に関するいくら"
 "かのヒントを提供します。"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><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"
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "{{attachment:Installer_advanced_options_a.png}}"
-msgid "Installer advanced options screen 1"
+msgid "64-bit Installer advanced options screen 1"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 "<emphasis role=\"strong\">Back..</emphasis> を選択するとメインメニューに戻り"
 "ます。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
+#| "access to all available questions in graphical mode."
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
-"<emphasis role=\"strong\">Expert install</emphasis> ではテキストモードの全て"
-"の質問にアクセスできます。"
+"<emphasis role=\"strong\">Graphical expert install</emphasis> ではグラフィカ"
+"ルモードの全ての質問にアクセスできます。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> により、このインストール用メ"
 "ディアは緊急タスク向けのレスキューディスクになります。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Automated install</emphasis> には preseed ファイル"
-"が必要です。"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"preseed file."
 msgstr ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> では amd64 でのテ"
-"キストモードの全ての質問にアクセスできます。"
+"<emphasis role=\"strong\">Graphical automated install</emphasis> には "
+"preseed ファイルが必要です。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> により、このインス"
-"トール用メディアは amd64 での緊急タスク向けのレスキューディスクになります。"
+"<emphasis role=\"strong\">Expert install</emphasis> ではテキストモードの全て"
+"の質問にアクセスできます。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
-"preseed file."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> には preseed "
-"ファイルが必要です。"
-
-#. 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}}"
+"<emphasis role=\"strong\">Rescue mode</emphasis> により、このインストール用メ"
+"ディアは緊急タスク向けのレスキューディスクになります。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "{{attachment:Installer_advanced_options_a.png}}"
-msgid "Installer advanced options screen 2"
-msgstr "{{attachment:Installer_advanced_options_a.png}}"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#| msgid ""
+#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
+#| "file."
 msgid ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
+"preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> ではグラフィカ"
-"ルモードの全ての質問にアクセスできます。"
+"<emphasis role=\"strong\">Automated install</emphasis> には preseed ファイル"
+"が必要です。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Installer boot menu on 32-bit Hardware"
 msgstr ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> により、このインス"
-"トール用メディアは GTK を利用したグラフィカルな緊急タスク向けのレスキューディ"
-"スクになります。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
-"preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> には "
-"preseed ファイルが必要です。"
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> では "
-"amd64 でのグラフィカルモードの全ての質問にアクセスできます。"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "32-bit Installer boot menu"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> により、こ"
-"のインストール用メディアは GTK を利用したグラフィカルな amd64 での緊急タスク"
-"向けのレスキューディスクになります。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Help screen"
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> には "
-"preseed ファイルが必要です。"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/alert.png"
-msgid "./images/Installer_help.png"
+msgid "./images/01c-Installer_help.png"
 msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1712,8 +1703,12 @@ msgid "Additional boot parameters for installations"
 msgstr "インストール時の追加のブートパラメータ"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
+#| "boot menu."
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 "i386/amd64 ではブートメニューでタブキーを押すとブートオプションを編集できるよ"
@@ -1721,43 +1716,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-"複数アーキテクチャ対応のUSBフラッシュドライブ / Blu-ray ディスクイメージで"
-"は、64ビットの x86 マシンでは amd64-installgui、32ビットの x86 マシンでは "
-"installgui をデフォルトで使います。"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-"複数アーキテクチャ対応のイメージを使って amd64 のテキストモードでブートしたい"
-"場合は <computeroutput>amd64-install</computeroutput> となります。"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-"同様に <computeroutput>amd64-expertgui</computeroutput> を選択すると amd64 "
-"の GUI バージョンになります。"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-"amd64 マシンで複数アーキテクチャ対応のイメージを使って i386 モードでブートし"
-"たい場合は <computeroutput>インストール</computeroutput> (テキストモード) ま"
-"たは <computeroutput>expertgui</computeroutput> (グラフィカルモード) を手作業"
-"で選択する必要があります。"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1787,7 +1745,7 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "<emphasis role=\"strong\">KDE 「Plasma」</emphasis> デスクトップに代えて "
@@ -2457,11 +2415,11 @@ msgstr ""
 "トワーク及びシンクライアントネットワークでの PXE ブートのスクリーンショットで"
 "す:"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgid "01-Installer_boot_menu.png"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#| msgid "{{attachment:Installer_help.png}}"
+msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgstr "{{attachment:Installer_help.png}}"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -6278,19 +6236,28 @@ msgid "HowTos for the desktop"
 msgstr "デスクトップ HowTo"
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr "KDE「Plasma」、GNOME、LXDE、Xfce と MATE の平行利用"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To install other desktop environments after installation, simply use apt-"
+#| "get:"
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 "インストール後に他のデスクトップ環境をインストールするには単に apt-get を使い"
 "ます:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
@@ -6313,11 +6280,17 @@ msgstr ""
 "い。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you don't want to do installations with the default desktop KDE "
+#| "\"Plasma\", you can also <link linkend=\"Installation--"
+#| "The_installation_process\">install with one of the four alternative "
+#| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 "デフォルトのデスクトップ KDE「Plasma」に何もインストールしたくない場合、4つの"
 "代替デスクトップ GNOME、LXDE、Xfce、MATE を直接<link linkend=\"Installation--"
@@ -6449,7 +6422,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -12056,6 +12029,114 @@ msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
 
+#~ msgid "Select type of installation"
+#~ msgstr "インストールの選択"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
+#~ "amd64 GTK installer where you can use the mouse."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis>は GTK を利用"
+#~ "した amd64 のインストーラで、マウスを利用できます。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access "
+#~ "to all available questions in text mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> では amd64 での"
+#~ "テキストモードの全ての質問にアクセスできます。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> により、このインス"
+#~ "トール用メディアは amd64 での緊急タスク向けのレスキューディスクになりま"
+#~ "す。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+#~ "preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> には "
+#~ "preseed ファイルが必要です。"
+
+#, fuzzy
+#~| msgid "{{attachment:Installer_advanced_options_b.png}}"
+#~ msgid "./images/Installer_advanced_options_b.png"
+#~ msgstr "{{attachment:Installer_advanced_options_b.png}}"
+
+#, fuzzy
+#~| msgid "{{attachment:Installer_advanced_options_a.png}}"
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "{{attachment:Installer_advanced_options_a.png}}"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks with a graphical "
+#~ "GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> により、このイ"
+#~ "ンストール用メディアは GTK を利用したグラフィカルな緊急タスク向けのレス"
+#~ "キューディスクになります。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "gives access to all available questions in graphical mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> では "
+#~ "amd64 でのグラフィカルモードの全ての質問にアクセスできます。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes "
+#~ "this install medium become a rescue disk for emergency tasks on amd64 "
+#~ "with a graphical GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> により、"
+#~ "このインストール用メディアは GTK を利用したグラフィカルな amd64 での緊急タ"
+#~ "スク向けのレスキューディスクになります。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "needs a preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> に"
+#~ "は preseed ファイルが必要です。"
+
+#~ msgid ""
+#~ "The multi-architecture USB flash drive / Blu-ray disc image defaults to "
+#~ "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit "
+#~ "x86 machines."
+#~ msgstr ""
+#~ "複数アーキテクチャ対応のUSBフラッシュドライブ / Blu-ray ディスクイメージで"
+#~ "は、64ビットの x86 マシンでは amd64-installgui、32ビットの x86 マシンでは "
+#~ "installgui をデフォルトで使います。"
+
+#~ msgid ""
+#~ "If you want to boot the amd64 text mode with the multi-architecture "
+#~ "image, that would be <computeroutput>amd64-install</computeroutput>."
+#~ msgstr ""
+#~ "複数アーキテクチャ対応のイメージを使って amd64 のテキストモードでブートし"
+#~ "たい場合は <computeroutput>amd64-install</computeroutput> となります。"
+
+#~ msgid ""
+#~ "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> "
+#~ "to get the GUI version on amd64."
+#~ msgstr ""
+#~ "同様に <computeroutput>amd64-expertgui</computeroutput> を選択すると "
+#~ "amd64 の GUI バージョンになります。"
+
+#~ msgid ""
+#~ "If you want to boot the i386 mode with the multi-arch image on an amd64 "
+#~ "machine you need to manually select <computeroutput>install</"
+#~ "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#~ "(graphical mode)."
+#~ msgstr ""
+#~ "amd64 マシンで複数アーキテクチャ対応のイメージを使って i386 モードでブート"
+#~ "したい場合は <computeroutput>インストール</computeroutput> (テキストモー"
+#~ "ド) または <computeroutput>expertgui</computeroutput> (グラフィカルモー"
+#~ "ド) を手作業で選択する必要があります。"
+
 #, fuzzy
 #~| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
@@ -12073,9 +12154,6 @@ msgstr ""
 #~ msgid "{{attachment:23-Tjener-Login.png}}"
 #~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
-#~ msgid "{{attachment:Installer_help.png}}"
-#~ msgstr "{{attachment:Installer_help.png}}"
-
 #~ msgid "{{attachment:pxe-tjener.png}}"
 #~ msgstr "{{attachment:pxe-tjener.png}}"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index 77fd383..1846279 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+0000\n"
 "PO-Revision-Date: 2016-11-02 05:28+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -1597,34 +1597,30 @@ msgstr ""
 "så skal standardoppsettet være greit."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
-msgstr "Velg type installasjon"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+#, fuzzy
+#| msgid "Installation and download options"
+msgid "Installation types and options"
+msgstr "Installasjon og nedlastingsvalg"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 64-bit Hardware"
 msgstr "Installasjons-oppstartmeny"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
-msgstr ""
-"<emphasis role=\"strong\">Install</emphasis>  er den standardiserte "
-"tekstmodus-innstallasjonen for i386- og AMD64-maskiner."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01-Installer_64bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
-msgstr ""
-"<emphasis role=\"strong\">64 bit install</emphasis> kjører en AMD64 "
-"installasjon i tekstmodus."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "64-bit Installer boot menu"
+msgstr "Installasjons-oppstartmeny"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1632,167 +1628,174 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis> bruker en GTK-"
 "installasjon hvor du kan bruke musen."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
+#| "mode install."
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> for å kjøre en "
-"64-bit GTK-installasjon hvor du kan bruke en mus."
+"<emphasis role=\"strong\">64 bit install</emphasis> kjører en AMD64 "
+"installasjon i tekstmodus."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
+#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> viser en "
 "undermeny med flere detaljerte valg å velge mellom"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
+#| "installation on i386 and amd64."
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+"<emphasis role=\"strong\">Install</emphasis>  er den standardiserte "
+"tekstmodus-innstallasjonen for i386- og AMD64-maskiner."
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
+#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> gir noen hint i bruk av "
 "installasjonsprosessen"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Installer_advanced_options_a.png"
-msgid "./images/Installer_advanced_options_a.png"
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer advanced options screen 1"
+msgid "64-bit Installer advanced options screen 1"
 msgstr "Installer avanserte alternativer skjermbilde1"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 "<emphasis role=\"strong\">Back..</emphasis> bringer deg tilbake til "
 "hovedmenyen."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
+#| "access to all available questions in graphical mode."
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
-"<emphasis role=\"strong\">Expert install</emphasis> gir tilgang til alle "
-"tilgjengelige spørsmål i klartekst."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gir tilgang "
+"til alle tilgjengelige spørsmål i grafisk modus."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> gjør dette "
 "installasjonsmediet til en redningsdisk for nødsituasjonsoppgaver."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Automated install</emphasis> trenger en «preseed»-"
-"fil (for automatisk installasjon)."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> trenger en "
+"«preseed»-fil (for automatisk installasjon)."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gir tilgang til "
-"alle tilgjengelige spørsmål i klartekst tilknyttet AMD64."
+"<emphasis role=\"strong\">Expert install</emphasis> gir tilgang til alle "
+"tilgjengelige spørsmål i klartekst."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> gjør dette "
-"installasjonsmedium til en redningsdisk for beredskapsoppgaver på AMD64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> gjør dette "
+"installasjonsmediet til en redningsdisk for nødsituasjonsoppgaver."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
+#| "file."
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
 msgstr ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> trenger en "
-"«preseed»-fil (for automatisk installasjon)."
+"<emphasis role=\"strong\">Automated install</emphasis> trenger en «preseed»-"
+"fil (for automatisk installasjon)."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "./images/Installer_advanced_options_b.png"
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "./images/Installer_advanced_options_b.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "Avanserte installasjonsvalg på skjerm 2"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
-msgstr ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gir tilgang "
-"til alle tilgjengelige spørsmål i grafisk modus."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
-msgstr ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> gjør dette "
-"installasjonsmedium til en redningsdisk for beredskapsmessige oppgaver med "
-"et grafisk GTK-utseende."
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 32-bit Hardware"
+msgstr "Installasjons-oppstartmeny"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
-"preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> trenger en "
-"«preseed»-fil (for automatisk installasjon)."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gir "
-"tilgang til alle tilgjengelige spørsmål i grafisk modus for AMD64."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "32-bit Installer boot menu"
+msgstr "Installasjons-oppstartmeny"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> gjør dette "
-"installasjonsmedium til en redningsdisk for beredskapsoppgaver på AMD64 med "
-"et grafisk GTK-utseende."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"trenger en «preseed»-fil."
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer help screen"
+msgid "Help screen"
+msgstr "Installasjons-hjelpeskjerm"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/01-Installer_boot_menu.png"
-msgid "./images/Installer_help.png"
+msgid "./images/01c-Installer_help.png"
 msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr "Installasjons-hjelpeskjerm"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1805,8 +1808,12 @@ msgid "Additional boot parameters for installations"
 msgstr "Flere oppstartsparametre for installasjoner"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
+#| "boot menu."
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 "På i386/AMD64, så kan oppstartsalternativer redigeres ved å trykke TAB-"
@@ -1814,42 +1821,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-"USB Fler-arkitektur flash-disk/Blu-ray disk-typer er standard for bruk av "
-"AMD64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 "
-"maskiner."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-"Hvis du vil starte opp en AMD64 i tekstmodus med en fler-arkitekturtype, må "
-"du bruke <computeroutput>amd64-install</computeroutput>."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-"På samme måte kan du velge <computeroutput>amd64-expertgui</computeroutput> "
-"for å få GUI-versjonen på AMD64."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-"Hvis du vil starte opp i i386-modus med en fler-arkitektur type på en AMD64-"
-"maskin må du skrive <computeroutput>install</computeroutput> (tekstmodus) "
-"eller <computeroutput>expertgui</computeroutput> (grafisk modus)."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1879,7 +1850,7 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "For å installere skrivebordsmiljøet <emphasis role=\"strong\">GNOME</"
@@ -2555,11 +2526,11 @@ msgstr ""
 "første oppstart av tjener, en PXE-start både på arbeidsstasjonens og "
 "tynnklientens nettverk:"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "./images/01-Installer_boot_menu.png"
-msgid "01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+#| msgid "01-Installer_boot_menu.png"
+msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgstr "01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -6469,19 +6440,28 @@ msgid "HowTos for the desktop"
 msgstr "Veiledninger for skrivebordet"
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr "Bruk av KDE «Plasma», GNOME, LXDE, Xfce og/eller MATE sammen"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To install other desktop environments after installation, simply use apt-"
+#| "get:"
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 "For å installere andre skrivebordmiljøer etter installasjonen, bruk rett og "
 "slett apt-get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
@@ -6502,11 +6482,17 @@ msgstr ""
 "linkend=\"NetworkClients\">networked clients</link> for detaljer."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you don't want to do installations with the default desktop KDE "
+#| "\"Plasma\", you can also <link linkend=\"Installation--"
+#| "The_installation_process\">install with one of the four alternative "
+#| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 "Hvis du ikke ønsker å installere det standard skrivebordsmiljøet KDE \"Plasma"
 "\" kan du velge å <link linkend=\"Installation--The_installation_process"
@@ -6639,7 +6625,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -12779,6 +12765,116 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#~ msgid "Select type of installation"
+#~ msgstr "Velg type installasjon"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
+#~ "amd64 GTK installer where you can use the mouse."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> for å kjøre "
+#~ "en 64-bit GTK-installasjon hvor du kan bruke en mus."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access "
+#~ "to all available questions in text mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gir tilgang "
+#~ "til alle tilgjengelige spørsmål i klartekst tilknyttet AMD64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> gjør dette "
+#~ "installasjonsmedium til en redningsdisk for beredskapsoppgaver på AMD64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+#~ "preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> trenger en "
+#~ "«preseed»-fil (for automatisk installasjon)."
+
+#, fuzzy
+#~| msgid "./images/Installer_advanced_options_b.png"
+#~ msgid "./images/Installer_advanced_options_b.png"
+#~ msgstr "./images/Installer_advanced_options_b.png"
+
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr "Avanserte installasjonsvalg på skjerm 2"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks with a graphical "
+#~ "GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> gjør dette "
+#~ "installasjonsmedium til en redningsdisk for beredskapsmessige oppgaver "
+#~ "med et grafisk GTK-utseende."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "gives access to all available questions in graphical mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gir "
+#~ "tilgang til alle tilgjengelige spørsmål i grafisk modus for AMD64."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes "
+#~ "this install medium become a rescue disk for emergency tasks on amd64 "
+#~ "with a graphical GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> gjør "
+#~ "dette installasjonsmedium til en redningsdisk for beredskapsoppgaver på "
+#~ "AMD64 med et grafisk GTK-utseende."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "needs a preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "trenger en «preseed»-fil."
+
+#~ msgid ""
+#~ "The multi-architecture USB flash drive / Blu-ray disc image defaults to "
+#~ "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit "
+#~ "x86 machines."
+#~ msgstr ""
+#~ "USB Fler-arkitektur flash-disk/Blu-ray disk-typer er standard for bruk av "
+#~ "AMD64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 "
+#~ "maskiner."
+
+#~ msgid ""
+#~ "If you want to boot the amd64 text mode with the multi-architecture "
+#~ "image, that would be <computeroutput>amd64-install</computeroutput>."
+#~ msgstr ""
+#~ "Hvis du vil starte opp en AMD64 i tekstmodus med en fler-arkitekturtype, "
+#~ "må du bruke <computeroutput>amd64-install</computeroutput>."
+
+#~ msgid ""
+#~ "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> "
+#~ "to get the GUI version on amd64."
+#~ msgstr ""
+#~ "På samme måte kan du velge <computeroutput>amd64-expertgui</"
+#~ "computeroutput> for å få GUI-versjonen på AMD64."
+
+#~ msgid ""
+#~ "If you want to boot the i386 mode with the multi-arch image on an amd64 "
+#~ "machine you need to manually select <computeroutput>install</"
+#~ "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#~ "(graphical mode)."
+#~ msgstr ""
+#~ "Hvis du vil starte opp i i386-modus med en fler-arkitektur type på en "
+#~ "AMD64-maskin må du skrive <computeroutput>install</computeroutput> "
+#~ "(tekstmodus) eller <computeroutput>expertgui</computeroutput> (grafisk "
+#~ "modus)."
+
+#, fuzzy
+#~| msgid "./images/01-Installer_boot_menu.png"
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "./images/01-Installer_boot_menu.png"
+
 #, fuzzy
 #~| msgid "./images/27-Tjener-KDE_Desktop.png"
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
@@ -12890,11 +12986,6 @@ msgstr ""
 #~ msgstr "./images/23-Tjener-KDM_Login.png"
 
 #, fuzzy
-#~| msgid "01-Installer_boot_menu.png"
-#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#, fuzzy
 #~| msgid "./images/Installer_help.png"
 #~ msgid "{{attachment:Installer_help.png}}"
 #~ msgstr "./images/Installer_help.png"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index 38c1236..9876463 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+0000\n"
 "PO-Revision-Date: 2016-11-08 12:16+0100\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"
@@ -30,7 +30,6 @@ msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Handleiding voor Debian Edu 9+edu0 codenaam Stretch"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/23-Tjener-Login.png"
 msgstr "./images/23-Tjener-Login.png"
 
@@ -1099,11 +1098,6 @@ msgstr ""
 "hoofdstuk <link linkend=\"Architecture\">Architectuur van het netwerk</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
-#| "(Debian architecture 'i386', oldest supported processors are Intel "
-#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
-#| "processors."
 msgid ""
 "The computers running Debian Edu / Skolelinux must have either 32 bit "
 "(Debian architecture 'i386', oldest supported processors are 686 class ones) "
@@ -1184,9 +1178,6 @@ msgstr ""
 "profiel:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "main server + thin client server: 60 GiB. As usual with disk space on a "
-#| "main server, \"the bigger the better\"."
 msgid ""
 "main server + thin client server: 70 GiB. As usual with disk space on a main "
 "server, \"the bigger the better\"."
@@ -1195,7 +1186,6 @@ msgstr ""
 "op een hoofdserver, geldt \"hoe meer, hoe beter\"."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "thin client server: 40 GiB."
 msgid "thin client server: 50 GiB."
 msgstr "thin-clientserver: 50 GiB."
 
@@ -1595,36 +1585,30 @@ msgstr ""
 "een standaardinstallatie."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
-msgstr "Een type van installatie kiezen"
-
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/01-Installer_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+#, fuzzy
+#| msgid "Installation and download options"
+msgid "Installation types and options"
+msgstr "Installatie- en downloadopties"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer boot menu"
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 64-bit Hardware"
 msgstr "Opstartmenu van het installatieprogramma"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
-msgstr ""
-"<emphasis role=\"strong\">Install</emphasis> staat voor de uitvoering van "
-"het installatieprogramma op een i386- of een amd64-computer in de standaard "
-"tekstmodus."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01-Installer_64bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
-msgstr ""
-"<emphasis role=\"strong\">64 bit-install</emphasis> staat voor de uitvoering "
-"van het installatieprogramma op een amd64-computer in de standaard "
-"tekstmodus."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "64-bit Installer boot menu"
+msgstr "Opstartmenu van het installatieprogramma"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1632,123 +1616,97 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis> gebruikt het "
 "grafische GTK-installatieprogramma waarin u de muis kunt gebruiken."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
+#| "mode install."
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> gebruikt op "
-"een amd64-computer het grafische GTK-installatieprogramma waarin u de muis "
-"kunt gebruiken."
+"<emphasis role=\"strong\">64 bit-install</emphasis> staat voor de uitvoering "
+"van het installatieprogramma op een amd64-computer in de standaard "
+"tekstmodus."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
+#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> biedt een sub-"
 "menu met meer uitgebreide keuzemogelijkheden."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
+#| "installation on i386 and amd64."
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+"<emphasis role=\"strong\">Install</emphasis> staat voor de uitvoering van "
+"het installatieprogramma op een i386- of een amd64-computer in de standaard "
+"tekstmodus."
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
+#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> geeft aanwijzingen bij het gebruik "
 "van het installatieprogramma. "
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/Installer_advanced_options_a.png"
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer advanced options screen 1"
+msgid "64-bit 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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 "<emphasis role=\"strong\">Back..</emphasis> voert u terug naar het hoofdmenu."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
-msgstr ""
-"<emphasis role=\"strong\">Expert install</emphasis> legt alle beschikbare "
-"vragen voor en gebruikt de tekstmodus."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
-msgstr ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> doet dit installatiemedium "
-"als een reparatie-cd fungeren, zodat u noodbewerkingen kunt uitvoeren."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
-msgstr ""
-"<emphasis role=\"strong\">Automated install</emphasis> 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 ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
-msgstr ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> wordt in "
-"tekstmodus uitgevoerd op een 64-bitcomputer en legt daarbij alle beschikbare "
-"vragen voor."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
-msgstr ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> doet dit "
-"installatiemedium als een reparatie-cd fungeren, zodat u noodbewerkingen "
-"kunt uitvoeren op een 64-bitcomputer."
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
-"preseed file."
-msgstr ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> heeft een "
-"bestand nodig waarmee een aantal configuratieopties aan het "
-"installatieprogramma doorgegeven worden op een 64-bitcomputer."
-
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_b.png"
-msgstr "./images/Installer_advanced_options_b.png"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 2"
-msgstr "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 2"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
+#| "access to all available questions in graphical mode."
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
+"to all available questions, mouse usable."
 msgstr ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> legt alle "
 "beschikbare vragen voor en gebruikt de grafische modus."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
 "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> doet dit "
-"installatiemedium als een reparatie-cd fungeren, zodat u noodbewerkingen "
-"kunt uitvoeren. Het gebruikt daarbij de grafische omgeving van GTK."
+"<emphasis role=\"strong\">Rescue mode</emphasis> doet dit installatiemedium "
+"als een reparatie-cd fungeren, zodat u noodbewerkingen kunt uitvoeren."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1757,44 +1715,78 @@ msgstr ""
 "bestand nodig waarmee een aantal configuratieopties aan het "
 "installatieprogramma doorgegeven worden. De grafische modus wordt gebruikt."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis>  legt "
-"alle beschikbare vragen voor en gebruikt de grafische modus op een 64-"
-"bitcomputer."
+"<emphasis role=\"strong\">Expert install</emphasis> legt alle beschikbare "
+"vragen voor en gebruikt de tekstmodus."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> doet dit "
-"installatiemedium als een reparatie-cd fungeren, zodat u noodbewerkingen "
-"kunt uitvoeren op een 64-bitcomputer. Het gebruikt daarbij de grafische "
-"omgeving van GTK."
+"<emphasis role=\"strong\">Rescue mode</emphasis> doet dit installatiemedium "
+"als een reparatie-cd fungeren, zodat u noodbewerkingen kunt uitvoeren."
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
+#| "file."
 msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
+"preseed file."
+msgstr ""
+"<emphasis role=\"strong\">Automated install</emphasis> heeft een bestand "
+"nodig waarmee een aantal configuratieopties aan het installatieprogramma "
+"doorgegeven worden."
+
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "Installer boot menu on 32-bit Hardware"
+msgstr "Opstartmenu van het installatieprogramma"
+
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Installer boot menu"
+msgid "32-bit Installer boot menu"
+msgstr "Opstartmenu van het installatieprogramma"
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis>  "
-"heeft een bestand nodig waarmee een aantal configuratieopties aan het "
-"installatieprogramma doorgegeven worden."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "Installer help screen"
+msgid "Help screen"
+msgstr "Installatieprogramma - hulpscherm"
+
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/Installer_help.png"
+msgid "./images/01c-Installer_help.png"
 msgstr "./images/Installer_help.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1808,8 +1800,12 @@ msgid "Additional boot parameters for installations"
 msgstr "Installaties met bijkomende opstartparameters"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
+#| "boot menu."
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 "Op i386/amd64-computers kunt u de opstartopties van het installatieprogramma "
@@ -1817,47 +1813,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-"Indien u het multi-architectuur opstartimage op USB-stick of op een blu-"
-"rayschijf gebruikt, zal het opstartprogramma standaard in grafische modus "
-"uitgevoerd worden en, afhankelijk van het processortype, in de 64-bit- of in "
-"de 32-bitversie."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-"Indien u vanaf een multi-architectuur opstartimage de amd64-tekstmodus wenst "
-"te gebruiken, moet u kiezen voor het menu-item <computeroutput>amd64-"
-"install</computeroutput>."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-"Evenzo kunt u het menu-item <computeroutput>amd64-expertgui</computeroutput> "
-"kiezen om op een amd64-computer de expertenmodus van het "
-"installatieprogramma in een grafische omgeving uit te voeren."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-"Indien u op een amd64-computer met het multi-archtectuurimage het "
-"installatieprogramma in i386-modus wenst op te starten, dient u handmatig "
-"het menu-item <computeroutput>install</computeroutput> te kiezen (voor de "
-"tekstmodus) of het item <computeroutput>expertgui</computeroutput> (voor de "
-"grafische modus)."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1880,14 +1835,15 @@ msgstr ""
 "de proxydienst van de hoofdserver gebruikt."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 #| msgid ""
 #| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
+#| "of the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
 #| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Om de bureaubladomgeving van <emphasis role=\"strong\">GNOME</emphasis> in "
@@ -1916,10 +1872,6 @@ msgstr ""
 "als opstartparameter van de kernel."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
-#| "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
-#| "boot parameters."
 msgid ""
 "And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
 "instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
@@ -2587,9 +2539,9 @@ 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><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -2780,7 +2732,6 @@ msgid "tjener KDM Login"
 msgstr "KDM-aanmeldscherm op tjener"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-MATE_Desktop_Browser.png"
 
@@ -2789,7 +2740,6 @@ msgid "KDE and Browser"
 msgstr "KDE met browser"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/27-Tjener-KDE_Desktop.png"
 msgid "./images/27-Tjener-MATE_Desktop.png"
 msgstr "./images/27-Tjener-MATE_Desktop.png"
 
@@ -2810,7 +2760,6 @@ msgid "Diskless Workstation Login"
 msgstr "Aanmeldscherm op een schijfloos werkstation"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr "./images/31-ThinClient-MATE_Desktop.png"
 
@@ -2915,7 +2864,6 @@ msgstr ""
 "wenken en behandelt ook enkele veel voorkomende vragen."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Debian Edu KDE desktop"
 msgid "Debian Edu MATE desktop"
 msgstr "Het MATE-bureaublad van Debian Edu"
 
@@ -6550,19 +6498,28 @@ msgid "HowTos for the desktop"
 msgstr "HowTo's in verband met de bureaubladomgeving"
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr "KDE \"Plasma\", GNOME, LXDE, Xfce en/of MATE samen gebruiken"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To install other desktop environments after installation, simply use apt-"
+#| "get:"
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 "Om na het installatieproces bijkomende bureaubladomgevingen te installeren, "
 "gebruikt u apt-get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
@@ -6585,11 +6542,17 @@ msgstr ""
 "link> voor meer uitleg."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you don't want to do installations with the default desktop KDE "
+#| "\"Plasma\", you can also <link linkend=\"Installation--"
+#| "The_installation_process\">install with one of the four alternative "
+#| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 "Indien u geen installaties wenst uit te voeren met het standaardbureaublad "
 "KDE \"Plasma\", kunt u ook onmiddellijk <link linkend=\"Installation--"
@@ -6708,14 +6671,14 @@ msgid "To use www.deb-multimedia.org do the following:"
 msgstr "Om www.deb-multimedia.org te kunnen gebruiken, doet u het volgende:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
 #| msgid ""
 #| "# install the debian-keyring securely:\n"
 #| "apt-get install debian-keyring\n"
 #| "# fetch the deb-multimedia key insecurely:\n"
 #| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
 #| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  7DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 #| "# add repository to sources.list - please check the homepages for mirrors!\n"
 #| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
 #| "# update the list of available packages:\n"
@@ -6728,7 +6691,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -9364,11 +9327,6 @@ msgstr ""
 "(sambaNTPassword and sambaLMPassword) identiek zijn."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-#| "but this will only update the Kerberos password, and not the Samba and "
-#| "GOsa² (LDAP) password. So after you changed your password at the login "
-#| "prompt, you really should also change it using GOsa²."
 msgid ""
 "Changing passwords using PAM is working also at the GDM login prompt, but "
 "this will only update the Kerberos password, and not the Samba and GOsa² "
@@ -12985,6 +12943,124 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Select type of installation"
+#~ msgstr "Een type van installatie kiezen"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
+#~ "amd64 GTK installer where you can use the mouse."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> gebruikt op "
+#~ "een amd64-computer het grafische GTK-installatieprogramma waarin u de "
+#~ "muis kunt gebruiken."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access "
+#~ "to all available questions in text mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> wordt in "
+#~ "tekstmodus uitgevoerd op een 64-bitcomputer en legt daarbij alle "
+#~ "beschikbare vragen voor."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> doet dit "
+#~ "installatiemedium als een reparatie-cd fungeren, zodat u noodbewerkingen "
+#~ "kunt uitvoeren op een 64-bitcomputer."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+#~ "preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> heeft een "
+#~ "bestand nodig waarmee een aantal configuratieopties aan het "
+#~ "installatieprogramma doorgegeven worden op een 64-bitcomputer."
+
+#~ msgid "./images/Installer_advanced_options_b.png"
+#~ msgstr "./images/Installer_advanced_options_b.png"
+
+#~ msgid "Installer advanced options screen 2"
+#~ msgstr ""
+#~ "Installatieprogramma - keuzemogelijkheden voor gevorderden - scherm 2"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks with a graphical "
+#~ "GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> doet dit "
+#~ "installatiemedium als een reparatie-cd fungeren, zodat u noodbewerkingen "
+#~ "kunt uitvoeren. Het gebruikt daarbij de grafische omgeving van GTK."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "gives access to all available questions in graphical mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis>  "
+#~ "legt alle beschikbare vragen voor en gebruikt de grafische modus op een "
+#~ "64-bitcomputer."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes "
+#~ "this install medium become a rescue disk for emergency tasks on amd64 "
+#~ "with a graphical GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> doet "
+#~ "dit installatiemedium als een reparatie-cd fungeren, zodat u "
+#~ "noodbewerkingen kunt uitvoeren op een 64-bitcomputer. Het gebruikt "
+#~ "daarbij de grafische omgeving van GTK."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "needs a preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis>  "
+#~ "heeft een bestand nodig waarmee een aantal configuratieopties aan het "
+#~ "installatieprogramma doorgegeven worden."
+
+#~ msgid ""
+#~ "The multi-architecture USB flash drive / Blu-ray disc image defaults to "
+#~ "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit "
+#~ "x86 machines."
+#~ msgstr ""
+#~ "Indien u het multi-architectuur opstartimage op USB-stick of op een blu-"
+#~ "rayschijf gebruikt, zal het opstartprogramma standaard in grafische modus "
+#~ "uitgevoerd worden en, afhankelijk van het processortype, in de 64-bit- of "
+#~ "in de 32-bitversie."
+
+#~ msgid ""
+#~ "If you want to boot the amd64 text mode with the multi-architecture "
+#~ "image, that would be <computeroutput>amd64-install</computeroutput>."
+#~ msgstr ""
+#~ "Indien u vanaf een multi-architectuur opstartimage de amd64-tekstmodus "
+#~ "wenst te gebruiken, moet u kiezen voor het menu-item "
+#~ "<computeroutput>amd64-install</computeroutput>."
+
+#~ msgid ""
+#~ "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> "
+#~ "to get the GUI version on amd64."
+#~ msgstr ""
+#~ "Evenzo kunt u het menu-item <computeroutput>amd64-expertgui</"
+#~ "computeroutput> kiezen om op een amd64-computer de expertenmodus van het "
+#~ "installatieprogramma in een grafische omgeving uit te voeren."
+
+#~ msgid ""
+#~ "If you want to boot the i386 mode with the multi-arch image on an amd64 "
+#~ "machine you need to manually select <computeroutput>install</"
+#~ "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#~ "(graphical mode)."
+#~ msgstr ""
+#~ "Indien u op een amd64-computer met het multi-archtectuurimage het "
+#~ "installatieprogramma in i386-modus wenst op te starten, dient u handmatig "
+#~ "het menu-item <computeroutput>install</computeroutput> te kiezen (voor de "
+#~ "tekstmodus) of het item <computeroutput>expertgui</computeroutput> (voor "
+#~ "de grafische modus)."
+
+#~ msgid "01-Installer_boot_menu.png"
+#~ msgstr "01-Installer_boot_menu.png"
+
 #, fuzzy
 #~| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
@@ -13075,9 +13151,6 @@ msgstr ""
 #~ msgid "{{attachment:31-ThinClient-MATE_Desktop.png}}"
 #~ msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
 
-#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
-#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
-
 #~ msgid "{{attachment:Installer_advanced_options_a.png}}"
 #~ msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index 86de27a..f71f7f2 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+0000\n"
 "PO-Revision-Date: 2016-10-26 08:52+0000\n"
 "Last-Translator: Stanisław Krukowski <dfk0077 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -1269,156 +1269,137 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
+msgid "Installation types and options"
 msgstr ""
 
-#. 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"
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Installer boot menu on 64-bit Hardware"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "./images/01-Installer_64bit_boot_menu.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "64-bit Installer boot menu"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
+msgstr "<emphasis role=\"strong\">Nazwa zwyczajowa</emphasis>"
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+"<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
+"with more detailed options to choose."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "64-bit Installer advanced options screen 1"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
-msgstr ""
-
-#. 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>
-msgid ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
-msgstr ""
+msgstr "<emphasis role=\"strong\">Nazwa zwyczajowa</emphasis>"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Installer boot menu on 32-bit Hardware"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
-"preseed file."
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "32-bit Installer boot menu"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Help screen"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "./images/01c-Installer_help.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1430,38 +1411,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1478,7 +1433,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 
@@ -1943,9 +1898,11 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
-msgstr ""
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -4773,17 +4730,19 @@ msgid "HowTos for the desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4801,10 +4760,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4893,7 +4852,7 @@ msgid ""
 "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
 "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
@@ -9401,8 +9360,3 @@ msgstr ""
 #~| msgid "./images/23-Tjener-KDM_Login.png"
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.png}}"
 #~ msgstr "./images/23-Tjener-KDM_Login.png"
-
-#, fuzzy
-#~| msgid "./images/23-Tjener-KDM_Login.png"
-#~ msgid "{{attachment:23-Tjener-Login.png}}"
-#~ msgstr "./images/23-Tjener-KDM_Login.png"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index e12a522..1199b5b 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-11-07 17:01+0000\n"
+"POT-Creation-Date: 2016-11-08 16:14+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"
@@ -1142,156 +1142,127 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
+msgid "Installation types and options"
 msgstr ""
 
-#. 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"
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Installer boot menu on 64-bit Hardware"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01-Installer_64bit_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "64-bit Installer boot menu"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_advanced_options_a.png"
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-msgid "Installer advanced options screen 1"
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "64-bit Installer advanced options screen 1"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
 msgstr ""
 
-#. 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>
-msgid ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Installer boot menu on 32-bit Hardware"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
-"preseed file."
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01b-Installer_32bit_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+msgid "32-bit Installer boot menu"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Help screen"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/Installer_help.png"
+#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/01c-Installer_help.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><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>
+#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1303,38 +1274,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
 "http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
@@ -1816,8 +1761,8 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "01-Installer_boot_menu.png"
+#. type: Content of: <article><section><section><para>
+msgid "{{attachment:01-Installer_boot_menu.png}}"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -4632,17 +4577,19 @@ msgid "HowTos for the desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4660,10 +4607,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 26dc58e..19c8018 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -484,84 +484,75 @@
 <para>When you do a Debian Edu installation, you have a few options to choose from. Don't be afraid; there aren't many. We have done a good job of hiding the complexity of Debian during the installation and beyond. However, Debian Edu is Debian, and if you want there are more than 42,000 packages to choose from and a billion configuration options. For the majority of our users, our defaults should be fine. 
 </para>
 
-<section id="Installation--Select_type_of_installation">
-<title>Select type of installation
+<section id="Installation--Installation_types_and_options">
+<title>Installation types and options
+</title>
+
+<section id="Installation--Installer_boot_menu_on_64-bit_Hardware">
+<title>Installer boot menu on 64-bit Hardware
 </title><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<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>
-<para> <emphasis role="strong">64 bit install</emphasis> does an amd64 text-mode install.
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_64bit_boot_menu.png"/></imageobject><textobject><phrase>64-bit Installer boot menu</phrase></textobject></inlinemediaobject>
+</para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
+<para><emphasis role="strong">Graphical install</emphasis> uses the GTK installer where you can use the mouse.
 </para>
-<para> <emphasis role="strong">Graphical install</emphasis> uses the GTK installer where you can use the mouse.
+<para> <emphasis role="strong">Install</emphasis> uses text mode.
 </para>
-<para> <emphasis role="strong">64 bit graphical install</emphasis> uses the amd64 GTK installer where you can use the mouse.
+<para> <emphasis role="strong">Advanced options ></emphasis> gives a sub menu with more detailed options to choose.
 </para>
-<para> <emphasis role="strong">Advanced options ></emphasis> gives a sub menu with more detailed options to choose
+<para><emphasis role="strong">32-bit install options ></emphasis> allows a 32-bit installation on 64-bit hardware.
 </para>
-<para><emphasis role="strong">Help</emphasis> gives some hints on using the installer
+<para><emphasis role="strong">Help</emphasis> gives some hints on using the installer; see screenshot below.
 </para></entry></row></tbody></tgroup></informaltable><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_advanced_options_a.png"/></imageobject><textobject><phrase>Installer advanced options screen 1</phrase></textobject></inlinemediaobject>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01a-Installer_64bit_advanced_options.png"/></imageobject><textobject><phrase>64-bit 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>
-<para><emphasis role="strong">Expert install</emphasis> gives access to all available questions in text mode.
-</para>
-<para> <emphasis role="strong">Rescue mode</emphasis> makes this install medium become a rescue disk for emergency tasks.
-</para>
-<para> <emphasis role="strong">Automated install</emphasis> needs a preseed file.
-</para>
-<para> <emphasis role="strong">64 bit expert install</emphasis> gives access to all available questions in text mode on amd64.
+<para><emphasis role="strong">Graphical expert install</emphasis> gives access to all available questions, mouse usable.
 </para>
-<para> <emphasis role="strong">64 bit rescue mode</emphasis> makes this install medium become a rescue disk for emergency tasks on amd64.
-</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><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>
-<para> <emphasis role="strong">Graphical rescue mode</emphasis> makes this install medium become a rescue disk for emergency tasks with a graphical GTK look.
+<para> <emphasis role="strong">Graphical rescue mode</emphasis> makes this install medium become a rescue disk for emergency tasks.
 </para>
 <para> <emphasis role="strong">Graphical automated install</emphasis> needs a preseed file.
 </para>
-<para> <emphasis role="strong">64 bit graphical expert install</emphasis> gives access to all available questions in graphical mode on amd64.
+<para> <emphasis role="strong">Expert install</emphasis> gives access to all available questions in text mode.
 </para>
-<para> <emphasis role="strong">64 bit graphical rescue mode</emphasis> makes this install medium become a rescue disk for emergency tasks on amd64 with a graphical GTK look.
+<para> <emphasis role="strong">Rescue mode</emphasis> text mode; makes this install medium become a rescue disk for emergency tasks.
 </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><inlinemediaobject><imageobject><imagedata fileref="./images/Installer_help.png"/></imageobject><textobject><phrase>Installer help screen</phrase></textobject></inlinemediaobject>
+<para> <emphasis role="strong">Automated install</emphasis> text mode; needs a preseed file.
+</para></entry></row></tbody></tgroup></informaltable>
+</section>
+
+<section id="Installation--Installer_boot_menu_on_32-bit_Hardware">
+<title>Installer boot menu on 32-bit Hardware
+</title><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01b-Installer_32bit_boot_menu.png"/></imageobject><textobject><phrase>32-bit Installer boot menu</phrase></textobject></inlinemediaobject>
+</para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
+<para>Explanations are similar to those for 64-bit hardware.
+</para></entry></row></tbody></tgroup></informaltable>
+</section>
+
+<section id="Installation--Help_screen">
+<title>Help screen
+</title><informaltable><tgroup cols="1"><colspec colname="col_0"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01c-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>
+</section>
 
 <section id="Installation--Additional_boot_parameters_for_installations">
 <title>Additional boot parameters for installations
 </title>
-<para>On i386/amd64, boot options can be edited by pressing the TAB key in the boot menu. 
+<para>In both cases, boot options can be edited by pressing the TAB key in the boot menu. 
 </para>
 <itemizedlist>
 <listitem>
-<para>The multi-architecture USB flash drive / Blu-ray disc image defaults to using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 machines. 
-</para></listitem>
-<listitem>
-<para>If you want to boot the amd64 text mode with the multi-architecture image, that would be <computeroutput>amd64-install</computeroutput>. 
-</para></listitem>
-<listitem>
-<para>Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to get the GUI version on amd64. 
-</para></listitem>
-<listitem>
-<para>If you want to boot the i386 mode with the multi-arch image on an amd64 machine you need to manually select <computeroutput>install</computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> (graphical mode). 
-</para></listitem>
-<listitem>
 <para>You can use an existing HTTP proxy service on the network to speed up the installation of the main server profile from CD. Add <computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot parameter. 
 </para></listitem>
 <listitem>
 <para>If you have already installed the main server profile on a machine, further installations should be done via PXE, as this will automatically use the proxy of the main server. 
 </para></listitem>
 <listitem>
-<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the <emphasis role="strong">MATE"</emphasis> desktop, add <computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters. 
+<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the <emphasis role="strong">MATE</emphasis> desktop, add <computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters. 
 </para></listitem>
 <listitem>
 <para>To install the <emphasis role="strong">LXDE</emphasis> desktop instead, add <computeroutput>desktop=lxde</computeroutput> to the kernel boot parameters. 
@@ -758,7 +749,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para>So here is a screenshot tour through a graphical Main-Server + Workstation + Thin Client Server installation and how it looks at the first boot of the tjener, a PXE boot on the workstation network and on the thinclient network: 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>01-Installer_boot_menu.png</phrase></textobject></inlinemediaobject> 
+<para>{{attachment:01-Installer_boot_menu.png}} 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/02-select_a_language.png"/></imageobject><textobject><phrase>02-select_a_language.png</phrase></textobject></inlinemediaobject> 
 </para>
@@ -1997,16 +1988,17 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 <title>HowTos for the desktop
 </title>
 
-<section id="Desktop--Using_KDE_.26quot.3BPlasma.26quot.3B.2C_GNOME.2C_LXDE.2C_Xfce_and.2BAC8or_MATE_together">
-<title>Using KDE "Plasma", GNOME, LXDE, Xfce and/or MATE together
+<section id="Desktop--Using_MATE.2C_GNOME.2C_LXDE.2C_Xfce_and.2BAC8or_KDE_Plasma_together">
+<title>Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together
 </title>
-<para>To install other desktop environments after installation, simply use apt-get: 
-</para><screen><![CDATA[ apt-get install gnome lxde xfce4 mate-desktop]]></screen>
+<para>To install other desktop environments after installation, simply use apt: 
+</para><screen><![CDATA[ apt update
+ apt install gnome lxde xfce4 kde-standard]]></screen>
 <para>Users will then be able to choose any of the five desktop environment via the login manager before logging in. Of course, you can also choose to give less choices. 
 </para>
 <para>The usage of LXDE as default on thin clients can be forced; see  <link linkend="NetworkClients">networked clients</link> for details. 
 </para>
-<para>If you don't want to do installations with the default desktop KDE "Plasma", you can also <link linkend="Installation--The_installation_process">install with one of the four alternative desktops, GNOME, LXDE, Xfce or MATE</link> directly.  
+<para>If you don't want to do installations with the default desktop MATE, you can also <link linkend="Installation--The_installation_process">install with one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> directly.  
 </para>
 </section>
 
@@ -2044,7 +2036,7 @@ gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907
 # check securely if the key is correct and add it to the keyring used by APT if it is:
 gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -
 # add repository to sources.list - please check the homepages for mirrors!
-echo "deb http://deb-multimedia.org jessie main" >> /etc/apt/sources.list
+echo "deb http://deb-multimedia.org stretch main" >> /etc/apt/sources.list
 # update the list of available packages:
 apt-get update]]></screen>
 </section>
diff --git a/documentation/debian-edu-stretch/images/01-Installer_64bit_boot_menu.png b/documentation/debian-edu-stretch/images/01-Installer_64bit_boot_menu.png
new file mode 100644
index 0000000..9590b5c
Binary files /dev/null and b/documentation/debian-edu-stretch/images/01-Installer_64bit_boot_menu.png differ
diff --git a/documentation/debian-edu-stretch/images/01a-Installer_64bit_advanced_options.png b/documentation/debian-edu-stretch/images/01a-Installer_64bit_advanced_options.png
new file mode 100644
index 0000000..63d148e
Binary files /dev/null and b/documentation/debian-edu-stretch/images/01a-Installer_64bit_advanced_options.png differ
diff --git a/documentation/debian-edu-stretch/images/01b-Installer_32bit_boot_menu.png b/documentation/debian-edu-stretch/images/01b-Installer_32bit_boot_menu.png
new file mode 100644
index 0000000..c0eb731
Binary files /dev/null and b/documentation/debian-edu-stretch/images/01b-Installer_32bit_boot_menu.png differ
diff --git a/documentation/debian-edu-stretch/images/01c-Installer_help.png b/documentation/debian-edu-stretch/images/01c-Installer_help.png
new file mode 100644
index 0000000..e240cc9
Binary files /dev/null and b/documentation/debian-edu-stretch/images/01c-Installer_help.png differ

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

