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

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Sun Sep 18 13:27:00 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 3abe38d38eb639f0037a82dbb9415b6a4e9c8e80
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Sep 18 15:26:47 2016 +0200

    Update Debian Edu Stretch manual and images from the wiki.
---
 debian/changelog                                   |   1 +
 .../debian-edu-stretch-manual.da.po                | 147 ++++++++++----
 .../debian-edu-stretch-manual.de.po                | 180 +++++++++++------
 .../debian-edu-stretch-manual.es.po                | 156 ++++++++++-----
 .../debian-edu-stretch-manual.fr.po                | 173 +++++++++-------
 .../debian-edu-stretch-manual.it.po                | 172 +++++++++-------
 .../debian-edu-stretch-manual.ja.po                | 151 +++++++++++---
 .../debian-edu-stretch-manual.nb.po                | 172 +++++++++-------
 .../debian-edu-stretch-manual.nl.po                | 222 +++++++++++----------
 .../debian-edu-stretch-manual.pot                  |  94 ++++++---
 .../debian-edu-stretch-manual.xml                  |  24 +--
 .../debian-edu-stretch/images/de/worldmap.png      | Bin 383526 -> 383460 bytes
 .../debian-edu-stretch/images/es/worldmap.png      | Bin 383614 -> 383619 bytes
 .../debian-edu-stretch/images/fr/worldmap.png      | Bin 383537 -> 383543 bytes
 .../debian-edu-stretch/images/worldmap.png         | Bin 383526 -> 383533 bytes
 15 files changed, 965 insertions(+), 527 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a4b50ae..7d47dde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ debian-edu-doc (1.906~20160911) UNRELEASED; urgency=medium
   [ Wolfgang Schweer ]
   * Add still valid (en|de|es|fr) image files.
   * Update Debian Edu Jessie manual from the wiki.
+  * Update Debian Edu Stretch manual and images from the wiki.
 
  -- Holger Levsen <holger at debian.org>  Sun, 11 Sep 2016 00:32:38 +0200
 
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 90fc805..371680e 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-jessie-manual\n"
-"POT-Creation-Date: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 15:24+0200\n"
 "PO-Revision-Date: 2015-05-25 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -184,12 +184,18 @@ msgstr ""
 msgid "Network"
 msgstr "Netværk"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Debian_Edu_Network_Jessie.png"
-msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+msgid "./images/Debian_Edu_Network_Stretch.png"
 msgstr "./images/Debian_Edu_Network_Jessie.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "The default network setup"
+msgid "The Debian Edu network topology"
+msgstr "Netværkets standardopsætning"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2875,11 +2881,15 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "GOsa²-logind samt overblik"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/gosa2_overview.png"
-msgid "{{attachment:gosa2_overview.png}}"
-msgstr "./images/gosa2_overview.png"
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3100,11 +3110,15 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Søg, ændr og slet brugere"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/filterbox.png"
-msgid "{{attachment:filterbox.png}}"
-msgstr "./images/filterbox.png"
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3144,11 +3158,17 @@ msgstr ""
 "ændre adgangskoden for brugeren og ændre listen over grupper som brugeren er "
 "medlem af."
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/edit_user.png"
-msgid "{{attachment:edit_user.png}}"
-msgstr "./images/edit_user.png"
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Adding users"
+msgid "Editing user data"
+msgstr "Tilføje brugere"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3200,12 +3220,18 @@ msgid ""
 msgstr ""
 "på den efterfølgende side kan du angive en ny adgangskode valgt af dig selv"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/change_password_administratively.png"
-msgid "{{attachment:change_password_administratively.png}}"
+msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Set passwords"
+msgid "Set user password"
+msgstr "Angiv adgangskoder"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3316,17 +3342,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppehåndtering med GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/create_group.png"
-msgid "{{attachment:create_group.png}}"
-msgstr "./images/create_group.png"
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/list_groups.png"
-msgid "{{attachment:list_groups.png}}"
-msgstr "./images/list_groups.png"
+#| msgid "./images/alert.png"
+msgid "./images/list_groups.png"
+msgstr "./images/alert.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3513,30 +3543,46 @@ msgstr ""
 "Forbindelse til LDAP som cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "indtast adgangskode:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_list.png"
-msgid "{{attachment:gosa_systems_list.png}}"
+msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_host_details.png"
-msgid "{{attachment:gosa_systems_host_details.png}}"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_edit_host.png"
-msgid "{{attachment:gosa_systems_edit_host.png}}"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_add_netgroup.png"
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4080,10 +4126,16 @@ msgstr ""
 "(vedligeholdelse) i menuen på siden for sikkerhedskopiering og vælg det "
 "ældste øjebliksbillede du ønsker at bevare:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/slbackup-php_maintenance.png"
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
+msgstr "./images/slbackup-php_maintenance.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/slbackup-php_maintenance.png"
+msgid "slbackup-php Maintenance"
 msgstr "./images/slbackup-php_maintenance.png"
 
 #. type: Content of: <article><section><section><title>
@@ -12727,6 +12779,31 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#, fuzzy
+#~| msgid "./images/gosa2_overview.png"
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "./images/gosa2_overview.png"
+
+#, fuzzy
+#~| msgid "./images/filterbox.png"
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "./images/filterbox.png"
+
+#, fuzzy
+#~| msgid "./images/edit_user.png"
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "./images/edit_user.png"
+
+#, fuzzy
+#~| msgid "./images/create_group.png"
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "./images/create_group.png"
+
+#, fuzzy
+#~| msgid "./images/list_groups.png"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "./images/list_groups.png"
+
 #~ msgid "None yet."
 #~ msgstr "Ingen endnu."
 
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 12ab15b..aaa4996 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 15:24+0200\n"
 "PO-Revision-Date: 2016-09-18 13:45+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -190,10 +190,16 @@ msgstr ""
 msgid "Network"
 msgstr "Netzwerk"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+msgid "./images/Debian_Edu_Network_Stretch.png"
 msgstr "{{attachment:Debian_Edu_Network_Stretch.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "The Debian Edu network topology"
+msgstr "Die Struktur des Debian-Edu-Netzwerks"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2798,9 +2804,15 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "GOsa²-Anmeldung und Übersicht"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:gosa2_overview.png}}"
-msgstr "{{attachment:gosa2_overview.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr "Übersichtsseite von GOsa² nach der Anmeldung als Erstbenutzer"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3012,9 +3024,15 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Benutzer suchen, modifizieren und löschen"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:filterbox.png}}"
-msgstr "{{attachment:filterbox.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr "Filterbox"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3056,9 +3074,15 @@ msgstr ""
 "einem Benutzer gehören, modifizieren können; dort kann auch das Passwort und "
 "die Zugehörigkeit zu Gruppen geändert werden."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:edit_user.png}}"
-msgstr "{{attachment:edit_user.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Benutzerdaten bearbeiten"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3114,10 +3138,16 @@ msgstr ""
 "auf der anschließend gezeigten Seite können Sie ein selbst gewähltes "
 "Passwort setzen."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:change_password_administratively.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:change_password_administratively.png}}"
+msgid "./images/change_password_administratively.png"
 msgstr "{{attachment:change_password_administratively.png}}"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Set user password"
+msgstr "Passwort setzen "
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3231,13 +3261,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppen mit GOsa² verwalten"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:create_group.png}}"
-msgstr "{{attachment:create_group.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:list_groups.png}}"
-msgstr "{{attachment:list_groups.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "Gruppe einrichten"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/list_groups.png"
+msgstr "./images/alert.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3429,22 +3467,46 @@ msgstr ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_list.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:gosa_systems_list.png}}"
+msgid "./images/gosa_systems_list.png"
 msgstr "{{attachment:gosa_systems_list.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_host_details.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr "GOsa² Liste der Systeme"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:gosa_systems_host_details.png}}"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "{{attachment:gosa_systems_host_details.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_edit_host.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr "Host Details"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:gosa_systems_edit_host.png}}"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "{{attachment:gosa_systems_edit_host.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr "Host bearbeiten"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr "Netgroup hinzufügen"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4003,10 +4065,16 @@ msgstr ""
 "»Wartung« (Maintenance) im Menü auf der Backup-Seite und wählen dort den "
 "ältesten zu bewahrenden Zustand (snapshot):"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "slbackup-php Maintenance"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Serverüberwachung (Monitoring)"
@@ -10162,8 +10230,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 "
@@ -12676,6 +12744,21 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "{{attachment:gosa2_overview.png}}"
+
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "{{attachment:filterbox.png}}"
+
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "{{attachment:edit_user.png}}"
+
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "{{attachment:create_group.png}}"
+
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "{{attachment:list_groups.png}}"
+
 #~ msgid "None yet."
 #~ msgstr "Bisher keine."
 
@@ -12694,9 +12777,6 @@ msgstr ""
 #~ msgid "Debian Edu login"
 #~ msgstr "Debian-Edu Anmeldung"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "Die Struktur des Debian-Edu-Netzwerks"
-
 #~ msgid ""
 #~ "Sources are available from the Debian archive, see <ulink url=\"http://"
 #~ "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
@@ -12817,36 +12897,6 @@ msgstr ""
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "Debian-Edu KDE-Desktop"
 
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr "Übersichtsseite von GOsa² nach der Anmeldung als Erstbenutzer"
-
-#~ msgid "Filterbox"
-#~ msgstr "Filterbox"
-
-#~ msgid "Editing user data"
-#~ msgstr "Benutzerdaten bearbeiten"
-
-#~ msgid "Set user password"
-#~ msgstr "Passwort setzen "
-
-#~ msgid "create group"
-#~ msgstr "Gruppe einrichten"
-
-#~ msgid "GOsa² systems listing"
-#~ msgstr "GOsa² Liste der Systeme"
-
-#~ msgid "Host details"
-#~ msgstr "Host Details"
-
-#~ msgid "Modify host"
-#~ msgstr "Host bearbeiten"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Netgroup hinzufügen"
-
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "slbackup-php Maintenance"
-
 #~ msgid ""
 #~ "Remove diversion; the postinst from <computeroutput>debian-edu-config</"
 #~ "computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
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 72900fa..e1db3d6 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-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 15:24+0200\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"
@@ -204,12 +204,16 @@ msgstr ""
 msgid "Network"
 msgstr "Red"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Debian_Edu_Network_Jessie.png"
-msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+msgid "./images/Debian_Edu_Network_Stretch.png"
 msgstr "./images/Debian_Edu_Network_Jessie.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "The Debian Edu network topology"
+msgstr "La Topología de red de Debian Edu"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2871,11 +2875,15 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/gosa2_overview.png"
-msgid "{{attachment:gosa2_overview.png}}"
-msgstr "./images/gosa2_overview.png"
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3046,11 +3054,15 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Buscar, modificar y borrar usuarios"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/filterbox.png"
-msgid "{{attachment:filterbox.png}}"
-msgstr "./images/filterbox.png"
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr "Filterbox"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3080,11 +3092,15 @@ msgstr ""
 "al usuario directamente, cambiar su contraseña y modificar la lista de "
 "grupos a los que pertenece."
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/edit_user.png"
-msgid "{{attachment:edit_user.png}}"
-msgstr "./images/edit_user.png"
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Editar datos de usuarios"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3136,12 +3152,16 @@ msgid ""
 "yourself"
 msgstr "En la siguiente página, puede escribir la nueva contraseña"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/change_password_administratively.png"
-msgid "{{attachment:change_password_administratively.png}}"
+msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Set user password"
+msgstr "Establecer contraseñas de usuario"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3251,17 +3271,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestión de usuarios con GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/create_group.png"
-msgid "{{attachment:create_group.png}}"
-msgstr "./images/create_group.png"
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "crear un grupo"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/list_groups.png"
-msgid "{{attachment:list_groups.png}}"
-msgstr "./images/list_groups.png"
+#| msgid "./images/alert.png"
+msgid "./images/list_groups.png"
+msgstr "./images/alert.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3408,30 +3432,46 @@ msgstr ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_list.png"
-msgid "{{attachment:gosa_systems_list.png}}"
+msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_host_details.png"
-msgid "{{attachment:gosa_systems_host_details.png}}"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_edit_host.png"
-msgid "{{attachment:gosa_systems_edit_host.png}}"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_add_netgroup.png"
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -3859,10 +3899,16 @@ msgstr ""
 "menú de la página respaldo y seleccione la instantánea más vieja que desee "
 "conservar:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "slbackup-php Maintenance"
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
+msgstr "Mantenimiento de slbackup-php"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "slbackup-php Maintenance"
+msgid "slbackup-php Maintenance"
 msgstr "Mantenimiento de slbackup-php"
 
 #. type: Content of: <article><section><section><title>
@@ -10777,6 +10823,31 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #, fuzzy
+#~| msgid "./images/gosa2_overview.png"
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "./images/gosa2_overview.png"
+
+#, fuzzy
+#~| msgid "./images/filterbox.png"
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "./images/filterbox.png"
+
+#, fuzzy
+#~| msgid "./images/edit_user.png"
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "./images/edit_user.png"
+
+#, fuzzy
+#~| msgid "./images/create_group.png"
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "./images/create_group.png"
+
+#, fuzzy
+#~| msgid "./images/list_groups.png"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "./images/list_groups.png"
+
+#, fuzzy
 #~| msgid "Manual for Debian Edu 8.0+edu0 Codename Jessie"
 #~ msgid "Manual for Debian Edu 9+edu0 Codename \"Stretch\""
 #~ msgstr "Manual para Debian-Edu 8.0+edu0 nombre código \"Jessie\""
@@ -10784,9 +10855,6 @@ msgstr ""
 #~ msgid "Debian Edu login"
 #~ msgstr "Inicio de sesión de Debian Edu"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "La Topología de red de Debian Edu"
-
 #~ msgid "Installer boot menu"
 #~ msgstr "Menú de carga del instalador"
 
@@ -10820,18 +10888,6 @@ msgstr ""
 #~ msgid "Diskless Workstation Login"
 #~ msgstr "Inicio de sesión de estaciones sin disco"
 
-#~ msgid "Filterbox"
-#~ msgstr "Filterbox"
-
-#~ msgid "Editing user data"
-#~ msgstr "Editar datos de usuarios"
-
-#~ msgid "Set user password"
-#~ msgstr "Establecer contraseñas de usuario"
-
-#~ msgid "create group"
-#~ msgstr "crear un grupo"
-
 #, fuzzy
 #~| msgid "apt-get install killer"
 #~ msgid "apt-get -y install killer"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index cdd1c0b..34c4657 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-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 15:24+0200\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"
@@ -190,12 +190,16 @@ msgstr ""
 msgid "Network"
 msgstr "Réseau"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Debian_Edu_Network_Jessie.png"
-msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+msgid "./images/Debian_Edu_Network_Stretch.png"
 msgstr "./images/Debian_Edu_Network_Jessie.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "The Debian Edu network topology"
+msgstr "Topologie du réseau Debian Edu"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2963,11 +2967,15 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "Connexion à GOsa² et aperçu"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/gosa2_overview.png"
-msgid "{{attachment:gosa2_overview.png}}"
-msgstr "./images/gosa2_overview.png"
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr "Page d'aperçu de GOsa² après connexion en tant que premier utilisateur"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3194,11 +3202,15 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Rechercher, modifier et supprimer des utilisateurs"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/filterbox.png"
-msgid "{{attachment:filterbox.png}}"
-msgstr "./images/filterbox.png"
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr "Boîte de filtre"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3240,11 +3252,15 @@ msgstr ""
 "informations relatives à un utilisateur, changer son mot de passe et "
 "modifier la liste des groupes auxquels il appartient."
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/edit_user.png"
-msgid "{{attachment:edit_user.png}}"
-msgstr "./images/edit_user.png"
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Modifier les données d'utilisateur"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3298,12 +3314,16 @@ msgstr ""
 "Sur la page présentée, vous pouvez définir un nouveau mot de passe choisi "
 "par vous-même."
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/change_password_administratively.png"
-msgid "{{attachment:change_password_administratively.png}}"
+msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Set user password"
+msgstr "Définir le mot de passe utilisateur"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3416,17 +3436,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestion des groupes avec GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/create_group.png"
-msgid "{{attachment:create_group.png}}"
-msgstr "./images/create_group.png"
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "Créer un groupe"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/list_groups.png"
-msgid "{{attachment:list_groups.png}}"
-msgstr "./images/list_groups.png"
+#| msgid "./images/alert.png"
+msgid "./images/list_groups.png"
+msgstr "./images/alert.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3621,30 +3645,46 @@ msgstr ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_list.png"
-msgid "{{attachment:gosa_systems_list.png}}"
+msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr "Liste des systèmes dans GOsa²"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_host_details.png"
-msgid "{{attachment:gosa_systems_host_details.png}}"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr "Renseignements sur le système"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_edit_host.png"
-msgid "{{attachment:gosa_systems_edit_host.png}}"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr "Modification du système"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_add_netgroup.png"
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr "Ajout de groupe réseau"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4210,12 +4250,16 @@ msgstr ""
 "« Maintenance » dans le menu de la page des sauvegarde et choisissez le "
 "dernier instantané à garder :"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/slbackup-php_maintenance.png"
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Maintenance de slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Surveillance des serveurs"
@@ -13136,6 +13180,31 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#, fuzzy
+#~| msgid "./images/gosa2_overview.png"
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "./images/gosa2_overview.png"
+
+#, fuzzy
+#~| msgid "./images/filterbox.png"
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "./images/filterbox.png"
+
+#, fuzzy
+#~| msgid "./images/edit_user.png"
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "./images/edit_user.png"
+
+#, fuzzy
+#~| msgid "./images/create_group.png"
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "./images/create_group.png"
+
+#, fuzzy
+#~| msgid "./images/list_groups.png"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "./images/list_groups.png"
+
 #~ msgid "None yet."
 #~ msgstr "Aucun pour le moment."
 
@@ -13153,9 +13222,6 @@ msgstr ""
 #~ msgid "Debian Edu login"
 #~ msgstr "Connexion à Debian Edu"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "Topologie du réseau Debian Edu"
-
 #~ msgid ""
 #~ "Sources are available from the Debian archive, see <ulink url=\"http://"
 #~ "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
@@ -13276,37 +13342,6 @@ msgstr ""
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "bureau Debian Edu KDE"
 
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr ""
-#~ "Page d'aperçu de GOsa² après connexion en tant que premier utilisateur"
-
-#~ msgid "Filterbox"
-#~ msgstr "Boîte de filtre"
-
-#~ msgid "Editing user data"
-#~ msgstr "Modifier les données d'utilisateur"
-
-#~ msgid "Set user password"
-#~ msgstr "Définir le mot de passe utilisateur"
-
-#~ msgid "create group"
-#~ msgstr "Créer un groupe"
-
-#~ msgid "GOsa² systems listing"
-#~ msgstr "Liste des systèmes dans GOsa²"
-
-#~ msgid "Host details"
-#~ msgstr "Renseignements sur le système"
-
-#~ msgid "Modify host"
-#~ msgstr "Modification du système"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Ajout de groupe réseau"
-
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Maintenance de slbackup-php"
-
 #~ msgid ""
 #~ "Remove diversion; the postinst from <computeroutput>debian-edu-config</"
 #~ "computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
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 928046b..e004cea 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-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 15:24+0200\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"
@@ -186,12 +186,16 @@ msgstr ""
 msgid "Network"
 msgstr "La rete"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Debian_Edu_Network_Jessie.png"
-msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+msgid "./images/Debian_Edu_Network_Stretch.png"
 msgstr "./images/Debian_Edu_Network_Jessie.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "The Debian Edu network topology"
+msgstr "La topologia della rete Debian Edu"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2916,11 +2920,15 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "Accesso a GOsa² e pagina iniziale"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/gosa2_overview.png"
-msgid "{{attachment:gosa2_overview.png}}"
-msgstr "./images/gosa2_overview.png"
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr "Pagina di GOsa² dopo il login come primo utente"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3145,11 +3153,15 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Cercare, modificare e cancellare utenti"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/filterbox.png"
-msgid "{{attachment:filterbox.png}}"
-msgstr "./images/filterbox.png"
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr "Il riquadro dei filtri"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3191,11 +3203,15 @@ msgstr ""
 "informazioni dell'utente come cambiare la password dell'utente o modificare "
 "la lista dei gruppi ai quali appartiene."
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/edit_user.png"
-msgid "{{attachment:edit_user.png}}"
-msgstr "./images/edit_user.png"
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Modificare i dati utente"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3247,12 +3263,16 @@ msgstr ""
 "nella pagina che si presenta è possibile impostare una nuova password a "
 "propria scelta"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/change_password_administratively.png"
-msgid "{{attachment:change_password_administratively.png}}"
+msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Set user password"
+msgstr "Configurare la password dell'utente"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3364,17 +3384,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestione dei gruppi con GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/create_group.png"
-msgid "{{attachment:create_group.png}}"
-msgstr "./images/create_group.png"
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "creare il gruppo"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/list_groups.png"
-msgid "{{attachment:list_groups.png}}"
-msgstr "./images/list_groups.png"
+#| msgid "./images/alert.png"
+msgid "./images/list_groups.png"
+msgstr "./images/alert.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3567,30 +3591,46 @@ msgstr ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_list.png"
-msgid "{{attachment:gosa_systems_list.png}}"
+msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr "Elenco dei sistemi di GOsa²"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_host_details.png"
-msgid "{{attachment:gosa_systems_host_details.png}}"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr "Dettagli dell'host"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_edit_host.png"
-msgid "{{attachment:gosa_systems_edit_host.png}}"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr "Modificare host"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_add_netgroup.png"
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr "Aggiungere gruppi di rete (netgroup)"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4140,12 +4180,16 @@ msgstr ""
 "Se si desidera eliminare vecchi backup, scegliere \"Maintenance\" nel menu "
 "della pagina di backup e selezionare l'istantanea più vecchia da conservare:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/slbackup-php_maintenance.png"
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Manutenzione di slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Monitorare il server"
@@ -12877,6 +12921,31 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#, fuzzy
+#~| msgid "./images/gosa2_overview.png"
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "./images/gosa2_overview.png"
+
+#, fuzzy
+#~| msgid "./images/filterbox.png"
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "./images/filterbox.png"
+
+#, fuzzy
+#~| msgid "./images/edit_user.png"
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "./images/edit_user.png"
+
+#, fuzzy
+#~| msgid "./images/create_group.png"
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "./images/create_group.png"
+
+#, fuzzy
+#~| msgid "./images/list_groups.png"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "./images/list_groups.png"
+
 #~ msgid "None yet."
 #~ msgstr "None yet."
 
@@ -12893,9 +12962,6 @@ msgstr ""
 #~ msgid "Debian Edu login"
 #~ msgstr "Login di Debian Edu"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "La topologia della rete Debian Edu"
-
 #~ msgid ""
 #~ "Sources are available from the Debian archive, see <ulink url=\"http://"
 #~ "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
@@ -13016,36 +13082,6 @@ msgstr ""
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "Desktop KDE di Debian Edu"
 
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr "Pagina di GOsa² dopo il login come primo utente"
-
-#~ msgid "Filterbox"
-#~ msgstr "Il riquadro dei filtri"
-
-#~ msgid "Editing user data"
-#~ msgstr "Modificare i dati utente"
-
-#~ msgid "Set user password"
-#~ msgstr "Configurare la password dell'utente"
-
-#~ msgid "create group"
-#~ msgstr "creare il gruppo"
-
-#~ msgid "GOsa² systems listing"
-#~ msgstr "Elenco dei sistemi di GOsa²"
-
-#~ msgid "Host details"
-#~ msgstr "Dettagli dell'host"
-
-#~ msgid "Modify host"
-#~ msgstr "Modificare host"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Aggiungere gruppi di rete (netgroup)"
-
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Manutenzione di slbackup-php"
-
 #~ msgid ""
 #~ "Remove diversion; the postinst from <computeroutput>debian-edu-config</"
 #~ "computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
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 75c0681..83fe5ac 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-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 15:24+0200\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"
@@ -169,10 +169,18 @@ msgstr ""
 msgid "Network"
 msgstr "ネットワーク"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+msgid "./images/Debian_Edu_Network_Stretch.png"
 msgstr "{{attachment:Debian_Edu_Network_Stretch.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "The default network setup"
+msgid "The Debian Edu network topology"
+msgstr "デフォルトのネットワーク設定"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2688,9 +2696,15 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "GOsa² のログインと概要"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:gosa2_overview.png}}"
-msgstr "{{attachment:gosa2_overview.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -2888,9 +2902,15 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "ユーザの検索、変更、削除"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:filterbox.png}}"
-msgstr "{{attachment:filterbox.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2928,9 +2948,17 @@ msgstr ""
 "ユーザに関する情報を直接変更できる新しいページが表示されます。ユーザのパス"
 "ワードを変更し、ユーザの所属グループ一覧を変更します。"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:edit_user.png}}"
-msgstr "{{attachment:edit_user.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Adding users"
+msgid "Editing user data"
+msgstr "ユーザの追加"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -2979,10 +3007,18 @@ msgid ""
 "yourself"
 msgstr "次に表示されるページでそのユーザの新しいパスワードを設定できます"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:change_password_administratively.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:change_password_administratively.png}}"
+msgid "./images/change_password_administratively.png"
 msgstr "{{attachment:change_password_administratively.png}}"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Set passwords"
+msgid "Set user password"
+msgstr "パスワード設定"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3090,13 +3126,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "GOsa² によるグループ管理"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:create_group.png}}"
-msgstr "{{attachment:create_group.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:list_groups.png}}"
-msgstr "{{attachment:list_groups.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/list_groups.png"
+msgstr "./images/alert.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3282,22 +3326,46 @@ msgstr ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_list.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:gosa_systems_list.png}}"
+msgid "./images/gosa_systems_list.png"
 msgstr "{{attachment:gosa_systems_list.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_host_details.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:gosa_systems_host_details.png}}"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "{{attachment:gosa_systems_host_details.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_edit_host.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:gosa_systems_edit_host.png}}"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "{{attachment:gosa_systems_edit_host.png}}"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -3834,8 +3902,16 @@ msgstr ""
 "古いバックアップを消してしまいたい場合はバックアップページのメニューから"
 "「Maintenance」を選択して残しておく最古のスナップショットを選択します:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
+msgstr "{{attachment:slbackup-php_maintenance.png}}"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "slbackup-php Maintenance"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
 #. type: Content of: <article><section><section><title>
@@ -11844,3 +11920,18 @@ msgid ""
 msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
+
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "{{attachment:gosa2_overview.png}}"
+
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "{{attachment:filterbox.png}}"
+
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "{{attachment:edit_user.png}}"
+
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "{{attachment:create_group.png}}"
+
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "{{attachment:list_groups.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index 6c6015c..cf1fae4 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-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 15:24+0200\n"
 "PO-Revision-Date: 2015-06-02 12:58+0000\n"
 "Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -196,12 +196,16 @@ msgstr ""
 msgid "Network"
 msgstr "Nettverk"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Debian_Edu_Network_Jessie.png"
-msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+msgid "./images/Debian_Edu_Network_Stretch.png"
 msgstr "./images/Debian_Edu_Network_Jessie.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "The Debian Edu network topology"
+msgstr "Nettverket Debian Edu sitt oppsett"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2889,11 +2893,15 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "GOsa² Login pluss oversikt"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/gosa2_overview.png"
-msgid "{{attachment:gosa2_overview.png}}"
-msgstr "./images/gosa2_overview.png"
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr "GOsa² oversiktsside etter innlogging, som den første brukeren"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3109,11 +3117,15 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Søk etter og slett brukere"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/filterbox.png"
-msgid "{{attachment:filterbox.png}}"
-msgstr "./images/filterbox.png"
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr "Filterbox"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3154,11 +3166,15 @@ msgstr ""
 "bruker, endre passordet til brukeren, og endre listen over grupper som "
 "brukeren tilhører."
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/edit_user.png"
-msgid "{{attachment:edit_user.png}}"
-msgstr "./images/edit_user.png"
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Legge til brukere"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3212,12 +3228,16 @@ msgid ""
 msgstr ""
 "På den påfølgende siden kan du sette et nytt passord som du selv velger."
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/change_password_administratively.png"
-msgid "{{attachment:change_password_administratively.png}}"
+msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Set user password"
+msgstr "Sett brukerpassord"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3329,17 +3349,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppeadministrasjon med GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/create_group.png"
-msgid "{{attachment:create_group.png}}"
-msgstr "./images/create_group.png"
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "lag gruppe"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/list_groups.png"
-msgid "{{attachment:list_groups.png}}"
-msgstr "./images/list_groups.png"
+#| msgid "./images/alert.png"
+msgid "./images/list_groups.png"
+msgstr "./images/alert.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3522,30 +3546,46 @@ msgstr ""
 "Tilkobling til LDAP som cn=admin, ou=ldap-access, dc=skole, dc = skolelinux, dc=no\n"
 "oppgi passord:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_list.png"
-msgid "{{attachment:gosa_systems_list.png}}"
+msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr "Systemopplisting i "
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_host_details.png"
-msgid "{{attachment:gosa_systems_host_details.png}}"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr "Maskindetaljer"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_edit_host.png"
-msgid "{{attachment:gosa_systems_edit_host.png}}"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr "Endre maskindetaljer"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/gosa_systems_add_netgroup.png"
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr "Legg til nettgruppe"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4086,12 +4126,16 @@ msgstr ""
 "Hvis du ønsker å kvitte deg med eldre sikkerhetskopier, velg «Vedlikehold» i "
 "menyen på sikkerhetskopi-siden, og velg å beholde det eldste øyeblikksbildet:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/slbackup-php_maintenance.png"
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "slbackup-php Vedlikehold"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Tjenerovervåkning"
@@ -12727,6 +12771,31 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#, fuzzy
+#~| msgid "./images/gosa2_overview.png"
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "./images/gosa2_overview.png"
+
+#, fuzzy
+#~| msgid "./images/filterbox.png"
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "./images/filterbox.png"
+
+#, fuzzy
+#~| msgid "./images/edit_user.png"
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "./images/edit_user.png"
+
+#, fuzzy
+#~| msgid "./images/create_group.png"
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "./images/create_group.png"
+
+#, fuzzy
+#~| msgid "./images/list_groups.png"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "./images/list_groups.png"
+
 #~ msgid "None yet."
 #~ msgstr "Ingen kjente ennå."
 
@@ -12744,9 +12813,6 @@ msgstr ""
 #~ msgid "Debian Edu login"
 #~ msgstr "Skolelinux innlogging"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "Nettverket Debian Edu sitt oppsett"
-
 #, fuzzy
 #~| msgid ""
 #~| "Sources are available from the Debian archive, see <ulink url=\"http://"
@@ -12870,36 +12936,6 @@ msgstr ""
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "Debian Edu KDE desktop"
 
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr "GOsa² oversiktsside etter innlogging, som den første brukeren"
-
-#~ msgid "Filterbox"
-#~ msgstr "Filterbox"
-
-#~ msgid "Editing user data"
-#~ msgstr "Legge til brukere"
-
-#~ msgid "Set user password"
-#~ msgstr "Sett brukerpassord"
-
-#~ msgid "create group"
-#~ msgstr "lag gruppe"
-
-#~ msgid "GOsa² systems listing"
-#~ msgstr "Systemopplisting i "
-
-#~ msgid "Host details"
-#~ msgstr "Maskindetaljer"
-
-#~ msgid "Modify host"
-#~ msgstr "Endre maskindetaljer"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Legg til nettgruppe"
-
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "slbackup-php Vedlikehold"
-
 #~ msgid ""
 #~ "Remove diversion; the postinst from <computeroutput>debian-edu-config</"
 #~ "computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
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 50408f4..f270309 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-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 15:24+0200\n"
 "PO-Revision-Date: 2016-09-10 21:10+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -177,9 +177,15 @@ msgstr ""
 msgid "Network"
 msgstr "Het netwerk"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
-msgstr "{{attachment:Debian_Edu_Network_Stretch.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/Debian_Edu_Network_Jessie.png"
+msgid "./images/Debian_Edu_Network_Stretch.png"
+msgstr "./images/Debian_Edu_Network_Jessie.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "The Debian Edu network topology"
+msgstr "Netwerktopologie van Debian Edu"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -2859,9 +2865,13 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "Zich aanmelden bij GOsa² en de overzichtspagina"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:gosa2_overview.png}}"
-msgstr "{{attachment:gosa2_overview.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa2_overview.png"
+msgstr "./images/gosa2_overview.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr "Overzichtspagina van GOsa² na het aanmelden als de eerste gebruiker"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3084,9 +3094,13 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Opzoeken, wijzigen en verwijderen van gebruikers"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:filterbox.png}}"
-msgstr "{{attachment:filterbox.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/filterbox.png"
+msgstr "./images/filterbox.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr "Filterkader"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3130,9 +3144,13 @@ msgstr ""
 "rechtstreeks kunt bewerken, zijn wachtwoord kunt wijzigen en wijzigingen "
 "kunt aanbrengen in de lijst van groepen waarvan hij lid is,"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:edit_user.png}}"
-msgstr "{{attachment:edit_user.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/edit_user.png"
+msgstr "./images/edit_user.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Gebruikersgegevens bewerken"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3190,9 +3208,13 @@ msgstr ""
 "op het scherm dat daarop verschijnt, kunt u een nieuw door uzelf gekozen "
 "wachtwoord instellen"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:change_password_administratively.png}}"
-msgstr "{{attachment:change_password_administratively.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/change_password_administratively.png"
+msgstr "./images/change_password_administratively.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Set user password"
+msgstr "Een gebruikerswachtwoord aanmaken"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3305,13 +3327,17 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Het beheer van groepen met GOsa²"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:create_group.png}}"
-msgstr "{{attachment:create_group.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/create_group.png"
+msgstr "./images/create_group.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:list_groups.png}}"
-msgstr "{{attachment:list_groups.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "een groep aanmaken"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/list_groups.png"
+msgstr "./images/list_groups.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3509,21 +3535,37 @@ msgstr ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_list.png}}"
-msgstr "{{attachment:gosa_systems_list.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa_systems_list.png"
+msgstr "./images/gosa_systems_list.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_host_details.png}}"
-msgstr "{{attachment:gosa_systems_host_details.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr "Een lijst van systemen in GOsa²"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_edit_host.png}}"
-msgstr "{{attachment:gosa_systems_edit_host.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa_systems_host_details.png"
+msgstr "./images/gosa_systems_host_details.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
-msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr "Meer bijzonderheden over een systeem"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa_systems_edit_host.png"
+msgstr "./images/gosa_systems_edit_host.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr "Aanpassingen aan een systeem"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa_systems_add_netgroup.png"
+msgstr "./images/gosa_systems_add_netgroup.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr "Een netgroep toevoegen"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4093,10 +4135,16 @@ msgstr ""
 "webpagina van de back-updienst het item \"Onderhoud.\" Geef vervolgens op "
 "welke de oudste back-up is die u wenst te behouden:"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:slbackup-php_maintenance.png}}"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "{{attachment:slbackup-php_maintenance.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Beheer van slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Servers opvolgen"
@@ -9922,9 +9970,6 @@ msgid "Known issues"
 msgstr "Bekende problemen"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Stretch\"/> is a wiki and updated frequently."
 msgid ""
 "see <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Stretch#\">the "
 "Debian Edu Stretch status page</ulink>."
@@ -12935,6 +12980,39 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+#~ msgstr "{{attachment:Debian_Edu_Network_Stretch.png}}"
+
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "{{attachment:gosa2_overview.png}}"
+
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "{{attachment:filterbox.png}}"
+
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "{{attachment:edit_user.png}}"
+
+#~ msgid "{{attachment:change_password_administratively.png}}"
+#~ msgstr "{{attachment:change_password_administratively.png}}"
+
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "{{attachment:create_group.png}}"
+
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "{{attachment:list_groups.png}}"
+
+#~ msgid "{{attachment:gosa_systems_list.png}}"
+#~ msgstr "{{attachment:gosa_systems_list.png}}"
+
+#~ msgid "{{attachment:gosa_systems_host_details.png}}"
+#~ msgstr "{{attachment:gosa_systems_host_details.png}}"
+
+#~ msgid "{{attachment:gosa_systems_edit_host.png}}"
+#~ msgstr "{{attachment:gosa_systems_edit_host.png}}"
+
+#~ msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+#~ msgstr "{{attachment:gosa_systems_add_netgroup.png}}"
+
 #~ msgid "None yet."
 #~ msgstr "Nog niet."
 
@@ -12961,12 +13039,6 @@ msgstr ""
 #~ msgid "Debian Edu login"
 #~ msgstr "Aanmelden bij Debian Edu"
 
-#~ msgid "./images/Debian_Edu_Network_Jessie.png"
-#~ msgstr "./images/Debian_Edu_Network_Jessie.png"
-
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "Netwerktopologie van Debian Edu"
-
 #~ msgid ""
 #~ "Sources are available from the Debian archive, see <ulink url=\"http://"
 #~ "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
@@ -13194,66 +13266,6 @@ msgstr ""
 #~ msgid "Debian Edu KDE desktop"
 #~ msgstr "Het KDE-bureaublad van Debian Edu"
 
-#~ msgid "./images/gosa2_overview.png"
-#~ msgstr "./images/gosa2_overview.png"
-
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr "Overzichtspagina van GOsa² na het aanmelden als de eerste gebruiker"
-
-#~ msgid "./images/filterbox.png"
-#~ msgstr "./images/filterbox.png"
-
-#~ msgid "Filterbox"
-#~ msgstr "Filterkader"
-
-#~ msgid "./images/edit_user.png"
-#~ msgstr "./images/edit_user.png"
-
-#~ msgid "Editing user data"
-#~ msgstr "Gebruikersgegevens bewerken"
-
-#~ msgid "./images/change_password_administratively.png"
-#~ msgstr "./images/change_password_administratively.png"
-
-#~ msgid "Set user password"
-#~ msgstr "Een gebruikerswachtwoord aanmaken"
-
-#~ msgid "./images/create_group.png"
-#~ msgstr "./images/create_group.png"
-
-#~ msgid "create group"
-#~ msgstr "een groep aanmaken"
-
-#~ msgid "./images/list_groups.png"
-#~ msgstr "./images/list_groups.png"
-
-#~ msgid "./images/gosa_systems_list.png"
-#~ msgstr "./images/gosa_systems_list.png"
-
-#~ msgid "GOsa² systems listing"
-#~ msgstr "Een lijst van systemen in GOsa²"
-
-#~ msgid "./images/gosa_systems_host_details.png"
-#~ msgstr "./images/gosa_systems_host_details.png"
-
-#~ msgid "Host details"
-#~ msgstr "Meer bijzonderheden over een systeem"
-
-#~ msgid "./images/gosa_systems_edit_host.png"
-#~ msgstr "./images/gosa_systems_edit_host.png"
-
-#~ msgid "Modify host"
-#~ msgstr "Aanpassingen aan een systeem"
-
-#~ msgid "./images/gosa_systems_add_netgroup.png"
-#~ msgstr "./images/gosa_systems_add_netgroup.png"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Een netgroep toevoegen"
-
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Beheer van slbackup-php"
-
 #~ msgid ""
 #~ "Remove diversion; the postinst from <computeroutput>debian-edu-config</"
 #~ "computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 33d0211..141d306 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-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 15:24+0200\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"
@@ -130,8 +130,12 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:Debian_Edu_Network_Stretch.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Debian_Edu_Network_Stretch.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "The Debian Edu network topology"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2049,8 +2053,12 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:gosa2_overview.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa2_overview.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2192,8 +2200,12 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:filterbox.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/filterbox.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2221,8 +2233,12 @@ msgid ""
 "belongs to."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:edit_user.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/edit_user.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -2264,8 +2280,12 @@ msgid ""
 "yourself"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:change_password_administratively.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/change_password_administratively.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Set user password"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2355,12 +2375,16 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:create_group.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/create_group.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:list_groups.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/list_groups.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2487,20 +2511,36 @@ msgid ""
 "enter password:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_list.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa_systems_list.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_host_details.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_edit_host.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa_systems_host_details.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa_systems_edit_host.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa_systems_add_netgroup.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2895,8 +2935,12 @@ msgid ""
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:slbackup-php_maintenance.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/slbackup-php_maintenance.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 456d8f6..43ba833 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -48,7 +48,7 @@
 <section id="Architecture--Network">
 <title>Network
 </title>
-<para>{{attachment:Debian_Edu_Network_Stretch.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Debian_Edu_Network_Stretch.png"/></imageobject><textobject><phrase>The Debian Edu network topology</phrase></textobject></inlinemediaobject> 
 </para>
 <para>The figure is a sketch of the assumed network topology. The default setup of a Skolelinux network assumes that there is one (and only one) main-server, while allowing the inclusion of both normal workstations and thin-client-servers (with associated thin-clients and/or diskless workstations). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the thin-client servers, each of which is on a separate network so that the tra [...]
 </para>
@@ -906,7 +906,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 <section id="GettingStarted--GOsa.2BALI-_Login_plus_Overview">
 <title>GOsa² Login plus Overview
 </title>
-<para>{{attachment:gosa2_overview.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa2_overview.png"/></imageobject><textobject><phrase>GOsa² overview page after login as the first  user</phrase></textobject></inlinemediaobject> 
 </para>
 <para>After logging in to GOsa² you will see the overview page of GOsa². 
 </para>
@@ -958,7 +958,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 <section id="GettingStarted--Search.2C_modify_and_delete_users">
 <title>Search, modify and delete users
 </title>
-<para>{{attachment:filterbox.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/filterbox.png"/></imageobject><textobject><phrase>Filterbox</phrase></textobject></inlinemediaobject> 
 </para>
 <para>To modify or delete a user, use GOsa² to browse the list of users on your system. On the middle of the screen you may open the "Filter" box, a search tool provided by GOsa². If you don't know the exact location of your user account in your tree, change to the base level of the GOsa²/LDAP tree and search there with the option marked "Search in subtrees". 
 </para>
@@ -966,7 +966,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para>A new page will show up where you can directly modify information about the user, change the password of the user and modify the list of groups the user belongs to. 
 </para>
-<para>{{attachment:edit_user.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/edit_user.png"/></imageobject><textobject><phrase>Editing user data</phrase></textobject></inlinemediaobject> 
 </para>
 </section>
 
@@ -988,7 +988,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 <listitem>
 <para>on the page subsequently presented you can set a new password chosen by yourself 
 </para></listitem></orderedlist>
-<para>{{attachment:change_password_administratively.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/change_password_administratively.png"/></imageobject><textobject><phrase>Set user password</phrase></textobject></inlinemediaobject> 
 </para>
 <para><emphasis role="strong">Beware of security implications due to easy to guess passwords!</emphasis> 
 </para>
@@ -1039,9 +1039,9 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 <section id="GettingStarted--Group_Management_with_GOsa.2BALI-">
 <title>Group Management with GOsa²
 </title>
-<para>{{attachment:create_group.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/create_group.png"/></imageobject><textobject><phrase>create group</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:list_groups.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/list_groups.png"/></imageobject><textobject><phrase>create group</phrase></textobject></inlinemediaobject> 
 </para>
 <para>The management of groups is very similar to the management of users.  
 </para>
@@ -1086,13 +1086,13 @@ Enter password if you want to activate these changes, and ^c to abort.
 
 Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no
 enter password: ]]></screen>
-<para>{{attachment:gosa_systems_list.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_list.png"/></imageobject><textobject><phrase>GOsa² systems listing</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:gosa_systems_host_details.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_host_details.png"/></imageobject><textobject><phrase>Host details</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:gosa_systems_edit_host.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_edit_host.png"/></imageobject><textobject><phrase>Modify host</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:gosa_systems_add_netgroup.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_add_netgroup.png"/></imageobject><textobject><phrase>Add netgroup</phrase></textobject></inlinemediaobject> 
 </para>
 <para>A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</computeroutput> can be used to trigger the update manually.  
 </para>
@@ -1269,7 +1269,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 </para>
 <para>If you want to get rid of older backups, choose "Maintenance" in the menu on the backup page and select the oldest snapshot to keep: 
 </para>
-<para>{{attachment:slbackup-php_maintenance.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/slbackup-php_maintenance.png"/></imageobject><textobject><phrase>slbackup-php Maintenance</phrase></textobject></inlinemediaobject> 
 </para>
 </section>
 
diff --git a/documentation/debian-edu-stretch/images/de/worldmap.png b/documentation/debian-edu-stretch/images/de/worldmap.png
index 8900535..7c4c02b 100644
Binary files a/documentation/debian-edu-stretch/images/de/worldmap.png and b/documentation/debian-edu-stretch/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-stretch/images/es/worldmap.png b/documentation/debian-edu-stretch/images/es/worldmap.png
index c914a39..33b7053 100644
Binary files a/documentation/debian-edu-stretch/images/es/worldmap.png and b/documentation/debian-edu-stretch/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-stretch/images/fr/worldmap.png b/documentation/debian-edu-stretch/images/fr/worldmap.png
index f8dadef..ff66c80 100644
Binary files a/documentation/debian-edu-stretch/images/fr/worldmap.png and b/documentation/debian-edu-stretch/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-stretch/images/worldmap.png b/documentation/debian-edu-stretch/images/worldmap.png
index 8900535..564666c 100644
Binary files a/documentation/debian-edu-stretch/images/worldmap.png and b/documentation/debian-edu-stretch/images/worldmap.png differ

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



More information about the debian-edu-commits mailing list