[debian-edu-commits] debian-edu/ 01/04: Update Jessie manual from the wiki

David Prévot taffit at moszumanska.debian.org
Sun Oct 5 13:38:48 UTC 2014


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

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

commit 31c5e5cdbc1db1585ca9b170b2da278d5ec0410e
Author: David Prévot <taffit at debian.org>
Date:   Sun Oct 5 09:24:58 2014 -0400

    Update Jessie manual from the wiki
    
    Git-Dch: Ignore
---
 .../debian-edu-jessie-manual.da.po                 | 323 +++++++++------
 .../debian-edu-jessie-manual.de.po                 | 302 ++++++++------
 .../debian-edu-jessie-manual.es.po                 | 420 +++++++++++---------
 .../debian-edu-jessie-manual.fr.po                 | 401 ++++++++++---------
 .../debian-edu-jessie-manual.it.po                 | 436 +++++++++++----------
 .../debian-edu-jessie-manual.nb.po                 | 310 +++++++++------
 .../debian-edu-jessie-manual.nl.po                 | 302 ++++++++------
 .../debian-edu-jessie/debian-edu-jessie-manual.pot | 172 +++++---
 .../debian-edu-jessie/debian-edu-jessie-manual.xml |  52 +--
 .../debian-edu-jessie/images/de/worldmap.png       | Bin 387301 -> 387282 bytes
 .../debian-edu-jessie/images/es/worldmap.png       | Bin 387416 -> 387396 bytes
 .../debian-edu-jessie/images/fr/worldmap.png       | Bin 387348 -> 387329 bytes
 .../debian-edu-jessie/images/worldmap.png          | Bin 387340 -> 387321 bytes
 13 files changed, 1587 insertions(+), 1131 deletions(-)

diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index 146c1bf..4ba5d00 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2014-09-30 10:13+0000\n"
+"POT-Creation-Date: 2014-10-05 09:22-0400\n"
 "PO-Revision-Date: 2014-09-23 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -35,11 +35,15 @@ msgstr "Manual for Debian Edu / Skolelinux Wheezy 7.1+edu0"
 msgid "Manual for Debian Edu 8.0~alpha+edu0 Codename Jessie"
 msgstr "Manual for Debian Edu 7.1+edu0 kodenavn Wheezy"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+#| msgid "./images/30-ThinClient-LDM_Login.png"
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "./images/30-ThinClient-LDM_Login.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Logind for Debian Edu"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -185,12 +189,16 @@ 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_Wheezy.png"
-msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
+msgid "./images/Debian_Edu_Network_Jessie.png"
 msgstr "./images/Debian_Edu_Network_Wheezy.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "The Debian Edu network topology"
+msgstr "Debian Edu's netværkstopologi"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2320,11 +2328,15 @@ msgstr ""
 "Det er sådan her at PXE-menuen ser ud kun med profilen for <emphasis role="
 "\"strong\">hovedserveren</emphasis>:"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/pxe-tjener.png"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "./images/pxe-tjener.png"
+#| msgid "./images/alert.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "bredde=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2336,11 +2348,9 @@ msgstr ""
 "\">hovedserveren</emphasis> og <emphasis role=\"strong\">Serveren for tynde "
 "klienter</emphasis>:"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2661,41 +2671,71 @@ msgstr "20-Finish_the_Installation.png"
 msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "tjener-KDM-logind"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/24-Tjener-KDE_Start.png"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+msgid "./images/24-Tjener-KDE_Start.png"
 msgstr "./images/24-Tjener-KDE_Start.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
+msgstr "KDE starter ..."
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE og browser"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "KDE-skrivebord"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Diskløs arbejdsstation-logind"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgstr "./images/31-ThinClient-KDE_Desktop.png"
+#| msgid "./images/30-ThinClient-LDM_Login.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
+msgstr "./images/30-ThinClient-LDM_Login.png"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2778,6 +2818,10 @@ msgstr ""
 "Kapitlet <link linkend=\"HowTo\">Hjælp</link> dækker flere fif og ideer og "
 "nogle ofte stillede spørgsmål."
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu KDE desktop"
+msgstr "Debian Edu KDE-skrivebord"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -2881,11 +2925,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 "GOsa²-overbliksside efter logind som den første bruger"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -3106,11 +3154,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 "Filterbox"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3150,11 +3202,15 @@ 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>
+msgid "Editing user data"
+msgstr "Redigering af brugerdata"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3206,12 +3262,16 @@ 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>
+msgid "Set user password"
+msgstr "Angiv brugeradgangskode"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3322,17 +3382,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 "opret 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."
@@ -3519,30 +3583,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 "Visning af GOsa²-systemer"
+
+#. 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 "Værtsdetaljer"
+
+#. 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 "Ændr vært"
+
+#. 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 "Tilføj netgruppe"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4624,7 +4704,7 @@ msgid ""
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu Wheezy</"
-"ulink> about how to upgrade to Wheezy from the previous release, Squezze, "
+"ulink> about how to upgrade to Wheezy from the previous release, Squeeze, "
 "and the Squeeze manual covers the one before that! (Lenny was it's name and "
 "before that there was even another one, based on what was called Etch.)"
 msgstr ""
@@ -5178,7 +5258,7 @@ msgstr "Opgradering med en cd eller lignede aftryk"
 #| "only physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Jessie "
-"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Hvis du ønsker at opgradere fra en version til den næste (for eksempel fra "
@@ -9641,9 +9721,9 @@ msgstr "Manual for Debian Edu 7.1+edu0 kodenavn »Wheezy«"
 #| "list of copyright owners."
 msgid ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <ulink url="
-"\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy/CopyRight#"
-"\">Copyright chapter</ulink> for the full list of copyright owners."
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
@@ -11875,11 +11955,55 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Logind for Debian Edu"
+#, fuzzy
+#~| msgid "./images/23-Tjener-KDM_Login.png"
+#~ msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgstr "./images/23-Tjener-KDM_Login.png"
+
+#, fuzzy
+#~| msgid "./images/pxe-tjener.png"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "./images/pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#, fuzzy
+#~| msgid "./images/31-ThinClient-KDE_Desktop.png"
+#~ msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#~ msgstr "./images/31-ThinClient-KDE_Desktop.png"
+
+#, 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"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "Debian Edu's netværkstopologi"
+#, 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 "./images/01-Installer_boot_menu.png"
 #~ msgstr "./images/01-Installer_boot_menu.png"
@@ -11896,12 +12020,6 @@ msgstr ""
 #~ msgid "Installer help screen"
 #~ msgstr "Installationsprogrammets hjælpeskærm"
 
-#~ msgid "width=400"
-#~ msgstr "bredde=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
 #~ msgid "./images/02-select_a_language.png"
 #~ msgstr "./images/02-select_a_language.png"
 
@@ -11971,54 +12089,6 @@ msgstr ""
 #~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "tjener-KDM-logind"
-
-#~ msgid "KDE starting..."
-#~ msgstr "KDE starter ..."
-
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE og browser"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "KDE-skrivebord"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Diskløs arbejdsstation-logind"
-
-#~ msgid "Debian Edu KDE desktop"
-#~ msgstr "Debian Edu KDE-skrivebord"
-
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr "GOsa²-overbliksside efter logind som den første bruger"
-
-#~ msgid "Filterbox"
-#~ msgstr "Filterbox"
-
-#~ msgid "Editing user data"
-#~ msgstr "Redigering af brugerdata"
-
-#~ msgid "Set user password"
-#~ msgstr "Angiv brugeradgangskode"
-
-#~ msgid "create group"
-#~ msgstr "opret gruppe"
-
-#~ msgid "GOsa² systems listing"
-#~ msgstr "Visning af GOsa²-systemer"
-
-#~ msgid "Host details"
-#~ msgstr "Værtsdetaljer"
-
-#~ msgid "Modify host"
-#~ msgstr "Ændr vært"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Tilføj netgruppe"
-
 #~ msgid "slbackup-php Maintenance"
 #~ msgstr "Vedligeholdelse for slbackup-php"
 
@@ -12082,8 +12152,5 @@ msgstr ""
 #~ "25; se <computeroutput>man 5 gosa.conf</computeroutput> for yderligere "
 #~ "detaljer. Lav en sikkerhedskopi af gosa.conf før du ændrer i den!)"
 
-#~ msgid "./images/30-ThinClient-LDM_Login.png"
-#~ msgstr "./images/30-ThinClient-LDM_Login.png"
-
 #~ msgid "Thin Client Login"
 #~ msgstr "Tynd klient-logind"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 999d55e..3b3ca93 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-30 10:13+0000\n"
+"POT-Creation-Date: 2014-10-05 09:22-0400\n"
 "PO-Revision-Date: 2014-05-30 01:06+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -44,12 +44,16 @@ msgstr "Handbuch für Debian Edu / Skolelinux Wheezy 7.1+edu0"
 msgid "Manual for Debian Edu 8.0~alpha+edu0 Codename Jessie"
 msgstr "Handbuch für Debian Edu 7.1+edu0, Codename Wheezy"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+msgid "./images/23-Tjener-KDM_Login.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Debian-Edu Anmeldung"
+
 #. type: Content of: <article><section><para>
 #, fuzzy
 #| msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
@@ -200,12 +204,16 @@ msgstr ""
 msgid "Network"
 msgstr "Netzwerk"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Debian_Edu_Network_Wheezy.png"
-msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
+msgid "./images/Debian_Edu_Network_Jessie.png"
 msgstr "./images/Debian_Edu_Network_Wheezy.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 "
@@ -2375,11 +2383,15 @@ msgstr ""
 "So sieht das PXE-Menü mit dem <emphasis role=\"strong\">Hauptserver</"
 "emphasis> als alleinigem Profil aus:"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/pxe-tjener.png"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "./images/pxe-tjener.png"
+#| msgid "./images/alert.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2391,11 +2403,9 @@ msgstr ""
 "emphasis>- und <emphasis role=\"strong\">Terminal-Server</emphasis>-Profil "
 "aus:"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2717,40 +2727,70 @@ msgstr "20-Finish_the_Installation.png"
 msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "KDM-Login von tjener"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/24-Tjener-KDE_Start.png"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+msgid "./images/24-Tjener-KDE_Start.png"
 msgstr "./images/24-Tjener-KDE_Start.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
+msgstr "KDE startet ..."
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE und Browser"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "KDE-Desktop"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Diskless Workstation Login"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -2835,6 +2875,10 @@ msgstr ""
 "Im Kapitel <link linkend=\"HowTo\">HowTo</link> gibt es mehr Tipps und "
 "Tricks, sowie Antworten auf häufig gestellte Fragen."
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu KDE desktop"
+msgstr "Debian-Edu KDE-Desktop"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -2942,11 +2986,15 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "GOsa²-Anmeldung und Übersicht"
 
-#. 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 "Ü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²."
@@ -3171,11 +3219,15 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Benutzer suchen, modifizieren und löschen"
 
-#. 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 ""
@@ -3217,11 +3269,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>
+#. 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 "Benutzerdaten bearbeiten"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3277,12 +3333,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>
+#. 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 "Passwort setzen "
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3396,17 +3456,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppen mit GOsa² verwalten"
 
-#. 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 "Gruppe einrichten"
+
+#. 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."
@@ -3598,30 +3662,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 "GOsa² Liste der Systeme"
+
+#. 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 "Host Details"
+
+#. 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 "Host bearbeiten"
+
+#. 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 "Netgroup hinzufügen"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4737,7 +4817,7 @@ msgid ""
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu Wheezy</"
-"ulink> about how to upgrade to Wheezy from the previous release, Squezze, "
+"ulink> about how to upgrade to Wheezy from the previous release, Squeeze, "
 "and the Squeeze manual covers the one before that! (Lenny was it's name and "
 "before that there was even another one, based on what was called Etch.)"
 msgstr ""
@@ -5304,7 +5384,7 @@ msgstr "Upgrade mit einer CD oder einem vergleichbaren Medium"
 #| "only physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Jessie "
-"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Falls Sie ein Upgrade von einer Version zu einer nächsten (wie z.B. von "
@@ -9885,9 +9965,9 @@ msgstr "Handbuch für Debian Edu 7.1+edu0, Codename »Wheezy«"
 #| "list of copyright owners."
 msgid ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <ulink url="
-"\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy/CopyRight#"
-"\">Copyright chapter</ulink> for the full list of copyright owners."
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > und andere; die vollständige "
@@ -12162,11 +12242,45 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Debian-Edu Anmeldung"
+#, fuzzy
+#~| msgid "./images/pxe-tjener.png"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "./images/pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#, 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"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "Die Struktur des Debian-Edu-Netzwerks"
+#, fuzzy
+#~| msgid "./images/list_groups.png"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "./images/list_groups.png"
 
 #~ msgid "./images/01-Installer_boot_menu.png"
 #~ msgstr "./images/01-Installer_boot_menu.png"
@@ -12183,12 +12297,6 @@ msgstr ""
 #~ msgid "Installer help screen"
 #~ msgstr "Hilfe-Bildschirm des Installers"
 
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
 #~ msgid "./images/02-select_a_language.png"
 #~ msgstr "./images/02-select_a_language.png"
 
@@ -12258,54 +12366,6 @@ msgstr ""
 #~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "KDM-Login von tjener"
-
-#~ msgid "KDE starting..."
-#~ msgstr "KDE startet ..."
-
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE und Browser"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "KDE-Desktop"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Diskless Workstation Login"
-
-#~ msgid "Debian Edu KDE desktop"
-#~ msgstr "Debian-Edu KDE-Desktop"
-
-#~ 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"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index 92db206..c4b5f30 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-30 10:13+0000\n"
+"POT-Creation-Date: 2014-10-05 09:22-0400\n"
 "PO-Revision-Date: 2013-12-02 00:31-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -38,11 +38,13 @@ msgstr "Manual de Debian Edu / Skolelinux 7.1+edu0"
 msgid "Manual for Debian Edu 8.0~alpha+edu0 Codename Jessie"
 msgstr "Manual para Debian-Edu 7.1+edu0 nombre código \"Wheezy\""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "23-Tjener-KDM_Login.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Inicio de sesión de Debian Edu"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -193,12 +195,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_Wheezy.png"
-msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
+msgid "./images/Debian_Edu_Network_Jessie.png"
 msgstr "./images/Debian_Edu_Network_Wheezy.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 "
@@ -2388,11 +2394,13 @@ msgstr ""
 "Así es como el menú PXE se mira con el perfil <emphasis role=\"strong\">Main-"
 "Server</emphasis>:"
 
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "pxe-tjener.png"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "pxe-tjener.png"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/pxe-tjener.png"
+msgstr "./images/pxe-tjener.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -2408,11 +2416,9 @@ msgstr ""
 "Así es como el menú PXE se mira con el perfil <emphasis role=\"strong\">Main-"
 "Server</emphasis> y <emphasis role=\"strong\">Thin-Client-Server</emphasis>:"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2731,41 +2737,59 @@ msgstr "20-Finish_the_Installation.png"
 msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "24-Tjener-KDE_Start.png"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "24-Tjener-KDE_Start.png"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "Inicio de sesión KDM en tjener"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
-msgstr "26-Tjener-KDE_Desktop_Browser.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/24-Tjener-KDE_Start.png"
+msgstr "./images/24-Tjener-KDE_Start.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
-msgstr "27-Tjener-KDE_Desktop.png"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
+msgstr "Iniciando KDE.."
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "29-Diskless-WS-KDM_Login.png"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
-msgstr "29-Diskless-WS-KDM_Login.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
+msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE y el navegador"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/27-Tjener-KDE_Desktop.png"
+msgstr "./images/27-Tjener-KDE_Desktop.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "Escritorio KDE"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgstr "31-ThinClient-KDE_Desktop.png"
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr "./images/29-Diskless-WS-LDM_Login.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Inicio de sesión de estaciones sin disco"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/31-ThinClient-KDE_Desktop.png"
+msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2845,6 +2869,12 @@ msgstr ""
 "El capítulo  <link linkend=\"HowTo\">HowTo</link> describe más trucos, "
 "pistas y algunas preguntas de uso frecuente."
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Debian Edu desktop"
+msgid "Debian Edu KDE desktop"
+msgstr "Escritorio Debian Edu con KDE Plasma"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -2948,11 +2978,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>
 #, fuzzy
@@ -3126,11 +3160,13 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Buscar, modificar y borrar usuarios"
 
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "pxe-tjener.png"
-msgid "{{attachment:filterbox.png}}"
-msgstr "pxe-tjener.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 "Filterbox"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3160,11 +3196,13 @@ 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>
-#, fuzzy
-#| msgid "[attachment:lwat-edituser_lenny.png]"
-msgid "{{attachment:edit_user.png}}"
-msgstr "[attachment:lwat-edituser_lenny.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 "Editar datos de usuarios"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3216,12 +3254,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 "
@@ -3333,17 +3375,17 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestión de usuarios con GOsa²"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "pxe-tjener.png"
-msgid "{{attachment:create_group.png}}"
-msgstr "pxe-tjener.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>
-#, fuzzy
-#| msgid "[attachment:lwat-editpasswd.png]"
-msgid "{{attachment:list_groups.png}}"
-msgstr "[attachment:lwat-editpasswd.png]"
+#. 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>
+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."
@@ -3530,29 +3572,39 @@ 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>
-#, fuzzy
-#| msgid "13-Install the base system.png"
-msgid "{{attachment:gosa_systems_list.png}}"
-msgstr "13-Install the base system.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>
-#, fuzzy
-#| msgid "13-Install the base system.png"
-msgid "{{attachment:gosa_systems_host_details.png}}"
-msgstr "13-Install the base system.png"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "13-Install the base system.png"
-msgid "{{attachment:gosa_systems_edit_host.png}}"
-msgstr "13-Install the base system.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>
+#. 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 "./images/gosa_systems_edit_host.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 "./images/gosa_systems_add_netgroup.png"
-msgid "{{attachment:gosa_systems_add_netgroup.png}}"
-msgstr "./images/gosa_systems_add_netgroup.png"
+#| msgid "./images/gosa_systems_edit_host.png"
+msgid "./images/gosa_systems_add_netgroup.png"
+msgstr "./images/gosa_systems_edit_host.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4630,7 +4682,7 @@ msgid ""
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu Wheezy</"
-"ulink> about how to upgrade to Wheezy from the previous release, Squezze, "
+"ulink> about how to upgrade to Wheezy from the previous release, Squeeze, "
 "and the Squeeze manual covers the one before that! (Lenny was it's name and "
 "before that there was even another one, based on what was called Etch.)"
 msgstr ""
@@ -5107,7 +5159,7 @@ msgstr "Actualizar con un CD o similar"
 #| "only physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Jessie "
-"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Si usted quiere actualizar de una versión a otra (por ejemplo, de Wheezy 7.1 "
@@ -8979,9 +9031,9 @@ msgstr "Manual para Debian-Edu 7.1+edu0 nombre código \"Wheezy\""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <ulink url="
-"\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy/CopyRight#"
-"\">Copyright chapter</ulink> for the full list of copyright owners."
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -11041,14 +11093,95 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
-#~ msgid "./images/23-Tjener-KDM_Login.png"
-#~ msgstr "./images/23-Tjener-KDM_Login.png"
+#, fuzzy
+#~| msgid "23-Tjener-KDM_Login.png"
+#~ msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgstr "23-Tjener-KDM_Login.png"
+
+#, fuzzy
+#~| msgid "pxe-tjener.png"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Inicio de sesión de Debian Edu"
+#, fuzzy
+#~| msgid "24-Tjener-KDE_Start.png"
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "24-Tjener-KDE_Start.png"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "La Topología de red de Debian Edu"
+#, fuzzy
+#~| msgid "26-Tjener-KDE_Desktop_Browser.png"
+#~ msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+#~ msgstr "26-Tjener-KDE_Desktop_Browser.png"
+
+#, fuzzy
+#~| msgid "27-Tjener-KDE_Desktop.png"
+#~ msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#~ msgstr "27-Tjener-KDE_Desktop.png"
+
+#, fuzzy
+#~| msgid "29-Diskless-WS-KDM_Login.png"
+#~ msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+#~ msgstr "29-Diskless-WS-KDM_Login.png"
+
+#, fuzzy
+#~| msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#, fuzzy
+#~| msgid "./images/gosa2_overview.png"
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "./images/gosa2_overview.png"
+
+#, fuzzy
+#~| msgid "pxe-tjener.png"
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "[attachment:lwat-edituser_lenny.png]"
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "[attachment:lwat-edituser_lenny.png]"
+
+#, fuzzy
+#~| msgid "pxe-tjener.png"
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "[attachment:lwat-editpasswd.png]"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "[attachment:lwat-editpasswd.png]"
+
+#, fuzzy
+#~| msgid "13-Install the base system.png"
+#~ msgid "{{attachment:gosa_systems_list.png}}"
+#~ msgstr "13-Install the base system.png"
+
+#, fuzzy
+#~| msgid "13-Install the base system.png"
+#~ msgid "{{attachment:gosa_systems_host_details.png}}"
+#~ msgstr "13-Install the base system.png"
+
+#, fuzzy
+#~| msgid "13-Install the base system.png"
+#~ msgid "{{attachment:gosa_systems_edit_host.png}}"
+#~ msgstr "13-Install the base system.png"
+
+#, fuzzy
+#~| msgid "./images/gosa_systems_add_netgroup.png"
+#~ msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+#~ msgstr "./images/gosa_systems_add_netgroup.png"
 
 #~ msgid "./images/01-Installer_boot_menu.png"
 #~ msgstr "./images/01-Installer_boot_menu.png"
@@ -11068,15 +11201,6 @@ msgstr ""
 #~ msgid "Installer help screen"
 #~ msgstr "Pantalla de ayuda del instalador"
 
-#~ msgid "./images/pxe-tjener.png"
-#~ msgstr "./images/pxe-tjener.png"
-
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
 #~ msgid "01-Installer_boot_menu.png"
 #~ msgstr "01-Installer_boot_menu.png"
 
@@ -11212,80 +11336,6 @@ msgstr ""
 #~ msgid "21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "Inicio de sesión KDM en tjener"
-
-#~ msgid "./images/24-Tjener-KDE_Start.png"
-#~ msgstr "./images/24-Tjener-KDE_Start.png"
-
-#~ msgid "KDE starting..."
-#~ msgstr "Iniciando KDE.."
-
-#~ msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-#~ msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
-
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE y el navegador"
-
-#~ msgid "./images/27-Tjener-KDE_Desktop.png"
-#~ msgstr "./images/27-Tjener-KDE_Desktop.png"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "Escritorio KDE"
-
-#~ msgid "./images/29-Diskless-WS-LDM_Login.png"
-#~ msgstr "./images/29-Diskless-WS-LDM_Login.png"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Inicio de sesión de estaciones sin disco"
-
-#~ msgid "./images/31-ThinClient-KDE_Desktop.png"
-#~ msgstr "./images/31-ThinClient-KDE_Desktop.png"
-
-#, fuzzy
-#~| msgid "Debian Edu desktop"
-#~ msgid "Debian Edu KDE desktop"
-#~ msgstr "Escritorio Debian Edu con KDE Plasma"
-
-#~ msgid "./images/filterbox.png"
-#~ msgstr "./images/filterbox.png"
-
-#~ msgid "Filterbox"
-#~ msgstr "Filterbox"
-
-#~ msgid "./images/edit_user.png"
-#~ msgstr "./images/edit_user.png"
-
-#~ msgid "Editing user data"
-#~ msgstr "Editar datos de usuarios"
-
-#~ msgid "Set user password"
-#~ msgstr "Establecer contraseñas de usuario"
-
-#~ msgid "./images/create_group.png"
-#~ msgstr "./images/create_group.png"
-
-#~ msgid "create group"
-#~ msgstr "crear un grupo"
-
-#~ msgid "./images/list_groups.png"
-#~ msgstr "./images/list_groups.png"
-
-#~ msgid "./images/gosa_systems_list.png"
-#~ msgstr "./images/gosa_systems_list.png"
-
-#~ msgid "./images/gosa_systems_host_details.png"
-#~ msgstr "./images/gosa_systems_host_details.png"
-
-#~ msgid "./images/gosa_systems_edit_host.png"
-#~ msgstr "./images/gosa_systems_edit_host.png"
-
 #~ msgid "slbackup-php Maintenance"
 #~ msgstr "Mantenimiento de slbackup-php"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index b0ee7b9..b8485ab 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-09-30 10:13+0000\n"
+"POT-Creation-Date: 2014-10-05 09:22-0400\n"
 "PO-Revision-Date: 2014-09-23 07:24+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -36,11 +36,13 @@ msgstr "Manuel de Debian Edu/Skolelinux Wheezy 7.1+edu0"
 msgid "Manual for Debian Edu 8.0~alpha+edu0 Codename Jessie"
 msgstr "Manuel de Debian Edu 7.1+edu0 nom de code Wheezy"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:23-Tjener-KDM_Login.png]"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "[attachment:23-Tjener-KDM_Login.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Connexion à Debian Edu"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -189,12 +191,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_Wheezy.png"
-msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
+msgid "./images/Debian_Edu_Network_Jessie.png"
 msgstr "./images/Debian_Edu_Network_Wheezy.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 "
@@ -2388,11 +2394,13 @@ msgstr ""
 "Voici à quoi ressemble le menu PXE avec uniquement le profil <emphasis role="
 "\"strong\">Serveur principal</emphasis> :"
 
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "[attachment:pxe-tjener.png]"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "[attachment:pxe-tjener.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/pxe-tjener.png"
+msgstr "./images/pxe-tjener.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2404,11 +2412,9 @@ msgstr ""
 "\">Serveur principal</emphasis> et <emphasis role=\"strong\">Serveur de "
 "clients légers</emphasis> :"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2732,41 +2738,59 @@ msgstr "[attachment:20-Finish_the_Installation.png]"
 msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
-msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:24-Tjener-KDE_Start.png]"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "[attachment:24-Tjener-KDE_Start.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
-msgstr "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "Invite KDM sur tjener"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:27-Tjener-KDE_Desktop.png]"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
-msgstr "[attachment:27-Tjener-KDE_Desktop.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/24-Tjener-KDE_Start.png"
+msgstr "./images/24-Tjener-KDE_Start.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
-msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
+msgstr "Démarrage de KDE..."
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
+msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE et un navigateur Internet"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/27-Tjener-KDE_Desktop.png"
+msgstr "./images/27-Tjener-KDE_Desktop.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "Bureau KDE"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgstr "[attachment:31-ThinClient-KDE_Desktop.png]"
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr "./images/29-Diskless-WS-LDM_Login.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Invite de connexion sur une station de travail sans disque dur"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/31-ThinClient-KDE_Desktop.png"
+msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2854,6 +2878,10 @@ msgstr ""
 "Le chapitre <link linkend=\"HowTo\">Manuels (HowTo)</link> fournit davantage "
 "d'astuces et de réponses à des questions courantes."
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu KDE desktop"
+msgstr "bureau Debian Edu KDE"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -2959,11 +2987,13 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "Connexion à GOsa² et aperçu"
 
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "[attachment:gosa2_overview.png]"
-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 "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²."
@@ -3190,11 +3220,13 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Rechercher, modifier et supprimer des utilisateurs"
 
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "[attachment:filterbox.png]"
-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 "Boîte de filtre"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3236,11 +3268,13 @@ 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>
-#, fuzzy
-#| msgid "[attachment:edit_user.png]"
-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 "Modifier les données d'utilisateur"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3294,12 +3328,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 "
@@ -3412,17 +3450,17 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestion des groupes avec GOsa²"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:create_group.png]"
-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>
-#, fuzzy
-#| msgid "[attachment:list_groups.png]"
-msgid "{{attachment:list_groups.png}}"
-msgstr "[attachment:list_groups.png]"
+#. 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>
+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."
@@ -3617,30 +3655,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}}"
-msgstr "./images/gosa_systems_list.png"
+#| msgid "./images/gosa2_overview.png"
+msgid "./images/gosa_systems_list.png"
+msgstr "./images/gosa2_overview.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</"
@@ -4762,7 +4816,7 @@ msgid ""
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu Wheezy</"
-"ulink> about how to upgrade to Wheezy from the previous release, Squezze, "
+"ulink> about how to upgrade to Wheezy from the previous release, Squeeze, "
 "and the Squeeze manual covers the one before that! (Lenny was it's name and "
 "before that there was even another one, based on what was called Etch.)"
 msgstr ""
@@ -5333,7 +5387,7 @@ msgstr "Mettre à jour avec un CD ou une image similaire"
 #| "only physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Jessie "
-"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Si vous voulez mettre à jour d'une version à une autre (par exemple de "
@@ -9935,9 +9989,9 @@ msgstr "Manuel de Debian Edu 7.1+edu0 nom de code « Wheezy »"
 #| "list of copyright owners."
 msgid ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <ulink url="
-"\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy/CopyRight#"
-"\">Copyright chapter</ulink> for the full list of copyright owners."
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 "Droits d'auteur (C) 2007-2014 à Holger Levsen < <ulink url=\"mailto:"
 "holger at layer-acht.org\">holger at layer-acht.org</ulink> > et autres, "
@@ -12235,14 +12289,80 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
-#~ msgid "./images/23-Tjener-KDM_Login.png"
-#~ msgstr "./images/23-Tjener-KDM_Login.png"
+#, fuzzy
+#~| msgid "[attachment:23-Tjener-KDM_Login.png]"
+#~ msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgstr "[attachment:23-Tjener-KDM_Login.png]"
+
+#, fuzzy
+#~| msgid "[attachment:pxe-tjener.png]"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "[attachment:pxe-tjener.png]"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#~ msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+
+#, fuzzy
+#~| msgid "[attachment:24-Tjener-KDE_Start.png]"
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
+
+#, fuzzy
+#~| msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+#~ msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+#~ msgstr "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+
+#, fuzzy
+#~| msgid "[attachment:27-Tjener-KDE_Desktop.png]"
+#~ msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#~ msgstr "[attachment:27-Tjener-KDE_Desktop.png]"
+
+#, fuzzy
+#~| msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+#~ msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+#~ msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Connexion à Debian Edu"
+#, fuzzy
+#~| msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
+#~ msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#~ msgstr "[attachment:31-ThinClient-KDE_Desktop.png]"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "Topologie du réseau Debian Edu"
+#, fuzzy
+#~| msgid "[attachment:gosa2_overview.png]"
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "[attachment:gosa2_overview.png]"
+
+#, fuzzy
+#~| msgid "[attachment:filterbox.png]"
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "[attachment:filterbox.png]"
+
+#, fuzzy
+#~| msgid "[attachment:edit_user.png]"
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "[attachment:edit_user.png]"
+
+#, fuzzy
+#~| msgid "[attachment:create_group.png]"
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "[attachment:create_group.png]"
+
+#, fuzzy
+#~| msgid "[attachment:list_groups.png]"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "[attachment:list_groups.png]"
+
+#, fuzzy
+#~| msgid "./images/gosa_systems_list.png"
+#~ msgid "{{attachment:gosa_systems_list.png}}"
+#~ msgstr "./images/gosa_systems_list.png"
 
 #~ msgid "./images/01-Installer_boot_menu.png"
 #~ msgstr "./images/01-Installer_boot_menu.png"
@@ -12262,15 +12382,6 @@ msgstr ""
 #~ msgid "Installer help screen"
 #~ msgstr "Écran d'aide de l'installateur"
 
-#~ msgid "./images/pxe-tjener.png"
-#~ msgstr "./images/pxe-tjener.png"
-
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
 #~ msgid "01-Installer_boot_menu.png"
 #~ msgstr "01-Installer_boot_menu.png"
 
@@ -12406,88 +12517,6 @@ msgstr ""
 #~ msgid "21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "Invite KDM sur tjener"
-
-#~ msgid "./images/24-Tjener-KDE_Start.png"
-#~ msgstr "./images/24-Tjener-KDE_Start.png"
-
-#~ msgid "KDE starting..."
-#~ msgstr "Démarrage de KDE..."
-
-#~ msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-#~ msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
-
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE et un navigateur Internet"
-
-#~ msgid "./images/27-Tjener-KDE_Desktop.png"
-#~ msgstr "./images/27-Tjener-KDE_Desktop.png"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "Bureau KDE"
-
-#~ msgid "./images/29-Diskless-WS-LDM_Login.png"
-#~ msgstr "./images/29-Diskless-WS-LDM_Login.png"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Invite de connexion sur une station de travail sans disque dur"
-
-#~ msgid "./images/31-ThinClient-KDE_Desktop.png"
-#~ msgstr "./images/31-ThinClient-KDE_Desktop.png"
-
-#~ msgid "Debian Edu KDE desktop"
-#~ msgstr "bureau Debian Edu KDE"
-
-#~ msgid "./images/gosa2_overview.png"
-#~ msgstr "./images/gosa2_overview.png"
-
-#~ 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 "./images/filterbox.png"
-#~ msgstr "./images/filterbox.png"
-
-#~ msgid "Filterbox"
-#~ msgstr "Boîte de filtre"
-
-#~ msgid "./images/edit_user.png"
-#~ msgstr "./images/edit_user.png"
-
-#~ msgid "Editing user data"
-#~ msgstr "Modifier les données d'utilisateur"
-
-#~ msgid "Set user password"
-#~ msgstr "Définir le mot de passe utilisateur"
-
-#~ msgid "./images/create_group.png"
-#~ msgstr "./images/create_group.png"
-
-#~ msgid "create group"
-#~ msgstr "Créer un groupe"
-
-#~ msgid "./images/list_groups.png"
-#~ msgstr "./images/list_groups.png"
-
-#~ 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"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index b312966..43992b6 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2014-09-30 10:13+0000\n"
+"POT-Creation-Date: 2014-10-05 09:22-0400\n"
 "PO-Revision-Date: 2014-06-26 19:17+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -33,11 +33,13 @@ msgstr "Manuale di Debian Edu / Skolelinux Wheezy 7.1+edu0"
 msgid "Manual for Debian Edu 8.0~alpha+edu0 Codename Jessie"
 msgstr "Manuale per Debian Edu 7.1+edu0 Nome in codice Wheezy"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:23-Tjener-KDM_Login.png]"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "[attachment:23-Tjener-KDM_Login.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Login di Debian Edu"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -186,12 +188,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_Wheezy.png"
-msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
+msgid "./images/Debian_Edu_Network_Jessie.png"
 msgstr "./images/Debian_Edu_Network_Wheezy.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 "
@@ -2353,11 +2359,13 @@ msgstr ""
 "Così appare il menu PXE solo con il profilo <emphasis role=\"strong\">Main-"
 "Server</emphasis>:"
 
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "[attachment:pxe-tjener.png]"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "[attachment:pxe-tjener.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/pxe-tjener.png"
+msgstr "./images/pxe-tjener.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2368,11 +2376,9 @@ msgstr ""
 "Così appare il menu PXE con i profili <emphasis role=\"strong\">Main-Server "
 "</emphasis> e <emphasis role=\"strong\">Thin-Client-Server</emphasis>:"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2689,41 +2695,59 @@ msgstr "[attachment:20-Finish_the_Installation.png]"
 msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
-msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:24-Tjener-KDE_Start.png]"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
-msgstr "[attachment:24-Tjener-KDE_Start.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
-msgstr "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "Login KDM su tjener"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:27-Tjener-KDE_Desktop.png]"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
-msgstr "[attachment:27-Tjener-KDE_Desktop.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/24-Tjener-KDE_Start.png"
+msgstr "./images/24-Tjener-KDE_Start.png"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
-msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
+msgstr "Avvio di KDE..."
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
+msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE e il browser"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/27-Tjener-KDE_Desktop.png"
+msgstr "./images/27-Tjener-KDE_Desktop.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "Desktop KDE"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgstr "[attachment:31-ThinClient-KDE_Desktop.png]"
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr "./images/29-Diskless-WS-LDM_Login.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Login su workstation senza dischi"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/31-ThinClient-KDE_Desktop.png"
+msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2808,6 +2832,10 @@ msgstr ""
 "La sezione <link linkend=\"NetworkClients\">HowTo</link> descrive altri "
 "accorgimenti e trucchi e alcune risposte alle domande frequenti."
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu KDE desktop"
+msgstr "Desktop KDE di Debian Edu"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -2913,11 +2941,13 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "Accesso a GOsa² e pagina iniziale"
 
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "[attachment:gosa2_overview.png]"
-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 "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²."
@@ -3142,11 +3172,13 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Cercare, modificare e cancellare utenti"
 
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "[attachment:filterbox.png]"
-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 "Il riquadro dei filtri"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3188,11 +3220,13 @@ 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>
-#, fuzzy
-#| msgid "[attachment:edit_user.png]"
-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 "Modificare i dati utente"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3244,12 +3278,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 "
@@ -3361,17 +3399,17 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestione dei gruppi con GOsa²"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:create_group.png]"
-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>
-#, fuzzy
-#| msgid "[attachment:list_groups.png]"
-msgid "{{attachment:list_groups.png}}"
-msgstr "[attachment:list_groups.png]"
+#. 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>
+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."
@@ -3564,29 +3602,39 @@ 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>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_list.png]"
-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>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_list.png]"
-msgid "{{attachment:gosa_systems_host_details.png}}"
-msgstr "[attachment:gosa_systems_list.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr "Elenco dei sistemi di GOsa²"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_list.png]"
-msgid "{{attachment:gosa_systems_edit_host.png}}"
-msgstr "[attachment:gosa_systems_list.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>
+#. 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>
+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 "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}}"
-msgstr "./images/gosa_systems_add_netgroup.png"
+#| msgid "./images/gosa_systems_edit_host.png"
+msgid "./images/gosa_systems_add_netgroup.png"
+msgstr "./images/gosa_systems_edit_host.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 ""
@@ -4682,7 +4730,7 @@ msgid ""
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu Wheezy</"
-"ulink> about how to upgrade to Wheezy from the previous release, Squezze, "
+"ulink> about how to upgrade to Wheezy from the previous release, Squeeze, "
 "and the Squeeze manual covers the one before that! (Lenny was it's name and "
 "before that there was even another one, based on what was called Etch.)"
 msgstr ""
@@ -5234,7 +5282,7 @@ msgstr "Aggiornamento da CD o immagine simile"
 #| "only physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Jessie "
-"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Se si vuole aggiornare da una versione a un'altra (per esempio da Wheezy "
@@ -9746,9 +9794,9 @@ msgstr "Manuale per Debian Edu 7.1+edu0 nome in codice Wheezy"
 #| "list of copyright owners."
 msgid ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <ulink url="
-"\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy/CopyRight#"
-"\">Copyright chapter</ulink> for the full list of copyright owners."
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > e altri, vedere il <link "
@@ -12002,14 +12050,95 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
-#~ msgid "./images/23-Tjener-KDM_Login.png"
-#~ msgstr "./images/23-Tjener-KDM_Login.png"
+#, fuzzy
+#~| msgid "[attachment:23-Tjener-KDM_Login.png]"
+#~ msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgstr "[attachment:23-Tjener-KDM_Login.png]"
+
+#, fuzzy
+#~| msgid "[attachment:pxe-tjener.png]"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "[attachment:pxe-tjener.png]"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#~ msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+
+#, fuzzy
+#~| msgid "[attachment:24-Tjener-KDE_Start.png]"
+#~ msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
+
+#, fuzzy
+#~| msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+#~ msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+#~ msgstr "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
+
+#, fuzzy
+#~| msgid "[attachment:27-Tjener-KDE_Desktop.png]"
+#~ msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#~ msgstr "[attachment:27-Tjener-KDE_Desktop.png]"
+
+#, fuzzy
+#~| msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+#~ msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+#~ msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Login di Debian Edu"
+#, fuzzy
+#~| msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
+#~ msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#~ msgstr "[attachment:31-ThinClient-KDE_Desktop.png]"
+
+#, fuzzy
+#~| msgid "[attachment:gosa2_overview.png]"
+#~ msgid "{{attachment:gosa2_overview.png}}"
+#~ msgstr "[attachment:gosa2_overview.png]"
+
+#, fuzzy
+#~| msgid "[attachment:filterbox.png]"
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "[attachment:filterbox.png]"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "La topologia della rete Debian Edu"
+#, fuzzy
+#~| msgid "[attachment:edit_user.png]"
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "[attachment:edit_user.png]"
+
+#, fuzzy
+#~| msgid "[attachment:create_group.png]"
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr "[attachment:create_group.png]"
+
+#, fuzzy
+#~| msgid "[attachment:list_groups.png]"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "[attachment:list_groups.png]"
+
+#, fuzzy
+#~| msgid "[attachment:gosa_systems_list.png]"
+#~ msgid "{{attachment:gosa_systems_list.png}}"
+#~ msgstr "[attachment:gosa_systems_list.png]"
+
+#, fuzzy
+#~| msgid "[attachment:gosa_systems_list.png]"
+#~ msgid "{{attachment:gosa_systems_host_details.png}}"
+#~ msgstr "[attachment:gosa_systems_list.png]"
+
+#, fuzzy
+#~| msgid "[attachment:gosa_systems_list.png]"
+#~ msgid "{{attachment:gosa_systems_edit_host.png}}"
+#~ msgstr "[attachment:gosa_systems_list.png]"
+
+#, fuzzy
+#~| msgid "./images/gosa_systems_add_netgroup.png"
+#~ msgid "{{attachment:gosa_systems_add_netgroup.png}}"
+#~ msgstr "./images/gosa_systems_add_netgroup.png"
 
 #~ msgid "./images/01-Installer_boot_menu.png"
 #~ msgstr "./images/01-Installer_boot_menu.png"
@@ -12029,15 +12158,6 @@ msgstr ""
 #~ msgid "Installer help screen"
 #~ msgstr "Schermata di aiuto dell'installatore"
 
-#~ msgid "./images/pxe-tjener.png"
-#~ msgstr "./images/pxe-tjener.png"
-
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
 #~ msgid "01-Installer_boot_menu.png"
 #~ msgstr "01-Installer_boot_menu.png"
 
@@ -12173,96 +12293,6 @@ msgstr ""
 #~ msgid "21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "Login KDM su tjener"
-
-#~ msgid "./images/24-Tjener-KDE_Start.png"
-#~ msgstr "./images/24-Tjener-KDE_Start.png"
-
-#~ msgid "KDE starting..."
-#~ msgstr "Avvio di KDE..."
-
-#~ msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-#~ msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
-
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE e il browser"
-
-#~ msgid "./images/27-Tjener-KDE_Desktop.png"
-#~ msgstr "./images/27-Tjener-KDE_Desktop.png"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "Desktop KDE"
-
-#~ msgid "./images/29-Diskless-WS-LDM_Login.png"
-#~ msgstr "./images/29-Diskless-WS-LDM_Login.png"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Login su workstation senza dischi"
-
-#~ msgid "./images/31-ThinClient-KDE_Desktop.png"
-#~ msgstr "./images/31-ThinClient-KDE_Desktop.png"
-
-#~ msgid "Debian Edu KDE desktop"
-#~ msgstr "Desktop KDE di Debian Edu"
-
-#~ msgid "./images/gosa2_overview.png"
-#~ msgstr "./images/gosa2_overview.png"
-
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr "Pagina di GOsa² dopo il login come primo utente"
-
-#~ msgid "./images/filterbox.png"
-#~ msgstr "./images/filterbox.png"
-
-#~ msgid "Filterbox"
-#~ msgstr "Il riquadro dei filtri"
-
-#~ msgid "./images/edit_user.png"
-#~ msgstr "./images/edit_user.png"
-
-#~ msgid "Editing user data"
-#~ msgstr "Modificare i dati utente"
-
-#~ msgid "Set user password"
-#~ msgstr "Configurare la password dell'utente"
-
-#~ msgid "./images/create_group.png"
-#~ msgstr "./images/create_group.png"
-
-#~ msgid "create group"
-#~ msgstr "creare il gruppo"
-
-#~ 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 "Elenco dei sistemi di GOsa²"
-
-#~ msgid "./images/gosa_systems_host_details.png"
-#~ msgstr "./images/gosa_systems_host_details.png"
-
-#~ msgid "Host details"
-#~ msgstr "Dettagli dell'host"
-
-#~ msgid "./images/gosa_systems_edit_host.png"
-#~ msgstr "./images/gosa_systems_edit_host.png"
-
-#~ msgid "Modify host"
-#~ msgstr "Modificare host"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Aggiungere gruppi di rete (netgroup)"
-
 #~ msgid "slbackup-php Maintenance"
 #~ msgstr "Manutenzione di slbackup-php"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index fac188d..7885902 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2014-09-30 10:13+0000\n"
+"POT-Creation-Date: 2014-10-05 09:22-0400\n"
 "PO-Revision-Date: 2014-06-15 16:48+0200\n"
 "Last-Translator: Ole-Erik Yrvin <oeyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -38,11 +38,16 @@ msgstr "Debian Edu / Skolelinux Wheezy 7.1+edu0 utgivelsesmanual"
 msgid "Manual for Debian Edu 8.0~alpha+edu0 Codename Jessie"
 msgstr "Utgivelsesmanual for Debian Edu 7.1+edu0 kodenavn Wheezy"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "./images/23-Tjener-KDM_Login.png"
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lenny-10-basesystem.png\"/></imageobject>"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Skolelinux innlogging"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -187,12 +192,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_Wheezy.png"
-msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
+msgid "./images/Debian_Edu_Network_Jessie.png"
 msgstr "./images/Debian_Edu_Network_Wheezy.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "The Debian Edu network topology"
+msgstr "Krav for nettverksoppsett"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2344,10 +2353,16 @@ msgstr ""
 "Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong"
 "\">hovedtjeber</emphasis> tilgjengelig: "
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "./images/pxe-tjener.png"
+msgid "./images/pxe-tjener.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lenny-10-basesystem.png\"/></imageobject>"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -2360,12 +2375,10 @@ msgstr ""
 "emphasis> og <emphasis role=\"strong\">tynnklienttjener</emphasis> "
 "profilene :"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
-"png]\"/></imageobject>"
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -2693,41 +2706,73 @@ msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
 "getting-]started.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+msgid "./images/24-Tjener-KDE_Start.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
 "lenny-10-basesystem.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
 "png]\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
+"png]\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "KDE Desktop"
+msgstr "Katalogtjeneste (OpenLDAP) [ldap]"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
 "lenny-10-basesystem.png\"/></imageobject>"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "Diskless Workstation Login"
+msgstr "Arbeidstasjoner uten harddisk"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
 "png]\"/></imageobject>"
@@ -2803,6 +2848,11 @@ msgstr ""
 "HowTo#\">HowTo</ulink> kapittelet dekker flere tips, triks og endel ofte "
 "spurte spørsmål."
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "Debian Edu KDE desktop"
+msgstr "Krav for nettverksoppsett"
+
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 msgid ""
@@ -2902,8 +2952,13 @@ 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>
+#, fuzzy
+msgid "./images/gosa2_overview.png"
+msgstr "./images/sad.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>
@@ -3056,10 +3111,16 @@ 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 "{{attachment:filterbox.png}}"
-msgstr "<phrase>attachment:lwat-adduser.png</phrase>"
+msgid "./images/filterbox.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lenny-10-basesystem.png\"/></imageobject>"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3090,10 +3151,17 @@ 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"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lenny-10-basesystem.png\"/></imageobject>"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "{{attachment:edit_user.png}}"
-msgstr "<phrase>attachment:lwat-edituser.png</phrase>"
+msgid "Editing user data"
+msgstr "Legge til brukere"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3138,13 +3206,18 @@ msgid ""
 "yourself"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
+#. 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 ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:worldmap.png"
 "\"/]></imageobject>"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "Set user password"
+msgstr "Sett passord"
+
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 msgid ""
@@ -3241,17 +3314,23 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Brukeradministrasjon med lwat"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "{{attachment:create_group.png}}"
+msgid "./images/create_group.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
 "lenny-10-basesystem.png\"/></imageobject>"
 
-#. 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 "{{attachment:list_groups.png}}"
-msgstr "<phrase>attachment:lwat-edituser.png</phrase>"
+msgid "./images/list_groups.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lenny-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3408,34 +3487,50 @@ msgid ""
 "enter password:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. 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 ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
 "edu-]squeeze-10-basesystem.png\"/></imageobject>"
 
-#. 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 "{{attachment:gosa_systems_host_details.png}}"
+msgid "./images/gosa_systems_host_details.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
 "edu-]squeeze-10-basesystem.png\"/></imageobject>"
 
-#. 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 "{{attachment:gosa_systems_edit_host.png}}"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
 "lenny-10-basesystem.png\"/></imageobject>"
 
-#. 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 "{{attachment:gosa_systems_add_netgroup.png}}"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
 "edu-]squeeze-10-basesystem.png\"/></imageobject>"
 
+#. 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</"
@@ -4553,7 +4648,7 @@ msgid ""
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu Wheezy</"
-"ulink> about how to upgrade to Wheezy from the previous release, Squezze, "
+"ulink> about how to upgrade to Wheezy from the previous release, Squeeze, "
 "and the Squeeze manual covers the one before that! (Lenny was it's name and "
 "before that there was even another one, based on what was called Etch.)"
 msgstr ""
@@ -5131,7 +5226,7 @@ msgstr "Oppgradering fra en CD eller et tilsvarende avtrykk."
 #, fuzzy
 msgid ""
 "If you want to upgrade from one version to another (for example from Jessie "
-"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Hvis du vil oppgradere fra en versjon til en annen (for eksempel fra Wheezy "
@@ -9726,9 +9821,9 @@ msgstr "Utgivelsesmanual for Debian Edu 7.1+edu0 kodenavn Wheezy"
 #, fuzzy
 msgid ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <ulink url="
-"\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy/CopyRight#"
-"\">Copyright chapter</ulink> for the full list of copyright owners."
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 "Opphavsrett © 2007 Holger Levsen < <ulink url='mailto:holger at layer-acht."
 "org'>holger at layer-acht.org</ulink> > og andre, se <link linkend=\"CopyRight"
@@ -11854,11 +11949,50 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Skolelinux innlogging"
+#, fuzzy
+#~| msgid "./images/23-Tjener-KDM_Login.png"
+#~ msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgstr "./images/23-Tjener-KDM_Login.png"
+
+#, fuzzy
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "./images/pxe-tjener.png"
+
+#, fuzzy
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-"
+#~ "tjener.png]\"/></imageobject>"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "Krav for nettverksoppsett"
+#, fuzzy
+#~ msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+#~ "lenny-10-basesystem.png\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-"
+#~ "tjener.png]\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "{{attachment:filterbox.png}}"
+#~ msgstr "<phrase>attachment:lwat-adduser.png</phrase>"
+
+#, fuzzy
+#~ msgid "{{attachment:edit_user.png}}"
+#~ msgstr "<phrase>attachment:lwat-edituser.png</phrase>"
+
+#, fuzzy
+#~ msgid "{{attachment:create_group.png}}"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+#~ "lenny-10-basesystem.png\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "<phrase>attachment:lwat-edituser.png</phrase>"
 
 #, fuzzy
 #~ msgid "Installer advanced options screen 1"
@@ -11873,10 +12007,6 @@ msgstr ""
 #~ msgstr "Installasjonsvalg i detalj"
 
 #, fuzzy
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
-#, fuzzy
 #~ msgid "./images/04-Configure_the_keyboard.png"
 #~ msgstr "./images/04-Configure_the_keyboard.png"
 
@@ -12009,50 +12139,6 @@ msgstr ""
 #~ "getting-]started.png\"/></imageobject>"
 
 #, fuzzy
-#~ msgid "KDE Desktop"
-#~ msgstr "Katalogtjeneste (OpenLDAP) [ldap]"
-
-#, fuzzy
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Arbeidstasjoner uten harddisk"
-
-#, fuzzy
-#~ msgid "./images/31-ThinClient-KDE_Desktop.png"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-"
-#~ "tjener.png]\"/></imageobject>"
-
-#, fuzzy
-#~ msgid "Debian Edu KDE desktop"
-#~ msgstr "Krav for nettverksoppsett"
-
-#, fuzzy
-#~ msgid "./images/filterbox.png"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-#~ "lenny-10-basesystem.png\"/></imageobject>"
-
-#, fuzzy
-#~ msgid "./images/edit_user.png"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-#~ "lenny-10-basesystem.png\"/></imageobject>"
-
-#, fuzzy
-#~ msgid "Editing user data"
-#~ msgstr "Legge til brukere"
-
-#, fuzzy
-#~ msgid "Set user password"
-#~ msgstr "Sett passord"
-
-#, fuzzy
-#~ msgid "./images/list_groups.png"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-#~ "lenny-10-basesystem.png\"/></imageobject>"
-
-#, fuzzy
 #~ msgid "slbackup-php Maintenance"
 #~ msgstr "slbackup-php Vedlikehold"
 
@@ -12069,12 +12155,6 @@ msgstr ""
 #~ "opphavsrett 2007 og er utgitt under GPL2 eller senere versjoner."
 
 #, fuzzy
-#~ msgid "./images/30-ThinClient-LDM_Login.png"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-#~ "lenny-10-basesystem.png\"/></imageobject>"
-
-#, fuzzy
 #~ msgid "Thin Client Login"
 #~ msgstr "Tynnklienter"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 5bbaa86..5d27f43 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-09-30 10:13+0000\n"
+"POT-Creation-Date: 2014-10-05 09:22-0400\n"
 "PO-Revision-Date: 2014-08-08 17:24+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -32,12 +32,16 @@ msgstr "Handleiding Debian Edu/Skolelinux Wheezy 7.1+edu0"
 msgid "Manual for Debian Edu 8.0~alpha+edu0 Codename Jessie"
 msgstr "Handleiding voor Debian Edu 7.1+edu0 codenaam Wheezy"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/23-Tjener-KDM_Login.png"
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+msgid "./images/23-Tjener-KDM_Login.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr "Aanmelden bij Debian Edu"
+
 #. type: Content of: <article><section><para>
 #, fuzzy
 #| msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
@@ -188,12 +192,16 @@ msgstr ""
 msgid "Network"
 msgstr "Het netwerk"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/Debian_Edu_Network_Wheezy.png"
-msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
+msgid "./images/Debian_Edu_Network_Jessie.png"
 msgstr "./images/Debian_Edu_Network_Wheezy.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 ""
 "The figure is a sketch of the assumed network topology. The default setup of "
@@ -2425,11 +2433,15 @@ msgstr ""
 "Indien u koos voor een <emphasis role=\"strong\">Hoofdserver</emphasis> met "
 "uitsluitend het hoofdserverprofiel, ziet het menu van PXE er zo uit:"
 
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/pxe-tjener.png"
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "./images/pxe-tjener.png"
+#| msgid "./images/alert.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2441,11 +2453,9 @@ msgstr ""
 "emphasis> als een <emphasis role=\"strong\">Thin-clientserver-</"
 "emphasis>profiel, ziet het menu van PXE er als volgt uit:"
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2771,40 +2781,70 @@ msgstr "20-Finish_the_Installation.png"
 msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr "KDM-aanmeldscherm op tjener"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/24-Tjener-KDE_Start.png"
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+msgid "./images/24-Tjener-KDE_Start.png"
 msgstr "./images/24-Tjener-KDE_Start.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
+msgstr "Opstarten van KDE..."
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr "KDE met browser"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr "Bureaublad van KDE"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/29-Diskless-WS-LDM_Login.png"
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr "Aanmeldscherm op een schijfloos werkstation"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -2893,6 +2933,10 @@ msgstr ""
 "Het hoofdstuk <link linkend=\"HowTo\">HowTo</link> geeft nog meer handige "
 "wenken en behandelt ook enkele veel voorkomende vragen."
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu KDE desktop"
+msgstr "Het KDE-bureaublad van Debian Edu"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -3000,11 +3044,15 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "Zich aanmelden bij GOsa² en de overzichtspagina"
 
-#. 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 "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²."
@@ -3240,11 +3288,15 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Opzoeken, wijzigen en verwijderen van gebruikers"
 
-#. 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 "Filterkader"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3288,11 +3340,15 @@ 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>
+#. 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 "Gebruikersgegevens bewerken"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Set passwords"
@@ -3350,12 +3406,16 @@ msgstr ""
 "op het scherm dat daarop verschijnt, kunt u een nieuw door uzelf gekozen "
 "wachtwoord instellen"
 
-#. 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 "Een gebruikerswachtwoord aanmaken"
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3467,17 +3527,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Het beheer van groepen met 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 "een groep aanmaken"
+
+#. 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."
@@ -3675,30 +3739,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 "Een lijst van systemen in 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 "Meer bijzonderheden over een systeem"
+
+#. 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 "Aanpassingen aan een systeem"
+
+#. 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 "Een netgroep toevoegen"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4833,7 +4913,7 @@ msgid ""
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu Wheezy</"
-"ulink> about how to upgrade to Wheezy from the previous release, Squezze, "
+"ulink> about how to upgrade to Wheezy from the previous release, Squeeze, "
 "and the Squeeze manual covers the one before that! (Lenny was it's name and "
 "before that there was even another one, based on what was called Etch.)"
 msgstr ""
@@ -5415,7 +5495,7 @@ msgstr "Opwaarderen met behulp van een cd of een gelijksoortig image"
 #| "only physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Jessie "
-"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Indien u wenst op te waarderen van een versie naar een andere (bijvoorbeeld "
@@ -10089,9 +10169,9 @@ msgstr "Handleiding voor Debian Edu 7.1+edu0 codenaam Wheezy"
 #| "list of copyright owners."
 msgid ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <ulink url="
-"\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy/CopyRight#"
-"\">Copyright chapter</ulink> for the full list of copyright owners."
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > en anderen. Raadpleeg het "
@@ -12417,11 +12497,45 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
-#~ msgid "Debian Edu login"
-#~ msgstr "Aanmelden bij Debian Edu"
+#, fuzzy
+#~| msgid "./images/pxe-tjener.png"
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "./images/pxe-tjener.png"
+
+#, fuzzy
+#~| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+#~ msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
+#, fuzzy
+#~| msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#, 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"
 
-#~ msgid "The Debian Edu network topology"
-#~ msgstr "Netwerktopologie van Debian Edu"
+#, fuzzy
+#~| msgid "./images/list_groups.png"
+#~ msgid "{{attachment:list_groups.png}}"
+#~ msgstr "./images/list_groups.png"
 
 #~ msgid "./images/01-Installer_boot_menu.png"
 #~ msgstr "./images/01-Installer_boot_menu.png"
@@ -12440,12 +12554,6 @@ msgstr ""
 #~ msgid "Installer help screen"
 #~ msgstr "Installatieprogramma - hulpscherm"
 
-#~ msgid "width=400"
-#~ msgstr "width=400"
-
-#~ msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#~ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
 #~ msgid "./images/02-select_a_language.png"
 #~ msgstr "./images/02-select_a_language.png"
 
@@ -12515,54 +12623,6 @@ msgstr ""
 #~ msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 #~ msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#~ msgid "./images/22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
-
-#~ msgid "tjener KDM Login"
-#~ msgstr "KDM-aanmeldscherm op tjener"
-
-#~ msgid "KDE starting..."
-#~ msgstr "Opstarten van KDE..."
-
-#~ msgid "KDE and Browser"
-#~ msgstr "KDE met browser"
-
-#~ msgid "KDE Desktop"
-#~ msgstr "Bureaublad van KDE"
-
-#~ msgid "Diskless Workstation Login"
-#~ msgstr "Aanmeldscherm op een schijfloos werkstation"
-
-#~ msgid "Debian Edu KDE desktop"
-#~ msgstr "Het KDE-bureaublad van Debian Edu"
-
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr "Overzichtspagina van GOsa² na het aanmelden als de eerste gebruiker"
-
-#~ msgid "Filterbox"
-#~ msgstr "Filterkader"
-
-#~ msgid "Editing user data"
-#~ msgstr "Gebruikersgegevens bewerken"
-
-#~ msgid "Set user password"
-#~ msgstr "Een gebruikerswachtwoord aanmaken"
-
-#~ msgid "create group"
-#~ msgstr "een groep aanmaken"
-
-#~ msgid "GOsa² systems listing"
-#~ msgstr "Een lijst van systemen in GOsa²"
-
-#~ msgid "Host details"
-#~ msgstr "Meer bijzonderheden over een systeem"
-
-#~ msgid "Modify host"
-#~ msgstr "Aanpassingen aan een systeem"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Een netgroep toevoegen"
-
 #~ msgid "slbackup-php Maintenance"
 #~ msgstr "Beheer van slbackup-php"
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 715e54c..9c03963 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-30 10:13+0000\n"
+"POT-Creation-Date: 2014-10-05 09:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -28,8 +28,12 @@ msgstr ""
 msgid "Manual for Debian Edu 8.0~alpha+edu0 Codename Jessie"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr ""
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -130,8 +134,12 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:Debian_Edu_Network_Jessie.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/Debian_Edu_Network_Jessie.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>
@@ -1661,8 +1669,12 @@ msgid ""
 "Server</emphasis> profile only:"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:pxe-tjener.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/pxe-tjener.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1672,8 +1684,8 @@ msgid ""
 "emphasis> profiles:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1885,28 +1897,56 @@ msgstr ""
 msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/24-Tjener-KDE_Start.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/27-Tjener-KDE_Desktop.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Diskless Workstation Login"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -1968,6 +2008,10 @@ msgid ""
 "and some frequently asked questions."
 msgstr ""
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu KDE desktop"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -2045,8 +2089,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>
@@ -2188,8 +2236,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>
@@ -2217,8 +2269,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>
@@ -2260,8 +2316,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>
@@ -2351,12 +2411,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>
@@ -2483,20 +2547,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>
@@ -3259,7 +3339,7 @@ msgid ""
 "based Debian Edu release first, before you can follow the instructions "
 "provided above. Instructions are given in the <ulink url=\"https://wiki."
 "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu Wheezy</"
-"ulink> about how to upgrade to Wheezy from the previous release, Squezze, "
+"ulink> about how to upgrade to Wheezy from the previous release, Squeeze, "
 "and the Squeeze manual covers the one before that! (Lenny was it's name and "
 "before that there was even another one, based on what was called Etch.)"
 msgstr ""
@@ -3661,7 +3741,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "If you want to upgrade from one version to another (for example from Jessie "
-"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 
@@ -6881,9 +6961,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Copyright (C) 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
-"acht.org\">holger at layer-acht.org</ulink> > and others, see the <ulink url="
-"\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy/CopyRight#"
-"\">Copyright chapter</ulink> for the full list of copyright owners."
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 5e705e4..4e7c2f9 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -4,7 +4,7 @@
 <section id="AboutDebianEdu">
 <title>Manual for Debian Edu 8.0~alpha+edu0 Codename Jessie
 </title>
-<para>{{attachment:23-Tjener-KDM_Login.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/23-Tjener-KDM_Login.png"/></imageobject><textobject><phrase>Debian Edu login</phrase></textobject></inlinemediaobject> 
 </para>
 <para>This is the manual for the Debian Edu Jessie 8.0~alpha+edu0 release.  
 </para>
@@ -48,7 +48,7 @@
 <section id="Architecture--Network">
 <title>Network
 </title>
-<para>{{attachment:Debian_Edu_Network_Jessie.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/Debian_Edu_Network_Jessie.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>
@@ -711,11 +711,11 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
 </para>
 <para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> profile only: 
 </para>
-<para>{{attachment:pxe-tjener.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/pxe-tjener.png"/></imageobject><textobject><phrase>width=400</phrase></textobject></inlinemediaobject> 
 </para>
 <para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> and <emphasis role="strong">Thin-Client-Server</emphasis> profiles: 
 </para>
-<para>{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>width=400</phrase></textobject></inlinemediaobject> 
 </para>
 <para>This setup also allows diskless workstations and thin clients to be booted on the main network. Unlike workstations, diskless workstations don't have to be added to LDAP with GOsa², but can be, for example if you want to force the hostname. 
 </para>
@@ -805,21 +805,21 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
 </para>
 <para>{{attachment:21-Finish_the_Installation-Installation_complete.png}} 
 </para>
-<para>{{attachment:22-Tjener_GRUB_boot_menu.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/22-Tjener_GRUB_boot_menu.png"/></imageobject><textobject><phrase>22-Tjener_GRUB_boot_menu.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:23-Tjener-KDM_Login.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/23-Tjener-KDM_Login.png"/></imageobject><textobject><phrase>tjener KDM Login</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:24-Tjener-KDE_Start.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/24-Tjener-KDE_Start.png"/></imageobject><textobject><phrase>KDE starting...</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:26-Tjener-KDE_Desktop_Browser.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/26-Tjener-KDE_Desktop_Browser.png"/></imageobject><textobject><phrase>KDE and Browser</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:27-Tjener-KDE_Desktop.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-KDE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>28-Diskless-WS-GRUB_Boot_menu-PXE.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:29-Diskless-WS-LDM_Login.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/29-Diskless-WS-LDM_Login.png"/></imageobject><textobject><phrase>Diskless Workstation Login</phrase></textobject></inlinemediaobject> 
 </para>
-<para>{{attachment:31-ThinClient-KDE_Desktop.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/31-ThinClient-KDE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop</phrase></textobject></inlinemediaobject> 
 </para>
 </section>
 </section>
@@ -851,7 +851,7 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
 </para>
 <para>The <link linkend="HowTo">HowTo</link> chapter covers more tips and tricks and some frequently asked questions. 
 </para>
-<para>{{attachment:27-Tjener-KDE_Desktop.png}} 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-KDE_Desktop.png"/></imageobject><textobject><phrase>Debian Edu KDE desktop</phrase></textobject></inlinemediaobject> 
 </para>
 
 <section id="GettingStarted--Services_running_on_the_main_server">
@@ -903,7 +903,7 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></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>
@@ -955,7 +955,7 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></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>
@@ -963,7 +963,7 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></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>
 
@@ -985,7 +985,7 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></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>
@@ -1036,9 +1036,9 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></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>
@@ -1083,13 +1083,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>
@@ -1434,7 +1434,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 <section id="Upgrades--Upgrades_from_older_Debian_Edu_.2BAC8_Skolelinux_installations_.28before_Wheezy.29">
 <title>Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)
 </title>
-<para>To upgrade from any older release, you will need to upgrade to the Wheezy-based Debian Edu release first, before you can follow the instructions provided above. Instructions are given in the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Wheezy#">Manual for Debian Edu Wheezy</ulink> about how to upgrade to Wheezy from the previous release, Squezze, and the Squeeze manual covers the one before that! (Lenny was it's name and before that there was even another one, based  [...]
+<para>To upgrade from any older release, you will need to upgrade to the Wheezy-based Debian Edu release first, before you can follow the instructions provided above. Instructions are given in the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Wheezy#">Manual for Debian Edu Wheezy</ulink> about how to upgrade to Wheezy from the previous release, Squeeze, and the Squeeze manual covers the one before that! (Lenny was it's name and before that there was even another one, based  [...]
 </para>
 </section>
 </section>
@@ -1609,7 +1609,7 @@ apt-get update]]></screen>
 <section id="Administration--Upgrading_with_a_CD_or_similar_image">
 <title>Upgrading with a CD or similar image
 </title>
-<para>If you want to upgrade from one version to another (for example from Jessie 7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only physical media, follow these steps: 
+<para>If you want to upgrade from one version to another (for example from Jessie 8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only physical media, follow these steps: 
 </para>
 <para>Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the apt-cdrom command: 
 </para><screen><![CDATA[mount /media/cdrom
@@ -3225,7 +3225,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <section id="AppendixA--Manual_for_Debian_Edu_8.0~alpha.2B-edu0_Codename_.26quot.3BJessie.26quot.3B">
 <title>Manual for Debian Edu 8.0~alpha+edu0 Codename "Jessie"
 </title>
-<para>Copyright (C) 2007-2014 Holger Levsen < <ulink url="mailto:holger at layer-acht.org">holger at layer-acht.org</ulink> > and others, see the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Wheezy/CopyRight#">Copyright chapter</ulink> for the full list of copyright owners. 
+<para>Copyright (C) 2007-2014 Holger Levsen < <ulink url="mailto:holger at layer-acht.org">holger at layer-acht.org</ulink> > and others, see the <link linkend="CopyRight">Copyright chapter</link> for the full list of copyright owners. 
 </para>
 <para>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. 
 </para>
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index 1b41570..89f52d3 100644
Binary files a/documentation/debian-edu-jessie/images/de/worldmap.png and b/documentation/debian-edu-jessie/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/es/worldmap.png b/documentation/debian-edu-jessie/images/es/worldmap.png
index 7a5f271..11223c0 100644
Binary files a/documentation/debian-edu-jessie/images/es/worldmap.png and b/documentation/debian-edu-jessie/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/fr/worldmap.png b/documentation/debian-edu-jessie/images/fr/worldmap.png
index 621ef2a..e3ac774 100644
Binary files a/documentation/debian-edu-jessie/images/fr/worldmap.png and b/documentation/debian-edu-jessie/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/worldmap.png b/documentation/debian-edu-jessie/images/worldmap.png
index a981786..9a665c3 100644
Binary files a/documentation/debian-edu-jessie/images/worldmap.png and b/documentation/debian-edu-jessie/images/worldmap.png differ

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



More information about the debian-edu-commits mailing list