[debian-edu-commits] debian-edu/debian-edu-doc.git (#1501) - master (branch) updated: 1.5_20130617_7.1-13-g0c5cae1

Wolfgang Schweer schweer-guest at alioth.debian.org
Wed Jul 3 13:29:53 UTC 2013


The branch, master has been updated
       via  0c5cae170738f218addacf965e976e4434cf7ce3 (commit)
      from  08c741b61d0e18b3f2d59ca30f350b387001f8f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0c5cae170738f218addacf965e976e4434cf7ce3
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Jul 3 15:19:57 2013 +0200

    Update manual from the wiki.

-----------------------------------------------------------------------

Summary of changes:
 .../debian-edu-wheezy-manual.da.po                 |  410 +++++++++++-----
 .../debian-edu-wheezy-manual.de.po                 |  496 +++++++++++++-------
 .../debian-edu-wheezy-manual.es.po                 |  343 +++++++++-----
 .../debian-edu-wheezy-manual.fr.po                 |  439 +++++++++++------
 .../debian-edu-wheezy-manual.it.po                 |  457 ++++++++++++------
 .../debian-edu-wheezy-manual.nb.po                 |  306 +++++++-----
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot |  215 ++++++---
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml |  111 ++---
 documentation/debian-edu-wheezy/fixme-status.txt   |   16 +-
 9 files changed, 1838 insertions(+), 955 deletions(-)

The diff of changes is:
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 42e4777..919d5d2 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-03 15:09+0300\n"
 "PO-Revision-Date: 2013-02-15 11:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1506,7 +1506,7 @@ msgstr ""
 #| "CD.iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
 "iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
@@ -1517,8 +1517,8 @@ msgstr ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
 #| "CD.iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
-"CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
 "iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
@@ -1530,7 +1530,7 @@ msgstr ""
 #| "edu-7.0.0+r0-CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
 "CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
@@ -1898,13 +1898,24 @@ msgstr ""
 "yderligere installationer udføres via PXE, da dette automatisk vil bruge "
 "proxyen for hovedserveren."
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid ""
+"Boot parameters available when installing from CD, not when installing from "
+"DVD"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "For at installere <emphasis role=\"strong\">GNOME</emphasis>-skrivebordet i "
 "stedet for <emphasis role=\"strong\">KDE</emphasis>-skrivebordet så tilføj "
@@ -1913,11 +1924,33 @@ msgstr ""
 "ikke tilgængelig ved installation fra dvd."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"parameters."
+msgstr ""
+"For at installere <emphasis role=\"strong\">LXDE</emphasis>-skrivebordet i "
+"stedet for så tilføj <computeroutput>desktop=lxde</computeroutput> til "
+"kerneopstartsparametrene. Denne indstilling er kun tilgængelig, når der "
+"installeres fra cd. Den er ikke tilgængelig ved installation fra dvd."
+
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
+msgid ""
+"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+"parameters."
 msgstr ""
 "For at installere <emphasis role=\"strong\">LXDE</emphasis>-skrivebordet i "
 "stedet for så tilføj <computeroutput>desktop=lxde</computeroutput> til "
@@ -2131,6 +2164,16 @@ msgstr ""
 "installation - Running debian-edu-profile-udeb...«"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"After giving the root password, you will be asked to create a normal user "
+"account \"for non-administrative tasks\". For Debian-edu, this account is "
+"very important! It is the account you will use to manage the Skolelinux "
+"network. You must choose a password length of at least 5 characters for this "
+"user, otherwise you will not be able to log in (even though a shorter "
+"password will be accepted by the installer)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Hyg dig"
 
@@ -2208,7 +2251,10 @@ msgstr ""
 "nettet varierer fra profil til profil:"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+#, fuzzy
+#| msgid ""
+#| "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgid "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2562,7 +2608,7 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: some screenshots still need to be done here..."
+msgid "FIXME: one screenshot still needs to be done here..."
 msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2819,9 +2865,15 @@ msgstr "23-Tjener-KDM_Login.png"
 msgid "tjener KDM Login"
 msgstr "23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:24-Tjener-KDE_Start.png]"
-msgstr "[attachment:24-Tjener-KDE_Start.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "24-Tjener-KDE_Start.png"
+msgid "./images/24-Tjener-KDE_Start.png"
+msgstr "24-Tjener-KDE_Start.png"
+
+#. 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
@@ -2845,22 +2897,34 @@ msgstr "27-Tjener-KDE_Desktop.png"
 msgid "KDE Desktop"
 msgstr "Fjernskrivebord"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
-msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "29-Diskless-WS-KDM_Login.png"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr "29-Diskless-WS-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:30-ThinClient-LDM_Login.png]"
-msgstr "[attachment:30-ThinClient-LDM_Login.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Diskless workstations"
+msgid "Diskless Workstation Login"
+msgstr "Diskløse arbejdsstationer"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "31-ThinClient-KDE_Desktop.png"
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+#| msgid "30-ThinClient-LDM_Login.png"
+msgid "./images/30-ThinClient-LDM_Login.png"
+msgstr "30-ThinClient-LDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
+#, fuzzy
+#| msgid "Thin clients"
+msgid "Thin Client Login"
+msgstr "Tynde klienter"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "31-ThinClient-KDE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -2918,6 +2982,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"If generic DNS traffic is blocked out of your network and you need to use "
+"some specific DNS server to look up internet hosts, you need to tell the DNS "
+"server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
+"options and specify the IP address of the DNS server to use."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
 "and some frequently asked questions."
 msgstr ""
@@ -3279,12 +3351,20 @@ msgid "Filterbox"
 msgstr "Filterbox"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To modify or delete a user, use GOsa² to browse the list of users on your "
+#| "system. On the very right of the screen you will find 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 \"[x] Search in subtrees"
+#| "\"."
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
-"system. On the very right of the screen you will find the \"Filter\" box, a "
+"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 \"[x] Search in subtrees\"."
+"and search there with the option marked \"Search in subtrees\"."
 msgstr ""
 "For at ændre eller slette en bruger, så brug GOsa² til at gennemse listen "
 "over brugere på dit system. I højre siden af skærmen kan du se boksen "
@@ -3294,12 +3374,19 @@ msgstr ""
 "markeret."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When using the \"Filter\" box, results will immediately appear in the "
+#| "middle of the text in the table list view. Every line represents a user "
+#| "account and the items farthest to the right on each line are little icons "
+#| "that provide actions for you: edit, lock, set password, restore snapshot "
+#| "(greyed out if no snapshot was taken before), take snapshot and delete."
 msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
 "the items farthest to the right on each line are little icons that provide "
-"actions for you: edit, lock, set password, restore snapshot (greyed out if "
-"no snapshot was taken before), take snapshot and delete."
+"actions for you: cut entry, copy entry, edit user, lock account, set "
+"password, take snapshot (not usable) and remove user."
 msgstr ""
 "Når der bruges boksen »Filter« vil resultaterne umiddelbart fremkomme i "
 "midten af teksten i tabelvisningen. Hver linje repræsenterer en brugerkonto "
@@ -3381,14 +3468,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>
-msgid "FIXME: add screenshot of a user changing her password with GOSA2"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:change_password_administratively.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:change_password_administratively.png]"
+msgid "./images/change_password_administratively.png"
 msgstr "[attachment:change_password_administratively.png]"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+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 "
@@ -3509,17 +3598,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppehåndtering med GOsa²"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for group management with GOSA2"
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:create_group.png]"
-msgstr "[attachment:create_group.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "opret gruppe"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:list_groups.png]"
-msgstr "[attachment:list_groups.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/list_groups.png"
+msgstr "./images/smile.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3674,7 +3767,7 @@ msgid ""
 "machine this way. It may be better to first think about your network: For "
 "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
 "x>100 for workstations. Don't forget to activate the just added system. "
-"With the exception of the main server all system will then have a matching "
+"With the exception of the main server all systems will then have a matching "
 "icon."
 msgstr ""
 "For at tildele en vært med MAC-adressen 52:54:00:12:34:10, en statisk IP-"
@@ -3686,14 +3779,26 @@ msgstr ""
 "netværk."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If the machines have booted as thin clients/diskless workstations or have "
+#| "been installed using any of the networked profiles, the "
+#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
+#| "to automatically add machines to GOsa². Please note, that the IP "
+#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+#| "computeroutput> belong to the dynamic IP range. These systems can then be "
+#| "modified though to suite your network. A few screenshots show how this "
+#| "may be done."
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
 "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to "
-"automatically add machines to GOsa². Please note, that the IP addresses "
-"shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> "
-"belong to the dynamic IP range. These systems can then be modified though to "
-"suite your network. A few screenshots show how this may be done."
+"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -"
+"h</computeroutput> shows usage information. Please note, that the IP "
+"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+"computeroutput> belong to the dynamic IP range. These systems can then be "
+"modified though to suite your network. A few screenshots show how this may "
+"be done."
 msgstr ""
 "Hvis maskinerne er opstartet som tynde klienter/diskløse arbejdsstationer "
 "eller er blevet installeret med brug af nogle af netværksprofilerne, kan "
@@ -3704,17 +3809,25 @@ msgstr ""
 "passer til dit netværk. Et par skærmbilleder viser hvordan dette gøres."
 
 #. type: CDATA
-#, no-wrap
-msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-"info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a\n"
+#| "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+#| "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
+#| "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password: █"
+msgid ""
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █"
+"enter password:"
 msgstr ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
 "info: Opret GOSa-maskine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
@@ -3726,26 +3839,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>
-msgid "FIXME: add screenshots for machine management with GOSA2"
-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>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_list.png]"
+msgid "./images/gosa_systems_list.png"
 msgstr "[attachment:gosa_systems_list.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_host_details.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr "Visning af GOsa²-systemer"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_host_details.png]"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "[attachment:gosa_systems_host_details.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_edit_host.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr "Værtsdetaljer"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_edit_host.png]"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "[attachment:gosa_systems_edit_host.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_add_netgroup.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr "Ændr vært"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_add_netgroup.png]"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "[attachment:gosa_systems_add_netgroup.png]"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr "Tilføj netgruppe"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4235,14 +4368,16 @@ msgstr ""
 "(vedligeholdelse) i menuen på siden for sikkerhedskopiering og vælg det "
 "ældste øjebliksbillede du ønsker at bevare:"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:slbackup-php_maintenance.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:slbackup-php_maintenance.png]"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "[attachment:slbackup-php_maintenance.png]"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Vedligeholdelse for slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Serverovervågning"
@@ -6114,7 +6249,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgstr "<emphasis role=\"strong\">Tynd klient</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A thin client setup enables an ordinary PC to function as an (X-)terminal, "
 "where all software runs on the LTSP server. This means that this machine "
@@ -6131,7 +6266,7 @@ msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 msgstr "<emphasis role=\"strong\">Diskløs arbejdsstation</emphasis>"
 
 # engelsk fejl gamle ?
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A diskless workstation runs all software locally. The client machines boot "
 "directly from the LTSP server without a local hard drive. Software is "
@@ -6152,11 +6287,37 @@ msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
-"add them with GOsa²."
+"add them with GOsa², cause LDM is used to login and connect to the LTSP "
+"server."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"These steps have to be taken to get back to the behaviour in Debian Edu "
+"Squeeze."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
+"lts.conf (or set this in LDAP). Make sure, that the display manager is "
+"installed in the LTSP chroot."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Add workstations with GOsa²"
+msgid "Add the diskless workstations to LDAP with GOsa²."
+msgstr "Tilføj arbejdsstationer med GOsa²"
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
+msgstr "<emphasis role=\"strong\">LTSP-klientkerne</emphasis>"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "LTSP client boot will fail if the client's network card requires a non-free "
 "firmware. A PXE installation can be used for troubleshooting problems with "
 "netbooting a machine; if the Debian Installer complains about a missing XXX."
@@ -6219,26 +6380,26 @@ msgstr ""
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP-klientkerne</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In order to support older hardware the package <computeroutput>linux-"
+#| "image-486</computeroutput> is installed by default. If all LTSP client "
+#| "machines support the 686 processor architecture the <computeroutput>linux-"
+#| "image-686</computeroutput> package could be installed in the chroot."
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-486</computeroutput> is installed by default. If all LTSP client "
 "machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot."
+"image-686</computeroutput> package could be installed in the chroot. Make "
+"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
+"installation."
 msgstr ""
 "For at understøtte ældre udstyr installeres pakken <computeroutput>linux-"
 "image-486</computeroutput> som standard. Hvis alle LTSP-klientmaskiner "
 "understøtter 686-processorarkitekturen kan pakken <computeroutput>linux-"
 "image-686</computeroutput> installeres i chroot'en."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
-"after installation."
-msgstr ""
-"Vær sikker på at køre <computeroutput>ltsp-update-kernels</computeroutput> "
-"efter installationen."
-
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
 #| msgid "Select type of installation"
@@ -7682,8 +7843,12 @@ msgid "Redirecting using global policies"
 msgstr "Videresende med brug af globale politikker"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME explain how to use profiles from global policies for Windows "
+#| "machines in the skolelinux network"
 msgid ""
-"FIXME explain how to use profiles from global policies for Windows machines "
+"FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
 "FIXME explain how to use profiles from global policies for Windows machines "
@@ -8621,8 +8786,10 @@ msgstr ""
 "skulle så se din seneste sendte e-post i indboksen under »intern«."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Obtaining a Kerberos ticket to read email on diskless clients"
-msgstr ""
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
+msgstr "Introduktion til tynde klienter og diskløse arbejdsstationer"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9106,13 +9273,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The start of LTSP clients as diskless workstation / thin client can be "
-"configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/dm) "
-"-- or individually adding an entry in lts.conf or LDAP."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
 "hidden to the end user, others even to the GOsa admin."
@@ -11512,8 +11672,30 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
-#~ msgid "Add workstations with GOsa²"
-#~ msgstr "Tilføj arbejdsstationer med GOsa²"
+#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
+#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
+
+#~ msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+#~ msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
+
+#~ msgid "[attachment:30-ThinClient-LDM_Login.png]"
+#~ msgstr "[attachment:30-ThinClient-LDM_Login.png]"
+
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#~ msgid "[attachment:create_group.png]"
+#~ msgstr "[attachment:create_group.png]"
+
+#~ msgid "[attachment:list_groups.png]"
+#~ msgstr "[attachment:list_groups.png]"
+
+#~ msgid ""
+#~ "Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Vær sikker på at køre <computeroutput>ltsp-update-kernels</"
+#~ "computeroutput> efter installationen."
 
 #~ msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 #~ msgstr "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
@@ -11759,15 +11941,6 @@ msgstr ""
 #~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 #~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
-#~ msgid "24-Tjener-KDE_Start.png"
-#~ msgstr "24-Tjener-KDE_Start.png"
-
-#~ msgid "29-Diskless-WS-KDM_Login.png"
-#~ msgstr "29-Diskless-WS-KDM_Login.png"
-
-#~ msgid "30-ThinClient-LDM_Login.png"
-#~ msgstr "30-ThinClient-LDM_Login.png"
-
 #~ msgid ""
 #~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
 #~ "to install the main server, all user passwords exept that one for the "
@@ -11815,27 +11988,6 @@ msgstr ""
 #~ "  done\n"
 #~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
 
-#~ 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"
-
 #~ msgid ""
 #~ "The Debian Edu Wheezy Manual has generally been cleaned up and improved. "
 #~ "A proof-read with corrections was done by a native English linguist."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index 00c520c..6a37245 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-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: 2013-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-03 15:09+0300\n"
 "PO-Revision-Date: 2013-06-21 18:52+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -280,9 +280,6 @@ msgstr ""
 "Terminal-Server via PXE booten."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "DHCPD on the LTSP servers only serves a dedicated 192.168.0.0/24 network "
-#| "on the second interface and should seldom need to be changed."
 msgid ""
 "DHCPD on the LTSP servers only serves a dedicated network on the second "
 "interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) and "
@@ -1102,7 +1099,6 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 ist verbunden mit dem Hauptnetzwerk (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "eth1 is used for serving the thin-clients (192.168.0.0/24) ."
 msgid ""
 "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
 "192.168.1.0/24) ."
@@ -1479,25 +1475,37 @@ msgstr ""
 "Prozessorarchitektur ist erhältlich mittels"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+#| "edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
 "edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
-"CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
 "CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
@@ -1841,13 +1849,24 @@ msgstr ""
 "haben, sollten weitere Installationen via PXE erfolgen, da dann automatisch "
 "der Proxy des Hauptservers benutzt wird."
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid ""
+"Boot parameters available when installing from CD, not when installing from "
+"DVD"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Um die graphische Arbeitsumgebung <emphasis role=\"strong\">GNOME</emphasis> "
 "anstelle von <emphasis role=\"strong\">KDE</emphasis> zu installieren, fügen "
@@ -1856,11 +1875,33 @@ msgstr ""
 "bei DVD-Installation."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"parameters."
+msgstr ""
+"Um die graphische Arbeitsumgebung <emphasis role=\"strong\">LXDE</emphasis> "
+"anstelle von KDE zu installieren, fügen Sie <computeroutput>desktop=lxde</"
+"computeroutput> als Kernel-Boot-Parameter hinzu. Diese Option steht nur bei "
+"Installationen von CD zur Verfügung, nicht bei DVD-Installation."
+
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
+msgid ""
+"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+"parameters."
 msgstr ""
 "Um die graphische Arbeitsumgebung <emphasis role=\"strong\">LXDE</emphasis> "
 "anstelle von KDE zu installieren, fügen Sie <computeroutput>desktop=lxde</"
@@ -2090,6 +2131,16 @@ msgstr ""
 "benötigen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"After giving the root password, you will be asked to create a normal user "
+"account \"for non-administrative tasks\". For Debian-edu, this account is "
+"very important! It is the account you will use to manage the Skolelinux "
+"network. You must choose a password length of at least 5 characters for this "
+"user, otherwise you will not be able to log in (even though a shorter "
+"password will be accepted by the installer)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Freuen Sie sich!"
 
@@ -2169,7 +2220,10 @@ msgstr ""
 "Pakete hängt vom jeweiligen Installationsprofil ab."
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+#, fuzzy
+#| msgid ""
+#| "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgid "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2518,9 +2572,9 @@ msgstr ""
 "im Netzwerk für Arbeitsplatzrechner bzw. für Thin Clients."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: some screenshots still need to be done here..."
+#, fuzzy
+#| msgid "FIXME: some screenshots still need to be done here..."
+msgid "FIXME: one screenshot still needs to be done here..."
 msgstr "FIXME: some screenshots still need to be done here..."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2688,32 +2742,26 @@ msgid "18-Build LTSP chroot.png"
 msgstr "18-Build LTSP chroot.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:20-Finish_the_Installation.png]"
 msgid "./images/20-Finish_the_Installation.png"
 msgstr "./images/20-Finish_the_Installation.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "[attachment:20-Finish_the_Installation.png]"
 msgid "20-Finish_the_Installation.png"
 msgstr "20-Finish_the_Installation.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
@@ -2733,12 +2781,17 @@ msgstr "./images/23-Tjener-KDM_Login.png"
 msgid "tjener KDM Login"
 msgstr "KDM-Login von tjener"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:24-Tjener-KDE_Start.png]"
-msgstr "[attachment:24-Tjener-KDE_Start.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/27-Tjener-KDE_Desktop.png"
+msgid "./images/24-Tjener-KDE_Start.png"
+msgstr "./images/27-Tjener-KDE_Desktop.png"
+
+#. 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>
-#| msgid "[attachment:26-Tjener-KDE_Desktop_Browser.png]"
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
@@ -2747,32 +2800,40 @@ msgid "KDE and Browser"
 msgstr "KDE und Browser"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/23-Tjener-KDM_Login.png"
 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 "Remote Desktop"
 msgid "KDE Desktop"
 msgstr "KDE-Desktop"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:30-ThinClient-LDM_Login.png]"
-msgstr "[attachment:30-ThinClient-LDM_Login.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Diskless workstations"
+msgid "Diskless Workstation Login"
+msgstr "Diskless Workstations"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "./images/31-ThinClient-KDE_Desktop.png"
+#, fuzzy
+#| msgid "./images/23-Tjener-KDM_Login.png"
+msgid "./images/30-ThinClient-LDM_Login.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
-msgid "31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+#, fuzzy
+#| msgid "Thin clients"
+msgid "Thin Client Login"
+msgstr "Thin Clients"
+
+#. 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"
@@ -2830,6 +2891,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"If generic DNS traffic is blocked out of your network and you need to use "
+"some specific DNS server to look up internet hosts, you need to tell the DNS "
+"server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
+"options and specify the IP address of the DNS server to use."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
 "and some frequently asked questions."
 msgstr ""
@@ -2837,7 +2906,6 @@ msgstr ""
 "Tricks, sowie Antworten auf häufig gestellte Fragen."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Debian Edu login"
 msgid "Debian Edu KDE desktop"
 msgstr "Debian-Edu KDE-Desktop"
 
@@ -3003,13 +3071,6 @@ msgstr ""
 "abzubilden. "
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A default Debian Edu main server installation currently provides two "
-#| "\"departments\": Teachers and Students, plus the base level of the LDAP "
-#| "tree. Student accounts are intended to be added to the \"Students\" "
-#| "department, teachers to the \"Teachers\" department; systems (servers, "
-#| "Skolelinux workstations, Windows machines, etc.) are currently added to "
-#| "the base level. Find your own scheme for customising this structure."
 msgid ""
 "A default Debian Edu main server installation currently provides two "
 "\"departments\": Teachers and Students, plus the base level of the LDAP "
@@ -3181,12 +3242,20 @@ msgid "Filterbox"
 msgstr "Filterbox"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To modify or delete a user, use GOsa² to browse the list of users on your "
+#| "system. On the very right of the screen you will find 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 \"[x] Search in subtrees"
+#| "\"."
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
-"system. On the very right of the screen you will find the \"Filter\" box, a "
+"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 \"[x] Search in subtrees\"."
+"and search there with the option marked \"Search in subtrees\"."
 msgstr ""
 "Um einen Benutzer zu modifizieren oder zu löschen, verwenden Sie GOsa², um "
 "die Benutzerliste auf Ihrem System zu durchsuchen: Ganz rechts auf der Seite "
@@ -3197,12 +3266,19 @@ msgstr ""
 "Option »[x] Suche in Teilbäumen«."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When using the \"Filter\" box, results will immediately appear in the "
+#| "middle of the text in the table list view. Every line represents a user "
+#| "account and the items farthest to the right on each line are little icons "
+#| "that provide actions for you: edit, lock, set password, restore snapshot "
+#| "(greyed out if no snapshot was taken before), take snapshot and delete."
 msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
 "the items farthest to the right on each line are little icons that provide "
-"actions for you: edit, lock, set password, restore snapshot (greyed out if "
-"no snapshot was taken before), take snapshot and delete."
+"actions for you: cut entry, copy entry, edit user, lock account, set "
+"password, take snapshot (not usable) and remove user."
 msgstr ""
 "Bei Verwendung der »Filterbox« erscheinen die Ergebnisse unmittelbar in der "
 "Liste der Benutzer. Jede Zeile repräsentiert eine Benutzerkennung; am "
@@ -3234,11 +3310,6 @@ msgid "Set passwords"
 msgstr "Passwörter setzen "
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The students can change their own passwords by logging into GOsa² with "
-#| "their own usernames. A logged-in student will be presented with a very "
-#| "minimal version of GOsa² that only allows access to the student's own "
-#| "account data sheet and to the set-password dialog."
 msgid ""
 "The students can change their own passwords by logging into GOsa² with their "
 "own usernames. To ease the access of GOsa², an entry called Gosa is provided "
@@ -3288,14 +3359,18 @@ msgstr ""
 "auf der anschließend gezeigten Seite können Sie ein selbst gewähltes "
 "Passwort setzen."
 
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: add screenshot of a user changing her password with GOSA2"
-msgstr "FIXME: add screenshot of a user changing her password with GOSA2"
-
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:change_password_administratively.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:change_password_administratively.png]"
+msgid "./images/change_password_administratively.png"
 msgstr "[attachment:change_password_administratively.png]"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Set passwords"
+msgid "Set user password"
+msgstr "Passwörter setzen "
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
@@ -3309,16 +3384,6 @@ msgid "Advanced user management"
 msgstr "Fortgeschrittene Nutzerverwaltung"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "It is possible to mass-create users with GOsa² by using a CSV file, which "
-#| "can be created with any good spreadsheet software (for example "
-#| "<computeroutput>oocalc</computeroutput>). At least, entries for the "
-#| "following fields have to be provided: uid, last name (sn) and first name "
-#| "(givenName). Make sure that there are no duplicate entries in the uid "
-#| "field. Please note that the check for duplicates must include already "
-#| "existing uid entries in LDAP (which could be obtained by executing "
-#| "<computeroutput>getent passwd | grep tjener/home | cut -d\":\" -f1</"
-#| "computeroutput> on the command line)."
 msgid ""
 "It is possible to mass-create users with GOsa² by using a CSV file, which "
 "can be created with any good spreadsheet software (for example "
@@ -3419,17 +3484,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppen mit GOsa² verwalten"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for group management with GOSA2"
-msgstr "FIXME: add screenshots for group management with GOSA2"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:create_group.png]"
-msgstr "[attachment:create_group.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:list_groups.png]"
-msgstr "[attachment:list_groups.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/edit_user.png"
+msgid "./images/list_groups.png"
+msgstr "./images/edit_user.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3526,11 +3595,6 @@ msgstr ""
 "linkend=\"Architecture\">Kapitel über die Netzwerkstruktur</link> zu finden."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "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."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks *have* to be added with "
@@ -3558,14 +3622,18 @@ msgstr ""
 "für DHCP reserviert und werden dynamisch zugewiesen."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
 #| msgid ""
 #| "To assign a host with the MAC address 52:54:00:12:34:10 a static IP "
 #| "address in GOsa² you have to enter the MAC address, the hostname and the "
 #| "IP; alternatively you might click the <computeroutput>Propose ip</"
 #| "computeroutput> button which will show the first free fixed address in "
-#| "10.0.0.0/8, most probably something like 10.0.0.1 if you add the first "
-#| "machine this way. It may be better to first think about a suited range "
-#| "for your network."
+#| "10.0.0.0/8, most probably something like 10.0.0.2 if you add the first "
+#| "machine this way. It may be better to first think about your network: For "
+#| "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
+#| "x>100 for workstations. Don't forget to activate the just added "
+#| "system. With the exception of the main server all system will then have a "
+#| "matching icon."
 msgid ""
 "To assign a host with the MAC address 52:54:00:12:34:10 a static IP address "
 "in GOsa² you have to enter the MAC address, the hostname and the IP; "
@@ -3575,7 +3643,7 @@ msgid ""
 "machine this way. It may be better to first think about your network: For "
 "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
 "x>100 for workstations. Don't forget to activate the just added system. "
-"With the exception of the main server all system will then have a matching "
+"With the exception of the main server all systems will then have a matching "
 "icon."
 msgstr ""
 "Um einem Rechner mit der MAC-Adresse 52:54:00:12:34:10 eine statische IP-"
@@ -3587,14 +3655,26 @@ msgstr ""
 "über einen für Ihr Netzwerk geeigneten IP-Bereich nachzudenken."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If the machines have booted as thin clients/diskless workstations or have "
+#| "been installed using any of the networked profiles, the "
+#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
+#| "to automatically add machines to GOsa². Please note, that the IP "
+#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+#| "computeroutput> belong to the dynamic IP range. These systems can then be "
+#| "modified though to suite your network. A few screenshots show how this "
+#| "may be done."
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
 "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to "
-"automatically add machines to GOsa². Please note, that the IP addresses "
-"shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> "
-"belong to the dynamic IP range. These systems can then be modified though to "
-"suite your network. A few screenshots show how this may be done."
+"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -"
+"h</computeroutput> shows usage information. Please note, that the IP "
+"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+"computeroutput> belong to the dynamic IP range. These systems can then be "
+"modified though to suite your network. A few screenshots show how this may "
+"be done."
 msgstr ""
 "Wenn die Maschinen als Thin Clients bzw. Diskless Workstations gestartet "
 "oder wenn sie unter Verwendung eines der Netzwerkprofile installiert wurden, "
@@ -3607,17 +3687,25 @@ msgstr ""
 "Einige Bilder zeigen, wie dies erfolgen könnte."
 
 #. type: CDATA
-#, no-wrap
-msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-"info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a\n"
+#| "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+#| "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
+#| "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password: █"
+msgid ""
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █"
+"enter password:"
 msgstr ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
 "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
@@ -3629,26 +3717,46 @@ msgstr ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password: █"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for machine management with GOSA2"
-msgstr "FIXME: add screenshots for machine management with GOSA2"
-
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_list.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_list.png]"
+msgid "./images/gosa_systems_list.png"
 msgstr "[attachment:gosa_systems_list.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_host_details.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_host_details.png]"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "[attachment:gosa_systems_host_details.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_edit_host.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_edit_host.png]"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "[attachment:gosa_systems_edit_host.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_add_netgroup.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_add_netgroup.png]"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "[attachment:gosa_systems_add_netgroup.png]"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -3788,9 +3896,6 @@ msgstr ""
 "statische IP-Adressen aus LDAP festzulegen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
-#| "or your users won't be able to access their home directories."
 msgid ""
 "Remember to configure workstations and ltsp-servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -4150,12 +4255,16 @@ msgstr ""
 "»Wartung« (Maintenance) im Menü auf der Backup-Seite und wählen dort den "
 "ältesten zu bewahrenden Zustand (snapshot):"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
-msgstr "FIXME: show slbackup-php maintainance wheezy screenshot here"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:slbackup-php_maintenance.png]"
+msgid "./images/slbackup-php_maintenance.png"
+msgstr "[attachment:slbackup-php_maintenance.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:slbackup-php_maintenance.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "[attachment:slbackup-php_maintenance.png]"
+msgid "slbackup-php Maintenance"
 msgstr "[attachment:slbackup-php_maintenance.png]"
 
 #. type: Content of: <article><section><section><title>
@@ -4993,9 +5102,6 @@ msgstr ""
 "resize2fs /dev/vg_system/skole+tjener+home0"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "To extend home0 <emphasis role=\"strong\">by</emphasis> 30G, you insert a "
-#| "'+' (-L+30G)"
 msgid "To extend home0 by additional 30G, you insert a '+' (-L+30G)"
 msgstr "Um home0 um 30G zu vergrößern, fügen  Sie ein '+' (-L+30G) hinzu."
 
@@ -6049,7 +6155,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgstr "<emphasis role=\"strong\">Thin Client</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A thin client setup enables an ordinary PC to function as an (X-)terminal, "
 "where all software runs on the LTSP server. This means that this machine "
@@ -6066,7 +6172,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 msgstr "<emphasis role=\"strong\">Diskless Workstation</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A diskless workstation runs all software locally. The client machines boot "
 "directly from the LTSP server without a local hard drive. Software is "
@@ -6084,11 +6190,18 @@ msgstr ""
 "Clients verwenden zu können."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. Unlike workstations, diskless workstations run without any need "
+#| "to add them with GOsa²."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
-"add them with GOsa²."
+"add them with GOsa², cause LDM is used to login and connect to the LTSP "
+"server."
 msgstr ""
 "LTSP definiert 320MB als das (voreingestellte) Minimum an RAM für Diskless "
 "Workstations. Wenn weniger RAM vorhanden ist, wird die Maschine als Thin "
@@ -6097,6 +6210,29 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"These steps have to be taken to get back to the behaviour in Debian Edu "
+"Squeeze."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
+"lts.conf (or set this in LDAP). Make sure, that the display manager is "
+"installed in the LTSP chroot."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Add the diskless workstations to LDAP with GOsa²."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
+msgstr "<emphasis role=\"strong\">Kernel der LTSP-Clients</emphasis>"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "LTSP client boot will fail if the client's network card requires a non-free "
 "firmware. A PXE installation can be used for troubleshooting problems with "
 "netbooting a machine; if the Debian Installer complains about a missing XXX."
@@ -6162,26 +6298,26 @@ msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgstr "<emphasis role=\"strong\">Kernel der LTSP-Clients</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In order to support older hardware the package <computeroutput>linux-"
+#| "image-486</computeroutput> is installed by default. If all LTSP client "
+#| "machines support the 686 processor architecture the <computeroutput>linux-"
+#| "image-686</computeroutput> package could be installed in the chroot."
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-486</computeroutput> is installed by default. If all LTSP client "
 "machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot."
+"image-686</computeroutput> package could be installed in the chroot. Make "
+"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
+"installation."
 msgstr ""
 "Um auch ältere Hardware zu unterstützen, wird voreingestellt das Paket "
 "<computeroutput>linux-image-486</computeroutput> installiert. Falls alle "
 "LTSP-Client-Rechner 686-Prozessoren besitzen, dann könnte im Chroot das "
 "Paket <computeroutput>linux-image-686</computeroutput> installiert werden."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
-"after installation."
-msgstr ""
-"Führen Sie nach der Installation unbedingt <computeroutput>ltsp-update-"
-"kernels</computeroutput> aus."
-
 #. type: Content of: <article><section><section><section><title>
 msgid "LTSP client type selection"
 msgstr "Typ des LTSP-Client auswählen"
@@ -7665,8 +7801,12 @@ msgid "Redirecting using global policies"
 msgstr "Umleitung unter Verwendung globaler Richtlinien"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME explain how to use profiles from global policies for Windows "
+#| "machines in the skolelinux network"
 msgid ""
-"FIXME explain how to use profiles from global policies for Windows machines "
+"FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
 "FIXME explain how to use profiles from global policies for Windows machines "
@@ -8629,7 +8769,9 @@ msgstr ""
 "»Intern« sollte die gerade abgeschickte E-Mail vorhanden sein."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Obtaining a Kerberos ticket to read email on diskless clients"
+#, fuzzy
+#| msgid "Obtaining a Kerberos ticket to read email on diskless clients"
+msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
 msgstr ""
 "Kerberos-Ticket zum Lesen von Email auf Diskless Workstations anfordern"
 
@@ -8989,7 +9131,6 @@ msgid "Software updates"
 msgstr "Aktualisierung von Software"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Everything which is new in Debian Wheezy 7.x, eg:"
 msgid "Everything which is new in Debian Wheezy 7.1, eg:"
 msgstr "Alles, was in Debian Wheezy 7.1 neu ist, z. B.:"
 
@@ -9056,11 +9197,6 @@ msgid "Debian Wheezy includes about 37000 packages available for installation."
 msgstr "Debian Wheezy enthält mehr als 37.000 installierbare Pakete."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "More information about Debian Wheezy 7.x is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
-#| "installmanual\">installation manual</ulink>."
 msgid ""
 "More information about Debian Wheezy 7.1 is provided in the <ulink url="
 "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
@@ -9122,20 +9258,6 @@ msgid "LTSP diskless workstations run without any configuration."
 msgstr "LTSP Diskless Workstations benötigen keine Konfiguration."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "LTSP clients start as diskless workstation / thin client can be "
-#| "configured via command line argument -- or individually adding an entry "
-#| "in lts.conf or LDAP."
-msgid ""
-"The start of LTSP clients as diskless workstation / thin client can be "
-"configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/dm) "
-"-- or individually adding an entry in lts.conf or LDAP."
-msgstr ""
-"Der Start von LTSP Clients als Diskless Workstation / Thin Client kann "
-"mittels Kommandozeilen-Argument konfiguriert werden oder  individuell durch "
-"einen Eintrag in lts.conf oder LDAP."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
@@ -9406,8 +9528,8 @@ msgstr ""
 "translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
 "Übersetzungen aktualisieren wollen."
 
-#. <remark>
-#. status ignore</remark>
+#.  <remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -11566,3 +11688,51 @@ msgstr ""
 "Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
+
+#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
+#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
+
+#~ msgid "[attachment:30-ThinClient-LDM_Login.png]"
+#~ msgstr "[attachment:30-ThinClient-LDM_Login.png]"
+
+#~| msgid "[attachment:31-ThinClient-KDE_Desktop.png]"
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#~ msgid "FIXME: add screenshot of a user changing her password with GOSA2"
+#~ msgstr "FIXME: add screenshot of a user changing her password with GOSA2"
+
+#~ msgid "FIXME: add screenshots for group management with GOSA2"
+#~ msgstr "FIXME: add screenshots for group management with GOSA2"
+
+#~ msgid "[attachment:create_group.png]"
+#~ msgstr "[attachment:create_group.png]"
+
+#~ msgid "[attachment:list_groups.png]"
+#~ msgstr "[attachment:list_groups.png]"
+
+#~ msgid "FIXME: add screenshots for machine management with GOSA2"
+#~ msgstr "FIXME: add screenshots for machine management with GOSA2"
+
+#~ msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
+#~ msgstr "FIXME: show slbackup-php maintainance wheezy screenshot here"
+
+#~ msgid ""
+#~ "Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Führen Sie nach der Installation unbedingt <computeroutput>ltsp-update-"
+#~ "kernels</computeroutput> aus."
+
+#~| msgid ""
+#~| "LTSP clients start as diskless workstation / thin client can be "
+#~| "configured via command line argument -- or individually adding an entry "
+#~| "in lts.conf or LDAP."
+#~ msgid ""
+#~ "The start of LTSP clients as diskless workstation / thin client can be "
+#~ "configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/"
+#~ "dm) -- or individually adding an entry in lts.conf or LDAP."
+#~ msgstr ""
+#~ "Der Start von LTSP Clients als Diskless Workstation / Thin Client kann "
+#~ "mittels Kommandozeilen-Argument konfiguriert werden oder  individuell "
+#~ "durch einen Eintrag in lts.conf oder LDAP."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index 31fdebb..05a8ea5 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-03 15:09+0300\n"
 "PO-Revision-Date: 2012-06-16 18:34-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1804,7 +1804,7 @@ msgstr ""
 #| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1815,8 +1815,8 @@ msgstr ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 #| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
-"CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1828,7 +1828,7 @@ msgstr ""
 #| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
 "edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -2278,6 +2278,12 @@ msgid ""
 "proxy of the main server."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid ""
+"Boot parameters available when installing from CD, not when installing from "
+"DVD"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
@@ -2289,9 +2295,7 @@ msgstr ""
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "para instalar el escritorio <emphasis role=\"strong\">GNOME</emphasis> en "
 "lugar del escritorio <emphasis role=\"strong\">KDE</emphasis>, agrega "
@@ -2309,8 +2313,24 @@ msgstr ""
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"parameters."
+msgstr ""
+"para instalar el escritorio <emphasis role=\"strong\">LXDE</emphasis>, "
+"deberá agregar <computeroutput> desktop=lxde</computeroutput>en los "
+"parámetros del kernel. Esta opción es disponible únicamente cuando se "
+"instala desde CD, más no desde DVD."
+
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "to install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, but "
+#| "not from DVD."
+msgid ""
+"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+"parameters."
 msgstr ""
 "para instalar el escritorio <emphasis role=\"strong\">LXDE</emphasis>, "
 "deberá agregar <computeroutput> desktop=lxde</computeroutput>en los "
@@ -2593,6 +2613,16 @@ msgstr ""
 "Ejecutando debian'edu'profile'udeb.....\""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"After giving the root password, you will be asked to create a normal user "
+"account \"for non-administrative tasks\". For Debian-edu, this account is "
+"very important! It is the account you will use to manage the Skolelinux "
+"network. You must choose a password length of at least 5 characters for this "
+"user, otherwise you will not be able to log in (even though a shorter "
+"password will be accepted by the installer)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Sonríe :)"
 
@@ -2674,7 +2704,7 @@ msgstr ""
 "variarán de acuerdo al perfil seleccionado:"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgid "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -3059,7 +3089,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "FIXME: some screenshots still need to be done here..."
+msgid "FIXME: one screenshot still needs to be done here..."
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -3322,12 +3352,16 @@ msgstr "23-Tjener-KDM_Login.png"
 msgid "tjener KDM Login"
 msgstr "23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "24-Tjener-KDE_Start.png"
-msgid "[attachment:24-Tjener-KDE_Start.png]"
+msgid "./images/24-Tjener-KDE_Start.png"
 msgstr "24-Tjener-KDE_Start.png"
 
+#. 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 "26-Tjener-KDE_Desktop_Browser.png"
@@ -3350,28 +3384,36 @@ msgstr "27-Tjener-KDE_Desktop.png"
 msgid "KDE Desktop"
 msgstr "Escritorio remoto"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "29-Diskless-WS-KDM_Login.png"
-msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "29-Diskless-WS-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Diskless workstations"
+msgid "Diskless Workstation Login"
+msgstr "Estaciones sin disco"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "30-ThinClient-LDM_Login.png"
-msgid "[attachment:30-ThinClient-LDM_Login.png]"
+msgid "./images/30-ThinClient-LDM_Login.png"
 msgstr "30-ThinClient-LDM_Login.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Thin clients"
+msgid "Thin Client Login"
+msgstr "Clientes ligeros"
+
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "31-ThinClient-KDE_Desktop.png"
 msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "31-ThinClient-KDE_Desktop.png"
 
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
-
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr "Para empezar"
@@ -3448,6 +3490,14 @@ msgstr ""
 "necesitamos hacer."
 
 #. type: Content of: <article><section><section><para>
+msgid ""
+"If generic DNS traffic is blocked out of your network and you need to use "
+"some specific DNS server to look up internet hosts, you need to tell the DNS "
+"server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
+"options and specify the IP address of the DNS server to use."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid ""
 #| "The following <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
@@ -3767,10 +3817,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
-"system. On the very right of the screen you will find the \"Filter\" box, a "
+"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 \"[x] Search in subtrees\"."
+"and search there with the option marked \"Search in subtrees\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3778,8 +3828,8 @@ msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
 "the items farthest to the right on each line are little icons that provide "
-"actions for you: edit, lock, set password, restore snapshot (greyed out if "
-"no snapshot was taken before), take snapshot and delete."
+"actions for you: cut entry, copy entry, edit user, lock account, set "
+"password, take snapshot (not usable) and remove user."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3854,17 +3904,19 @@ msgid ""
 "yourself"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: add screenshot of a user changing her password with GOSA2"
-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:network-"
 "arch.]png\"/></imageobject>"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Set passwords"
+msgid "Set user password"
+msgstr "Establecer contraseñas"
+
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid ""
@@ -3971,17 +4023,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestión de Usuarios con lwat"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for group management with GOSA2"
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/create_group.png"
+msgstr "01-Installer_boot_menu.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:create_group.png]"
-msgstr ""
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "crear un grupo"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:list_groups.png]"
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/list_groups.png"
+msgstr "01-Installer_boot_menu.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -4122,7 +4178,7 @@ msgid ""
 "machine this way. It may be better to first think about your network: For "
 "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
 "x>100 for workstations. Don't forget to activate the just added system. "
-"With the exception of the main server all system will then have a matching "
+"With the exception of the main server all systems will then have a matching "
 "icon."
 msgstr ""
 "Para asignarle la dirección MAC  52:54:00:12:34:10 a una dirección ip "
@@ -4135,50 +4191,66 @@ msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
 "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to "
-"automatically add machines to GOsa². Please note, that the IP addresses "
-"shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> "
-"belong to the dynamic IP range. These systems can then be modified though to "
-"suite your network. A few screenshots show how this may be done."
+"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -"
+"h</computeroutput> shows usage information. Please note, that the IP "
+"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+"computeroutput> belong to the dynamic IP range. These systems can then be "
+"modified though to suite your network. A few screenshots show how this may "
+"be done."
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
 msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-"info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █"
+"enter password:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for machine management with GOSA2"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "03-select_your_location.png"
+msgid "./images/gosa_systems_list.png"
+msgstr "03-select_your_location.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "13-Install the base system.png"
-msgid "[attachment:gosa_systems_list.png]"
-msgstr "13-Install the base system.png"
+#| msgid "03-select_your_location.png"
+msgid "./images/gosa_systems_host_details.png"
+msgstr "03-select_your_location.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_host_details.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
 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>
+#, fuzzy
+#| msgid "03-select_your_location.png"
+msgid "./images/gosa_systems_edit_host.png"
+msgstr "03-select_your_location.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "13-Install the base system.png"
-msgid "[attachment:gosa_systems_add_netgroup.png]"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "13-Install the base system.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4667,16 +4739,18 @@ msgid ""
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "pxe-tjener.png"
-msgid "[attachment:slbackup-php_maintenance.png]"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "pxe-tjener.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Maintainance"
+msgid "slbackup-php Maintenance"
+msgstr "Mantenimiento"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Monitorización del servidor"
@@ -6247,7 +6321,7 @@ msgstr ""
 "<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas "
 "indicaciones básicas:"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
 "A thin client setup enables an ordinary PC to function as an (X-)terminal, "
@@ -6267,7 +6341,7 @@ msgstr ""
 "<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas "
 "indicaciones básicas:"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
 "A diskless workstation runs all software locally. The client machines boot "
@@ -6288,9 +6362,36 @@ msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
-"add them with GOsa²."
+"add them with GOsa², cause LDM is used to login and connect to the LTSP "
+"server."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"These steps have to be taken to get back to the behaviour in Debian Edu "
+"Squeeze."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
+"lts.conf (or set this in LDAP). Make sure, that the display manager is "
+"installed in the LTSP chroot."
 msgstr ""
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "add workstations with GOsa²"
+msgid "Add the diskless workstations to LDAP with GOsa²."
+msgstr "agregar estaciones de trabajo con GOsa²"
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
+msgstr ""
+"<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas "
+"indicaciones básicas:"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "LTSP client boot will fail if the client's network card requires a non-free "
@@ -6341,25 +6442,15 @@ msgstr ""
 "<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas "
 "indicaciones básicas:"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-486</computeroutput> is installed by default. If all LTSP client "
 "machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "See the output of <computeroutput>man etckeeper</computeroutput> for more "
-#| "information."
-msgid ""
-"Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
-"after installation."
+"image-686</computeroutput> package could be installed in the chroot. Make "
+"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
+"installation."
 msgstr ""
-"Revise la salida de <computeroutput>man etckeeper</computeroutput> para más "
-"información."
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
@@ -7500,7 +7591,7 @@ msgstr "Redirigir usando políticas globales"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"FIXME explain how to use profiles from global policies for Windows machines "
+"FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
 
@@ -8269,8 +8360,9 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Obtaining a Kerberos ticket to read email on diskless clients"
-msgstr ""
+#, fuzzy
+msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
+msgstr "Clientes ligeros vs Puestos sin disco"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8749,13 +8841,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The start of LTSP clients as diskless workstation / thin client can be "
-"configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/dm) "
-"-- or individually adding an entry in lts.conf or LDAP."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
 "hidden to the end user, others even to the GOsa admin."
@@ -10937,9 +11022,38 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #, fuzzy
-#~| msgid "add workstations with GOsa²"
-#~ msgid "Add workstations with GOsa²"
-#~ msgstr "agregar estaciones de trabajo con GOsa²"
+#~| msgid "24-Tjener-KDE_Start.png"
+#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
+#~ msgstr "24-Tjener-KDE_Start.png"
+
+#, fuzzy
+#~| msgid "29-Diskless-WS-KDM_Login.png"
+#~ msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+#~ msgstr "29-Diskless-WS-KDM_Login.png"
+
+#, fuzzy
+#~| msgid "30-ThinClient-LDM_Login.png"
+#~ msgid "[attachment:30-ThinClient-LDM_Login.png]"
+#~ msgstr "30-ThinClient-LDM_Login.png"
+
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#, fuzzy
+#~| msgid "13-Install the base system.png"
+#~ msgid "[attachment:gosa_systems_list.png]"
+#~ msgstr "13-Install the base system.png"
+
+#, fuzzy
+#~| msgid ""
+#~| "See the output of <computeroutput>man etckeeper</computeroutput> for "
+#~| "more information."
+#~ msgid ""
+#~ "Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Revise la salida de <computeroutput>man etckeeper</computeroutput> para "
+#~ "más información."
 
 #, fuzzy
 #~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -11147,28 +11261,6 @@ msgstr ""
 #~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 #~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
-#~ msgid "24-Tjener-KDE_Start.png"
-#~ msgstr "24-Tjener-KDE_Start.png"
-
-#~ msgid "29-Diskless-WS-KDM_Login.png"
-#~ msgstr "29-Diskless-WS-KDM_Login.png"
-
-#~ msgid "30-ThinClient-LDM_Login.png"
-#~ msgstr "30-ThinClient-LDM_Login.png"
-
-#, fuzzy
-#~| msgid "Set passwords"
-#~ msgid "Set user password"
-#~ msgstr "Establecer contraseñas"
-
-#~ msgid "create group"
-#~ msgstr "crear un grupo"
-
-#, fuzzy
-#~| msgid "Maintainance"
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Mantenimiento"
-
 #, fuzzy
 #~| msgid ""
 #~| "New in Debian Edu 6.0.3 beta2 Codename \"Wheezy\" released 2012-01-07"
@@ -11441,11 +11533,6 @@ msgstr ""
 #~ msgstr "Nuevas características en Squeeze:"
 
 #, fuzzy
-#~| msgid "03-select_your_location.png"
-#~ msgid "./images/collect_system_info.png"
-#~ msgstr "03-select_your_location.png"
-
-#, fuzzy
 #~| msgid ""
 #~| "The <computeroutput>debian-edu-expert</computeroutput> boot-option adds "
 #~| "the <emphasis role=\"strong\">minimal</emphasis> profile to the profile "
@@ -12231,10 +12318,6 @@ msgstr ""
 #~ msgstr "Para empezar"
 
 #, fuzzy
-#~ msgid "Changing kioskmode on diskless workstations"
-#~ msgstr "Clientes ligeros vs Puestos sin disco"
-
-#, fuzzy
 #~ msgid "Disabling kioskmode"
 #~ msgstr "modificar el modo Kiosk"
 
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index 3913032..01f6168 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-03 15:09+0300\n"
 "PO-Revision-Date: 2013-05-14 00:39+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1518,7 +1518,7 @@ msgstr ""
 #| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
 "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
@@ -1529,8 +1529,8 @@ msgstr ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 #| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
-"CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
 "CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
@@ -1542,7 +1542,7 @@ msgstr ""
 #| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
@@ -1913,13 +1913,24 @@ msgstr ""
 "installations futures seront faites à l'aide de PXE, car elles utiliseront "
 "automatiquement le mandataire du serveur principal."
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid ""
+"Boot parameters available when installing from CD, not when installing from "
+"DVD"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Pour installer le bureau<emphasis role=\"strong\">GNOME</emphasis> au lieu "
 "de <emphasis role=\"strong\">KDE</emphasis>, ajoutez "
@@ -1928,11 +1939,33 @@ msgstr ""
 "partir du CD, pas à partir du DVD."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"parameters."
+msgstr ""
+"Pour installer le bureau<emphasis role=\"strong\">LXDE</emphasis> à la "
+"place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
+"d'initialisation du noyau. Cette option n'est disponible qu'en installant à "
+"partir du CD, pas à partir du DVD."
+
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
+msgid ""
+"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+"parameters."
 msgstr ""
 "Pour installer le bureau<emphasis role=\"strong\">LXDE</emphasis> à la "
 "place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
@@ -2161,6 +2194,16 @@ msgstr ""
 "profile-udeb... »"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"After giving the root password, you will be asked to create a normal user "
+"account \"for non-administrative tasks\". For Debian-edu, this account is "
+"very important! It is the account you will use to manage the Skolelinux "
+"network. You must choose a password length of at least 5 characters for this "
+"user, otherwise you will not be able to log in (even though a shorter "
+"password will be accepted by the installer)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Détendez-vous"
 
@@ -2239,7 +2282,10 @@ msgstr ""
 "Le nombre de paquets récupérés sur Internet varie selon le profil :"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+#, fuzzy
+#| msgid ""
+#| "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgid "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2596,7 +2642,7 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: some screenshots still need to be done here..."
+msgid "FIXME: one screenshot still needs to be done here..."
 msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2853,9 +2899,15 @@ msgstr "23-Tjener-KDM_Login.png"
 msgid "tjener KDM Login"
 msgstr "23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:24-Tjener-KDE_Start.png]"
-msgstr "[attachment:24-Tjener-KDE_Start.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "24-Tjener-KDE_Start.png"
+msgid "./images/24-Tjener-KDE_Start.png"
+msgstr "24-Tjener-KDE_Start.png"
+
+#. 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
@@ -2879,22 +2931,34 @@ msgstr "27-Tjener-KDE_Desktop.png"
 msgid "KDE Desktop"
 msgstr "Bureaux distants"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
-msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "29-Diskless-WS-KDM_Login.png"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr "29-Diskless-WS-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:30-ThinClient-LDM_Login.png]"
-msgstr "[attachment:30-ThinClient-LDM_Login.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Diskless workstations"
+msgid "Diskless Workstation Login"
+msgstr "Stations de travail sans disque dur"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "31-ThinClient-KDE_Desktop.png"
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+#| msgid "30-ThinClient-LDM_Login.png"
+msgid "./images/30-ThinClient-LDM_Login.png"
+msgstr "30-ThinClient-LDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
+#, fuzzy
+#| msgid "Thin clients"
+msgid "Thin Client Login"
+msgstr "Clients légers"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "31-ThinClient-KDE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -2953,6 +3017,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"If generic DNS traffic is blocked out of your network and you need to use "
+"some specific DNS server to look up internet hosts, you need to tell the DNS "
+"server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
+"options and specify the IP address of the DNS server to use."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
 "and some frequently asked questions."
 msgstr ""
@@ -3309,12 +3381,20 @@ msgid "Filterbox"
 msgstr "Boîte de filtre"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To modify or delete a user, use GOsa² to browse the list of users on your "
+#| "system. On the very right of the screen you will find 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 \"[x] Search in subtrees"
+#| "\"."
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
-"system. On the very right of the screen you will find the \"Filter\" box, a "
+"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 \"[x] Search in subtrees\"."
+"and search there with the option marked \"Search in subtrees\"."
 msgstr ""
 "Pour modifier ou supprimer un utilisateur, utilisez GOsa² pour parcourir la "
 "liste des utilisateurs de votre système. Vous trouverez tout à droite de "
@@ -3324,12 +3404,19 @@ msgstr ""
 "recherche en cochant l'option « Chercher dans les sous-arbres »."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When using the \"Filter\" box, results will immediately appear in the "
+#| "middle of the text in the table list view. Every line represents a user "
+#| "account and the items farthest to the right on each line are little icons "
+#| "that provide actions for you: edit, lock, set password, restore snapshot "
+#| "(greyed out if no snapshot was taken before), take snapshot and delete."
 msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
 "the items farthest to the right on each line are little icons that provide "
-"actions for you: edit, lock, set password, restore snapshot (greyed out if "
-"no snapshot was taken before), take snapshot and delete."
+"actions for you: cut entry, copy entry, edit user, lock account, set "
+"password, take snapshot (not usable) and remove user."
 msgstr ""
 "Quand la boîte « Filtre » est utilisée, les résultats apparaissent "
 "immédiatement au milieu du texte dans la liste de tableau. Chaque ligne "
@@ -3414,14 +3501,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>
-msgid "FIXME: add screenshot of a user changing her password with GOSA2"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:change_password_administratively.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:change_password_administratively.png]"
+msgid "./images/change_password_administratively.png"
 msgstr "[attachment:change_password_administratively.png]"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+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 "
@@ -3545,17 +3634,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestion des groupes avec GOsa²"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for group management with GOSA2"
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:create_group.png]"
-msgstr "[attachment:create_group.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "Créer un groupe"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:list_groups.png]"
-msgstr "[attachment:list_groups.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/list_groups.png"
+msgstr "./images/smile.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3705,7 +3798,7 @@ msgid ""
 "machine this way. It may be better to first think about your network: For "
 "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
 "x>100 for workstations. Don't forget to activate the just added system. "
-"With the exception of the main server all system will then have a matching "
+"With the exception of the main server all systems will then have a matching "
 "icon."
 msgstr ""
 "Pour affecter une adresse IP statique à un hôte d'adresse MAC "
@@ -3717,14 +3810,26 @@ msgstr ""
 "d'abord réfléchir à une plage appropriée pour le réseau."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If the machines have booted as thin clients/diskless workstations or have "
+#| "been installed using any of the networked profiles, the "
+#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
+#| "to automatically add machines to GOsa². Please note, that the IP "
+#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+#| "computeroutput> belong to the dynamic IP range. These systems can then be "
+#| "modified though to suite your network. A few screenshots show how this "
+#| "may be done."
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
 "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to "
-"automatically add machines to GOsa². Please note, that the IP addresses "
-"shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> "
-"belong to the dynamic IP range. These systems can then be modified though to "
-"suite your network. A few screenshots show how this may be done."
+"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -"
+"h</computeroutput> shows usage information. Please note, that the IP "
+"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+"computeroutput> belong to the dynamic IP range. These systems can then be "
+"modified though to suite your network. A few screenshots show how this may "
+"be done."
 msgstr ""
 "Si les machines ont démarré comme clients légers ou stations de travail sans "
 "disque, ou ont été installées en utilisant n'importe quel profil réseau, le "
@@ -3736,17 +3841,25 @@ msgstr ""
 "captures d'écrans montrent comment cela peut être fait."
 
 #. type: CDATA
-#, no-wrap
-msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-"info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a\n"
+#| "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+#| "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
+#| "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password: █"
+msgid ""
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █"
+"enter password:"
 msgstr ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
 "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
@@ -3758,26 +3871,46 @@ msgstr ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password: █"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for machine management with GOSA2"
-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>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_list.png]"
+msgid "./images/gosa_systems_list.png"
 msgstr "[attachment:gosa_systems_list.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_host_details.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr "Liste des systèmes dans GOsa²"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_host_details.png]"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "[attachment:gosa_systems_host_details.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_edit_host.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr "Renseignements sur le système"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_edit_host.png]"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "[attachment:gosa_systems_edit_host.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_add_netgroup.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr "Modification du système"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_add_netgroup.png]"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "[attachment:gosa_systems_add_netgroup.png]"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr "Ajout de groupe réseau"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4282,14 +4415,16 @@ msgstr ""
 "« Maintenance » dans le menu de la page des sauvegarde et choisissez le "
 "dernier instantané à garder :"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:slbackup-php_maintenance.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:slbackup-php_maintenance.png]"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "[attachment:slbackup-php_maintenance.png]"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Maintenance de slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Surveillance des serveurs"
@@ -6196,7 +6331,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgstr "<emphasis role=\"strong\">Client léger</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A thin client setup enables an ordinary PC to function as an (X-)terminal, "
 "where all software runs on the LTSP server. This means that this machine "
@@ -6214,7 +6349,7 @@ msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 msgstr ""
 "<emphasis role=\"strong\">Station de travail sans disque dur</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A diskless workstation runs all software locally. The client machines boot "
 "directly from the LTSP server without a local hard drive. Software is "
@@ -6233,11 +6368,18 @@ msgstr ""
 "maintenance que les clients légers."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. Unlike workstations, diskless workstations run without any need "
+#| "to add them with GOsa²."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
-"add them with GOsa²."
+"add them with GOsa², cause LDM is used to login and connect to the LTSP "
+"server."
 msgstr ""
 "LTSP définit à 320 Mo la quantité minimale de mémoire vive nécessaire pour "
 "une station de travail sans disque. Si la quantité de mémoire vide est "
@@ -6247,6 +6389,31 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"These steps have to be taken to get back to the behaviour in Debian Edu "
+"Squeeze."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
+"lts.conf (or set this in LDAP). Make sure, that the display manager is "
+"installed in the LTSP chroot."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Add workstations with GOsa²"
+msgid "Add the diskless workstations to LDAP with GOsa²."
+msgstr "ajouter des stations de travail avec GOsa²."
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
+msgstr "<emphasis role=\"strong\">Noyau des clients légers</emphasis>"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "LTSP client boot will fail if the client's network card requires a non-free "
 "firmware. A PXE installation can be used for troubleshooting problems with "
 "netbooting a machine; if the Debian Installer complains about a missing XXX."
@@ -6313,12 +6480,20 @@ msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgstr "<emphasis role=\"strong\">Noyau des clients légers</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In order to support older hardware the package <computeroutput>linux-"
+#| "image-486</computeroutput> is installed by default. If all LTSP client "
+#| "machines support the 686 processor architecture the <computeroutput>linux-"
+#| "image-686</computeroutput> package could be installed in the chroot."
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-486</computeroutput> is installed by default. If all LTSP client "
 "machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot."
+"image-686</computeroutput> package could be installed in the chroot. Make "
+"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
+"installation."
 msgstr ""
 "Afin de pouvoir prendre en charge du matériel plus ancien, le paquet "
 "<computeroutput>linux-image-486</computeroutput> est installé par défaut. Si "
@@ -6326,14 +6501,6 @@ msgstr ""
 "le paquet <computeroutput>linux-image-686</computeroutput> peut être "
 "installé dans le chroot."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
-"after installation."
-msgstr ""
-"Veillez à exécuter la commande <computeroutput>ltsp-update-kernels</"
-"computeroutput> après l'installation."
-
 #. type: Content of: <article><section><section><section><title>
 msgid "LTSP client type selection"
 msgstr "Sélection du type de client léger"
@@ -7828,8 +7995,12 @@ msgid "Redirecting using global policies"
 msgstr "Redirection à l'aide de stratégies globales"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME explain how to use profiles from global policies for Windows "
+#| "machines in the skolelinux network"
 msgid ""
-"FIXME explain how to use profiles from global policies for Windows machines "
+"FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
 "FIXME explain how to use profiles from global policies for Windows machines "
@@ -8797,8 +8968,10 @@ msgstr ""
 "venez d'envoyer dans la boîte de réception sous « intern »."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Obtaining a Kerberos ticket to read email on diskless clients"
-msgstr ""
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
+msgstr "Introduction aux clients légers et stations de travail sans disque dur"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9301,21 +9474,6 @@ msgid "LTSP diskless workstations run without any configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "LTSP clients start as diskless workstation / thin client can be "
-#| "configured via command line argument -- or individually adding an entry "
-#| "in lts.conf or LDAP."
-msgid ""
-"The start of LTSP clients as diskless workstation / thin client can be "
-"configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/dm) "
-"-- or individually adding an entry in lts.conf or LDAP."
-msgstr ""
-"Le démarrage des clients légers en tant que station de travail sans disque "
-"ou client léger est configurable par un paramètre en ligne de commande, ou "
-"en ajoutant individuellement une entrée dans lts.conf ou dans LDAP."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
@@ -11771,8 +11929,45 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
-#~ msgid "Add workstations with GOsa²"
-#~ msgstr "ajouter des stations de travail avec GOsa²."
+#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
+#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
+
+#~ msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+#~ msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
+
+#~ msgid "[attachment:30-ThinClient-LDM_Login.png]"
+#~ msgstr "[attachment:30-ThinClient-LDM_Login.png]"
+
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#~ msgid "[attachment:create_group.png]"
+#~ msgstr "[attachment:create_group.png]"
+
+#~ msgid "[attachment:list_groups.png]"
+#~ msgstr "[attachment:list_groups.png]"
+
+#~ msgid ""
+#~ "Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Veillez à exécuter la commande <computeroutput>ltsp-update-kernels</"
+#~ "computeroutput> après l'installation."
+
+#, fuzzy
+#~| msgid ""
+#~| "LTSP clients start as diskless workstation / thin client can be "
+#~| "configured via command line argument -- or individually adding an entry "
+#~| "in lts.conf or LDAP."
+#~ msgid ""
+#~ "The start of LTSP clients as diskless workstation / thin client can be "
+#~ "configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/"
+#~ "dm) -- or individually adding an entry in lts.conf or LDAP."
+#~ msgstr ""
+#~ "Le démarrage des clients légers en tant que station de travail sans "
+#~ "disque ou client léger est configurable par un paramètre en ligne de "
+#~ "commande, ou en ajoutant individuellement une entrée dans lts.conf ou "
+#~ "dans LDAP."
 
 #~ msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 #~ msgstr "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
@@ -12029,15 +12224,6 @@ msgstr ""
 #~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 #~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
-#~ msgid "24-Tjener-KDE_Start.png"
-#~ msgstr "24-Tjener-KDE_Start.png"
-
-#~ msgid "29-Diskless-WS-KDM_Login.png"
-#~ msgstr "29-Diskless-WS-KDM_Login.png"
-
-#~ msgid "30-ThinClient-LDM_Login.png"
-#~ msgstr "30-ThinClient-LDM_Login.png"
-
 #~ msgid ""
 #~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
 #~ "to install the main server, all user passwords exept that one for the "
@@ -12087,27 +12273,6 @@ msgstr ""
 #~ "  done\n"
 #~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
 
-#~ msgid "Set user password"
-#~ msgstr "Définir le mot de passe utilisateur"
-
-#~ msgid "create group"
-#~ msgstr "Créer un groupe"
-
-#~ msgid "GOsa² systems listing"
-#~ msgstr "Liste des systèmes dans GOsa²"
-
-#~ msgid "Host details"
-#~ msgstr "Renseignements sur le système"
-
-#~ msgid "Modify host"
-#~ msgstr "Modification du système"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Ajout de groupe réseau"
-
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Maintenance de slbackup-php"
-
 #~ msgid ""
 #~ "The Debian Edu Wheezy Manual has generally been cleaned up and improved. "
 #~ "A proof-read with corrections was done by a native English linguist."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index 378aaeb..f3f6af2 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-03 15:09+0300\n"
 "PO-Revision-Date: 2013-05-12 17:17+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -1478,7 +1478,7 @@ msgstr ""
 #| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
 "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
@@ -1489,8 +1489,8 @@ msgstr ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 #| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
-"CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
 "CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
@@ -1502,7 +1502,7 @@ msgstr ""
 #| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
@@ -1871,13 +1871,24 @@ msgstr ""
 "ulteriori installazioni dovrebbero essere fatti via PXE, in quanto questi "
 "utilizzeranno automaticamente il proxy del server principale."
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid ""
+"Boot parameters available when installing from CD, not when installing from "
+"DVD"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Per installare il desktop <emphasis role=\"strong\">GNOME</emphasis> al "
 "posto del desktop <emphasis role=\"strong\">KDE</emphasis>, inserire "
@@ -1886,11 +1897,33 @@ msgstr ""
 "quando si installa da DVD."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"parameters."
+msgstr ""
+"Per installare il desktop <emphasis role=\"strong\">LXDE</emphasis>, "
+"inserire <computeroutput>desktop=lxde</computeroutput> ai parametri di boot "
+"del kernel.  Questa opzione è disponibile solo quando si installa dal CD, "
+"non quando si installa da DVD."
+
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters. This option is only available when installing from CD, not "
+#| "when installing from DVD."
+msgid ""
+"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+"parameters."
 msgstr ""
 "Per installare il desktop <emphasis role=\"strong\">LXDE</emphasis>, "
 "inserire <computeroutput>desktop=lxde</computeroutput> ai parametri di boot "
@@ -2113,6 +2146,16 @@ msgstr ""
 "debian-edu-profile-udeb...\""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"After giving the root password, you will be asked to create a normal user "
+"account \"for non-administrative tasks\". For Debian-edu, this account is "
+"very important! It is the account you will use to manage the Skolelinux "
+"network. You must choose a password length of at least 5 characters for this "
+"user, otherwise you will not be able to log in (even though a shorter "
+"password will be accepted by the installer)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Be happy"
 
@@ -2190,7 +2233,10 @@ msgstr ""
 "prendere dalla rete cambia in base al profilo scelto:"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+#, fuzzy
+#| msgid ""
+#| "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgid "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2531,7 +2577,7 @@ msgstr ""
 #, fuzzy
 #| msgid ""
 #| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: some screenshots still need to be done here..."
+msgid "FIXME: one screenshot still needs to be done here..."
 msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2788,9 +2834,15 @@ msgstr "23-Tjener-KDM_Login.png"
 msgid "tjener KDM Login"
 msgstr "23-Tjener-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:24-Tjener-KDE_Start.png]"
-msgstr "[attachment:24-Tjener-KDE_Start.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "24-Tjener-KDE_Start.png"
+msgid "./images/24-Tjener-KDE_Start.png"
+msgstr "24-Tjener-KDE_Start.png"
+
+#. 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
@@ -2814,22 +2866,34 @@ msgstr "27-Tjener-KDE_Desktop.png"
 msgid "KDE Desktop"
 msgstr "Desktop Remoto"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
-msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "29-Diskless-WS-KDM_Login.png"
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr "29-Diskless-WS-KDM_Login.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:30-ThinClient-LDM_Login.png]"
-msgstr "[attachment:30-ThinClient-LDM_Login.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Diskless workstations"
+msgid "Diskless Workstation Login"
+msgstr "Workstation diskless (senza disco)"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "31-ThinClient-KDE_Desktop.png"
-msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+#| msgid "30-ThinClient-LDM_Login.png"
+msgid "./images/30-ThinClient-LDM_Login.png"
+msgstr "30-ThinClient-LDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
+#, fuzzy
+#| msgid "Thin clients"
+msgid "Thin Client Login"
+msgstr "Thin client"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "31-ThinClient-KDE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
@@ -2888,6 +2952,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"If generic DNS traffic is blocked out of your network and you need to use "
+"some specific DNS server to look up internet hosts, you need to tell the DNS "
+"server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
+"options and specify the IP address of the DNS server to use."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
 "and some frequently asked questions."
 msgstr ""
@@ -3242,12 +3314,20 @@ msgid "Filterbox"
 msgstr "Il box Filter"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To modify or delete a user, use GOsa² to browse the list of users on your "
+#| "system. On the very right of the screen you will find 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 \"[x] Search in subtrees"
+#| "\"."
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
-"system. On the very right of the screen you will find the \"Filter\" box, a "
+"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 \"[x] Search in subtrees\"."
+"and search there with the option marked \"Search in subtrees\"."
 msgstr ""
 "Per modificare o cancellare un utente si usa GOsa² per trovare l'utente nel "
 "sistema. In alto a sinistra dello schermo, si trova il box \"Filter\", uno "
@@ -3256,12 +3336,19 @@ msgstr ""
 "di Gosa²/LDAP e cercare con l'opzione segnata: \"[x] Cerca in subtrees\"."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When using the \"Filter\" box, results will immediately appear in the "
+#| "middle of the text in the table list view. Every line represents a user "
+#| "account and the items farthest to the right on each line are little icons "
+#| "that provide actions for you: edit, lock, set password, restore snapshot "
+#| "(greyed out if no snapshot was taken before), take snapshot and delete."
 msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
 "the items farthest to the right on each line are little icons that provide "
-"actions for you: edit, lock, set password, restore snapshot (greyed out if "
-"no snapshot was taken before), take snapshot and delete."
+"actions for you: cut entry, copy entry, edit user, lock account, set "
+"password, take snapshot (not usable) and remove user."
 msgstr ""
 "Quando si usa il box \"Filter\",  i risultati appariranno immediatamente "
 "nella metà del testo nell'elenco della tabella. Ogni linea rappresenta un "
@@ -3345,14 +3432,16 @@ msgstr ""
 "nella pagina che si presenta è possibile impostare una nuova password da voi "
 "scelta"
 
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: add screenshot of a user changing her password with GOSA2"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:change_password_administratively.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:change_password_administratively.png]"
+msgid "./images/change_password_administratively.png"
 msgstr "[attachment:change_password_administratively.png]"
 
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+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 "
@@ -3475,19 +3564,21 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gestione dei gruppi con GOsa²"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "FIXME: screenshots done without 608195"
-msgid "FIXME: add screenshots for group management with GOSA2"
-msgstr "FIXME: screenshots done without 608195"
+#| msgid "./images/alert.png"
+msgid "./images/create_group.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:create_group.png]"
-msgstr "[attachment:create_group.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
+msgstr "creare il gruppo"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:list_groups.png]"
-msgstr "[attachment:list_groups.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/list_groups.png"
+msgstr "./images/smile.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3634,7 +3725,7 @@ msgid ""
 "machine this way. It may be better to first think about your network: For "
 "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
 "x>100 for workstations. Don't forget to activate the just added system. "
-"With the exception of the main server all system will then have a matching "
+"With the exception of the main server all systems will then have a matching "
 "icon."
 msgstr ""
 "Per assegnare a un host con il MAC-address 52:54:00:12:34:10 un indirizzo "
@@ -3646,14 +3737,26 @@ msgstr ""
 "adatto per la rete."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If the machines have booted as thin clients/diskless workstations or have "
+#| "been installed using any of the networked profiles, the "
+#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
+#| "to automatically add machines to GOsa². Please note, that the IP "
+#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+#| "computeroutput> belong to the dynamic IP range. These systems can then be "
+#| "modified though to suite your network. A few screenshots show how this "
+#| "may be done."
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
 "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to "
-"automatically add machines to GOsa². Please note, that the IP addresses "
-"shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> "
-"belong to the dynamic IP range. These systems can then be modified though to "
-"suite your network. A few screenshots show how this may be done."
+"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -"
+"h</computeroutput> shows usage information. Please note, that the IP "
+"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+"computeroutput> belong to the dynamic IP range. These systems can then be "
+"modified though to suite your network. A few screenshots show how this may "
+"be done."
 msgstr ""
 "Se le macchine sono avviate come thin client/diskless workstations o sono "
 "state installate usando uno dei profili di rete, lo script "
@@ -3665,17 +3768,25 @@ msgstr ""
 "screenshots mostrano come questo può essere fatto."
 
 #. type: CDATA
-#, no-wrap
-msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-"info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "root at tjener:~# sitesummary2ldapdhcp -a\n"
+#| "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
+#| "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
+#| "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+#| "\n"
+#| "Enter password if you want to activate these changes, and ^c to abort.\n"
+#| "\n"
+#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+#| "enter password: █"
+msgid ""
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █"
+"enter password:"
 msgstr ""
 "root at tjener:~# sitesummary2ldapdhcp -a\n"
 "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
@@ -3687,26 +3798,46 @@ msgstr ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password: █"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for machine management with GOSA2"
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/collect_system_info.png"
+msgid "./images/gosa_systems_list.png"
+msgstr "./images/collect_system_info.png"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_list.png]"
-msgstr "[attachment:gosa_systems_list.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² systems listing"
+msgstr "GOsa² systems listing"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_host_details.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_host_details.png]"
+msgid "./images/gosa_systems_host_details.png"
 msgstr "[attachment:gosa_systems_host_details.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_edit_host.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
+msgstr "Dettagli dell'host"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_edit_host.png]"
+msgid "./images/gosa_systems_edit_host.png"
 msgstr "[attachment:gosa_systems_edit_host.png]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_add_netgroup.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Modify host"
+msgstr "Modificare l'host"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:gosa_systems_add_netgroup.png]"
+msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "[attachment:gosa_systems_add_netgroup.png]"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Add netgroup"
+msgstr "Aggiungere gruppi di rete (netgroup)"
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
@@ -4198,16 +4329,16 @@ msgstr ""
 "Se si desidera eliminare vecchi backup, scegliere \"Maintenance\" nel "
 "menudella pagina di backup e selezionare lo snapshot da conservare:"
 
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "FIXME: add an updated english squeeze screenshot here."
-msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
-msgstr "FIXME: add an updated english squeeze screenshot here."
-
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:slbackup-php_maintenance.png]"
+#| msgid "[attachment:slbackup-php_maintenance.png]"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr "[attachment:slbackup-php_maintenance.png]"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
+msgstr "Manutenzione di slbackup-php"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Monitorare il Server"
@@ -6066,7 +6197,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgstr "<emphasis role=\"strong\">Thin client</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A thin client setup enables an ordinary PC to function as an (X-)terminal, "
 "where all software runs on the LTSP server. This means that this machine "
@@ -6083,7 +6214,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 msgstr "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A diskless workstation runs all software locally. The client machines boot "
 "directly from the LTSP server without a local hard drive. Software is "
@@ -6101,11 +6232,18 @@ msgstr ""
 "thin clients."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. Unlike workstations, diskless workstations run without any need "
+#| "to add them with GOsa²."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
-"add them with GOsa²."
+"add them with GOsa², cause LDM is used to login and connect to the LTSP "
+"server."
 msgstr ""
 "LTSP definisce 320MB di RAM il minimo per le diskless workstation. Se la "
 "quantità di RAM è minore, la macchina si avvierà come thin client. A "
@@ -6114,6 +6252,31 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"These steps have to be taken to get back to the behaviour in Debian Edu "
+"Squeeze."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
+"lts.conf (or set this in LDAP). Make sure, that the display manager is "
+"installed in the LTSP chroot."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Add workstations with GOsa²"
+msgid "Add the diskless workstations to LDAP with GOsa²."
+msgstr "Aggiungere workstation con GOsa²"
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
+msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "LTSP client boot will fail if the client's network card requires a non-free "
 "firmware. A PXE installation can be used for troubleshooting problems with "
 "netbooting a machine; if the Debian Installer complains about a missing XXX."
@@ -6178,26 +6341,26 @@ msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In order to support older hardware the package <computeroutput>linux-"
+#| "image-486</computeroutput> is installed by default. If all LTSP client "
+#| "machines support the 686 processor architecture the <computeroutput>linux-"
+#| "image-686</computeroutput> package could be installed in the chroot."
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-486</computeroutput> is installed by default. If all LTSP client "
 "machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot."
+"image-686</computeroutput> package could be installed in the chroot. Make "
+"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
+"installation."
 msgstr ""
 "Per supportare l'hardware più vecchio il pacchetto <computeroutput>linux-"
 "image-486</computeroutput> è installato di default. Se tutti i client LTSP "
 "supportano l'architettura 686  il pacchetto <computeroutput>linux-image-686</"
 "computeroutput> dovrebbe essere installato in chroot."
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
-"after installation."
-msgstr ""
-"Assicurarsi di eseguire <computeroutput>ltsp-update-kernels</computeroutput> "
-"dopo l'installazione."
-
 #. type: Content of: <article><section><section><section><title>
 msgid "LTSP client type selection"
 msgstr "Selezione del tipo di client LTSP"
@@ -7657,8 +7820,12 @@ msgid "Redirecting using global policies"
 msgstr "Reindirizzamento usando una policy globale"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME explain how to use profiles from global policies for Windows "
+#| "machines in the skolelinux network"
 msgid ""
-"FIXME explain how to use profiles from global policies for Windows machines "
+"FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
 "FIXME explain how to use profiles from global policies for Windows machines "
@@ -8608,8 +8775,10 @@ msgstr ""
 "al di sotto di \"intern\"."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Obtaining a Kerberos ticket to read email on diskless clients"
-msgstr ""
+#, fuzzy
+#| msgid "Changing kioskmode on diskless workstations"
+msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
+msgstr "Cambiare il modo kiosk sulle workstation diskless"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9103,21 +9272,6 @@ msgid "LTSP diskless workstations run without any configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "LTSP clients start as diskless workstation / thin client can be "
-#| "configured via command line argument -- or individually adding an entry "
-#| "in lts.conf or LDAP."
-msgid ""
-"The start of LTSP clients as diskless workstation / thin client can be "
-"configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/dm) "
-"-- or individually adding an entry in lts.conf or LDAP."
-msgstr ""
-"I client LTSP vengono eseguiti come diskless workstation / thin client "
-"possono essere configurativia riga di comando -- o individualmente con "
-"l'aggiunta di una voce  in lts.conf o LDAP."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
@@ -11513,8 +11667,57 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
-#~ msgid "Add workstations with GOsa²"
-#~ msgstr "Aggiungere workstation con GOsa²"
+#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
+#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
+
+#~ msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+#~ msgstr "[attachment:29-Diskless-WS-KDM_Login.png]"
+
+#~ msgid "[attachment:30-ThinClient-LDM_Login.png]"
+#~ msgstr "[attachment:30-ThinClient-LDM_Login.png]"
+
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr "31-ThinClient-KDE_Desktop.png"
+
+#, fuzzy
+#~| msgid "FIXME: screenshots done without 608195"
+#~ msgid "FIXME: add screenshots for group management with GOSA2"
+#~ msgstr "FIXME: screenshots done without 608195"
+
+#~ msgid "[attachment:create_group.png]"
+#~ msgstr "[attachment:create_group.png]"
+
+#~ msgid "[attachment:list_groups.png]"
+#~ msgstr "[attachment:list_groups.png]"
+
+#~ msgid "[attachment:gosa_systems_list.png]"
+#~ msgstr "[attachment:gosa_systems_list.png]"
+
+#, fuzzy
+#~| msgid "FIXME: add an updated english squeeze screenshot here."
+#~ msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
+#~ msgstr "FIXME: add an updated english squeeze screenshot here."
+
+#~ msgid ""
+#~ "Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Assicurarsi di eseguire <computeroutput>ltsp-update-kernels</"
+#~ "computeroutput> dopo l'installazione."
+
+#, fuzzy
+#~| msgid ""
+#~| "LTSP clients start as diskless workstation / thin client can be "
+#~| "configured via command line argument -- or individually adding an entry "
+#~| "in lts.conf or LDAP."
+#~ msgid ""
+#~ "The start of LTSP clients as diskless workstation / thin client can be "
+#~ "configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/"
+#~ "dm) -- or individually adding an entry in lts.conf or LDAP."
+#~ msgstr ""
+#~ "I client LTSP vengono eseguiti come diskless workstation / thin client "
+#~ "possono essere configurativia riga di comando -- o individualmente con "
+#~ "l'aggiunta di una voce  in lts.conf o LDAP."
 
 #~ msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
 #~ msgstr "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
@@ -11770,15 +11973,6 @@ msgstr ""
 #~ msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 #~ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
-#~ msgid "24-Tjener-KDE_Start.png"
-#~ msgstr "24-Tjener-KDE_Start.png"
-
-#~ msgid "29-Diskless-WS-KDM_Login.png"
-#~ msgstr "29-Diskless-WS-KDM_Login.png"
-
-#~ msgid "30-ThinClient-LDM_Login.png"
-#~ msgstr "30-ThinClient-LDM_Login.png"
-
 #~ msgid ""
 #~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
 #~ "to install the main server, all user passwords exept that one for the "
@@ -11824,27 +12018,6 @@ msgstr ""
 #~ "  done\n"
 #~ "  kadmin.local -q \"modpol -maxlife 0secs users\""
 
-#~ msgid "Set user password"
-#~ msgstr "Configurare la password dell'utente"
-
-#~ msgid "create group"
-#~ msgstr "creare il gruppo"
-
-#~ msgid "GOsa² systems listing"
-#~ msgstr "GOsa² systems listing"
-
-#~ msgid "Host details"
-#~ msgstr "Dettagli dell'host"
-
-#~ msgid "Modify host"
-#~ msgstr "Modificare l'host"
-
-#~ msgid "Add netgroup"
-#~ msgstr "Aggiungere gruppi di rete (netgroup)"
-
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Manutenzione di slbackup-php"
-
 #~ msgid ""
 #~ "The Debian Edu Wheezy Manual has generally been cleaned up and improved. "
 #~ "A proof-read with corrections was done by a native English linguist."
@@ -12472,9 +12645,6 @@ msgstr ""
 #~ msgid "FIXME: what else is new in rc1?"
 #~ msgstr "FIXME: what else is new in rc1?"
 
-#~ msgid "./images/collect_system_info.png"
-#~ msgstr "./images/collect_system_info.png"
-
 #~ msgid "usage of sitesummary2ldapdhcp"
 #~ msgstr "uso di sitesummary2ldapdhcp"
 
@@ -13289,9 +13459,6 @@ msgstr ""
 #~ "Lo strumento kiosk si incaricherà di fare questo per noi se si fa click "
 #~ "su \"profile properties\" e scegliere un nuovo folder."
 
-#~ msgid "Changing kioskmode on diskless workstations"
-#~ msgstr "Cambiare il modo kiosk sulle workstation diskless"
-
 #~ msgid ""
 #~ "After you have made changes to the kioskmode settings with kiosktool as "
 #~ "described above, you will have to copy some files inside the chroot used "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index c0f6a86..3597d29 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-03 15:09+0300\n"
 "PO-Revision-Date: 2012-03-10 18:32+0100\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -1747,7 +1747,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
 "source-DVD.iso</computeroutput>"
@@ -1755,8 +1755,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
-"CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1765,7 +1765,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -2188,6 +2188,12 @@ msgid ""
 "proxy of the main server."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid ""
+"Boot parameters available when installing from CD, not when installing from "
+"DVD"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
@@ -2197,9 +2203,7 @@ msgstr ""
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "for å installere <emphasis role=\"strong\">GNOME</emphasis> skrivebordsmiljø "
 "i stedet for <emphasis role=\"strong\">KDE</emphasis> skrivebordsmiljø, legg "
@@ -2211,8 +2215,19 @@ msgstr ""
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"parameters."
+msgstr ""
+"for å installere <emphasis role=\"strong\">GNOME</emphasis> skrivebordsmiljø "
+"i stedet for <emphasis role=\"strong\">KDE</emphasis> skrivebordsmiljø, legg "
+"til <computeroutput>desktop=gnome</computeroutput> i kjernens boot "
+"parametere. "
+
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+msgid ""
+"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+"parameters."
 msgstr ""
 "for å installere <emphasis role=\"strong\">GNOME</emphasis> skrivebordsmiljø "
 "i stedet for <emphasis role=\"strong\">KDE</emphasis> skrivebordsmiljø, legg "
@@ -2460,6 +2475,16 @@ msgstr ""
 "Running debian-edu-profile-udeb...\" på skjermen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"After giving the root password, you will be asked to create a normal user "
+"account \"for non-administrative tasks\". For Debian-edu, this account is "
+"very important! It is the account you will use to manage the Skolelinux "
+"network. You must choose a password length of at least 5 characters for this "
+"user, otherwise you will not be able to log in (even though a shorter "
+"password will be accepted by the installer)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Vær glad"
 
@@ -2541,7 +2566,7 @@ msgstr ""
 "profil til profil:"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgid "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2940,7 +2965,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "FIXME: some screenshots still need to be done here..."
+msgid "FIXME: one screenshot still needs to be done here..."
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -3262,8 +3287,15 @@ msgstr ""
 msgid "tjener KDM Login"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:24-Tjener-KDE_Start.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+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><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -3290,24 +3322,35 @@ msgstr ""
 msgid "KDE Desktop"
 msgstr "Katalogtjeneste (OpenLDAP) [ldap]"
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:29-Diskless-WS-KDM_Login.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>
-msgid "[attachment:30-ThinClient-LDM_Login.png]"
-msgstr ""
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Diskless workstations"
+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"
+msgid "./images/30-ThinClient-LDM_Login.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
-"png]\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lenny-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-msgid "31-ThinClient-KDE_Desktop.png"
+#| msgid "Thin clients"
+msgid "Thin Client Login"
+msgstr "Tynnklienter"
+
+#. 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>"
@@ -3368,6 +3411,14 @@ msgstr ""
 "en del andre ting som alle må gjøre."
 
 #. type: Content of: <article><section><section><para>
+msgid ""
+"If generic DNS traffic is blocked out of your network and you need to use "
+"some specific DNS server to look up internet hosts, you need to tell the DNS "
+"server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
+"options and specify the IP address of the DNS server to use."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
 "The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
@@ -3667,10 +3718,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
-"system. On the very right of the screen you will find the \"Filter\" box, a "
+"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 \"[x] Search in subtrees\"."
+"and search there with the option marked \"Search in subtrees\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3678,8 +3729,8 @@ msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
 "the items farthest to the right on each line are little icons that provide "
-"actions for you: edit, lock, set password, restore snapshot (greyed out if "
-"no snapshot was taken before), take snapshot and delete."
+"actions for you: cut entry, copy entry, edit user, lock account, set "
+"password, take snapshot (not usable) and remove user."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3757,17 +3808,19 @@ msgid ""
 "yourself"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: add screenshot of a user changing her password with GOSA2"
-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 passwords"
+msgid "Set user password"
+msgstr "Sett passord"
+
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid ""
@@ -3873,17 +3926,23 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Brukeradministrasjon med lwat"
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for group management with GOSA2"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+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>
-msgid "[attachment:create_group.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:list_groups.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+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."
@@ -4015,7 +4074,7 @@ msgid ""
 "machine this way. It may be better to first think about your network: For "
 "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
 "x>100 for workstations. Don't forget to activate the just added system. "
-"With the exception of the main server all system will then have a matching "
+"With the exception of the main server all systems will then have a matching "
 "icon."
 msgstr ""
 "For å tildele en vert med MAC-adresse 00:40:05:AF:4E:C6 en statisk IP-"
@@ -4028,52 +4087,70 @@ msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
 "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to "
-"automatically add machines to GOsa². Please note, that the IP addresses "
-"shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> "
-"belong to the dynamic IP range. These systems can then be modified though to "
-"suite your network. A few screenshots show how this may be done."
+"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -"
+"h</computeroutput> shows usage information. Please note, that the IP "
+"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+"computeroutput> belong to the dynamic IP range. These systems can then be "
+"modified though to suite your network. A few screenshots show how this may "
+"be done."
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
 msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-"info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █"
+"enter password:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for machine management with GOSA2"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+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_list.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>
-msgid "[attachment:gosa_systems_host_details.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
 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>
+#, fuzzy
+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</"
@@ -4668,20 +4745,19 @@ msgid ""
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
-msgstr ""
-"Stjernen foran kommentar '#' er viktig, resten er selvfølgelig en kommentar "
-"<inlinemediaobject>"
-
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-msgid "[attachment:slbackup-php_maintenance.png]"
+msgid "./images/slbackup-php_maintenance.png"
 msgstr ""
 "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
 "squeeze-10-basesystem.png\"/></imageobject>"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Maintainance"
+msgid "slbackup-php Maintenance"
+msgstr "Vedlikehold"
+
 #. type: Content of: <article><section><section><title>
 msgid "Server Monitoring"
 msgstr "Tjenerovervåkning"
@@ -6570,7 +6646,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
 "A thin client setup enables an ordinary PC to function as an (X-)terminal, "
@@ -6587,7 +6663,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 msgstr "<emphasis role='strong'>Diskløs arbeidsstasjon</emphasis>:"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
 "A diskless workstation runs all software locally. The client machines boot "
@@ -6606,11 +6682,36 @@ msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
-"add them with GOsa²."
+"add them with GOsa², cause LDM is used to login and connect to the LTSP "
+"server."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"These steps have to be taken to get back to the behaviour in Debian Edu "
+"Squeeze."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
+"lts.conf (or set this in LDAP). Make sure, that the display manager is "
+"installed in the LTSP chroot."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+msgid "Add the diskless workstations to LDAP with GOsa²."
+msgstr "arbeidsstasjon"
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Thin client</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
+msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "LTSP client boot will fail if the client's network card requires a non-free "
 "firmware. A PXE installation can be used for troubleshooting problems with "
 "netbooting a machine; if the Debian Installer complains about a missing XXX."
@@ -6658,23 +6759,16 @@ msgstr ""
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-486</computeroutput> is installed by default. If all LTSP client "
 "machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot."
+"image-686</computeroutput> package could be installed in the chroot. Make "
+"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
+"installation."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid ""
-"Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
-"after installation."
-msgstr ""
-"Se på koden i <computeroutput>/etc/init.d/kdm</computeroutput> for å "
-"informasjon om hvordan disse variablene blir brukt."
-
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
 #| msgid "Select type of installation"
@@ -8374,7 +8468,7 @@ msgstr "Bruk av globale regler"
 #| "FIXME explain how to use profiles from global policies for windows "
 #| "machines in the skolelinux network"
 msgid ""
-"FIXME explain how to use profiles from global policies for Windows machines "
+"FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
 "FIXME explain how to use profiles from global policies for windows machines "
@@ -9236,8 +9330,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Obtaining a Kerberos ticket to read email on diskless clients"
-msgstr ""
+#, fuzzy
+#| msgid "Changing kioskmode on diskless workstations"
+msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
+msgstr "Endre kioskmodus på halvtykke arbeidstasjoner"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9744,13 +9840,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The start of LTSP clients as diskless workstation / thin client can be "
-"configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/dm) "
-"-- or individually adding an entry in lts.conf or LDAP."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
 "hidden to the end user, others even to the GOsa admin."
@@ -12062,8 +12151,24 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
 #, fuzzy
-#~ msgid "Add workstations with GOsa²"
-#~ msgstr "arbeidsstasjon"
+#~ msgid "31-ThinClient-KDE_Desktop.png"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-"
+#~ "tjener.png]\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
+#~ msgstr ""
+#~ "Stjernen foran kommentar '#' er viktig, resten er selvfølgelig en "
+#~ "kommentar <inlinemediaobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
+#~ "after installation."
+#~ msgstr ""
+#~ "Se på koden i <computeroutput>/etc/init.d/kdm</computeroutput> for å "
+#~ "informasjon om hvordan disse variablene blir brukt."
 
 #, fuzzy
 #~ msgid "[attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png]"
@@ -12185,16 +12290,6 @@ msgstr ""
 #~ "<ulink url=\"http://bugs.debian.org/516280\">516280</ulink>."
 
 #, fuzzy
-#~| msgid "Set passwords"
-#~ msgid "Set user password"
-#~ msgstr "Sett passord"
-
-#, fuzzy
-#~| msgid "Maintainance"
-#~ msgid "slbackup-php Maintenance"
-#~ msgstr "Vedlikehold"
-
-#, fuzzy
 #~ msgid ""
 #~ "With the introduction of <computeroutput>etckeeper</computeroutput> in "
 #~ "Debian Edu Wheezy (previous versions used <computeroutput>etcinsvk</"
@@ -13360,9 +13455,6 @@ msgstr ""
 #~ "Kioskverktøyet vil gjøre dette for deg hvis du klikker på "
 #~ "«profilegenskaper» og leter frem en ny mappe."
 
-#~ msgid "Changing kioskmode on diskless workstations"
-#~ msgstr "Endre kioskmodus på halvtykke arbeidstasjoner"
-
 #, fuzzy
 #~| msgid ""
 #~| "After you have made changes to the kioskmode settings with kiosktool "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index aea50bb..cb885b2 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-06-18 00:05+0300\n"
+"POT-Creation-Date: 2013-07-03 15:09+0300\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"
@@ -1082,19 +1082,19 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
-"CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1361,21 +1361,31 @@ msgid ""
 "proxy of the main server."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid ""
+"Boot parameters available when installing from CD, not when installing from "
+"DVD"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters. This option is only available when installing from CD, not when "
-"installing from DVD."
+"parameters."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+"parameters."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1530,6 +1540,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"After giving the root password, you will be asked to create a normal user "
+"account \"for non-administrative tasks\". For Debian-edu, this account is "
+"very important! It is the account you will use to manage the Skolelinux "
+"network. You must choose a password length of at least 5 characters for this "
+"user, otherwise you will not be able to log in (even though a shorter "
+"password will be accepted by the installer)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr ""
 
@@ -1588,7 +1608,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgid "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -1837,7 +1857,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "FIXME: some screenshots still need to be done here..."
+msgid "FIXME: one screenshot still needs to be done here..."
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2044,8 +2064,12 @@ msgstr ""
 msgid "tjener KDM Login"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:24-Tjener-KDE_Start.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><inlinemediaobject><textobject><phrase>
+msgid "KDE starting..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -2064,20 +2088,24 @@ msgstr ""
 msgid "KDE Desktop"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:29-Diskless-WS-KDM_Login.png]"
+#. 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>
-msgid "[attachment:30-ThinClient-LDM_Login.png]"
+#. 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"
+msgid "./images/30-ThinClient-LDM_Login.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "31-ThinClient-KDE_Desktop.png"
+msgid "Thin Client 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>
@@ -2124,6 +2152,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"If generic DNS traffic is blocked out of your network and you need to use "
+"some specific DNS server to look up internet hosts, you need to tell the DNS "
+"server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
+"options and specify the IP address of the DNS server to use."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
 "and some frequently asked questions."
 msgstr ""
@@ -2368,10 +2404,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
-"system. On the very right of the screen you will find the \"Filter\" box, a "
+"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 \"[x] Search in subtrees\"."
+"and search there with the option marked \"Search in subtrees\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2379,8 +2415,8 @@ msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
 "the items farthest to the right on each line are little icons that provide "
-"actions for you: edit, lock, set password, restore snapshot (greyed out if "
-"no snapshot was taken before), take snapshot and delete."
+"actions for you: cut entry, copy entry, edit user, lock account, set "
+"password, take snapshot (not usable) and remove user."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2437,12 +2473,12 @@ msgid ""
 "yourself"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: add screenshot of a user changing her password with GOSA2"
+#. 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>
-msgid "[attachment:change_password_administratively.png]"
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Set user password"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2532,16 +2568,16 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for group management with GOSA2"
+#. 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:create_group.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "create group"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:list_groups.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/list_groups.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2637,7 +2673,7 @@ msgid ""
 "machine this way. It may be better to first think about your network: For "
 "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
 "x>100 for workstations. Don't forget to activate the just added system. "
-"With the exception of the main server all system will then have a matching "
+"With the exception of the main server all systems will then have a matching "
 "icon."
 msgstr ""
 
@@ -2646,44 +2682,56 @@ msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
 "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to "
-"automatically add machines to GOsa². Please note, that the IP addresses "
-"shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> "
-"belong to the dynamic IP range. These systems can then be modified though to "
-"suite your network. A few screenshots show how this may be done."
+"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -"
+"h</computeroutput> shows usage information. Please note, that the IP "
+"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+"computeroutput> belong to the dynamic IP range. These systems can then be "
+"modified though to suite your network. A few screenshots show how this may "
+"be done."
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
 msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-"info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-"enter password: █"
+"enter password:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: add screenshots for machine management with GOSA2"
+#. 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_list.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_host_details.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_edit_host.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Host details"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:gosa_systems_add_netgroup.png]"
+#. 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>
@@ -3044,12 +3092,12 @@ msgid ""
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "FIXME: show slbackup-php maintainance wheezy screenshot here"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/slbackup-php_maintenance.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:slbackup-php_maintenance.png]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "slbackup-php Maintenance"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4389,7 +4437,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A thin client setup enables an ordinary PC to function as an (X-)terminal, "
 "where all software runs on the LTSP server. This means that this machine "
@@ -4401,7 +4449,7 @@ msgstr ""
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "A diskless workstation runs all software locally. The client machines boot "
 "directly from the LTSP server without a local hard drive. Software is "
@@ -4416,7 +4464,29 @@ msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. Unlike workstations, diskless workstations run without any need to "
-"add them with GOsa²."
+"add them with GOsa², cause LDM is used to login and connect to the LTSP "
+"server."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"These steps have to be taken to get back to the behaviour in Debian Edu "
+"Squeeze."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
+"lts.conf (or set this in LDAP). Make sure, that the display manager is "
+"installed in the LTSP chroot."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Add the diskless workstations to LDAP with GOsa²."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4465,18 +4535,14 @@ msgstr ""
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><para>
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-486</computeroutput> is installed by default. If all LTSP client "
 "machines support the 686 processor architecture the <computeroutput>linux-"
-"image-686</computeroutput> package could be installed in the chroot."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> "
-"after installation."
+"image-686</computeroutput> package could be installed in the chroot. Make "
+"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
+"installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5533,7 +5599,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"FIXME explain how to use profiles from global policies for Windows machines "
+"FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
 
@@ -6229,7 +6295,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Obtaining a Kerberos ticket to read email on diskless clients"
+msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6611,13 +6677,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The start of LTSP clients as diskless workstation / thin client can be "
-"configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/dm) "
-"-- or individually adding an entry in lts.conf or LDAP."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
 "hidden to the end user, others even to the GOsa admin."
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 7144799..5a5afa0 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -449,11 +449,11 @@ FIXME: only the CD download links work currently - the DVD and source DVD downlo
 <para>The netinstall CD, which can be used for installation of i386 and amd64 as well, is available via 
 </para>
 <itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0~a2-CD.iso">debian-edu-7.1+edu0~a2-CD.iso</ulink> 
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0~a3-CD.iso">debian-edu-7.1+edu0~a3-CD.iso</ulink> 
 </para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-CD.iso">debian-edu-7.1+edu0~a2-CD.iso</ulink> 
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-CD.iso">debian-edu-7.1+edu0~a3-CD.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~a2-CD.iso|debian-edu-7.1+edu0~a2-CD.iso </computeroutput> 
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 
@@ -560,12 +560,21 @@ FIXME: only the CD download links work currently - the DVD and source DVD downlo
 </para></listitem>
 <listitem>
 <para>If you have already installed the main server profile on a machine, further installations should be done via PXE, as this will automatically use the proxy of the main server. 
+</para></listitem></itemizedlist>
+</section>
+
+<section id="Installation--Boot_parameters_available_when_installing_from_CD.2C_not_when_installing_from_DVD">
+<title>Boot parameters available when installing from CD, not when installing from DVD
+</title>
+<itemizedlist>
+<listitem>
+<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the <emphasis role="strong">KDE</emphasis> desktop, add <computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters. 
 </para></listitem>
 <listitem>
-<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the <emphasis role="strong">KDE</emphasis> desktop, add <computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters. This option is only available when installing from CD, not when installing from DVD. 
+<para>To install the <emphasis role="strong">LXDE</emphasis> desktop instead, add <computeroutput>desktop=lxde</computeroutput> to the kernel boot parameters. 
 </para></listitem>
 <listitem>
-<para>To install the <emphasis role="strong">LXDE</emphasis> desktop instead, add <computeroutput>desktop=lxde</computeroutput> to the kernel boot parameters. This option is only available when installing from CD, not when installing from DVD. 
+<para>To install the <emphasis role="strong">Xfce</emphasis> desktop instead, add <computeroutput>desktop=xfce</computeroutput> to the kernel boot parameters. 
 </para></listitem></itemizedlist>
 </section>
 </section>
@@ -640,6 +649,9 @@ FIXME: only the CD download links work currently - the DVD and source DVD downlo
 <para>Wait. If the selected profiles include Thin-client-server then the installer will spend quite some time at the end, "Finishing the installation - Running debian-edu-profile-udeb..." 
 </para></listitem>
 <listitem>
+<para>After giving the root password, you will be asked to create a normal user account "for non-administrative tasks". For Debian-edu, this account is very important! It is the account you will use to manage the Skolelinux network. You must choose a password length of at least 5 characters for this user, otherwise you will not be able to log in (even though a shorter password will be accepted by the installer). 
+</para></listitem>
+<listitem>
 <para>Be happy 
 </para></listitem></itemizedlist>
 </section>
@@ -672,7 +684,7 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 <para>A netinst installation (which is the type of installation our CD provides) will fetch some packages from the CD and the rest from the net.  The amount of packages fetched from the net varies from profile to profile: 
 </para>
 <para>
-FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny. 
+FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny. 
 </para>
 <itemizedlist>
 <listitem>
@@ -780,7 +792,7 @@ FIXME: two PXE screenshots (with wheezy artwork) are missing here
 <para>So here is a screenshot tour through a graphical Main-Server + Workstation + Thin Client Server installation and how it looks at the first boot of the tjener, a PXE boot on the workstation network and on the thinclient network: 
 </para>
 <para>
-FIXME: some screenshots still need to be done here... 
+FIXME: one screenshot still needs to be done here... 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_boot_menu.png"/></imageobject><textobject><phrase>01-Installer_boot_menu.png</phrase></textobject></inlinemediaobject> 
 </para>
@@ -834,7 +846,7 @@ FIXME: some screenshots still need to be done here...
 </para>
 <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><inlinemediaobject><imageobject><imagedata fileref="./images/26-Tjener-KDE_Desktop_Browser.png"/></imageobject><textobject><phrase>KDE and Browser</phrase></textobject></inlinemediaobject> 
 </para>
@@ -842,11 +854,11 @@ FIXME: some screenshots still need to be done here...
 </para>
 <para>[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png] 
 </para>
-<para>[attachment:29-Diskless-WS-KDM_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:30-ThinClient-LDM_Login.png] 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/30-ThinClient-LDM_Login.png"/></imageobject><textobject><phrase>Thin Client Login</phrase></textobject></inlinemediaobject> 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/31-ThinClient-KDE_Desktop.png"/></imageobject><textobject><phrase>31-ThinClient-KDE_Desktop.png</phrase></textobject></inlinemediaobject> 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/31-ThinClient-KDE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop</phrase></textobject></inlinemediaobject> 
 </para>
 </section>
 </section>
@@ -873,6 +885,8 @@ FIXME: some screenshots still need to be done here...
 </para></listitem></orderedlist>
 <para>Adding users and workstations is described in detail below, so please read this chapter completely. It covers how to perform these minumum steps correctly as well, as other stuff that everybody will probably need to do. 
 </para>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> If generic DNS traffic is blocked out of your network and you need to use some specific DNS server to look up internet hosts, you need to tell the DNS server to use this server as its "forwarder".  Update /etc/bind/named.conf.options and specify the IP address of the DNS server to use. 
+</para>
 <para>The <link linkend="HowTo">HowTo</link> chapter covers more tips and tricks and some frequently asked questions. 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-KDE_Desktop.png"/></imageobject><textobject><phrase>Debian Edu KDE desktop</phrase></textobject></inlinemediaobject> 
@@ -981,9 +995,9 @@ FIXME: some screenshots still need to be done here...
 </title>
 <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 very right of the screen you will find 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 "[x] Search in subtrees". 
+<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>
-<para>When using the "Filter" box, results will immediately appear in the middle of the text in the table list view. Every line represents a user account and the items farthest to the right on each line are little icons that provide actions for you: edit, lock, set password, restore snapshot (greyed out if no snapshot was taken before), take snapshot and delete. 
+<para>When using the "Filter" box, results will immediately appear in the middle of the text in the table list view. Every line represents a user account and the items farthest to the right on each line are little icons that provide actions for you: cut entry, copy entry, edit user, lock account, set password, take snapshot (not usable) and remove user. 
 </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>
@@ -1009,10 +1023,7 @@ FIXME: some screenshots still need to be done here...
 <listitem>
 <para>on the page subsequently presented you can set a new password chosen by yourself 
 </para></listitem></orderedlist>
-<para>
-FIXME: add screenshot of a user changing her password with GOSA2 
-</para>
-<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>
@@ -1063,12 +1074,9 @@ FIXME: add screenshot of a user changing her password with GOSA2
 <section id="GettingStarted--Group_Management_with_GOsa.2BALI-">
 <title>Group Management with GOsa²
 </title>
-<para>
-FIXME: add screenshots for group management with GOSA2 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/create_group.png"/></imageobject><textobject><phrase>create group</phrase></textobject></inlinemediaobject> 
 </para>
-<para>[attachment:create_group.png] 
-</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>
@@ -1103,28 +1111,23 @@ net groupmap add unixgroup=NEW_GROUP type=domain ntgroup="NEW_GROUP"\
 </para>
 <para>To add a machine, use the GOsa² main menu, systems, add. You can use an IP address/hostname from the preconfigured address space 10.0.0.0/8. Currently there are only two predefined fixed addresses: 10.0.2.2 (tjener) and 10.0.0.1 (gateway). The addresses from 10.0.16.20 to 10.0.31.254 (roughly 10.0.16.0/20 or 4000 hosts) are reserved for DHCP and are assigned dynamically. 
 </para>
-<para>To assign a host with the MAC address 52:54:00:12:34:10 a static IP address in GOsa² you have to enter the MAC address, the hostname and the IP; alternatively you might click the <computeroutput>Propose ip</computeroutput> button which will show the first free fixed address in 10.0.0.0/8, most probably something like 10.0.0.2 if you add the first machine this way. It may be better to first think about your network: For example you could use 10.0.0.x with x>10 and x<50 for servers, and x>100 for workstations. Don't forget to activate the just added system. With the exception of the main server all system will then have a matching icon.  
+<para>To assign a host with the MAC address 52:54:00:12:34:10 a static IP address in GOsa² you have to enter the MAC address, the hostname and the IP; alternatively you might click the <computeroutput>Propose ip</computeroutput> button which will show the first free fixed address in 10.0.0.0/8, most probably something like 10.0.0.2 if you add the first machine this way. It may be better to first think about your network: For example you could use 10.0.0.x with x>10 and x<50 for servers, and x>100 for workstations. Don't forget to activate the just added system. With the exception of the main server all systems will then have a matching icon.  
 </para>
-<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa². Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified though to suite your network. A few screenshots show how this may be done. 
-</para><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a
-info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.
-info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.
-info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.
+<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic IP range. These systems can then be modified though to suite your network. A few screenshots show how this may be done. 
+</para><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations
+info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.
 
 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>
-FIXME: add screenshots for machine management with GOSA2 
+enter password: ]]></screen>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa_systems_list.png"/></imageobject><textobject><phrase>GOsa² systems listing</phrase></textobject></inlinemediaobject> 
 </para>
-<para>[attachment:gosa_systems_list.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_host_details.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_edit_host.png] 
-</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>
@@ -1293,10 +1296,7 @@ FIXME: add screenshots for machine management with GOSA2
 </para>
 <para>If you want to get rid of older backups, choose "Maintenance" in the menu on the backup page and select the oldest snapshot to keep: 
 </para>
-<para>
-FIXME: show slbackup-php maintainance wheezy screenshot here  
-</para>
-<para>[attachment:slbackup-php_maintenance.png] 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/slbackup-php_maintenance.png"/></imageobject><textobject><phrase>slbackup-php Maintenance</phrase></textobject></inlinemediaobject> 
 </para>
 </section>
 
@@ -1922,15 +1922,24 @@ apt-get update]]></screen>
 </para>
 <para><emphasis role="strong">Thin client</emphasis> 
 </para>
-<itemizedlist><listitem override="none">
 <para>A thin client setup enables an ordinary PC to function as an (X-)terminal, where all software runs on the LTSP server. This means that this machine boots from a diskette or directly from the server using network-PROM (or PXE) without using a local client hard drive.  
-</para></listitem></itemizedlist>
+</para>
 <para><emphasis role="strong">Diskless workstation</emphasis> 
 </para>
-<itemizedlist><listitem override="none">
 <para>A diskless workstation runs all software locally. The client machines boot directly from the LTSP server without a local hard drive. Software is administered and maintained on the LTSP server, but it runs on the diskless workstation. Home directories and system settings are stored on the server too. Diskless workstations are an excellent way of reusing newer hardware with the same low maintenance cost as with thin clients.  
+</para>
+<para>LTSP defines 320MB as the default minimum amount of RAM for diskless workstations. If the amount of RAM is less, the machine will boot as thin client. Unlike workstations, diskless workstations run without any need to add them with GOsa², cause LDM is used to login and connect to the LTSP server. 
+</para>
+<para>These steps have to be taken to get back to the behaviour in Debian Edu Squeeze. 
+</para>
+<itemizedlist>
+<listitem>
+<para>Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to lts.conf (or set this in LDAP). Make sure, that the display manager is installed in the LTSP chroot. 
+</para></listitem>
+<listitem>
+<para>Add the diskless workstations to LDAP with GOsa².   
 </para></listitem></itemizedlist>
-<para>LTSP defines 320MB as the default minimum amount of RAM for diskless workstations. If the amount of RAM is less, the machine will boot as thin client. Unlike workstations, diskless workstations run without any need to add them with GOsa².   
+<para><emphasis role="strong">LTSP client firmware</emphasis> 
 </para>
 <para>LTSP client boot will fail if the client's network card requires a non-free firmware. A PXE installation can be used for troubleshooting problems with netbooting a machine; if the Debian Installer complains about a missing XXX.bin file then non-free firmware has to be added to the initrd used by LTSP clients. 
 </para>
@@ -1952,10 +1961,7 @@ ltsp-update-kernels]]></screen>
 </para><screen><![CDATA[/usr/share/debian-edu-config/tools/ltsp-addfirmware]]></screen>
 <para><emphasis role="strong">LTSP client kernel</emphasis> 
 </para>
-<itemizedlist><listitem override="none">
-<para>In order to support older hardware the package <computeroutput>linux-image-486</computeroutput> is installed by default. If all LTSP client machines support the 686 processor architecture the <computeroutput>linux-image-686</computeroutput> package could be installed in the chroot. 
-</para></listitem></itemizedlist>
-<para>Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after installation. 
+<para>In order to support older hardware the package <computeroutput>linux-image-486</computeroutput> is installed by default. If all LTSP client machines support the 686 processor architecture the <computeroutput>linux-image-686</computeroutput> package could be installed in the chroot. Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after installation. 
 </para>
 
 <section id="NetworkClients--LTSP_client_type_selection">
@@ -2407,7 +2413,7 @@ FIXME: would it be better to explain user groups in Windows first with GOsa², a
 <title>Redirecting using global policies
 </title>
 <para>
-FIXME explain how to use profiles from global policies for Windows machines in the skolelinux network 
+FIXME: explain how to use profiles from global policies for Windows machines in the skolelinux network 
 </para>
 </section>
 </section>
@@ -2787,8 +2793,8 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 <para>Now send a test email to yourself. (This will create the IMAP folders on the server.) Wait a little bit, then click "Check Mail" in the KMail menu. There should be your recently sent email in the inbox below of "intern".  
 </para>
 
-<section id="Users--Obtaining_a_Kerberos_ticket_to_read_email_on_diskless_clients">
-<title>Obtaining a Kerberos ticket to read email on diskless clients
+<section id="Users--Obtaining_a_Kerberos_ticket_to_read_email_on_diskless_workstations">
+<title>Obtaining a Kerberos ticket to read email on diskless workstations
 </title>
 <para>If working on a diskless client, you don't have a Kerberos TGT by default. To get one, open up a terminal and execute <computeroutput>kinit</computeroutput>. Enter your password and the ticket will be granted. 
 </para>
@@ -3050,9 +3056,6 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>LTSP diskless workstations run without any configuration. 
 </para></listitem>
 <listitem>
-<para>The start of LTSP clients as diskless workstation / thin client can be configured via command line argument (DEFAULT_DISPLAY_MANAGER=/path/to/dm) -- or individually adding an entry in lts.conf or LDAP. 
-</para></listitem>
-<listitem>
 <para>GOsa gui: Now some options that seemed to be available, but are non functional, are greyed out (or are not clickable). Some tabs are completely hidden to the end user, others even to the GOsa admin. 
 </para></listitem></itemizedlist>
 </section>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index ee852d8..3941998 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -1,25 +1,17 @@
 ----------------------------------
 http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
 FIXME: only the CD download links work currently - the DVD and source DVD download URLs need to be adapted for wheezy still... They currently don't work.  
-FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny. 
+FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny. 
 FIXME: two PXE screenshots (with wheezy artwork) are missing here 
-FIXME: some screenshots still need to be done here... 
-----------------------------------
-http://wiki.debian.org/DebianEdu/Documentation/Wheezy//GettingStarted
-FIXME: add screenshot of a user changing her password with GOSA2 
-FIXME: add screenshots for group management with GOSA2 
-FIXME: add screenshots for machine management with GOSA2 
-----------------------------------
-http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Maintenance
-FIXME: show slbackup-php maintainance wheezy screenshot here  
+FIXME: one screenshot still needs to be done here... 
 ----------------------------------
 http://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/NetworkClients
 FIXME: would it be better to explain user groups in Windows first with GOsa², and then with an example for the command line? 
-FIXME explain how to use profiles from global policies for Windows machines in the skolelinux network 
+FIXME: explain how to use profiles from global policies for Windows machines in the skolelinux network 
 FIXME: describe roaming profile key for the global policy editor here 
 ----------------------------------
 http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Features
 FIXME: mass import will soon be fixed, remove this paragraph once this has happene d. 
 ====================
-13 FIXMEs left to fix
+9 FIXMEs left to fix
 ====================


hooks/post-receive
-- 
debian-edu-doc.git (Debian package debian-edu-doc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).




More information about the debian-edu-commits mailing list