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

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Tue Nov 15 13:47:17 UTC 2016


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

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

commit c3cd31284d29bec1f8100ce033563352282655ae
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Nov 15 14:45:37 2016 +0100

    Update Debian Edu Stretch manual from the wiki.
    
    (de) Stretch Manual translation update.
---
 debian/changelog                                   |  6 +-
 .../debian-edu-stretch-manual.da.po                | 86 ++++++++++++--------
 .../debian-edu-stretch-manual.de.po                | 87 +++++++++++----------
 .../debian-edu-stretch-manual.es.po                | 80 +++++++++++--------
 .../debian-edu-stretch-manual.fr.po                | 91 +++++++++++++---------
 .../debian-edu-stretch-manual.it.po                | 91 +++++++++++++---------
 .../debian-edu-stretch-manual.ja.po                | 86 ++++++++++++--------
 .../debian-edu-stretch-manual.nb.po                | 91 +++++++++++++---------
 .../debian-edu-stretch-manual.nl.po                | 87 ++++++++++++---------
 .../debian-edu-stretch-manual.pl.po                | 73 +++++++++--------
 .../debian-edu-stretch-manual.pot                  | 64 +++++++--------
 .../debian-edu-stretch-manual.xml                  | 44 +++++------
 12 files changed, 510 insertions(+), 376 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f659d1..e9df4a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 debian-edu-doc (1.911~20161115) UNRELEASED; urgency=medium
 
-  * …
+  [ Wolfgang Schweer ]
+  * Update Debian Edu Stretch manual from the wiki.
+
+  [ Stretch Manual translation updates ]
+  * German: Wolfgang Schweer.
 
  -- Holger Levsen <holger at debian.org>  Mon, 14 Nov 2016 12:44:34 +0100
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index 70a7c44..95413ad 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-14 11:15+0000\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\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"
@@ -1534,19 +1534,19 @@ msgstr "Indstillinger for installation og hentning"
 msgid "Installer boot menu on 64-bit Hardware"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1554,7 +1554,7 @@ msgstr ""
 "<emphasis role=\"strong\">Grafisk installation</emphasis> bruger GTK-"
 "installationsprogrammet, hvor du kan bruge musen."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
@@ -1564,7 +1564,7 @@ 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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
@@ -1576,7 +1576,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
@@ -1588,7 +1588,7 @@ 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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
@@ -1600,24 +1600,28 @@ msgstr ""
 "<emphasis role=\"strong\">Hjælp</emphasis> har nogle fif til brugen af "
 "installationsprogrammet"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment: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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "{{attachment:Installer_advanced_options_a.png}}"
 msgid "64-bit Installer advanced options screen 1"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+"<^><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
@@ -1629,7 +1633,7 @@ msgstr ""
 "<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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1641,7 +1645,7 @@ msgstr ""
 "<emphasis role=\"strong\">Redningstilstand</emphasis> omdanner dette "
 "installationsmedie til en redningsdisk i tilfælde af nedbrud."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1649,7 +1653,7 @@ msgstr ""
 "<emphasis role=\"strong\">Grafisk automatisk installation</emphasis> kræver "
 "en forudfyldt fil (preseed)."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1657,7 +1661,7 @@ msgstr ""
 "<emphasis role=\"strong\">Ekspertinstallation</emphasis> giver adgang til "
 "alle tilgængelige spørgsmål i teksttilstand."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1669,7 +1673,7 @@ msgstr ""
 "<emphasis role=\"strong\">Redningstilstand</emphasis> omdanner dette "
 "installationsmedie til en redningsdisk i tilfælde af nedbrud."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
@@ -1685,19 +1689,19 @@ msgstr ""
 msgid "Installer boot menu on 32-bit Hardware"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
@@ -1705,20 +1709,24 @@ msgstr ""
 msgid "Help screen"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/alert.png"
 msgid "./images/01c-Installer_help.png"
 msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This Help screen is self explaining and enables the <F>-keys on the "
+#| "keyboard for getting more detailed help on the topics described."
 msgid ""
-"This Help screen is self explaining and enables the <F>-keys on the "
-"keyboard for getting more detailed help on the topics described."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
 "Hjælpeskærmen er selvforklarende og aktiverer <F>-tasterne på "
 "tastaturet for yderligere hjælp om de beskrevne emner."
@@ -2432,21 +2440,28 @@ msgstr ""
 "ikke at bruge den."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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:"
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 "Så her er en visning af skærmbillederne for en hovedserver + arbejdsstation "
 "+ server for tynde klinter under installationen og hvordan det ser ud ved "
 "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>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "{{attachment:Installer_help.png}}"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "01-Installer_64bit_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -12501,6 +12516,11 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#, fuzzy
+#~| msgid "{{attachment:Installer_help.png}}"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
 #~ msgid "Select type of installation"
 #~ msgstr "Vælg installationstype"
 
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 60c48a4..99503a4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-14 11:15+0000\n"
-"PO-Revision-Date: 2016-11-08 18:24+0100\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\n"
+"PO-Revision-Date: 2016-11-15 14:37+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 "Language: de\n"
@@ -1570,15 +1570,15 @@ msgstr "Installationsarten und Optionen"
 msgid "Installer boot menu on 64-bit Hardware"
 msgstr "Startmenü des Installers auf 64-Bit-Hardware."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01-Installer_64bit_boot_menu.png"
 msgstr "./images/01-Installer_64bit_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "64-bit Installer boot menu"
 msgstr "Startmenü des 64-Bit-Installionsprogramms"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1586,11 +1586,11 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis> benutzt das "
 "graphische Installationsprogramm mit Maus."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr "<emphasis role=\"strong\">Install</emphasis> verwendet den Textmodus."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose."
@@ -1598,7 +1598,7 @@ msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> zeigt ein "
 "Untermenü mit weiteren Optionen."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
 "bit installation on 64-bit hardware."
@@ -1606,7 +1606,7 @@ msgstr ""
 "<emphasis role=\"strong\">32-bit install options ></emphasis> erlaubt "
 "eine 32-Bit-Installation auf 64-Bit-Hardware.."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer; see screenshot below."
@@ -1614,21 +1614,23 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> zeigt einige Hinweise für die "
 "Benutzung des Installationsprogrammes; siehe Screenshot weiter unten."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "./images/01a-Installer_64bit_advanced_options.png"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "64-bit Installer advanced options screen 1"
 msgstr "64-Bit-Installer advanced options Bildschim 1"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+"<^><emphasis role=\"strong\">Back..</emphasis> brings back to the main "
+"menu."
 msgstr ""
-"<emphasis role=\"strong\">Back..</emphasis> führt zum Hauptmenü zurück."
+"<^><emphasis role=\"strong\">Back..</emphasis> führt zum Hauptmenü "
+"zurück."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
 "to all available questions, mouse usable."
@@ -1636,7 +1638,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> zeigt alle "
 "verfügbaren Fragen; Maus ist benutzbar."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
 "install medium become a rescue disk for emergency tasks."
@@ -1644,7 +1646,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical rescue mode</emphasis> verwendet dieses "
 "Installationsmedium als Rettungswerkzeug für Notfälle."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1652,7 +1654,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> benötigt  "
 "eine Preseed-Datei."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1660,7 +1662,7 @@ msgstr ""
 "<emphasis role=\"strong\">Expert install</emphasis> zeigt alle verfügbaren "
 "Fragen für den Textmodus an."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
 "install medium become a rescue disk for emergency tasks."
@@ -1668,7 +1670,7 @@ msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> Textmodus; verwendet dieses "
 "Installationsmedium als Rettungswerkzeug für Notfälle."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
@@ -1680,15 +1682,15 @@ msgstr ""
 msgid "Installer boot menu on 32-bit Hardware"
 msgstr "Startmenü des Installers auf 32-Bit-Hardware."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01b-Installer_32bit_boot_menu.png"
 msgstr "./images/01b-Installer_32bit_boot_menu.png"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "32-bit Installer boot menu"
 msgstr "Startmenü des 32-Bit-Installers"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr "Die Erklärungen entsprechen denjenigen für 64-Bit-Hardware."
 
@@ -1696,21 +1698,21 @@ msgstr "Die Erklärungen entsprechen denjenigen für 64-Bit-Hardware."
 msgid "Help screen"
 msgstr "Hilfe-Bildschirm des Installationsprogramms"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01c-Installer_help.png"
 msgstr "./images/01c-Installer_help.png"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr "Hilfe-Bildschirm des Installers"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><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."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
-"Diese Hilfeseite ist selbsterklärend; mittels der <F>-Tasten können "
-"Sie weitergehende Informationen zu den angegebenen Themen bekommen."
+"<^> Diese Hilfeseite ist selbsterklärend; mittels der <F>-Tasten "
+"können Sie weitergehende Informationen zu den angegebenen Themen bekommen."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Additional boot parameters for installations"
@@ -2417,18 +2419,19 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 "Hier folgt nun eine Serie von Screenshots einer graphischen Installation "
-"(Hauptserver + Arbeitsplatzrechner + Terminal-Server); gefolgt von "
+"(Hauptserver + Arbeitsplatzrechner + Terminal-Server, 64-Bit); gefolgt von "
 "Screenshots nach dem ersten Starten von »tjener«, dem PXE-Start eines "
 "Rechners im Netzwerk für Arbeitsplatzrechner bzw. für Thin Clients."
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_64bit_boot_menu.png"
+msgstr "01-Installer_64bit_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -10096,8 +10099,8 @@ msgstr ""
 "translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
 "Übersetzungen aktualisieren wollen."
 
-#.  <remark>
-#. status ignore</remark> 
+#. <remark>
+#. status ignore</remark>
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -12610,6 +12613,9 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
 #~ msgid "Select type of installation"
 #~ msgstr "Art der Installation auswählen"
 
@@ -12716,9 +12722,6 @@ msgstr ""
 #~ "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}}"
 
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 feccbde..a58eb58 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-14 11:15+0000\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\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"
@@ -1616,19 +1616,19 @@ msgstr "Instalación y opciones de descarga"
 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>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/22-Tjener_GRUB_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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1636,7 +1636,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
@@ -1646,7 +1646,7 @@ msgstr ""
 "<emphasis role=\"strong\">Instalar 64 bit</emphasis> realiza la instalación "
 "en modo texto para amd64."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
@@ -1658,7 +1658,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
@@ -1670,7 +1670,7 @@ 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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
@@ -1682,26 +1682,30 @@ msgstr ""
 "<emphasis role=\"strong\">Ayuda</emphasis> brinda algunos consejos sobre "
 "como usar el instalador."
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "Installer advanced options screen 1"
 msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "Pantalla 1 de las opciones avanzadas del instalador"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "Installer advanced options screen 2"
 msgid "64-bit Installer advanced options screen 1"
 msgstr "Pantalla 2 de las opciones avanzadas del instalador"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+"<^><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
@@ -1713,7 +1717,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1725,7 +1729,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1733,7 +1737,7 @@ msgstr ""
 "<emphasis role=\"strong\">Instalación automática gráfica</emphasis> necesita "
 "un archivo preconfigurado."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1741,7 +1745,7 @@ msgstr ""
 "<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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1753,7 +1757,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
@@ -1771,19 +1775,19 @@ msgstr ""
 msgid "Installer boot menu on 32-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>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
@@ -1793,20 +1797,24 @@ msgstr ""
 msgid "Help screen"
 msgstr "Pantalla de ayuda del instalador"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/alert.png"
 msgid "./images/01c-Installer_help.png"
 msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr "Pantalla de ayuda del instalador"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This Help screen is self explaining and enables the <F>-keys on the "
+#| "keyboard for getting more detailed help on the topics described."
 msgid ""
-"This Help screen is self explaining and enables the <F>-keys on the "
-"keyboard for getting more detailed help on the topics described."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
 "Está pantalla de ayuda se explica por si sola y habilita las teclas <"
 "F> en el teclado para tener ayuda más detallada en los temas descritos."
@@ -2523,16 +2531,17 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "01-Installer_boot_menu.png"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "01-Installer_boot_menu.png"
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "01-Installer_64bit_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -10853,6 +10862,11 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#, fuzzy
+#~| msgid "01-Installer_boot_menu.png"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "01-Installer_boot_menu.png"
+
 #~ msgid "Select type of installation"
 #~ msgstr "Seleccione el tipo de instalación"
 
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 be04da2..d2b3819 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-14 11:15+0000\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\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"
@@ -1647,19 +1647,19 @@ msgstr "Options de téléchargement et d'installation"
 msgid "Installer boot menu on 64-bit Hardware"
 msgstr "Menu de démarrage de l'installateur"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1667,7 +1667,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
@@ -1677,7 +1677,7 @@ 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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
@@ -1689,7 +1689,7 @@ msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> affiche un sous-"
 "menu d'options détaillées à choisir"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
@@ -1701,7 +1701,7 @@ 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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
@@ -1713,26 +1713,30 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> donne quelques conseils pour "
 "utiliser l'installateur"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+"<^><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
@@ -1744,7 +1748,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> affiche toutes "
 "les questions en mode graphique."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1756,7 +1760,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1764,7 +1768,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> a besoin "
 "d'un fichier de configuration."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1772,7 +1776,7 @@ msgstr ""
 "<emphasis role=\"strong\">Expert install</emphasis> affiche toutes les "
 "questions en mode texte."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1784,7 +1788,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
@@ -1802,19 +1806,19 @@ msgstr ""
 msgid "Installer boot menu on 32-bit Hardware"
 msgstr "Menu de démarrage de l'installateur"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
@@ -1824,20 +1828,24 @@ msgstr ""
 msgid "Help screen"
 msgstr "Écran d'aide de l'installateur"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/01-Installer_boot_menu.png"
 msgid "./images/01c-Installer_help.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>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr "Écran d'aide de l'installateur"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This Help screen is self explaining and enables the <F>-keys on the "
+#| "keyboard for getting more detailed help on the topics described."
 msgid ""
-"This Help screen is self explaining and enables the <F>-keys on the "
-"keyboard for getting more detailed help on the topics described."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
 "Cet écran d'aide intuitif permet aux touches <F> du clavier d'obtenir "
 "plus d'explications sur les thèmes développés."
@@ -2581,10 +2589,17 @@ msgstr ""
 "l'utiliser."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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:"
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 "Voici la visite guidée montrant l'installation graphique d'un serveur "
 "principal, d'une station de travail, et d'un serveur de clients légers, "
@@ -2592,11 +2607,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>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "01-Installer_boot_menu.png"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "01-Installer_boot_menu.png"
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "01-Installer_64bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -13155,6 +13170,11 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#, fuzzy
+#~| msgid "01-Installer_boot_menu.png"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "01-Installer_boot_menu.png"
+
 #~ msgid "Select type of installation"
 #~ msgstr "Choisir un type d'installation"
 
@@ -13262,11 +13282,6 @@ msgstr ""
 #~ "<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}}"
 #~ msgstr "./images/27-Tjener-KDE_Desktop.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 5e862eb..39f7a0b 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-14 11:15+0000\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\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"
@@ -1619,19 +1619,19 @@ msgstr "Installare e scaricare"
 msgid "Installer boot menu on 64-bit Hardware"
 msgstr "Menu di avvio dell'installatore"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1639,7 +1639,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
@@ -1649,7 +1649,7 @@ 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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
@@ -1661,7 +1661,7 @@ msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> porta a un sotto "
 "menu con maggiori opzioni da scegliere"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
@@ -1673,7 +1673,7 @@ 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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
@@ -1685,25 +1685,29 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> dà alcuni suggerimenti "
 "sull'utilizzo dell'installatore"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+"<^><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
@@ -1715,7 +1719,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1728,7 +1732,7 @@ msgstr ""
 "questo supporto di installazione come disco di ripristino per le attività di "
 "emergenza."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1736,7 +1740,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> ha bisogno "
 "di un file di preconfigurazione."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1744,7 +1748,7 @@ msgstr ""
 "<emphasis role=\"strong\">Expert install</emphasis> dà accesso a tutte le "
 "domande disponibili in modalità testuale."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1757,7 +1761,7 @@ msgstr ""
 "questo supporto di installazione come disco di ripristino per le attività di "
 "emergenza."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
@@ -1775,19 +1779,19 @@ msgstr ""
 msgid "Installer boot menu on 32-bit Hardware"
 msgstr "Menu di avvio dell'installatore"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
@@ -1797,20 +1801,24 @@ msgstr ""
 msgid "Help screen"
 msgstr "Schermata di aiuto dell'installatore"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/01-Installer_boot_menu.png"
 msgid "./images/01c-Installer_help.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>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr "Schermata di aiuto dell'installatore"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This Help screen is self explaining and enables the <F>-keys on the "
+#| "keyboard for getting more detailed help on the topics described."
 msgid ""
-"This Help screen is self explaining and enables the <F>-keys on the "
-"keyboard for getting more detailed help on the topics described."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
 "Questa schermata di aiuto si spiega da sé e con i tasti <F> sulla "
 "tastiera permette di ottenere una guida più dettagliata sugli argomenti "
@@ -2539,21 +2547,28 @@ msgstr ""
 "con l'hardware, non vi è alcun motivo per non usare la modalità grafica. "
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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:"
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 "Qui sotto ci sono più schermate sulla installazione grafica Main-Server + "
 "Workstation + Thin Client Server e come questa appare al primo avvio del "
 "server tjener, un avvio via PXE su una rete delle workstation e sulla rete "
 "dei thin-client:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "01-Installer_boot_menu.png"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "01-Installer_boot_menu.png"
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "01-Installer_64bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -12900,6 +12915,11 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#, fuzzy
+#~| msgid "01-Installer_boot_menu.png"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "01-Installer_boot_menu.png"
+
 #~ msgid "Select type of installation"
 #~ msgstr "Selezionare il tipo d'installazione"
 
@@ -13009,11 +13029,6 @@ msgstr ""
 #~ "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}}"
 #~ msgstr "./images/27-Tjener-KDE_Desktop.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 6cc82bf..d259eb7 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-14 11:15+0000\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\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"
@@ -1507,19 +1507,19 @@ msgstr "インストールとダウンロードの選択肢"
 msgid "Installer boot menu on 64-bit Hardware"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1527,7 +1527,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis>は GTK を利用したインス"
 "トーラで、マウスを利用できます。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
@@ -1537,7 +1537,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit install</emphasis> では amd64 のテキストモー"
 "ドのインストールを行います。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
@@ -1549,7 +1549,7 @@ msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> ではもっと詳細なオ"
 "プションを選択できるサブメニューを提示します。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
@@ -1561,7 +1561,7 @@ msgstr ""
 "<emphasis role=\"strong\">install</emphasis> は i386 及び amd64 向けのデフォ"
 "ルトのテキストモードでのインストールを行います。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
@@ -1573,26 +1573,30 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> でインストーラの使用に関するいくら"
 "かのヒントを提供します。"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment: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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "{{attachment:Installer_advanced_options_a.png}}"
 msgid "64-bit Installer advanced options screen 1"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+"<^><emphasis role=\"strong\">Back..</emphasis> brings back to the main "
+"menu."
 msgstr ""
 "<emphasis role=\"strong\">Back..</emphasis> を選択するとメインメニューに戻り"
 "ます。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
@@ -1604,7 +1608,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> ではグラフィカ"
 "ルモードの全ての質問にアクセスできます。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1616,7 +1620,7 @@ msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> により、このインストール用メ"
 "ディアは緊急タスク向けのレスキューディスクになります。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1624,7 +1628,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> には "
 "preseed ファイルが必要です。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1632,7 +1636,7 @@ msgstr ""
 "<emphasis role=\"strong\">Expert install</emphasis> ではテキストモードの全て"
 "の質問にアクセスできます。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1644,7 +1648,7 @@ msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> により、このインストール用メ"
 "ディアは緊急タスク向けのレスキューディスクになります。"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
@@ -1660,19 +1664,19 @@ msgstr ""
 msgid "Installer boot menu on 32-bit Hardware"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
@@ -1680,20 +1684,24 @@ msgstr ""
 msgid "Help screen"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/alert.png"
 msgid "./images/01c-Installer_help.png"
 msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This Help screen is self explaining and enables the <F>-keys on the "
+#| "keyboard for getting more detailed help on the topics described."
 msgid ""
-"This Help screen is self explaining and enables the <F>-keys on the "
-"keyboard for getting more detailed help on the topics described."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
 "このヘルプ画面は自己説明的になっていて、キーボードの<F数字>キーを押すと"
 "説明されている項目についてもっと詳細なヘルプを得られるようになっています。"
@@ -2405,21 +2413,28 @@ msgstr ""
 "モードを使えないということでもなければこちらを使わない理由はありません。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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:"
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 "以下は中心サーバ + ワークステーション + シンクライアントサーバをグラフィカル"
 "モードでインストールした場合と、tjener の最初のブート、ワークステーションネッ"
 "トワーク及びシンクライアントネットワークでの PXE ブートのスクリーンショットで"
 "す:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "{{attachment:Installer_help.png}}"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "01-Installer_64bit_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -12018,6 +12033,11 @@ msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
 
+#, fuzzy
+#~| msgid "{{attachment:Installer_help.png}}"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
 #~ msgid "Select type of installation"
 #~ msgstr "インストールの選択"
 
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 23c97f5..350a51f 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-14 11:15+0000\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\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-"
@@ -1608,19 +1608,19 @@ msgstr "Installasjon og nedlastingsvalg"
 msgid "Installer boot menu on 64-bit Hardware"
 msgstr "Installasjons-oppstartmeny"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1628,7 +1628,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis> bruker en GTK-"
 "installasjon hvor du kan bruke musen."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
@@ -1638,7 +1638,7 @@ 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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
@@ -1650,7 +1650,7 @@ msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> viser en "
 "undermeny med flere detaljerte valg å velge mellom"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
@@ -1662,7 +1662,7 @@ 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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
@@ -1674,26 +1674,30 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> gir noen hint i bruk av "
 "installasjonsprosessen"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+"<^><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
@@ -1705,7 +1709,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1717,7 +1721,7 @@ msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> gjør dette "
 "installasjonsmediet til en redningsdisk for nødsituasjonsoppgaver."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1725,7 +1729,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> trenger en "
 "«preseed»-fil (for automatisk installasjon)."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1733,7 +1737,7 @@ msgstr ""
 "<emphasis role=\"strong\">Expert install</emphasis> gir tilgang til alle "
 "tilgjengelige spørsmål i klartekst."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1745,7 +1749,7 @@ msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> gjør dette "
 "installasjonsmediet til en redningsdisk for nødsituasjonsoppgaver."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
@@ -1763,19 +1767,19 @@ msgstr ""
 msgid "Installer boot menu on 32-bit Hardware"
 msgstr "Installasjons-oppstartmeny"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
@@ -1785,20 +1789,24 @@ msgstr ""
 msgid "Help screen"
 msgstr "Installasjons-hjelpeskjerm"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/01-Installer_boot_menu.png"
 msgid "./images/01c-Installer_help.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>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr "Installasjons-hjelpeskjerm"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This Help screen is self explaining and enables the <F>-keys on the "
+#| "keyboard for getting more detailed help on the topics described."
 msgid ""
-"This Help screen is self explaining and enables the <F>-keys on the "
-"keyboard for getting more detailed help on the topics described."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
 "Denne hjelpeskjermen er selvforklarende og gjør <F>-tastene på "
 "tastaturet i stand til å gi mer detaljert hjelp om de aktuelle emnene."
@@ -2516,21 +2524,28 @@ msgstr ""
 "er det all grunn til å bruke dette.   "
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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:"
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 "Disse skjermbildene gir en gjennomgang av en grafisk hovedtjener + "
 "arbeidsstasjon + tynnklient-tjenerinstallasjon, og hvordan det ser ut ved "
 "første oppstart av tjener, en PXE-start både på arbeidsstasjonens og "
 "tynnklientens nettverk:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "01-Installer_boot_menu.png"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "01-Installer_boot_menu.png"
+#| msgid "./images/01-Installer_boot_menu.png"
+msgid "01-Installer_64bit_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
@@ -12754,6 +12769,11 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#, fuzzy
+#~| msgid "01-Installer_boot_menu.png"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "01-Installer_boot_menu.png"
+
 #~ msgid "Select type of installation"
 #~ msgstr "Velg type installasjon"
 
@@ -12860,11 +12880,6 @@ msgstr ""
 #~ "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}}"
 #~ msgstr "./images/27-Tjener-KDE_Desktop.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 a1278df..e67ffc4 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-14 11:15+0000\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\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"
@@ -1596,19 +1596,19 @@ msgstr "Installatie- en downloadopties"
 msgid "Installer boot menu on 64-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>
+#. type: Attribute 'fileref' of: <article><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1616,7 +1616,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
@@ -1627,7 +1627,7 @@ msgstr ""
 "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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
@@ -1639,7 +1639,7 @@ msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> biedt een sub-"
 "menu met meer uitgebreide keuzemogelijkheden."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
@@ -1652,7 +1652,7 @@ msgstr ""
 "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>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
@@ -1664,25 +1664,29 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> geeft aanwijzingen bij het gebruik "
 "van het installatieprogramma. "
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+"<^><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
@@ -1694,7 +1698,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1706,7 +1710,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1715,7 +1719,7 @@ msgstr ""
 "bestand nodig waarmee een aantal configuratieopties aan het "
 "installatieprogramma doorgegeven worden. De grafische modus wordt gebruikt."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1723,7 +1727,7 @@ msgstr ""
 "<emphasis role=\"strong\">Expert install</emphasis> legt alle beschikbare "
 "vragen voor en gebruikt de tekstmodus."
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
@@ -1735,7 +1739,7 @@ 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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
@@ -1754,19 +1758,19 @@ msgstr ""
 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>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
@@ -1776,20 +1780,24 @@ msgstr ""
 msgid "Help screen"
 msgstr "Installatieprogramma - hulpscherm"
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr "Installatieprogramma - hulpscherm"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This Help screen is self explaining and enables the <F>-keys on the "
+#| "keyboard for getting more detailed help on the topics described."
 msgid ""
-"This Help screen is self explaining and enables the <F>-keys on the "
-"keyboard for getting more detailed help on the topics described."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
 "Dit hulp-scherm vraagt geen nadere uitleg. Het maakt de <F>-toetsen "
 "van het toetsenbord actief om meer uitgebreide hulp te krijgen in verband "
@@ -2528,10 +2536,17 @@ msgstr ""
 "grafische modus niet te gebruiken."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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:"
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 "Hier volgt dus een rondleiding langs enkele schermafdrukken van een "
 "grafische installatie van Hoofdserver + Werkstation + Thin-clientserver, van "
@@ -2539,9 +2554,11 @@ msgstr ""
 "van het scherm dat u ziet bij het opstarten via PXE van een computer op "
 "respectievelijk het netwerk voor werkstations en dat voor thin clients:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "01-Installer_64bit_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"
@@ -12932,6 +12949,9 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
 #~ msgid "Select type of installation"
 #~ msgstr "Een type van installatie kiezen"
 
@@ -13047,9 +13067,6 @@ msgstr ""
 #~ "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}}"
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 76f3cd2..ed15d98 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-14 11:15+0000\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\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-"
@@ -1276,90 +1276,93 @@ msgstr ""
 msgid "Installer boot menu on 64-bit Hardware"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/01-Installer_64bit_boot_menu.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "64-bit Installer boot menu"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer; see screenshot below."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "64-bit Installer advanced options screen 1"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
-msgstr ""
+"<^><emphasis role=\"strong\">Back..</emphasis> brings back to the main "
+"menu."
+msgstr "<emphasis role=\"strong\">Nazwa zwyczajowa</emphasis>"
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
 "to all available questions, mouse usable."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
 #| msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgid ""
@@ -1371,17 +1374,17 @@ msgstr "<emphasis role=\"strong\">Nazwa zwyczajowa</emphasis>"
 msgid "Installer boot menu on 32-bit Hardware"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "32-bit Installer boot menu"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
@@ -1389,20 +1392,20 @@ msgstr ""
 msgid "Help screen"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><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."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -1893,15 +1896,16 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "01-Installer_64bit_boot_menu.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -9358,5 +9362,10 @@ msgstr ""
 
 #, fuzzy
 #~| msgid "./images/23-Tjener-KDM_Login.png"
+#~ msgid "{{attachment:01-Installer_boot_menu.png}}"
+#~ msgstr "./images/23-Tjener-KDM_Login.png"
+
+#, fuzzy
+#~| msgid "./images/23-Tjener-KDM_Login.png"
 #~ msgid "{{attachment:27-Tjener-MATE_Desktop.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 c2b99f1..2321806 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-14 11:15+0000\n"
+"POT-Creation-Date: 2016-11-15 14:33+0100\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"
@@ -1149,86 +1149,87 @@ msgstr ""
 msgid "Installer boot menu on 64-bit Hardware"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01-Installer_64bit_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "64-bit Installer boot menu"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><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>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer; see screenshot below."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "64-bit Installer advanced options screen 1"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+"<^><emphasis role=\"strong\">Back..</emphasis> brings back to the main "
+"menu."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
 "to all available questions, mouse usable."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<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><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
@@ -1238,15 +1239,15 @@ msgstr ""
 msgid "Installer boot menu on 32-bit Hardware"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01b-Installer_32bit_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "32-bit Installer boot menu"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
 
@@ -1254,18 +1255,18 @@ msgstr ""
 msgid "Help screen"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01c-Installer_help.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><section><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."
+"<^> This Help screen is self explaining and enables the <F>-keys "
+"on the keyboard for getting more detailed help on the topics described."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -1756,13 +1757,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"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:"
+"So here is a screenshot tour through a graphical 64-bit 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:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "01-Installer_64bit_boot_menu.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 19c8018..81ba7e9 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -490,10 +490,10 @@
 
 <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_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.
+</title>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_64bit_boot_menu.png"/></imageobject><textobject><phrase>64-bit Installer boot menu</phrase></textobject></inlinemediaobject> 
+</para>
+<para> <emphasis role="strong">Graphical install</emphasis> uses the GTK installer where you can use the mouse.
 </para>
 <para> <emphasis role="strong">Install</emphasis> uses text mode.
 </para>
@@ -501,11 +501,11 @@
 </para>
 <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; 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/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><emphasis role="strong">Help</emphasis> gives some hints on using the installer; see screenshot below. 
+</para>
+<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>
+<para> <^><emphasis role="strong">Back..</emphasis> brings back to the main menu.
 </para>
 <para><emphasis role="strong">Graphical expert install</emphasis> gives access to all available questions, mouse usable.
 </para>
@@ -518,25 +518,25 @@
 <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">Automated install</emphasis> text mode; needs a preseed file.
-</para></entry></row></tbody></tgroup></informaltable>
+</para>
 </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>
+</title>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01b-Installer_32bit_boot_menu.png"/></imageobject><textobject><phrase>32-bit Installer boot menu</phrase></textobject></inlinemediaobject> 
+</para>
+<para> Explanations are similar to those for 64-bit hardware. 
+</para>
 </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>
+</title>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01c-Installer_help.png"/></imageobject><textobject><phrase>Installer help screen</phrase></textobject></inlinemediaobject> 
+</para>
+<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>
 </section>
 
 <section id="Installation--Additional_boot_parameters_for_installations">
@@ -747,9 +747,9 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </title>
 <para>The text mode and the graphical installation are functionally identical - only the appearance is different. The graphical mode offers the opportunity to use a mouse, and of course looks much nicer and more modern. Unless the hardware has trouble with the graphical mode, there is no reason not to use it.  
 </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>So here is a screenshot tour through a graphical 64-bit Main-Server + Workstation + Thin Client Server installation and how it looks at the first boot of the tjener, a PXE boot on the workstation network and on the thinclient network: 
 </para>
-<para>{{attachment:01-Installer_boot_menu.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_64bit_boot_menu.png"/></imageobject><textobject><phrase>01-Installer_64bit_boot_menu.png</phrase></textobject></inlinemediaobject> 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/02-select_a_language.png"/></imageobject><textobject><phrase>02-select_a_language.png</phrase></textobject></inlinemediaobject> 
 </para>

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



More information about the debian-edu-commits mailing list