[debian-edu-commits] debian-edu/debian-edu-doc.git (#1633) - master (branch) updated: 1.5_20131001_7.1-13-ga2af83b

Wed Oct 2 21:01:45 UTC 2013

The branch, master has been updated
       via  a2af83be8f2a02317466dcd228b5eb229e136845 (commit)
      from  3ff79683fe57422dc071e1e373d9ee628cb36822 (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 a2af83be8f2a02317466dcd228b5eb229e136845
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Oct 2 23:00:34 2013 +0200

    Update manual from the wiki

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

Summary of changes:
 .../debian-edu-wheezy-manual.da.po                 |  117 +++++++----
 .../debian-edu-wheezy-manual.de.po                 |  136 +++++++++----
 .../debian-edu-wheezy-manual.es.po                 |   74 +++----
 .../debian-edu-wheezy-manual.fr.po                 |  119 ++++++++----
 .../debian-edu-wheezy-manual.it.po                 |  149 +++++++++-----
 .../debian-edu-wheezy-manual.nb.po                 |  205 ++++++++++----------
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot |   49 ++---
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml |   20 +-
 8 files changed, 537 insertions(+), 332 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 23877ad..4dbc8dc 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-10-01 17:27-0400\n"
+"POT-Creation-Date: 2013-10-02 22:55+0300\n"
 "PO-Revision-Date: 2013-09-19 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1120,11 +1120,17 @@ msgstr ""
 "bedre ydelse. Ligesom en hurtigere CPU vil få tingene til at løbe hurtigere."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Swapping over the network is automatically enabled; the swap size is 32 "
+#| "MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+#| "conf on tjener to set the SIZE variable. Please <emphasis>tune up the "
+#| "swap size</emphasis> either locally on the PC or on the server."
 msgid ""
-"Swapping over the network is automatically enabled; the swap size is 32 MiB, "
-"and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on "
-"tjener to set the SIZE variable. Please <emphasis>tune up the swap size</"
-"emphasis> either locally on the PC or on the server."
+"Swapping over the network is automatically enabled; the swap size is 512 "
+"MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+"conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap "
+"size</emphasis> either locally on the PC or on the server."
 msgstr ""
 "Swapping over netværket bliver automatisk aktiveret; swapstørrelsen er 32 "
 "MiB, og hvis du skal bruge mere kan du tune denne indstilling ved at "
@@ -1141,18 +1147,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"On workstations with little RAM the spell checker can cause LibreOffice "
-"to hang if the swap space is too small. Then the system administrator has to "
+"On workstations with little RAM the spell checker can cause LibreOffice to "
+"hang if the swap space is too small. Then the system administrator has to "
 "disable the spell checker on LibreOffice or students have to kill "
-"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on "
-"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
+"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on a "
+"320 MiB RAM workstation solves this, and the spell checker runs smoothly."
 msgstr ""
-"På arbejdsstationer med begrænset RAM kan stavekontrollen få LibreOffice "
-"til at hænge hvis swapområdet er for lille. Systemadministratoren må så "
+"På arbejdsstationer med begrænset RAM kan stavekontrollen få LibreOffice til "
+"at hænge hvis swapområdet er for lille. Systemadministratoren må så "
 "deaktivere stavekontrollen for LibreOffice eller studenterne må dræbe "
-"LibreOffice, hvilket kan resultere i tabt arbejde. Aktivering af mindst "
-"512 MiB swap på en 320 MiB RAM arbejdsstation løser denne problemstilling, "
-"og stavekontrollen kører så fint."
+"LibreOffice, hvilket kan resultere i tabt arbejde. Aktivering af mindst 512 "
+"MiB swap på en 320 MiB RAM arbejdsstation løser denne problemstilling, og "
+"stavekontrollen kører så fint."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1800,9 +1806,15 @@ msgstr ""
 "proxyen for hovedserveren."
 
 #. 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."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "For at installere <emphasis role=\"strong\">GNOME</emphasis>-skrivebordet i "
@@ -5690,13 +5702,21 @@ msgstr ""
 "så svært for mange uerfarne brugere."
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
+#, fuzzy
+#| msgid ""
+#| "It is possible to have the default KDE file manager Dolphin showing up if "
+#| "KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+#| "environment. To configure this, simply execute <computeroutput>/usr/share/"
+#| "debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the "
+#| "terminal server. (When using Gnome, device icons will be placed on the "
+#| "desktop allowing easy access)."
+msgid ""
+"It is possible to have the default KDE \"Plasma\" file manager Dolphin "
+"showing up if KDE \"Plasma\" (or LDXE, if installed in parallel to KDE "
+"\"Plasma\") is in use as desktop environment. To configure this, simply "
+"execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde "
+"enable</computeroutput> on the terminal server. (When using GNOME, device "
+"icons will be placed on the desktop allowing easy access)."
 msgstr ""
 "Det er muligt at vise den normale KDE-filhåndtering Dolphin hvis KDE (eller "
 "LDXE, såfremt installeret parallelt med KDE) er i brug som skrivebordsmiljø. "
@@ -5823,13 +5843,21 @@ msgstr ""
 "om hvordan disse varibaler bruges."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE, Gnome and LXDE together"
+#, fuzzy
+#| msgid "Using KDE, Gnome and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME and LXDE together"
 msgstr "Brug af KDE, Gnnome og LXDE sammen"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
+#| "\"Installation--The_installation_process\">installation instructions</"
+#| "link>."
 msgid ""
-"If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
-"\"Installation--The_installation_process\">installation instructions</link>."
+"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
+"linkend=\"Installation--The_installation_process\">installation "
+"instructions</link>."
 msgstr ""
 "Hvis du ønsker at bruge GNOME eller LXDE i stedet for KDE, så følg <link "
 "linkend=\"Installation--The_installation_process"
@@ -7044,9 +7072,13 @@ msgstr ""
 "192.168.0.254 (ved en standardkonfiguration af Skolelinux)."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If for some reason XDMCP is accessible on your server which runs KDM, add "
+#| "the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
 msgid ""
-"If for some reason XDMCP is accessible on your server which runs KDM, add "
-"the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
+"If XDMCP is not accessible on your server which runs KDM, add the following "
+"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgstr ""
 "Hvis XDMCP af en eller anden årsag kan tilgås på din server, som kører KDM, "
 "så tilføj det følgende til <computeroutput>/etc/kde3/kdm/Xaccess</"
@@ -7069,8 +7101,9 @@ msgid "Then turn on XDMCP in KDM with the command:"
 msgstr "Tænd så XDMCP i KDM med kommandoen:"
 
 #. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+#, fuzzy, no-wrap
+#| msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 
 #. type: Content of: <article><section><section><para>
@@ -8902,10 +8935,15 @@ msgid "Linux kernel 3.2.x"
 msgstr "Linuxkerne version 3.2.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and "
+#| "LXDE 0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: "
+#| "see manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
-"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
-"manual.)"
+"0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
+"LXDE: see manual.)"
 msgstr ""
 "Skrivebordsmiljøet KDE »Plasma« 4.8.4, GNOME 3.4, Xfce 4.8.6 og LXDE 0.5.5 "
 "(KDE installeres som standard; for at vælge GNOME, Xfce eller LXDE: se "
@@ -9046,11 +9084,18 @@ msgid "Known issues"
 msgstr "Kendte problemstillinger"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Using KDE on standalone and roaming workstations, at least Konqueror, "
-"Chromium and Step sometimes fail to work out-of-the box when the machines "
-"are used outside the backbone network, proxy use is required to use the "
-"other network but no wpad.dat information is found. Workaround: Use "
+#, fuzzy
+#| msgid ""
+#| "Using KDE on standalone and roaming workstations, at least Konqueror, "
+#| "Chromium and Step sometimes fail to work out-of-the box when the machines "
+#| "are used outside the backbone network, proxy use is required to use the "
+#| "other network but no wpad.dat information is found. Workaround: Use "
+#| "Iceweasel or configure the proxy manually."
+msgid ""
+"Using KDE \"Plasma\" on standalone and roaming workstations, at least "
+"Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
+"machines are used outside the backbone network, proxy use is required to use "
+"the other network but no wpad.dat information is found. Workaround: Use "
 "Iceweasel or configure the proxy manually."
 msgstr ""
 "Ved brug af KDE på en uafhængige og roamingarbejdsstationer fejler "
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 4c8b5d0..c32d595 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-10-01 17:27-0400\n"
+"POT-Creation-Date: 2013-10-02 22:55+0300\n"
 "PO-Revision-Date: 2013-10-02 13:05+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1134,8 +1134,12 @@ msgstr ""
 "Empfehlenswert sind jedoch 128 MiB RAM und ein schnellerer Prozessor."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For running Iceweasel/Firefox and OpenOffice.org, 128 MiB RAM is a "
+#| "minimum requirement."
 msgid ""
-"For running Iceweasel/Firefox and OpenOffice.org, 128 MiB RAM is a minimum "
+"For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
 "requirement."
 msgstr ""
 "Bei Verwendung von Iceweasel/Firefox und OpenOffice müssen mindestens 128 "
@@ -1153,11 +1157,17 @@ msgstr ""
 "wird die Arbeit deutlich beschleunigen."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Swapping over the network is automatically enabled; the swap size is 32 MiB, "
-"and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on "
-"tjener to set the SIZE variable. Please <emphasis>tune up the swap size</"
-"emphasis> either locally on the PC or on the server."
+#, fuzzy
+#| msgid ""
+#| "Swapping over the network is automatically enabled; the swap size is 32 "
+#| "MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+#| "conf on tjener to set the SIZE variable. Please <emphasis>tune up the "
+#| "swap size</emphasis> either locally on the PC or on the server."
+msgid ""
+"Swapping over the network is automatically enabled; the swap size is 512 "
+"MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+"conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap "
+"size</emphasis> either locally on the PC or on the server."
 msgstr ""
 "Speicherauslagerung über das Netzwerk ist automatisch voreingestellt. Die "
 "Größe des Auslagerungsspeichers beträgt 32 MiB. Wenn Sie mehr benötigen, "
@@ -1175,12 +1185,20 @@ msgstr ""
 "Auslagerung über das Netzwerk."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"On workstations with little RAM the spell checker can cause OpenOffice.org "
-"to hang if the swap space is too small. Then the system administrator has to "
-"disable the spell checker on OpenOffice.org or students have to kill "
-"OpenOffice.org, resulting in loss of work. Enabling at least 512 MiB swap on "
-"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
+#, fuzzy
+#| msgid ""
+#| "On workstations with little RAM the spell checker can cause OpenOffice."
+#| "org to hang if the swap space is too small. Then the system administrator "
+#| "has to disable the spell checker on OpenOffice.org or students have to "
+#| "kill OpenOffice.org, resulting in loss of work. Enabling at least 512 MiB "
+#| "swap on a 320 MiB RAM workstation solves this, and the spell checker runs "
+#| "smoothly."
+msgid ""
+"On workstations with little RAM the spell checker can cause LibreOffice to "
+"hang if the swap space is too small. Then the system administrator has to "
+"disable the spell checker on LibreOffice or students have to kill "
+"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on a "
+"320 MiB RAM workstation solves this, and the spell checker runs smoothly."
 msgstr ""
 "Auf Workstations mit wenig RAM kann die Rechtschreibkontrolle von OpenOffice "
 "hängen bleiben, wenn der Swap-Speicher zu klein ist. Dann muss der System-"
@@ -1839,9 +1857,15 @@ msgstr ""
 "der Proxy des Hauptservers benutzt wird."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Um den <emphasis role=\"strong\">GNOME</emphasis>-Desktop anstatt des "
@@ -5830,13 +5854,21 @@ msgstr ""
 "Für unerfahrene Nutzer ist es recht schwierig, dies zu verstehen."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "It is possible to have the default KDE file manager Dolphin showing up if "
+#| "KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+#| "environment. To configure this, simply execute <computeroutput>/usr/share/"
+#| "debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the "
+#| "terminal server. (When using Gnome, device icons will be placed on the "
+#| "desktop allowing easy access)."
 msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
+"It is possible to have the default KDE \"Plasma\" file manager Dolphin "
+"showing up if KDE \"Plasma\" (or LDXE, if installed in parallel to KDE "
+"\"Plasma\") is in use as desktop environment. To configure this, simply "
+"execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde "
+"enable</computeroutput> on the terminal server. (When using GNOME, device "
+"icons will be placed on the desktop allowing easy access)."
 msgstr ""
 "Wenn KDE (oder LXDE, falls zusätzlich zu KDE installiert) als graphische "
 "Benutzerumgebung verwendet wird, dann ist es möglich, das System so "
@@ -5966,13 +5998,21 @@ msgstr ""
 "an, um zu erfahren, wie diese Variablen benutzt werden."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE, Gnome and LXDE together"
+#, fuzzy
+#| msgid "Using KDE, Gnome and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME and LXDE together"
 msgstr "KDE »Plasma«, GNOME und LXDE nebeneinander benutzen"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
+#| "\"Installation--The_installation_process\">installation instructions</"
+#| "link>."
 msgid ""
-"If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
-"\"Installation--The_installation_process\">installation instructions</link>."
+"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
+"linkend=\"Installation--The_installation_process\">installation "
+"instructions</link>."
 msgstr ""
 "Wenn GNOME oder LXDE statt KDE benutzt werden soll, dann finden Sie hier "
 "<link linkend=\"Installation--The_installation_process\">Installations-"
@@ -7133,9 +7173,16 @@ msgstr ""
 "geschickt."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Note: Since such ten-year-old thin clients may also have trouble running "
+#| "never versions of OpenOffice.org and Firefox/Iceweasel due to pixmap "
+#| "caching issues, you may consider running thin clients with at least 128 "
+#| "MB RAM, or upgrade the hardware, which will also give you the benefit of "
+#| "being able to use them as diskless workstations."
 msgid ""
 "Note: Since such ten-year-old thin clients may also have trouble running "
-"never versions of OpenOffice.org and Firefox/Iceweasel due to pixmap caching "
+"never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
 "issues, you may consider running thin clients with at least 128 MB RAM, or "
 "upgrade the hardware, which will also give you the benefit of being able to "
 "use them as diskless workstations."
@@ -7212,9 +7259,13 @@ msgstr ""
 "Konfiguration)."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If for some reason XDMCP is accessible on your server which runs KDM, add "
+#| "the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
 msgid ""
-"If for some reason XDMCP is accessible on your server which runs KDM, add "
-"the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
+"If XDMCP is not accessible on your server which runs KDM, add the following "
+"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgstr ""
 "Falls XDMCP auf Ihrem Server, auf dem KDM läuft, nicht erreichbar sein "
 "sollte, fügen Sie bitte Folgendes zu der Datei <computeroutput>/etc/kde4/kdm/"
@@ -7238,8 +7289,9 @@ msgid "Then turn on XDMCP in KDM with the command:"
 msgstr "Aktivieren Sie dann XDMCP in KDM mit dem Kommando:"
 
 #. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+#, fuzzy, no-wrap
+#| msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 
 #. type: Content of: <article><section><section><para>
@@ -9128,10 +9180,15 @@ msgid "Linux kernel 3.2.x"
 msgstr "Linux-Kernel in der Version 3.2.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and "
+#| "LXDE 0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: "
+#| "see manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
-"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
-"manual.)"
+"0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
+"LXDE: see manual.)"
 msgstr ""
 "Desktop-Umgebungen KDE »Plasma« 4.8.4, GNOME 3.4, Xfce 4.8.6 und LXDE 0.55 "
 "(KDE wird als Standard installiert; sehen Sie im Handbuch nach, um GNOME, "
@@ -9272,11 +9329,18 @@ msgid "Known issues"
 msgstr "Bekannte Probleme"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Using KDE on standalone and roaming workstations, at least Konqueror, "
+#| "Chromium and Step sometimes fail to work out-of-the box when the machines "
+#| "are used outside the backbone network, proxy use is required to use the "
+#| "other network but no wpad.dat information is found. Workaround: Use "
+#| "Iceweasel or configure the proxy manually."
 msgid ""
-"Using KDE on standalone and roaming workstations, at least Konqueror, "
-"Chromium and Step sometimes fail to work out-of-the box when the machines "
-"are used outside the backbone network, proxy use is required to use the "
-"other network but no wpad.dat information is found. Workaround: Use "
+"Using KDE \"Plasma\" on standalone and roaming workstations, at least "
+"Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
+"machines are used outside the backbone network, proxy use is required to use "
+"the other network but no wpad.dat information is found. Workaround: Use "
 "Iceweasel or configure the proxy manually."
 msgstr ""
 "Wenn KDE auf Einzelplatzrechnern oder mobilen Arbeitsplatzrechnern verwendet "
@@ -9549,8 +9613,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 "
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 c11f634..946f950 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-10-01 19:19-0400\n"
+"POT-Creation-Date: 2013-10-02 22:55+0300\n"
 "PO-Revision-Date: 2013-10-01 16:09-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1199,11 +1199,17 @@ msgstr ""
 "con un procesador más rápido ayudaría en su funcionamiento."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Swapping over the network is automatically enabled; the swap size is 32 "
+#| "MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+#| "conf on tjener to set the SIZE variable. Please <emphasis>tune up the "
+#| "swap size</emphasis> either locally on the PC or on the server."
 msgid ""
-"Swapping over the network is automatically enabled; the swap size is 32 MiB, "
-"and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on "
-"tjener to set the SIZE variable. Please <emphasis>tune up the swap size</"
-"emphasis> either locally on the PC or on the server."
+"Swapping over the network is automatically enabled; the swap size is 512 "
+"MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+"conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap "
+"size</emphasis> either locally on the PC or on the server."
 msgstr ""
 "La paginación de memoria por red esta habilitada por defecto, tiene un "
 "tamaño de 32Mb. Si necesita más, puede modificarlo desde la variable SIZE, "
@@ -1989,7 +1995,7 @@ msgstr ""
 #| "not from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "para instalar el escritorio <emphasis role=\"strong\">GNOME</emphasis> en "
@@ -5858,12 +5864,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
+"It is possible to have the default KDE \"Plasma\" file manager Dolphin "
+"showing up if KDE \"Plasma\" (or LDXE, if installed in parallel to KDE "
+"\"Plasma\") is in use as desktop environment. To configure this, simply "
+"execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde "
+"enable</computeroutput> on the terminal server. (When using GNOME, device "
+"icons will be placed on the desktop allowing easy access)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5958,14 +5964,17 @@ msgstr ""
 "información."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE, Gnome and LXDE together"
+#, fuzzy
+#| msgid "Using KDE, Gnome and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME and LXDE together"
 msgstr "Usar KDE, Gnome y LXDE juntos"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
-"If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
-"\"Installation--The_installation_process\">installation instructions</link>."
+"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
+"linkend=\"Installation--The_installation_process\">installation "
+"instructions</link>."
 msgstr ""
 "<ulink url=\"/DebianEdu/Documentation/Lenny/Translations\">Traducciones</"
 "ulink> de este documento"
@@ -6916,10 +6925,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To achieve that, add a stanza like the following to the file "
+#| "<computeroutput>/etc/lwat/admin.ini</computeroutput>:"
 msgid ""
-"If for some reason XDMCP is accessible on your server which runs KDM, add "
-"the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
+"If XDMCP is not accessible on your server which runs KDM, add the following "
+"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgstr ""
+"Para obtener esto, agregue un párrafo como el siguiente al archivo "
+"<computeroutput>/etc/lwat/admin.ini</computeroutput>:"
 
 #. type: CDATA
 #, no-wrap
@@ -6942,7 +6957,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -8551,8 +8566,8 @@ msgstr "Versión del kernel linux 2.6.18"
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
-"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
-"manual.)"
+"0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
+"LXDE: see manual.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8687,10 +8702,10 @@ msgstr "Problemas conocidos con la imágen"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Using KDE on standalone and roaming workstations, at least Konqueror, "
-"Chromium and Step sometimes fail to work out-of-the box when the machines "
-"are used outside the backbone network, proxy use is required to use the "
-"other network but no wpad.dat information is found. Workaround: Use "
+"Using KDE \"Plasma\" on standalone and roaming workstations, at least "
+"Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
+"machines are used outside the backbone network, proxy use is required to use "
+"the other network but no wpad.dat information is found. Workaround: Use "
 "Iceweasel or configure the proxy manually."
 msgstr ""
 
@@ -12118,17 +12133,6 @@ msgstr ""
 #~ "(por ejemplo, en base al año en que se incorporaron o retiraron de la "
 #~ "escuela) y para crear las carpetas personales en un directorio dedicado."
 
-#, fuzzy
-#~| msgid ""
-#~| "To achieve that, add a stanza like the following to the file "
-#~| "<computeroutput>/etc/lwat/admin.ini</computeroutput>:"
-#~ msgid ""
-#~ "To achieve this, add a stanza like the following to the file "
-#~ "<computeroutput>/etc/lwat/admin.ini</computeroutput>:"
-#~ msgstr ""
-#~ "Para obtener esto, agregue un párrafo como el siguiente al archivo "
-#~ "<computeroutput>/etc/lwat/admin.ini</computeroutput>:"
-
 #~ msgid ""
 #~ "[2009]\n"
 #~ "ou = \"ou=People,%base%\"\n"
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 308cfd7..7608e8e 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: debian-edu-doc\n"
-"POT-Creation-Date: 2013-10-01 17:27-0400\n"
+"POT-Creation-Date: 2013-10-02 22:55+0300\n"
 "PO-Revision-Date: 2013-09-18 15:22+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1157,11 +1157,17 @@ msgstr ""
 "vive amélioreront l'utilisation, de même qu'un processeur plus rapide."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Swapping over the network is automatically enabled; the swap size is 32 "
+#| "MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+#| "conf on tjener to set the SIZE variable. Please <emphasis>tune up the "
+#| "swap size</emphasis> either locally on the PC or on the server."
 msgid ""
-"Swapping over the network is automatically enabled; the swap size is 32 MiB, "
-"and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on "
-"tjener to set the SIZE variable. Please <emphasis>tune up the swap size</"
-"emphasis> either locally on the PC or on the server."
+"Swapping over the network is automatically enabled; the swap size is 512 "
+"MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+"conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap "
+"size</emphasis> either locally on the PC or on the server."
 msgstr ""
 "L'échange (« swapping ») par le réseau est automatiquement activé, la taille "
 "de la zone d'échange est de 32 Mio ; si vous avez besoin de plus, vous "
@@ -1180,11 +1186,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"On workstations with little RAM the spell checker can cause LibreOffice "
-"to hang if the swap space is too small. Then the system administrator has to "
+"On workstations with little RAM the spell checker can cause LibreOffice to "
+"hang if the swap space is too small. Then the system administrator has to "
 "disable the spell checker on LibreOffice or students have to kill "
-"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on "
-"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
+"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on a "
+"320 MiB RAM workstation solves this, and the spell checker runs smoothly."
 msgstr ""
 "Sur les stations de travail avec peu de mémoire vive, le correcteur "
 "orthographique peut faire planter LibreOffice si la taille du fichier "
@@ -1849,9 +1855,15 @@ msgstr ""
 "automatiquement le mandataire du serveur principal."
 
 #. 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."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Pour installer le bureau<emphasis role=\"strong\">GNOME</emphasis> au lieu "
@@ -5854,13 +5866,21 @@ msgstr ""
 "beaucoup d’utilisateurs non expérimentés."
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
+#, fuzzy
+#| msgid ""
+#| "It is possible to have the default KDE file manager Dolphin showing up if "
+#| "KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+#| "environment. To configure this, simply execute <computeroutput>/usr/share/"
+#| "debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the "
+#| "terminal server. (When using Gnome, device icons will be placed on the "
+#| "desktop allowing easy access)."
+msgid ""
+"It is possible to have the default KDE \"Plasma\" file manager Dolphin "
+"showing up if KDE \"Plasma\" (or LDXE, if installed in parallel to KDE "
+"\"Plasma\") is in use as desktop environment. To configure this, simply "
+"execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde "
+"enable</computeroutput> on the terminal server. (When using GNOME, device "
+"icons will be placed on the desktop allowing easy access)."
 msgstr ""
 "Il est possible de faire en sorte que Dolphin, le gestionnaire de fichiers "
 "par défaut de KDE, s'affiche si KDE (ou LXDE, s'il est installé "
@@ -5991,13 +6011,21 @@ msgstr ""
 "des informations concernant l'utilisation de ces variables."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE, Gnome and LXDE together"
+#, fuzzy
+#| msgid "Using KDE, Gnome and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME and LXDE together"
 msgstr "Utiliser KDE, Gnome et LXDE ensemble"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
+#| "\"Installation--The_installation_process\">installation instructions</"
+#| "link>."
 msgid ""
-"If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
-"\"Installation--The_installation_process\">installation instructions</link>."
+"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
+"linkend=\"Installation--The_installation_process\">installation "
+"instructions</link>."
 msgstr ""
 "Si vous voulez utiliser Gnome ou LXDE au lieu de KDE, veuillez consulter les "
 "<link linkend=\"Installation--The_installation_process\">instructions "
@@ -6727,10 +6755,10 @@ msgid ""
 "address or IP address like this: <computeroutput>[192.168.0.10]</"
 "computeroutput>."
 msgstr ""
-"Les valeurs par défaut sont définies dans la section "
-"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
-"indiquez son adresse MAC ou son adresse IP de cette manière : "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"Les valeurs par défaut sont définies dans la section <computeroutput>"
+"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
+"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7177,8 +7205,8 @@ msgid ""
 "use them as diskless workstations."
 msgstr ""
 "Note : ces vieux clients légers pourraient également avoir des problèmes à "
-"exécuter les versions récentes d'LibreOffice et Firefox/Iceweasel à cause "
-"de problèmes de mise en cache de pixmap. Vous devriez utiliser des clients "
+"exécuter les versions récentes d'LibreOffice et Firefox/Iceweasel à cause de "
+"problèmes de mise en cache de pixmap. Vous devriez utiliser des clients "
 "légers avec au moins 128 Mo de RAM ou mettre à jour le matériel, ce qui vous "
 "permettra également de les utiliser comme stations de travail sans disque "
 "dur."
@@ -7249,9 +7277,13 @@ msgstr ""
 "standard de Skolelinux)."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If for some reason XDMCP is accessible on your server which runs KDM, add "
+#| "the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
 msgid ""
-"If for some reason XDMCP is accessible on your server which runs KDM, add "
-"the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
+"If XDMCP is not accessible on your server which runs KDM, add the following "
+"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgstr ""
 "Si pour une raison quelconque, XDMCP est accessible depuis le serveur qui "
 "exécute KDM, veuillez ajouter ceci à <computeroutput>/etc/kde3/kdm/Xaccess</"
@@ -7275,8 +7307,9 @@ msgid "Then turn on XDMCP in KDM with the command:"
 msgstr "Ensuite, lancez XDMCP dans KDM grâce à la commande :"
 
 #. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+#, fuzzy, no-wrap
+#| msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 
 #. type: Content of: <article><section><section><para>
@@ -9177,10 +9210,15 @@ msgid "Linux kernel 3.2.x"
 msgstr "Noyau Linux version 3.2.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and "
+#| "LXDE 0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: "
+#| "see manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
-"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
-"manual.)"
+"0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
+"LXDE: see manual.)"
 msgstr ""
 "Environnements de bureau KDE « Plasma » 4.8.4, GNOME 3.4, Xfce 4.8.6 et LXDE "
 "(KDE est installé par défaut ; pour choisir GNOME, Xfce ou LXDE, consultez "
@@ -9321,11 +9359,18 @@ msgid "Known issues"
 msgstr "Problèmes connus"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Using KDE on standalone and roaming workstations, at least Konqueror, "
-"Chromium and Step sometimes fail to work out-of-the box when the machines "
-"are used outside the backbone network, proxy use is required to use the "
-"other network but no wpad.dat information is found. Workaround: Use "
+#, fuzzy
+#| msgid ""
+#| "Using KDE on standalone and roaming workstations, at least Konqueror, "
+#| "Chromium and Step sometimes fail to work out-of-the box when the machines "
+#| "are used outside the backbone network, proxy use is required to use the "
+#| "other network but no wpad.dat information is found. Workaround: Use "
+#| "Iceweasel or configure the proxy manually."
+msgid ""
+"Using KDE \"Plasma\" on standalone and roaming workstations, at least "
+"Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
+"machines are used outside the backbone network, proxy use is required to use "
+"the other network but no wpad.dat information is found. Workaround: Use "
 "Iceweasel or configure the proxy manually."
 msgstr ""
 "Lors de l'utilisation de KDE sur des stations de travail autonomes ou "
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 d422a89..db8e967 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-10-01 17:27-0400\n"
+"POT-Creation-Date: 2013-10-02 22:55+0300\n"
 "PO-Revision-Date: 2013-09-29 09:58+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -1122,8 +1122,8 @@ msgid ""
 "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
 "requirement."
 msgstr ""
-"Per eseguire Iceweasel/Firefox e LibreOffice, si raccomandano almeno 128 "
-"MiB di RAM come minimo."
+"Per eseguire Iceweasel/Firefox e LibreOffice, si raccomandano almeno 128 MiB "
+"di RAM come minimo."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1136,11 +1136,17 @@ msgstr ""
 "funzioneranno meglio e una CPU più veloce permetterebbe migliori prestazioni."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Swapping over the network is automatically enabled; the swap size is 32 "
+#| "MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+#| "conf on tjener to set the SIZE variable. Please <emphasis>tune up the "
+#| "swap size</emphasis> either locally on the PC or on the server."
 msgid ""
-"Swapping over the network is automatically enabled; the swap size is 32 MiB, "
-"and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on "
-"tjener to set the SIZE variable. Please <emphasis>tune up the swap size</"
-"emphasis> either locally on the PC or on the server."
+"Swapping over the network is automatically enabled; the swap size is 512 "
+"MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+"conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap "
+"size</emphasis> either locally on the PC or on the server."
 msgstr ""
 "L'uso della memoria di swap in rete è automaticamente abilitato: la sua "
 "grandezza è di 32 MiB, se ne serve di più si può modificare il file /etc/"
@@ -1158,17 +1164,17 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"On workstations with little RAM the spell checker can cause LibreOffice "
-"to hang if the swap space is too small. Then the system administrator has to "
+"On workstations with little RAM the spell checker can cause LibreOffice to "
+"hang if the swap space is too small. Then the system administrator has to "
 "disable the spell checker on LibreOffice or students have to kill "
-"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on "
-"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
+"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on a "
+"320 MiB RAM workstation solves this, and the spell checker runs smoothly."
 msgstr ""
 "Sulle workstation con poca memoria il correttore ortografico di OpenOffice."
 "org funziona male se la swap è troppo piccola. In questo caso "
 "l'amministratore deve disattivare il correttore ortografico in OpenOffice."
-"org o gli studenti devono terminare LibreOffice perdendo il proprio "
-"lavoro. Abilitare almeno 512 MiB di swap su una workstation con 320 MiB RAM "
+"org o gli studenti devono terminare LibreOffice perdendo il proprio lavoro. "
+"Abilitare almeno 512 MiB di swap su una workstation con 320 MiB RAM "
 "risolverà questo problema, facendo funzionare il correttore ortografico."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1826,9 +1832,15 @@ msgstr ""
 "utilizzerà automaticamente il proxy del server principale."
 
 #. 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."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "Per installare il desktop <emphasis role=\"strong\">GNOME</emphasis> al "
@@ -5752,13 +5764,21 @@ msgstr ""
 "$user. Questo può essere problematico per utenti non esperti."
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
+#, fuzzy
+#| msgid ""
+#| "It is possible to have the default KDE file manager Dolphin showing up if "
+#| "KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+#| "environment. To configure this, simply execute <computeroutput>/usr/share/"
+#| "debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the "
+#| "terminal server. (When using Gnome, device icons will be placed on the "
+#| "desktop allowing easy access)."
+msgid ""
+"It is possible to have the default KDE \"Plasma\" file manager Dolphin "
+"showing up if KDE \"Plasma\" (or LDXE, if installed in parallel to KDE "
+"\"Plasma\") is in use as desktop environment. To configure this, simply "
+"execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde "
+"enable</computeroutput> on the terminal server. (When using GNOME, device "
+"icons will be placed on the desktop allowing easy access)."
 msgstr ""
 "È possibile far aprire Dolphin, il gestore di file predefinito di KDE, se "
 "KDE (o LDXE, se installato insieme a KDE) è l'ambiente desktop in uso. Per "
@@ -5885,13 +5905,21 @@ msgstr ""
 "avere informazioni su come queste variabili vanno usate."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE, Gnome and LXDE together"
+#, fuzzy
+#| msgid "Using KDE, Gnome and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME and LXDE together"
 msgstr "Usare insieme KDE, Gnome e LXDE"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
+#| "\"Installation--The_installation_process\">installation instructions</"
+#| "link>."
 msgid ""
-"If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
-"\"Installation--The_installation_process\">installation instructions</link>."
+"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
+"linkend=\"Installation--The_installation_process\">installation "
+"instructions</link>."
 msgstr ""
 "Se si vuole usare Gnome o LXDE al posto di KDE, seguire <link linkend="
 "\"Installation--The_installation_process\">le istruzioni di installazione</"
@@ -6609,8 +6637,8 @@ msgid ""
 msgstr ""
 "I valori predefiniti sono definiti in <computeroutput>[default]</"
 "computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
+"</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7048,9 +7076,9 @@ msgid ""
 "use them as diskless workstations."
 msgstr ""
 "Nota: dato che i thin-client vecchi di 10 anni possono avere problemi quando "
-"eseguono nuove versioni di LibreOffice e Firefox/Iceweasel dovuti al "
-"pixmap caching, si può considerare di dotare i thin-client di almeno 128 MB "
-"di RAM, o aggiornare l'hardware con il vantaggio di poterli utilizzare come "
+"eseguono nuove versioni di LibreOffice e Firefox/Iceweasel dovuti al pixmap "
+"caching, si può considerare di dotare i thin-client di almeno 128 MB di RAM, "
+"o aggiornare l'hardware con il vantaggio di poterli utilizzare come "
 "workstation senza dischi."
 
 #. type: Content of: <article><section><section><title>
@@ -7115,9 +7143,13 @@ msgstr ""
 "Skolelinux)."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If for some reason XDMCP is accessible on your server which runs KDM, add "
+#| "the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
 msgid ""
-"If for some reason XDMCP is accessible on your server which runs KDM, add "
-"the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
+"If XDMCP is not accessible on your server which runs KDM, add the following "
+"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgstr ""
 "Se per qualche ragione XDMCP è accessibile sul proprio server che esegue "
 "KDM , aggiungere a <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
@@ -7140,8 +7172,9 @@ msgid "Then turn on XDMCP in KDM with the command:"
 msgstr "Quindi avviare XDMCP in KDM con il comando:"
 
 #. type: CDATA
-#, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+#, fuzzy, no-wrap
+#| msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
 
 #. type: Content of: <article><section><section><para>
@@ -9001,10 +9034,15 @@ msgid "Linux kernel 3.2.x"
 msgstr "Linux kernel 3.2.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and "
+#| "LXDE 0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: "
+#| "see manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
-"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
-"manual.)"
+"0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
+"LXDE: see manual.)"
 msgstr ""
 "Ambienti desktop KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6 e LXDE 0.5.5 "
 "(KDE è installato in modo predefinito; per scegliere GNOME, Xfce o LXDE: "
@@ -9147,11 +9185,18 @@ msgid "Known issues"
 msgstr "Problemi noti"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Using KDE on standalone and roaming workstations, at least Konqueror, "
-"Chromium and Step sometimes fail to work out-of-the box when the machines "
-"are used outside the backbone network, proxy use is required to use the "
-"other network but no wpad.dat information is found. Workaround: Use "
+#, fuzzy
+#| msgid ""
+#| "Using KDE on standalone and roaming workstations, at least Konqueror, "
+#| "Chromium and Step sometimes fail to work out-of-the box when the machines "
+#| "are used outside the backbone network, proxy use is required to use the "
+#| "other network but no wpad.dat information is found. Workaround: Use "
+#| "Iceweasel or configure the proxy manually."
+msgid ""
+"Using KDE \"Plasma\" on standalone and roaming workstations, at least "
+"Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
+"machines are used outside the backbone network, proxy use is required to use "
+"the other network but no wpad.dat information is found. Workaround: Use "
 "Iceweasel or configure the proxy manually."
 msgstr ""
 "Se si usa KDE su macchine autonome o mobili, almeno Konqueror, Chromium e "
@@ -15835,13 +15880,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
@@ -15853,8 +15898,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15862,8 +15907,8 @@ msgstr ""
 #~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15880,8 +15925,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -15889,8 +15934,8 @@ msgstr ""
 #~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
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 933267e..2f872f9 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-10-01 17:27-0400\n"
+"POT-Creation-Date: 2013-10-02 22:55+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"
@@ -768,10 +768,10 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
 "Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
@@ -1118,8 +1118,8 @@ msgid ""
 "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
 "requirement."
 msgstr ""
-"for å kjøre Iceweasel/Firefox og LibreOffice, så anbefales det minimum "
-"128 MB RAM."
+"for å kjøre Iceweasel/Firefox og LibreOffice, så anbefales det minimum 128 "
+"MB RAM."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
@@ -1135,10 +1135,10 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"Swapping over the network is automatically enabled; the swap size is 32 MiB, "
-"and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on "
-"tjener to set the SIZE variable. Please <emphasis>tune up the swap size</"
-"emphasis> either locally on the PC or on the server."
+"Swapping over the network is automatically enabled; the swap size is 512 "
+"MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+"conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap "
+"size</emphasis> either locally on the PC or on the server."
 msgstr ""
 "Vekselminne (swap) over nettverket er satt opp automatisk. Størrelsen på "
 "veksleminnet er satt til 32 MB. Hvis det er nødvenig, så kan denne "
@@ -1158,11 +1158,11 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"On workstations with little RAM the spell checker can cause LibreOffice "
-"to hang if the swap space is too small. Then the system administrator has to "
+"On workstations with little RAM the spell checker can cause LibreOffice to "
+"hang if the swap space is too small. Then the system administrator has to "
 "disable the spell checker on LibreOffice or students have to kill "
-"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on "
-"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
+"LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on a "
+"320 MiB RAM workstation solves this, and the spell checker runs smoothly."
 msgstr ""
 "På arbeidsstasjoner med lite minne (RAM), kan stavekontrollen i OpenOffice."
 "org føre til at klienten henger hvis vekselminnet (swap) er for lite. I "
@@ -1773,8 +1773,8 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 #, fuzzy
 msgid "./images/Installer_help.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
@@ -1857,7 +1857,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "for å installere <emphasis role=\"strong\">GNOME</emphasis> skrivebordsmiljø "
@@ -2586,57 +2586,57 @@ msgstr ""
 #, fuzzy
 msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"lwat-]edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"lwat-]edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -2701,43 +2701,43 @@ msgstr ""
 #, fuzzy
 msgid "./images/13-Install+the+base+system.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "13-Install the base system.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/14-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "14-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/17-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "17-Select_and_install_software.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
@@ -2768,29 +2768,29 @@ msgstr ""
 #, fuzzy
 msgid "./images/20-Finish_the_Installation.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "20-Finish_the_Installation.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
@@ -3574,8 +3574,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/gosa_systems_list.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² systems listing"
@@ -3585,8 +3585,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/gosa_systems_host_details.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Host details"
@@ -3607,8 +3607,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<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"
@@ -4130,8 +4130,8 @@ msgstr ""
 #, fuzzy
 msgid "./images/slbackup-php_maintenance.png"
 msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
@@ -5689,12 +5689,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
+"It is possible to have the default KDE \"Plasma\" file manager Dolphin "
+"showing up if KDE \"Plasma\" (or LDXE, if installed in parallel to KDE "
+"\"Plasma\") is in use as desktop environment. To configure this, simply "
+"execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde "
+"enable</computeroutput> on the terminal server. (When using GNOME, device "
+"icons will be placed on the desktop allowing easy access)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5814,14 +5814,15 @@ msgstr ""
 "informasjon om hvordan disse variablene blir brukt."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE, Gnome and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME and LXDE together"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
-"If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
-"\"Installation--The_installation_process\">installation instructions</link>."
+"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
+"linkend=\"Installation--The_installation_process\">installation "
+"instructions</link>."
 msgstr ""
 "Veiledninger for <link linkend=\"Administration\">generell administrasjon</"
 "link>"
@@ -5967,10 +5968,10 @@ msgid ""
 "boots from a diskette or directly from the server using network-PROM (or "
 "PXE) without using a local client hard drive."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. "
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -6947,8 +6948,8 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
-"If for some reason XDMCP is accessible on your server which runs KDM, add "
-"the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
+"If XDMCP is not accessible on your server which runs KDM, add the following "
+"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgstr ""
 "Hvis xdmcp av en eller annen grunn er tilgjengelig på din tjener som kjører "
 "KDM, legg følgende til /etc/kde3/kdm/Xaccess"
@@ -6974,7 +6975,7 @@ msgstr "Slå så på xdmcp i kdm med kommandoen:"
 
 #. type: CDATA
 #, fuzzy, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true\n"
 
 #. type: Content of: <article><section><section><para>
@@ -8730,8 +8731,8 @@ msgstr "Linux kjerneversjon 2.6.18"
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
-"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
-"manual.)"
+"0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
+"LXDE: see manual.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8856,10 +8857,10 @@ msgstr "Kjente problemer med CD/DVDen"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Using KDE on standalone and roaming workstations, at least Konqueror, "
-"Chromium and Step sometimes fail to work out-of-the box when the machines "
-"are used outside the backbone network, proxy use is required to use the "
-"other network but no wpad.dat information is found. Workaround: Use "
+"Using KDE \"Plasma\" on standalone and roaming workstations, at least "
+"Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
+"machines are used outside the backbone network, proxy use is required to use "
+"the other network but no wpad.dat information is found. Workaround: Use "
 "Iceweasel or configure the proxy manually."
 msgstr ""
 
@@ -11236,8 +11237,8 @@ msgstr ""
 #, fuzzy
 #~ msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
 #~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "getting-]started.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+#~ "started.png\"/></imageobject>"
 
 #, fuzzy
 #~ msgid "FIXME: add wheezy kde desktop screenshot here"
@@ -11260,8 +11261,8 @@ msgstr ""
 #, fuzzy
 #~ msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
 #~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "lwat-]edituser_squeeze.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+#~ "edituser_squeeze.png\"/></imageobject>"
 
 #, fuzzy
 #~| msgid "Set passwords"
@@ -12524,8 +12525,8 @@ msgstr ""
 #~ "workstation server(s):"
 #~ msgstr ""
 #~ "Forutsatt at de diskløse arbeidsstasjonene kjører <computeroutput>i386</"
-#~ "computeroutput>, må følgende kommandoer utføres på "
-#~ "arbeidsstasjonstjener(ne):"
+#~ "computeroutput>, må følgende kommandoer utføres på arbeidsstasjonstjener"
+#~ "(ne):"
 
 #~ msgid ""
 #~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
@@ -14852,13 +14853,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
 #~ "(sambaPwdLastSet=0)))' uid  | less"
 
 #~ msgid ""
@@ -14870,8 +14871,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -14879,8 +14880,8 @@ msgstr ""
 #~ "            -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
 #~ "etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -14896,8 +14897,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
@@ -14905,8 +14906,8 @@ msgstr ""
 #~ "           -f /etc/ldap/fixamba.ldif"
 #~ msgstr ""
 #~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
 #~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
 #~ "> /etc/ldap/fixamba.ldif\n"
 #~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 34c5bc0..5046c15 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-10-01 19:19-0400\n"
+"POT-Creation-Date: 2013-10-02 22:55+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"
@@ -842,10 +842,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Swapping over the network is automatically enabled; the swap size is 32 MiB, "
-"and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on "
-"tjener to set the SIZE variable. Please <emphasis>tune up the swap size</"
-"emphasis> either locally on the PC or on the server."
+"Swapping over the network is automatically enabled; the swap size is 512 "
+"MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+"conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap "
+"size</emphasis> either locally on the PC or on the server."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1360,7 +1360,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
+"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 
@@ -4263,12 +4263,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
+"It is possible to have the default KDE \"Plasma\" file manager Dolphin "
+"showing up if KDE \"Plasma\" (or LDXE, if installed in parallel to KDE "
+"\"Plasma\") is in use as desktop environment. To configure this, simply "
+"execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde "
+"enable</computeroutput> on the terminal server. (When using GNOME, device "
+"icons will be placed on the desktop allowing easy access)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4355,13 +4355,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE, Gnome and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME and LXDE together"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="
-"\"Installation--The_installation_process\">installation instructions</link>."
+"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
+"linkend=\"Installation--The_installation_process\">installation "
+"instructions</link>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5227,8 +5228,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If for some reason XDMCP is accessible on your server which runs KDM, add "
-"the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
+"If XDMCP is not accessible on your server which runs KDM, add the following "
+"to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgstr ""
 
 #. type: CDATA
@@ -5248,7 +5249,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true"
+msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6632,8 +6633,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
-"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
-"manual.)"
+"0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
+"LXDE: see manual.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6752,10 +6753,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Using KDE on standalone and roaming workstations, at least Konqueror, "
-"Chromium and Step sometimes fail to work out-of-the box when the machines "
-"are used outside the backbone network, proxy use is required to use the "
-"other network but no wpad.dat information is found. Workaround: Use "
+"Using KDE \"Plasma\" on standalone and roaming workstations, at least "
+"Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
+"machines are used outside the backbone network, proxy use is required to use "
+"the other network but no wpad.dat information is found. Workaround: Use "
 "Iceweasel or configure the proxy manually."
 msgstr ""
 
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 014cf0c..ad36aac 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -335,7 +335,7 @@
 </para>
 <itemizedlist>
 <listitem>
-<para>Swapping over the network is automatically enabled; the swap size is 32 MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap size</emphasis> either locally on the PC or on the server.  
+<para>Swapping over the network is automatically enabled; the swap size is 512 MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap size</emphasis> either locally on the PC or on the server.  
 </para>
 <itemizedlist>
 <listitem>
@@ -559,7 +559,7 @@
 <para>If you have already installed the main server profile on a machine, further installations should be done via PXE, as this will automatically use the proxy of the main server. 
 </para></listitem>
 <listitem>
-<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the <emphasis role="strong">KDE</emphasis> desktop, add <computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters. 
+<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the <emphasis role="strong">KDE "Plasma"</emphasis> desktop, add <computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters. 
 </para></listitem>
 <listitem>
 <para>To install the <emphasis role="strong">LXDE</emphasis> desktop instead, add <computeroutput>desktop=lxde</computeroutput> to the kernel boot parameters. 
@@ -1814,7 +1814,7 @@ apt-get upgrade]]></screen>
 </para>
 <para>When users insert a USB drive or a DVD / CDROM into a thin client there is only a notify-window showing up for a few seconds. The media is automatically mounted and it is possible to access it browsing to the /media/$user folder. This is quite difficult for many non experienced users. 
 </para>
-<para>It is possible to have the default KDE file manager Dolphin showing up if KDE (or LDXE, if installed in parallel to KDE) is in use as desktop environment. To configure this, simply execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal server. (When using Gnome, device icons will be placed on the desktop allowing easy access).  
+<para>It is possible to have the default KDE "Plasma" file manager Dolphin showing up if KDE "Plasma" (or LDXE, if installed in parallel to KDE "Plasma") is in use as desktop environment. To configure this, simply execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal server. (When using GNOME, device icons will be placed on the desktop allowing easy access).  
 </para>
 <para>In addition the following script could be used to create the symlink "media" for all users in their home folder for easy access to USB drives, CDROM / DVD or whatever media is connected to the thin client. This might come in handy if users want to edit files directly on their plugged in media. 
 </para><screen><![CDATA[ #!/bin/bash
@@ -1862,10 +1862,10 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"]]></screen>
 </para>
 </section>
 
-<section id="Desktop--Using_KDE.2C_Gnome_and_LXDE_together">
-<title>Using KDE, Gnome and LXDE together
+<section id="Desktop--Using_KDE_.22Plasma.22.2C_GNOME_and_LXDE_together">
+<title>Using KDE "Plasma", GNOME and LXDE together
 </title>
-<para>If you want to use Gnome or LXDE instead of KDE, follow the <link linkend="Installation--The_installation_process">installation instructions</link>. 
+<para>If you want to use GNOME or LXDE instead of KDE "Plasma", follow the <link linkend="Installation--The_installation_process">installation instructions</link>. 
 </para>
 <para>To install other desktop environments after installation, simply use apt-get: 
 </para><screen><![CDATA[ apt-get install gnome lxde]]></screen>
@@ -2217,12 +2217,12 @@ exit]]></screen>
 </para><screen><![CDATA[ X -query 192.168.0.254]]></screen>
 <para>The goal is to let your "real" thin client contact the xdmcp-server on 192.168.0.254 (given a standard Skolelinux configuration). 
 </para>
-<para>If for some reason XDMCP is accessible on your server which runs KDM, add the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>: 
+<para>If XDMCP is not accessible on your server which runs KDM, add the following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>: 
 </para><screen><![CDATA[ * # any host can get a login window]]></screen>
 <para>The star before the comment '#' is important; the rest is a comment, of course <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:)</phrase></textobject></inlinemediaobject> 
 </para>
 <para>Then turn on XDMCP in KDM with the command: 
-</para><screen><![CDATA[ sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true]]></screen>
+</para><screen><![CDATA[ sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true]]></screen>
 <para>Finally, restart KDM by running: 
 </para><screen><![CDATA[ sudo service kdm restart]]></screen>
 </section>
@@ -2997,7 +2997,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>Linux kernel 3.2.x 
 </para></listitem>
 <listitem>
-<para>Desktop environments KDE "Plasma" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE 0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see manual.) 
+<para>Desktop environments KDE "Plasma" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE 0.5.5 (KDE "Plasma" is installed by default; to choose GNOME, Xfce or LXDE: see manual.) 
 </para></listitem>
 <listitem>
 <para>Web browser Iceweasel 17 ESR 
@@ -3088,7 +3088,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </title>
 <itemizedlist>
 <listitem>
-<para>Using KDE on standalone and roaming workstations, at least Konqueror, Chromium and Step sometimes fail to work out-of-the box when the machines are used outside the backbone network, proxy use is required to use the other network but no wpad.dat information is found. Workaround: Use Iceweasel or configure the proxy manually. 
+<para>Using KDE "Plasma" on standalone and roaming workstations, at least Konqueror, Chromium and Step sometimes fail to work out-of-the box when the machines are used outside the backbone network, proxy use is required to use the other network but no wpad.dat information is found. Workaround: Use Iceweasel or configure the proxy manually. 
 </para></listitem></itemizedlist>
 </section>
 </section>


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).


