[debian-edu-commits] debian-edu/ 01/02: Update manual and images from the wiki, +4f

David Prévot taffit at alioth.debian.org
Sun Oct 27 18:08:07 UTC 2013


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

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

commit e5f6066c072e5370a3e1efdaf87bb50c85928d56
Author: David Prévot <taffit at debian.org>
Date:   Sun Oct 27 14:01:11 2013 -0400

    Update manual and images from the wiki, +4f
---
 .../debian-edu-wheezy-manual.da.po                 |   35 +-
 .../debian-edu-wheezy-manual.de.po                 |   95 +-
 .../debian-edu-wheezy-manual.es.po                 | 1009 ++++++--------------
 .../debian-edu-wheezy-manual.fr.po                 |   43 +-
 .../debian-edu-wheezy-manual.it.po                 |   63 +-
 .../debian-edu-wheezy-manual.nb.po                 |  159 +--
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot |   15 +-
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml |    8 +-
 .../debian-edu-wheezy/images/de/worldmap.png       |  Bin 386831 -> 386847 bytes
 .../debian-edu-wheezy/images/es/worldmap.png       |  Bin 386939 -> 386954 bytes
 .../debian-edu-wheezy/images/fr/worldmap.png       |  Bin 386881 -> 386897 bytes
 .../debian-edu-wheezy/images/worldmap.png          |  Bin 386882 -> 386898 bytes
 12 files changed, 528 insertions(+), 899 deletions(-)

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 4dbc8dc..b0d0c72 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-02 22:55+0300\n"
+"POT-Creation-Date: 2013-10-27 13:59-0400\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"
@@ -2719,9 +2719,18 @@ msgid "Minimum steps to get started"
 msgstr "Minimumstrin for at komme i gang"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "During installation of the main server a first user account was created. "
+#| "In the following text this account will be referenced as \"first user\". "
+#| "The first user can use <computeroutput>sudo</computeroutput> to become "
+#| "root."
 msgid ""
 "During installation of the main server a first user account was created. In "
-"the following text this account will be referenced as \"first user\". The "
+"the following text this account will be referenced as \"first user\". This "
+"account is special, as there's no Samba account (can be added via GOsa²), "
+"the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</"
+"computeroutput> is needed to make personal web pages accessible), and the "
 "first user can use <computeroutput>sudo</computeroutput> to become root."
 msgstr ""
 "Under installation af hovedserveren blev en første brugerkonto oprettet. I "
@@ -10335,9 +10344,14 @@ msgstr ""
 "skolelinux.org/\"/> for uafhængige installationer."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+#| "Gnome option, the LXDE desktop option is only supported by the CD "
+#| "installation method."
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
+"New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
+"GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
 "Ny LXDE-skrivebordsindstilling, udover KDE (standard) og GNOME. Som GNOME-"
@@ -10790,9 +10804,13 @@ msgstr ""
 "fildialoger i KDE."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Change video player setup to install different players in KDE "
+#| "(dragonplayer), Gnome (totem) and LXDE (totem)."
 msgid ""
 "Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 "Ændr videoafspilleropsætning for at installere andre afspillere i KDE "
 "(dragonplayer), GNOME (totem) og LXDE (totem)."
@@ -11113,8 +11131,13 @@ msgstr ""
 "brugergruppe."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Gnome added as a supported desktop; see the <link linkend=\"Installation"
+#| "\">Installation chapter</link> to learn how to install with GNOME instead "
+#| "of KDE as desktop."
 msgid ""
-"Gnome added as a supported desktop; see the <link linkend=\"Installation"
+"GNOME added as a supported desktop; see the <link linkend=\"Installation"
 "\">Installation chapter</link> to learn how to install with GNOME instead of "
 "KDE as desktop."
 msgstr ""
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 6e78121..6f67812 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-02 22:55+0300\n"
+"POT-Creation-Date: 2013-10-27 13:59-0400\n"
 "PO-Revision-Date: 2013-10-02 23:10+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -780,8 +780,8 @@ 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 ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
-"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
+"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
 "Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
 "Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
 "Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -1134,9 +1134,6 @@ msgstr ""
 "Empfehlenswert sind jedoch 128 MiB RAM und ein schnellerer Prozessor."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "For running Iceweasel/Firefox and OpenOffice.org, 128 MiB RAM is a "
-#| "minimum requirement."
 msgid ""
 "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
 "requirement."
@@ -1156,11 +1153,6 @@ 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."
 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."
@@ -1183,13 +1175,6 @@ 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."
 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 "
@@ -1854,11 +1839,6 @@ msgstr ""
 "der Proxy des Hauptservers benutzt wird."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
@@ -2781,9 +2761,18 @@ msgid "Minimum steps to get started"
 msgstr "Unbedingt erforderliche erste Schritte"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "During installation of the main server a first user account was created. "
+#| "In the following text this account will be referenced as \"first user\". "
+#| "The first user can use <computeroutput>sudo</computeroutput> to become "
+#| "root."
 msgid ""
 "During installation of the main server a first user account was created. In "
-"the following text this account will be referenced as \"first user\". The "
+"the following text this account will be referenced as \"first user\". This "
+"account is special, as there's no Samba account (can be added via GOsa²), "
+"the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</"
+"computeroutput> is needed to make personal web pages accessible), and the "
 "first user can use <computeroutput>sudo</computeroutput> to become root."
 msgstr ""
 "Während der Installation wurde eine erste Benutzerkennung eingerichtet. Im "
@@ -5850,13 +5839,6 @@ msgstr ""
 "Für unerfahrene Nutzer ist es recht schwierig, dies zu verstehen."
 
 #. 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)."
 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 "
@@ -5993,15 +5975,10 @@ msgstr ""
 "an, um zu erfahren, wie diese Variablen benutzt werden."
 
 #. type: Content of: <article><section><section><title>
-#| 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>
-#| 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 \"Plasma\", follow the <link "
 "linkend=\"Installation--The_installation_process\">installation "
@@ -7166,12 +7143,6 @@ msgstr ""
 "geschickt."
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 LibreOffice and Firefox/Iceweasel due to pixmap caching "
@@ -7251,9 +7222,6 @@ msgstr ""
 "Konfiguration)."
 
 #. 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>:"
 msgid ""
 "If XDMCP is not accessible on your server which runs KDM, add the following "
 "to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
@@ -7281,7 +7249,6 @@ 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"
 msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 msgstr "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 
@@ -9171,10 +9138,6 @@ 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>
-#| 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 \"Plasma\" is installed by default; to choose GNOME, Xfce or "
@@ -9319,12 +9282,6 @@ msgid "Known issues"
 msgstr "Bekannte Probleme"
 
 #. 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 "
-#| "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 "
@@ -9602,8 +9559,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 "
@@ -10589,9 +10546,14 @@ msgstr ""
 "angezeigt."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+#| "Gnome option, the LXDE desktop option is only supported by the CD "
+#| "installation method."
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
+"New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
+"GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
 "Neue Option für die graphische Arbeitsumgebung LXDE, zusätzlich zu KDE "
@@ -11057,9 +11019,13 @@ msgstr ""
 "KDE-Dateiauswahl verwendet, wenn es unter KDE ausgeführt wird."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Change video player setup to install different players in KDE "
+#| "(dragonplayer), Gnome (totem) and LXDE (totem)."
 msgid ""
 "Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 "Änderung der Einrichtung des Videoabspielers: Installation unterschiedlicher "
 "Abspieler in KDE (dragonplayer), GNOME (totem), und LXDE (totem)."
@@ -11386,8 +11352,13 @@ msgstr ""
 "Anwenders."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Gnome added as a supported desktop; see the <link linkend=\"Installation"
+#| "\">Installation chapter</link> to learn how to install with GNOME instead "
+#| "of KDE as desktop."
 msgid ""
-"Gnome added as a supported desktop; see the <link linkend=\"Installation"
+"GNOME added as a supported desktop; see the <link linkend=\"Installation"
 "\">Installation chapter</link> to learn how to install with GNOME instead of "
 "KDE as desktop."
 msgstr ""
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 faad794..1dfc66d 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-02 22:55+0300\n"
+"POT-Creation-Date: 2013-10-27 13:59-0400\n"
 "PO-Revision-Date: 2013-10-26 15:46-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -51,9 +51,8 @@ msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
-"La versión en <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy\"/> es un wiki "
-"actualizado frecuentemente."
+"La versión en <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Wheezy\"/> es un wiki actualizado frecuentemente."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -95,9 +94,9 @@ msgid ""
 msgstr ""
 "Inmediatamente después de la instalación, el servidor de la escuela "
 "ejecutará todos los servicios necesarios para que la red escolar sea "
-"funcional (vea el siguiente capítulo  <link linkend=\"Architecture\">detalles "
-"de la arquitectura de esta configuración</link>), y estará lista para "
-"agregar usuarios y equipos vía GOsa², que una interfaz de usuario web "
+"funcional (vea el siguiente capítulo  <link linkend=\"Architecture"
+"\">detalles de la arquitectura de esta configuración</link>), y estará lista "
+"para agregar usuarios y equipos vía GOsa², que una interfaz de usuario web "
 "cómoda, o cualquier otro editor de LDAP. Un ambiente de carga por red es "
 "preparado usando PXE, así, después de la instalación inicial del servidor "
 "principal desde CD, Blue-ray o unidad USB, las otras computadoras pueden ser "
@@ -133,8 +132,8 @@ msgstr ""
 "<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> es una "
 "distribución de Linux, hecha por el proyecto Debian Edu. Siendo una "
 "distribución <ulink url=\"http://wiki.debian.org/DebianPureBlends\">mezclada "
-"de Debian</ulink> es un sub-proyecto oficial de <ulink "
-"url=\"http://www.debian.org\">Debian</ulink> "
+"de Debian</ulink> es un sub-proyecto oficial de <ulink url=\"http://www."
+"debian.org\">Debian</ulink> "
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -156,8 +155,8 @@ msgstr ""
 "El proyecto Skolelinux fué fundado en Noruega el 2 de julio de 2001, y casi "
 "a la vez Raphaël Hertzog iniciaba el proyecto Debian Edu en Francia. Desde "
 "el 2003, ambos proyectos trabajaron unidos, aunque los nombres permanecieron "
-"separados. \"Skole\" y (Debian-)\"Educativo\" son dos términos bien conocidos "
-"en estas regiones."
+"separados. \"Skole\" y (Debian-)\"Educativo\" son dos términos bien "
+"conocidos en estas regiones."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -300,9 +299,9 @@ msgid ""
 "possible (but not required) to also select and install the thin-client-"
 "server and workstation profiles in addition to the main server profile."
 msgstr ""
-"Una red Skolelinux necesita un servidor principal (también llamado \"tjener\" "
-"que significa \"servidor\" en Noruego) que por defecto tenga la dirección IP "
-"10.0.2.2 y sea instalado seleccionando el perfil servidor principal. Es "
+"Una red Skolelinux necesita un servidor principal (también llamado \"tjener"
+"\" que significa \"servidor\" en Noruego) que por defecto tenga la dirección "
+"IP 10.0.2.2 y sea instalado seleccionando el perfil servidor principal. Es "
 "posible (pero no requerido) seleccionar e instalar también los perfiles de "
 "servidor de cliente ligero y estación de trabajo al perfil de servidor "
 "principal."
@@ -658,12 +657,6 @@ msgstr ""
 "todos los puestos de la red pueden usarlo como su servidor de DNS principal."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Pupils and teachers have the possibility to publish websites. The web "
-#| "server provides mechanisms for authenticating users, and for limiting "
-#| "access to individual pages and subdiretories to certain users and groups. "
-#| "Users will have the possibility to create dynamic web pages, as the web "
-#| "server will be programmable on the server side."
 msgid ""
 "Pupils and teachers have the ability to publish websites. The web server "
 "provides mechanisms for authenticating users, and for limiting access to "
@@ -678,15 +671,6 @@ msgstr ""
 "puede ejecutar programas del lado del servidor."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Information on users and machines can be changed in one central location, "
-#| "and is made accessible to all computers on the network automatically. To "
-#| "achieve this a centralized directory server is set up. The directory will "
-#| "have information on users, user groups, machines, and groups of machines. "
-#| "To avoid user confusion there won't be any difference between file "
-#| "groups, mailing lists, and network groups. This implies that groups of "
-#| "machines which have to be network groups, have the same namespace as user "
-#| "groups and mailing lists."
 msgid ""
 "Information on users and machines can be changed in one central location, "
 "and is made accessible to all computers on the network automatically. To "
@@ -720,14 +704,6 @@ msgstr ""
 "usuarios mediante los sistemas de administración."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "In order to avoid certain problems with NFS, and to make it simpler to "
-#| "debug problems, time needs to be synchronized on the different machines. "
-#| "To achieve this the Skolelinux server is set up as a local Network Time "
-#| "Protocol (NTP) server, and all workstations and clients are set up to "
-#| "synchronize their clock with the server. The server itself should "
-#| "synchronize its clock via NTP against machines on the Internet, thus "
-#| "ensuring the whole network has the correct time."
 msgid ""
 "In order to avoid certain problems with NFS, and to make it simpler to debug "
 "problems, the different machines need synchronised clocks. To achieve this "
@@ -764,9 +740,6 @@ msgid "LTSP server(s) (Thin client server(s))"
 msgstr "Servidor(es) LTSP (Servidor(es) de cliente(s) ligero(s))"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (also called thin client "
-#| "servers), which are installed by selecting the LTSP server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (also called thin client "
 "servers), which are installed by selecting the Thin client server profile."
@@ -788,12 +761,6 @@ msgid "Thin clients"
 msgstr "Clientes ligeros"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A thin client setup enables a ordinary PC to function as an (X-)terminal. "
-#| "This means that this machine boots from a diskette or directly from the "
-#| "server 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)."
 msgid ""
 "A thin client setup enables ordinary PCs to function as (X-)terminals. This "
 "means that the machine boots from a diskette or directly from the server "
@@ -801,10 +768,10 @@ msgid ""
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
 "Una configuración de cliente ligero permite a un PC ordinario funcionar como "
-"un terminal (X). Esto significa que la computadora arranca desde un "
-"disquete o desde el servidor a través de la red (usando network-PROM o PXE) "
-"sin usar el disco duro local. La configuración de cliente ligero que se usa "
-"es la de Linux Terminal Server Project (LTSP)."
+"un terminal (X). Esto significa que la computadora arranca desde un disquete "
+"o desde el servidor a través de la red (usando network-PROM o PXE) sin usar "
+"el disco duro local. La configuración de cliente ligero que se usa es la de "
+"Linux Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -856,12 +823,6 @@ msgstr ""
 "un disco local."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Diskless workstations are an exellent way of reusing newer hardware with "
-#| "the same low maintanence cost as with thin clients. Software is "
-#| "administered and maintained on the server with no need for local "
-#| "installed software on the clients. Home directories and system settings "
-#| "are stored on the server too."
 msgid ""
 "Diskless workstations are an excellent way of reusing newer hardware with "
 "the same low maintenance cost as with thin clients. Software is administered "
@@ -926,10 +887,6 @@ msgstr ""
 "que la automatización distribuya los cambios."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "All user information is kept in an LDAP directory. Updates of user "
-#| "accounts are made against this database and is used by the clients for "
-#| "user authentication."
 msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
@@ -950,8 +907,8 @@ msgid ""
 "sticks."
 msgstr ""
 "Actualmente hay dos medios de instalación: instalación por red desde un CD e "
-"instalación multi arquitectura desde un dispositivo USB. Ambos medios "
-"pueden ser cargados desde memorias USB."
+"instalación multi arquitectura desde un dispositivo USB. Ambos medios pueden "
+"ser cargados desde memorias USB."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1085,10 +1042,10 @@ msgstr ""
 "indeseada. El problema con la primera solución es que no es visible para los "
 "usuarios que el material que crean es accesible a todos los usuarios. Esto "
 "es detectable cuando se revisan los directorios de otros usuarios, donde uno "
-"puede ver los archivos que son legibles. El problema con la segunda "
-"solución es que muy poca gente acostumbra a hacer sus archivos accesibles, "
-"aunque no contengan nada sensible y el contenido sea útil para los que "
-"aprenden de como otros han resuelto los mismos problemas."
+"puede ver los archivos que son legibles. El problema con la segunda solución "
+"es que muy poca gente acostumbra a hacer sus archivos accesibles, aunque no "
+"contengan nada sensible y el contenido sea útil para los que aprenden de "
+"como otros han resuelto los mismos problemas."
 
 #. type: Content of: <article><section><title>
 msgid "Requirements"
@@ -1194,11 +1151,6 @@ msgstr ""
 "con un procesador más rápido ayudaría en su funcionamiento."
 
 #. 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."
 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."
@@ -1310,7 +1262,6 @@ msgstr ""
 "Puede tener hasta cientos de estaciones de trabajo en la red principal."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid "You can have up to 20 ltspservers on the main network."
 msgid ""
 "You can have a lot of LTSP servers on the main network; two different "
 "subnets are preconfigured in LDAP."
@@ -1463,14 +1414,10 @@ msgstr ""
 "\"Wheezy\""
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "DVDs for i386, amd64"
 msgid "netinstall CD image for i386, amd64"
 msgstr "Imagen en CD de instalación por red para i386, amd64"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The netinstall CD, which can be used for installation of i386 and amd64 "
-#| "as well, is available via"
 msgid ""
 "The netinstall CD, which also can be used for installation from USB flash "
 "drives, is suited to install on i386 and amd64 machines. It's available via"
@@ -1568,29 +1515,18 @@ msgstr ""
 "source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/"
-#| "debian-edu-6.0.3+edub1-source-USB.iso</computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
 "source-USB.iso debian-edu-7.1+edu0-source-USB.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0"
-"-source-USB.iso debian-edu-7.1+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-USB.iso debian-edu-7.1+edu0-source-USB.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Request a CD/DVD by mail"
 msgid "Request a CD / DVD by mail"
 msgstr "Solicite un CD / DVD por correo"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "For those without a fast internet connection, we offer to send you a CD "
-#| "or DVD for the cost of the CD or DVD and shipping. Just send an email to "
-#| "<ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we "
-#| "will discuss the payment details (for shipping and media) <placeholder "
-#| "type=\"inlinemediaobject\" id=\"0\"/> Remember to include the address you "
-#| "want the CD or DVD to be sent to in the email."
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
@@ -1599,14 +1535,11 @@ msgid ""
 msgstr ""
 "Para quienes que no poseen una conexión a Internet rápida, nosotros "
 "podríamos enviarle un CD o DVD por el precio del mismo y su envío. Solamente "
-"envíe un correo a  <ulink "
-"url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink>y podremos discutir "
-"acerca de los detalles del pago (del disco y el envío)."
+"envíe un correo a  <ulink url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</"
+"ulink>y podremos discutir acerca de los detalles del pago (del disco y el "
+"envío)."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "</inlinemediaobject> Remember to include the address you want the CD or "
-#| "DVD to be sent to in the email."
 msgid ""
 "Remember to include the address you want the CD or DVD to be sent to in the "
 "email."
@@ -1619,13 +1552,6 @@ msgid "Installing Debian Edu"
 msgstr "Instalacion de Debian Edu"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "When you do a Debian Edu installation, you have a few options to choose. "
-#| "Don't be afraid; there aren't many. We have done a good job hiding the "
-#| "complexity of Debian during the installation and beyond. However, Debian "
-#| "Edu is Debian, and if you want there are more than 15000 packages to "
-#| "choose from and a billion configuration options. For the majority of our "
-#| "users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
@@ -1646,19 +1572,14 @@ msgid "Select type of installation"
 msgstr "Seleccione el tipo de instalación"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/01-Installer_boot_menu.png"
 msgstr "./images/01-Installer_boot_menu.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#| msgid "01-Installer_boot_menu.png"
 msgid "Installer boot menu"
 msgstr "Menú de carga del instalador"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "<computeroutput>Install</computeroutput> is the default text mode "
-#| "installation on i386 and amd64."
 msgid ""
 "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
 "installation on i386 and amd64."
@@ -1667,60 +1588,46 @@ msgstr ""
 "predeterminado en formato texto para i386 y amd64."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "<computeroutput>64 bit install</computeroutput> does an amd64 text-mode "
-#| "install."
 msgid ""
 "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
 "install."
 msgstr ""
-"<emphasis role=\"strong\">Instalar 64 bit</emphasis> realiza la instalación en "
-"modo texto para amd64."
+"<emphasis role=\"strong\">Instalar 64 bit</emphasis> realiza la instalación "
+"en modo texto para amd64."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "Select <computeroutput>Graphical install</computeroutput> to have the GTK "
-#| "installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
 msgstr ""
-"<emphasis role=\"string\">Instalador gráfico</emphasis> usa el "
-"instalador GTK donde puede usar el ratón. "
+"<emphasis role=\"string\">Instalador gráfico</emphasis> usa el instalador "
+"GTK donde puede usar el ratón. "
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "Select <computeroutput>64 bit graphical install</computeroutput> to have "
-#| "the amd64 GTK installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
 "GTK installer where you can use the mouse."
 msgstr ""
-"<emphasis role=\"strong\">Instalador gráfico para 64 bits</emphasis> usa "
-"el instalador GTK de 64bits donde puede usar el ratón."
+"<emphasis role=\"strong\">Instalador gráfico para 64 bits</emphasis> usa el "
+"instalador GTK de 64bits donde puede usar el ratón."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "<emphasis role='strong'>FIXME</emphasis>, for now some basic pointers:"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose"
 msgstr ""
-"<emphasis role=\"strong\">Opciones avanzadas ></emphasis> brinda un submenú "
-"con opciones más detalladas que puede elegir"
+"<emphasis role=\"strong\">Opciones avanzadas ></emphasis> brinda un "
+"submenú con opciones más detalladas que puede elegir"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "<emphasis role='strong'>FIXME</emphasis>, for now some basic pointers:"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer"
 msgstr ""
-"<emphasis role=\"strong\">Ayuda</emphasis> brinda algunos consejos sobre como "
-"usar el instalador."
+"<emphasis role=\"strong\">Ayuda</emphasis> brinda algunos consejos sobre "
+"como usar el instalador."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/Installer_advanced_options_a.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
@@ -1729,8 +1636,6 @@ msgid "Installer advanced options screen 1"
 msgstr "Pantalla 1 de las opciones avanzadas del instalador"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "<emphasis role='strong'>FIXME</emphasis>, for now some basic pointers:"
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
@@ -1738,26 +1643,22 @@ msgstr ""
 "principal."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "Select <computeroutput>Graphical install</computeroutput> to have the GTK "
-#| "installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">Instalación experta</emphasis> le da acceso a todas "
-"las opciones disponibles en modo texto."
+"<emphasis role=\"strong\">Instalación experta</emphasis> le da acceso a "
+"todas las opciones disponibles en modo texto."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
 "become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">Modo de rescate</emphasis> lo convierte en un disco "
-"de rescate para tareas de emergencia."
+"<emphasis role=\"strong\">Modo de rescate</emphasis> lo convierte en un "
+"disco de rescate para tareas de emergencia."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
 msgstr ""
@@ -1765,15 +1666,12 @@ msgstr ""
 "archivo preconfigurado."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "<computeroutput>64 bit install</computeroutput> does an amd64 text-mode "
-#| "install."
 msgid ""
 "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
 "all available questions in text mode on amd64."
 msgstr ""
-"<emphasis role=\"strong\">Instalación experta 64 bits </emphasis> le da acceso "
-"a todas las opciones disponibles en modo texto en computadoras amd64."
+"<emphasis role=\"strong\">Instalación experta 64 bits </emphasis> le da "
+"acceso a todas las opciones disponibles en modo texto en computadoras amd64."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1784,7 +1682,6 @@ msgstr ""
 "un disco de rescate para tareas de emergencia compatible con amd64."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
 "preseed file."
@@ -1793,7 +1690,6 @@ msgstr ""
 "un archivo preconfigurado."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/Installer_advanced_options_b.png"
 msgstr "./images/Installer_advanced_options_b.png"
 
@@ -1802,15 +1698,12 @@ msgid "Installer advanced options screen 2"
 msgstr "Pantalla 2 de las opciones avanzadas del instalador"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "Select <computeroutput>Graphical install</computeroutput> to have the GTK "
-#| "installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
 "to all available questions in graphical mode."
 msgstr ""
-"<emphasis role=\"strong\">Instalación experta gráfica</emphasis> le da acceso "
-"a todas las opciones disponibles en modo gráfico."
+"<emphasis role=\"strong\">Instalación experta gráfica</emphasis> le da "
+"acceso a todas las opciones disponibles en modo gráfico."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1830,16 +1723,13 @@ msgstr ""
 "un archivo preconfigurado."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid ""
-#| "Select <computeroutput>64 bit graphical install</computeroutput> to have "
-#| "the amd64 GTK installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
 "access to all available questions in graphical mode on amd64."
 msgstr ""
-"<emphasis role=\"strong\">Instalación experta gráfica para 64 bits</emphasis> "
-"le da acceso a todas las opciones disponibles en modo gráfico compatible con "
-"amd64."
+"<emphasis role=\"strong\">Instalación experta gráfica para 64 bits</"
+"emphasis> le da acceso a todas las opciones disponibles en modo gráfico "
+"compatible con amd64."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -1860,7 +1750,6 @@ msgstr ""
 "necesita un archivo preconfigurado."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/Installer_help.png"
 msgstr "./images/Installer_help.png"
 
@@ -1873,18 +1762,14 @@ msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
 msgstr ""
-"Está pantalla de ayuda se explica por si sola y habilita las teclas "
-"<F> en el teclado para tener ayuda más detallada en los temas "
-"descritos."
+"Está pantalla de ayuda se explica por si sola y habilita las teclas <"
+"F> en el teclado para tener ayuda más detallada en los temas descritos."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Additional boot parameters for installations"
 msgstr "Parámetros adicionales de carga para instalaciones"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "On i386/amd64 boot-options can be edited by pressing the "
-#| "<emphasis>tabulator-key</emphasis> in the boot menu."
 msgid ""
 "On i386/amd64, boot options can be edited by pressing the TAB key in the "
 "boot menu."
@@ -1893,9 +1778,6 @@ msgstr ""
 "presionando la tecla TAB en el menú de inicio."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The multiarch DVD defaults to use amd64-installgui on x86 64-bits "
-#| "machines, and installgui on x86 32-bits machines."
 msgid ""
 "The multi-architecture USB flash drive / Blue-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
@@ -1906,16 +1788,13 @@ msgstr ""
 "gráfica en x86 32-bits."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "If you want to boot the amd64 text mode with the multiarch DVD it would "
-#| "be <computeroutput>amd64-install</computeroutput>."
 msgid ""
 "If you want to boot the amd64 text mode with the multi-architecture image, "
 "that would be <computeroutput>amd64-install</computeroutput>."
 msgstr ""
 "Si desea iniciar en modo texto para un equipo amd64 con la imagen "
-"multiarquitectura, debe seleccionar <computeroutput> "
-"amd64-install</computeroutput>."
+"multiarquitectura, debe seleccionar <computeroutput> amd64-install</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1926,20 +1805,15 @@ msgstr ""
 "amd64</computeroutput> para utilizar el modo gráfico para amd64."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "If you want to boot the i386 mode with the multiarch DVD on an amd64 "
-#| "machine you need to manually select <computeroutput>install</"
-#| "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
-#| "(graphical mode)."
 msgid ""
 "If you want to boot the i386 mode with the multi-arch image on an amd64 "
 "machine you need to manually select <computeroutput>install</computeroutput> "
 "(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
 msgstr ""
 "Si desea iniciar el modo i386 con la imagen multiarquitectura en un "
-"ordenador amd64, necesitará seleccionar el  "
-"<computeroutput>instalar</computeroutput> (modo texto) o "
-"<computeroutput>modo gráfico experto</computeroutput> (modo gráfico)."
+"ordenador amd64, necesitará seleccionar el  <computeroutput>instalar</"
+"computeroutput> (modo texto) o <computeroutput>modo gráfico experto</"
+"computeroutput> (modo gráfico)."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1949,9 +1823,9 @@ msgid ""
 "parameter."
 msgstr ""
 "Puede utilizar un servicio proxy HTTP existente en la red para agilizar la "
-"instalación del servidor principal desde CD. Agregue "
-"<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> "
-"como un parámetro adicional de carga."
+"instalación del servidor principal desde CD. Agregue <computeroutput>mirror/"
+"http/proxy=http://10.0.2.2:3128/</computeroutput> como un parámetro "
+"adicional de carga."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1964,54 +1838,37 @@ msgstr ""
 "automáticamente el proxy del servidor principal."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "to install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, but "
-#| "not from DVD."
 msgid ""
 "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."
 msgstr ""
 "Para instalar el escritorio <emphasis role=\"strong\">GNOME</emphasis> en "
-"lugar del escritorio <emphasis role=\"strong\">KDE Plasma</emphasis>, agregue "
-"<computeroutput>desktop=gnome</computeroutput> a los parámetros de carga del "
-"kernel."
+"lugar del escritorio <emphasis role=\"strong\">KDE Plasma</emphasis>, "
+"agregue <computeroutput>desktop=gnome</computeroutput> a los parámetros de "
+"carga del kernel."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "to install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, but "
-#| "not from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
 "parameters."
 msgstr ""
-"Para instalar el escritorio <emphasis role=\"strong\">LXDE</emphasis>, agregue "
-" <computeroutput>desktop=lxde</computeroutput> a los parámetros de carga "
-"del kernel."
+"Para instalar el escritorio <emphasis role=\"strong\">LXDE</emphasis>, "
+"agregue  <computeroutput>desktop=lxde</computeroutput> a los parámetros de "
+"carga del kernel."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "to install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, but "
-#| "not from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
 "parameters."
 msgstr ""
-"Para instalar el escritorio <emphasis role=\"strong\">Xfce</emphasis>, agregue "
-"<computeroutput>desktop=xfce</computeroutput> a los parámetros de carga del "
-"kernel."
+"Para instalar el escritorio <emphasis role=\"strong\">Xfce</emphasis>, "
+"agregue <computeroutput>desktop=xfce</computeroutput> a los parámetros de "
+"carga del kernel."
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "The actual installation process"
 msgid "The installation process"
 msgstr "El proceso de instalación"
 
@@ -2022,9 +1879,9 @@ msgid ""
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
-"Recuerde los <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Whee"
-"zy/Requirements\">requerimientos del sistema</ulink> y asegúrese que tenga al "
-"menos dos tarjetas de red (NIC) si planea configurar un servidor de "
+"Recuerde los <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Wheezy/Requirements\">requerimientos del sistema</ulink> y asegúrese que "
+"tenga al menos dos tarjetas de red (NIC) si planea configurar un servidor de "
 "clientes ligeros. "
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2036,7 +1893,6 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr "Elige un lugar que normalmente sería el lugar donde vives."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Choose a keyboard keymap (usually the countrys default is fine)"
 msgid "Choose a keyboard keymap (the country's default is usually fine)"
 msgstr ""
 "Seleccione una disposición de teclado (la predeterminada para su país es la "
@@ -2053,14 +1909,6 @@ msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Main-server</emphasis>,"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "This is the main server (tjener) for your school providing the following "
-#| "services: file, print, intranet, proxy, DNS, DHCP, LDAP, backup, nagios, "
-#| "sitesummary, and munin. All services are pre-configured to work out of "
-#| "the box. You must only install one main server per school! This profile "
-#| "does not include a graphical user interface.  If you want a graphical "
-#| "user interface, then select Workstation or Thin-Client-Server in addition "
-#| "to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
@@ -2081,11 +1929,6 @@ msgid "<emphasis role=\"strong\">Workstation</emphasis>"
 msgstr "<emphasis role=\"strong\">Workstations</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "A computer booting from its local hard drive, and running all software "
-#| "and devices locally like an ordinary computer, but the user login is "
-#| "authenticated by the main server, where the users files and desktop "
-#| "profile are stored."
 msgid ""
 "A computer booting from its local hard drive, and running all software and "
 "devices locally like an ordinary computer, except that user logins are "
@@ -2103,10 +1946,6 @@ msgid "<emphasis role=\"strong\">Roaming workstation</emphasis>"
 msgstr "<emphasis role=\"strong\">Roaming workstation</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Same as workstation but captable of authentication using cached "
-#| "credentials, meaning it can be used outside the school network. The users "
-#| "files and profiles are stored on the local disk."
 msgid ""
 "Same as workstation but capable of authentication using cached credentials, "
 "meaning it can be used outside the school network. The users' files and "
@@ -2127,16 +1966,6 @@ msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Thin client (and diskless workstation) server, also called LTSP server. "
-#| "Clients without hard drives boot and run software from this server. This "
-#| "computer needs two network cards, a lot of memory, and ideally more than "
-#| "one processor or core. See the chapter about <ulink url=\"http://wiki."
-#| "debian.org/DebianEdu/Documentation/Wheezy/Installation/DebianEdu/"
-#| "Documentation/Wheezy/HowTo/NetworkClients#\">networked clients</ulink> "
-#| "for more information on this subject. Chosing this profile also enables "
-#| "the workstation profile (even if it is not selected), a thin client "
-#| "server can always be used as a workstation, too."
 msgid ""
 "A thin client (and diskless workstation) server, also called a LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
@@ -2163,9 +1992,6 @@ msgid "<emphasis role=\"strong\">Standalone</emphasis>"
 msgstr "<emphasis role=\"strong\">Standalone</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "An ordinary computer that can function without a main server, ie. doesn't "
-#| "need to be on the network. Includes laptops."
 msgid ""
 "An ordinary computer that can function without a main server (that is, it "
 "doesn't need to be on the network). Includes laptops."
@@ -2180,12 +2006,6 @@ msgid "<emphasis role=\"strong\">Minimal</emphasis>"
 msgstr "<emphasis role=\"strong\">Minimal</emphasis>,"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "This profile is only available when using the 'debian-edu-expert' boot "
-#| "option.  It will install the base packages and configure the machine to "
-#| "integrate into the Debian Edu network, but without any services and "
-#| "applications.  It is useful as a platform for single services manually "
-#| "moved out from the main-server."
 msgid ""
 "This profile will install the base packages and configure the machine to "
 "integrate into the Debian Edu network, but without any services and "
@@ -2212,13 +2032,14 @@ msgid ""
 "server or as a thin client server to become usefull after the installation."
 msgstr ""
 "Los perfiles  <emphasis role=\"strong\">Main Server</emphasis>, <emphasis "
-"role=\"strong\">Workstation</emphasis> y <emphasis role=\"strong\">Thin Client "
-"Server</emphasis> son preseleccionados. Estos perfiles pueden ser instalados "
-"en una misma computadora si desea instalar el llamado <emphasis>servidor "
-"principal combinado</emphasis>. Esto significa que el servidor principal "
-"será un servidor de clientes ligeros y también será usado como una estación "
-"de trabajo. Esta es la opción prederterminada, ya que asumimos que la "
-"mayoría de personas luego instalará <link linkend=\"Installation--"
+"role=\"strong\">Workstation</emphasis> y <emphasis role=\"strong\">Thin "
+"Client Server</emphasis> son preseleccionados. Estos perfiles pueden ser "
+"instalados en una misma computadora si desea instalar el llamado "
+"<emphasis>servidor principal combinado</emphasis>. Esto significa que el "
+"servidor principal será un servidor de clientes ligeros y también será usado "
+"como una estación de trabajo. Esta es la opción prederterminada, ya que "
+"asumimos que la mayoría de personas luego instalará <link linkend="
+"\"Installation--"
 "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
 "PXE</link>. Tenga en cuenta que debe tener dos tarjetas de red instalado en "
 "la computadora que se va a usada como servidor principal combinado o como "
@@ -2236,50 +2057,36 @@ msgid ""
 msgstr ""
 "El orden de las tarjetas de red después de la instalación puede cambiar del "
 "orden durante la instalación. El orden deseado puede conseguirse editando el "
-"archivo <computeroutput>/etc/udev/rules.d/70-persistent-"
-"net.rules</computeroutput>: Usualmente, <emphasis>si esto pasa</emphasis>, "
-"querrá reemplazar eth0 con eth1 y eth1 con eth0; un reinicio del equipo es "
+"archivo <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+"computeroutput>: Usualmente, <emphasis>si esto pasa</emphasis>, querrá "
+"reemplazar eth0 con eth1 y eth1 con eth0; un reinicio del equipo es "
 "necesario para que los cambios tengan efecto."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Be aware that saying yes will destroy all data on the harddrives! Saying "
-#| "no on the other hand will require more work and one will need to make "
-#| "sure that the required partitions are created and are big enough."
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
 "\" will destroy all data on the hard drives! Saying \"no\" on the other hand "
 "will require more work - you will need to make sure that the required "
 "partitions are created and are big enough."
 msgstr ""
-"Seleccione \"si\" o \"no\" para particionamiento automático. Este consciente que "
-"al seleccionar sí, ¡se eliminarán todos los datos en el disco duro!, al "
+"Seleccione \"si\" o \"no\" para particionamiento automático. Este consciente "
+"que al seleccionar sí, ¡se eliminarán todos los datos en el disco duro!, al "
 "seleccionar no, se requerirá más trabajo y necesitará que las particiones "
 "requeridas sean creadas y tengan suficiente espacio."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Please say yes to submit information to <ulink url=\"http://popcon."
-#| "skolelinux.org/\"/> to allow us to know which packages are popular and "
-#| "should be kept for future releases.  Though you don't have to, it is a "
-#| "simple way for you to help. <placeholder type=\"inlinemediaobject\" id="
-#| "\"0\"/>"
 msgid ""
 "Please say \"yes\" to submitting information to <ulink url=\"http://popcon."
 "skolelinux.org/\"/> to allow us to know which packages are popular and "
 "should be kept for future releases.  Although you don't have to, it is a "
 "simple way for you to help."
 msgstr ""
-"Por favor, seleccione \"sí\" para enviar información a <ulink "
-"url=\"http://popcon.skolelinux.org/\"/> para permitirnos saber que paquetes "
-"son populares y deberían de mantenerse para futuras versiones. Usted no esta "
-"obligado a hacerlo, pero es la manera más fácil de que colabore."
+"Por favor, seleccione \"sí\" para enviar información a <ulink url=\"http://"
+"popcon.skolelinux.org/\"/> para permitirnos saber que paquetes son populares "
+"y deberían de mantenerse para futuras versiones. Usted no esta obligado a "
+"hacerlo, pero es la manera más fácil de que colabore."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "if thin client server is among the selected profiles, then the installer "
-#| "will spent quite some time at the end, \"Finishing the installation - "
-#| "Running debian-edu-profile-udeb...\""
 msgid ""
 "Wait. If the selected profiles include Thin-client-server then the installer "
 "will spend quite some time at the end, \"Finishing the installation - "
@@ -2309,9 +2116,9 @@ msgid ""
 "accepted by the installer)."
 msgstr ""
 "La contraseña para este usuario <emphasis role=\"strong\">debe</emphasis> "
-"tener una longitud de <emphasis role=\"strong\">al menos 5 "
-"caracteres</emphasis>, de los contrario, el ingreso al sistema no será "
-"posible (aunque el instalador acepte una contraseña menor)."
+"tener una longitud de <emphasis role=\"strong\">al menos 5 caracteres</"
+"emphasis>, de los contrario, el ingreso al sistema no será posible (aunque "
+"el instalador acepte una contraseña menor)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
@@ -2339,11 +2146,6 @@ msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
 msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blue-ray"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "If you install from a DVD, <computeroutput>/etc/apt/sources.list</"
-#| "computeroutput> it will only contain sources from the DVD afterwards. If "
-#| "you have an internet connection we strongly suggest adding the following "
-#| "lines to it so that available (security) updates can be installed:"
 msgid ""
 "After you install from the multi-arch USB flash drive / Blue-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
@@ -2396,12 +2198,6 @@ msgid "A note on thin-client-server installations"
 msgstr "Nota sobre la instalación de servidores de clientes ligeros"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "First of all, this profile name is confusing due to historic reasons, "
-#| "today this profile actually installs a LTSP server environment for thin-"
-#| "clients and for workstations. Debian bug <ulink url=\"http://bugs.debian."
-#| "org/516280#\">516280</ulink> has been filed to change the name of the "
-#| "profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
@@ -2411,16 +2207,11 @@ msgid ""
 msgstr ""
 "Antes que nada, el nombre del perfil es confuso debido a razones históricas. "
 "Actualmente este perfil instala un entorno de servidor LTSP para clientes "
-"ligeros y estaciones de trabajo. El fallo <ulink "
-"url=\"http://bugs.debian.org/588510#\">588510</ulink> ha sido archivado para "
-"cambiar el nombre del perfil a uno más apropiado."
+"ligeros y estaciones de trabajo. El fallo <ulink url=\"http://bugs.debian."
+"org/588510#\">588510</ulink> ha sido archivado para cambiar el nombre del "
+"perfil a uno más apropiado."
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "By providing the kernel argument <computeroutput>edu-skip-ltsp-make-"
-#| "client</computeroutput> it is possible to skip the step which converts "
-#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
-#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
 "client</computeroutput> makes it possible to skip the step which converts "
@@ -2451,9 +2242,6 @@ msgstr ""
 "saltarse este paso va a reducir considerablemente el tiempo de instalación."
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "Except for the longer installation time there is no harm creating "
-#| "combined chroots always and this is why this is done by default."
 msgid ""
 "Except for the longer installation time there is no harm in always creating "
 "combined chroots, which is why this is done by default."
@@ -2462,15 +2250,10 @@ msgstr ""
 "chroot combinado y por eso se hace de forma predeterminada."
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Installation using USBsticks instead of CD/DVDs"
 msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
 msgstr "Instalación utilizando memorias USB lugar de CD / Blue-ray"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Since the Squeeze release it is possible to directly copy the CD/DVD .iso "
-#| "images to an USBstick and boot from them. Simply execute a command like "
-#| "this, just adopt the file- and devicename to your needs:"
 msgid ""
 "Since the Squeeze release it is possible to directly copy the CD/DVD/BD "
 "<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
@@ -2492,9 +2275,6 @@ msgstr ""
 "bs=1024</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Depending which image you choose, the USBstick will behave just like a CD "
-#| "or DVD."
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
 "like a CD or Blue-ray disc."
@@ -2524,8 +2304,8 @@ msgstr ""
 "XXX.bin no se encuentra, es más probable que la tarjeta de red del cliente "
 "requiera un firmware no libre. En este caso el initrd del instalador de "
 "Debian debe ser modificado. Esto se puede lograr ejecutando el comando "
-"<computeroutput>/usr/share/debian-edu-config/tools/pxe-"
-"addfirmware</computeroutput> en el servidor."
+"<computeroutput>/usr/share/debian-edu-config/tools/pxe-addfirmware</"
+"computeroutput> en el servidor."
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -2540,7 +2320,6 @@ msgstr ""
 "Server</emphasis>:"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "pxe-tjener.png"
 msgid "./images/pxe-tjener.png"
 msgstr "./images/pxe-tjener.png"
 
@@ -2563,15 +2342,10 @@ msgstr ""
 "Server</emphasis> y <emphasis role=\"strong\">Thin-Client-Server</emphasis>:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "This setup also allows to boot diskless workstations and thin clients on "
-#| "the main network. Diskless workstations must be added with GOsa just like "
-#| "normal workstations or thin client servers."
 msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
@@ -2581,15 +2355,9 @@ msgstr ""
 "Esta configuración permite iniciar a las estaciones sin disco y clientes "
 "ligeros a través de la red principal. A diferencia de las estaciones de "
 "trabajo, las estaciones de trabajo sin disco no necesitan ser agregadas a "
-"LDAP con GOsa², pero pueden agregarse, si necesita forzar el nombre del "
-"host."
+"LDAP con GOsa², pero pueden agregarse, si necesita forzar el nombre del host."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "More information about network clients can be found in the <ulink url="
-#| "\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Installation/"
-#| "DebianEdu/Documentation/Wheezy/HowTo/NetworkClients#\">Network clients "
-#| "HowTo</ulink> chapter."
 msgid ""
 "More information about network clients can be found in the <link linkend="
 "\"NetworkClients\">Network clients HowTo</link> chapter."
@@ -2602,9 +2370,6 @@ msgid "Modifying PXE installations"
 msgstr "Modificar instalaciones PXE"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "The PXE installation is using a debian-installer preseed file, and this "
-#| "file can be modified to ask for more packages to install."
 msgid ""
 "The PXE installation uses a debian-installer preseed file, which can be "
 "modified to ask for more packages to install."
@@ -2643,11 +2408,10 @@ msgstr ""
 "Estos archivos pueden modificarse para ser ajustados a la configuración "
 "usada durante la instalación y así evitar las preguntas cuando se realicen "
 "instalaciones por red. Otra manera de lograr esto es agregar configuraciones "
-"extras a los archivos <computeroutput>/etc/debian-"
-"edu/pxeinstall.conf</computeroutput> y <computeroutput>/etc/debian-edu/www"
-"/debian-edu-install.dat.local</computeroutput> y ejecutar "
-"<computeroutput>/usr/sbin/debian-edu-pxeinstall</computeroutput> para "
-"actualizar los archivos generados."
+"extras a los archivos <computeroutput>/etc/debian-edu/pxeinstall.conf</"
+"computeroutput> y <computeroutput>/etc/debian-edu/www/debian-edu-install.dat."
+"local</computeroutput> y ejecutar <computeroutput>/usr/sbin/debian-edu-"
+"pxeinstall</computeroutput> para actualizar los archivos generados."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2670,15 +2434,14 @@ msgid ""
 "computeroutput>\" part from the last one."
 msgstr ""
 "Para desactivar o cambiar el uso del proxy cuando instale vía PXE, necesita "
-"cambiar las lineas que contengan "
-"<computeroutput>mirror/http/proxy</computeroutput>, "
-"<computeroutput>mirror/ftp/proxy</computeroutput> y "
+"cambiar las lineas que contengan <computeroutput>mirror/http/proxy</"
+"computeroutput>, <computeroutput>mirror/ftp/proxy</computeroutput> y "
 "<computeroutput>preseed/early_command</computeroutput> en el archivo "
-"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat "
-"</computeroutput>. Para desactivar el uso de proxy cuando instale, anteponga "
+"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
+"computeroutput>. Para desactivar el uso de proxy cuando instale, anteponga "
 "el signo '#' al inicio de las primeras dos lineas y elimine "
-"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; "
-"</computeroutput>\" de la última linea."
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
+"computeroutput>\" de la última linea."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2700,12 +2463,6 @@ msgid "Custom images"
 msgstr "Imágenes personalizadas"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Creating custom CDs or DVDs is possibly quite easy since we use the "
-#| "<ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
-#| "ulink>, which has a modular design and other nice features. <ulink url="
-#| "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> "
-#| "allows you to define answers to the questions normally asked."
 msgid ""
 "Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
@@ -2716,9 +2473,9 @@ msgstr ""
 "Crear CDs, DVDs o Blue-rays personalizados es bastante fácil, ya que se "
 "utilizamos el  <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
 "installer</ulink>, el cual es de diseño modular, y posee otras "
-"características útiles.La <ulink url=\"http://wiki.debian.org/DebianInstaller"
-"/Preseed\">Preconfiguración</ulink> le permite definir las respuestas a las "
-"preguntas realizadas regularmente."
+"características útiles.La <ulink url=\"http://wiki.debian.org/"
+"DebianInstaller/Preseed\">Preconfiguración</ulink> le permite definir las "
+"respuestas a las preguntas realizadas regularmente."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2737,12 +2494,6 @@ msgid "Screenshot tour"
 msgstr "Captura de pantalla del paseo"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The text mode and the graphical installation are identical, only the "
-#| "appearance is different. The graphical mode offers you the opportunity to "
-#| "use a mouse. Of course the graphical mode looks much nicer and more "
-#| "modern. Unless the hardware has trouble with the graphical mode, there is "
-#| "no reason not to use it."
 msgid ""
 "The text mode and the graphical installation are functionally identical - "
 "only the appearance is different. The graphical mode offers the opportunity "
@@ -2773,7 +2524,6 @@ msgid "01-Installer_boot_menu.png"
 msgstr "01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "02-select_a_language.png"
 msgid "./images/02-select_a_language.png"
 msgstr "./images/02-select_a_language.png"
 
@@ -2782,7 +2532,6 @@ msgid "02-select_a_language.png"
 msgstr "02-select_a_language.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "03-select_your_location.png"
 msgid "./images/03-select_your_location.png"
 msgstr "./images/03-select_your_location.png"
 
@@ -2791,7 +2540,6 @@ msgid "03-select_your_location.png"
 msgstr "03-select_your_location.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "04-Configure_the_keyboard.png"
 msgid "./images/04-Configure_the_keyboard.png"
 msgstr "./images/04-Configure_the_keyboard.png"
 
@@ -2800,7 +2548,6 @@ msgid "04-Configure_the_keyboard.png"
 msgstr "04-Configure_the_keyboard.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "05-Detect_and_mount_CD-ROM.png"
 msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
@@ -2809,7 +2556,6 @@ msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr "05-Detect_and_mount_CD-ROM.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "06-Load_installer_components_from_CD.png"
 msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr "./images/06-Load_installer_components_from_CD.png"
 
@@ -2818,7 +2564,6 @@ msgid "06-Load_installer_components_from_CD.png"
 msgstr "06-Load_installer_components_from_CD.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "07-Detect_network_hardware.png"
 msgid "./images/07-Detect_network_hardware.png"
 msgstr "./images/07-Detect_network_hardware.png"
 
@@ -2827,7 +2572,6 @@ msgid "07-Detect_network_hardware.png"
 msgstr "07-Detect_network_hardware.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "08-Choose_Debian_Edu_profile.png"
 msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
@@ -2836,7 +2580,6 @@ msgid "08-Choose_Debian_Edu_profile.png"
 msgstr "08-Choose_Debian_Edu_profile.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
@@ -2845,7 +2588,6 @@ msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
@@ -2854,7 +2596,6 @@ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "11-Participate_in_the_package_usage_survey.png"
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
@@ -2863,7 +2604,6 @@ msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr "11-Participate_in_the_package_usage_survey.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "./images/12-Set_up_users_and_passwords.png"
 
@@ -2872,32 +2612,26 @@ msgid "12-Set_up_users_and_passwords.png"
 msgstr "12-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "12a-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "./images/12b-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "12b-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "./images/12c-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "12c-Set_up_users_and_passwords.png"
 msgstr "12c-Set_up_users_and_passwords.png"
 
@@ -2910,7 +2644,6 @@ msgid "12d-Setting-up-the-partitioner.png"
 msgstr "12d-Setting-up-the-partitioner.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/12e-creating_ext4.png"
 msgstr "./images/12e-creating_ext4.png"
 
@@ -2919,7 +2652,6 @@ msgid "12e-creating_ext4.png"
 msgstr "12e-creating_ext4.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "13-Install the base system.png"
 msgid "./images/13-Install+the+base+system.png"
 msgstr "./images/13-Install+the+base+system.png"
 
@@ -2928,7 +2660,6 @@ msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "14-Select_and_install_software.png"
 msgid "./images/14-Select_and_install_software.png"
 msgstr "./images/14-Select_and_install_software.png"
 
@@ -2937,7 +2668,6 @@ msgid "14-Select_and_install_software.png"
 msgstr "14-Select_and_install_software.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "17-Select_and_install_software.png"
 msgid "./images/17-Select_and_install_software.png"
 msgstr "./images/17-Select_and_install_software.png"
 
@@ -2946,7 +2676,6 @@ msgid "17-Select_and_install_software.png"
 msgstr "17-Select_and_install_software.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "18-Build LTSP chroot.png"
 msgid "./images/18-Build+LTSP+chroot.png"
 msgstr "./images/18-Build+LTSP+chroot.png"
 
@@ -2955,7 +2684,6 @@ msgid "18-Build LTSP chroot.png"
 msgstr "18-Build LTSP chroot.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
@@ -2964,7 +2692,6 @@ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "20-Finish_the_Installation.png"
 msgid "./images/20-Finish_the_Installation.png"
 msgstr "./images/20-Finish_the_Installation.png"
 
@@ -2973,7 +2700,6 @@ msgid "20-Finish_the_Installation.png"
 msgstr "20-Finish_the_Installation.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "21-Finish_the_Installation-Installation_complete.png"
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
@@ -2982,7 +2708,6 @@ msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "22-Tjener_GRUB_boot_menu.png"
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
@@ -2991,12 +2716,10 @@ msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "23-Tjener-KDM_Login.png"
 msgid "tjener KDM Login"
 msgstr "Inicio de sesión KDM en tjener"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "24-Tjener-KDE_Start.png"
 msgid "./images/24-Tjener-KDE_Start.png"
 msgstr "./images/24-Tjener-KDE_Start.png"
 
@@ -3005,7 +2728,6 @@ msgid "KDE starting..."
 msgstr "Iniciando KDE.."
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "26-Tjener-KDE_Desktop_Browser.png"
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
@@ -3014,7 +2736,6 @@ msgid "KDE and Browser"
 msgstr "KDE y el navegador"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "27-Tjener-KDE_Desktop.png"
 msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
@@ -3023,22 +2744,18 @@ msgid "KDE Desktop"
 msgstr "Escritorio KDE"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "29-Diskless-WS-KDM_Login.png"
 msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Diskless workstations"
 msgid "Diskless Workstation Login"
 msgstr "Inicio de sesión de estaciones sin disco"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "31-ThinClient-KDE_Desktop.png"
 msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
@@ -3051,14 +2768,18 @@ msgid "Minimum steps to get started"
 msgstr "Pasos mínimos para iniciar"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
 #| msgid ""
-#| "Log into the server as user \"localadmin\" (which has the same password "
-#| "as the \"root\" account) - with the root account you cannot log in "
-#| "graphically. As localadmin you can use <computeroutput>sudo</"
-#| "computeroutput> to become root."
+#| "During installation of the main server a first user account was created. "
+#| "In the following text this account will be referenced as \"first user\". "
+#| "The first user can use <computeroutput>sudo</computeroutput> to become "
+#| "root."
 msgid ""
 "During installation of the main server a first user account was created. In "
-"the following text this account will be referenced as \"first user\". The "
+"the following text this account will be referenced as \"first user\". This "
+"account is special, as there's no Samba account (can be added via GOsa²), "
+"the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</"
+"computeroutput> is needed to make personal web pages accessible), and the "
 "first user can use <computeroutput>sudo</computeroutput> to become root."
 msgstr ""
 "Durante la instalación del servidor principal, fue creada una primera cuenta "
@@ -3074,11 +2795,6 @@ msgstr ""
 "usuario son:"
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#| msgid ""
-#| "Log into the server as user \"localadmin\" (which has the same password "
-#| "as the \"root\" account) - with the root account you cannot log in "
-#| "graphically. As localadmin you can use <computeroutput>sudo</"
-#| "computeroutput> to become root."
 msgid ""
 "Log into the server - with the root account you cannot log in graphically."
 msgstr ""
@@ -3098,10 +2814,6 @@ msgstr ""
 "trabajo sin disco pueden ser usados directamente sin ser agregados."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Adding users and workstations is described below, please read this "
-#| "chapter completely. It covers how to do these minumum steps correctly as "
-#| "well as other stuff probably everybody will need to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
 "this chapter completely. It covers how to perform these minumum steps "
@@ -3121,17 +2833,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The following <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-#| "Wheezy/GettingStarted/DebianEdu/Documentation/Wheezy/HowTo#\">HowTo</"
-#| "ulink> chapter covers more tips and tricks and some frequently asked "
-#| "questions."
 msgid ""
 "The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
 "and some frequently asked questions."
 msgstr ""
-"El capítulo  <link linkend=\"HowTo\">HowTo</link> describe más trucos, pistas "
-"y algunas preguntas de uso frecuente."
+"El capítulo  <link linkend=\"HowTo\">HowTo</link> describe más trucos, "
+"pistas y algunas preguntas de uso frecuente."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
@@ -3140,27 +2847,18 @@ msgid "Debian Edu KDE desktop"
 msgstr "Escritorio Debian Edu con KDE Plasma"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "There are several services running on the main server which can be "
-#| "managed via a web management interface.  We'll describe each service "
-#| "below."
 msgid ""
 "There are several services running on the main server which can be managed "
 "via a web management interface. We'll describe each service below."
 msgstr ""
 "Hay varios servicios ejecutándose en el servidor principal que se pueden "
-"gestionar con una interfaz web. Describiremos estos servicios a "
-"continuación."
+"gestionar con una interfaz web. Describiremos estos servicios a continuación."
 
 #. type: Content of: <article><section><section><title>
 msgid "Introduction to GOsa²"
 msgstr "Introducción a GOsa²"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "GOsa² is a web based management tool, that will help you manage some "
-#| "important parts of your Debian Edu setup. You can manage these four main "
-#| "groups (add, modify, delete):"
 msgid ""
 "GOsa² is a web based management tool that helps to manage some important "
 "parts of your Debian Edu setup. With GOsa² you can manage (add, modify, or "
@@ -3206,28 +2904,20 @@ msgstr ""
 "computadora con un navegador web, puede ser el mismo servidor principal si "
 "se instaló como un servidor combinado (servidor principal + servidor de "
 "clientes ligeros + estación de trabajo). Si no tiene disponible nada de lo "
-"mencionado anteriormente, vea <link linkend=\"Administration"
-"--Installing_a_graphical_environment_on_the_main-"
-"server_to_use_GOsa.2BALI-\">Instalar un entorno gráfico en el servidor "
-"principal para usar GOsa²</link>."
+"mencionado anteriormente, vea <link linkend=\"Administration--"
+"Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+"\">Instalar un entorno gráfico en el servidor principal para usar GOsa²</"
+"link>."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "From a web browser use this URL <ulink url=\"https://www/gosa\"/> for "
-#| "GOsa² access, login with username <computeroutput>super-admin</"
-#| "computeroutput> and the main server's root password."
 msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
-"Desde un navegador web, utilice <ulink url=\"https://www/gosa\"/> para acceder "
-"a GOsa² e ingrese por primera vez."
+"Desde un navegador web, utilice <ulink url=\"https://www/gosa\"/> para "
+"acceder a GOsa² e ingrese por primera vez."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "In case you <emphasis role=\"strong\">are</emphasis> using a new Debian "
-#| "Edu Wheezy machine, the override rule will be already in place and you "
-#| "can't be bothered."
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
@@ -3250,15 +2940,14 @@ msgid ""
 "For general information on GOsa² have a look at: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
 msgstr ""
-"Para información general sobre GOsa², revise:  <ulink "
-"url=\"https://oss.gonicus.de/labs/gosa/wiki/documentation\"/>"
+"Para información general sobre GOsa², revise:  <ulink url=\"https://oss."
+"gonicus.de/labs/gosa/wiki/documentation\"/>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
 
@@ -3283,12 +2972,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "In Debian Edu account information is stored in a LDAP directory. This "
-#| "data is used not only by the main server, but also by the (diskless) "
-#| "workstations and thin client servers on the network.  In this way data "
-#| "about students, pupils, teachers, etc. needs to be entered only once. "
-#| "After that it is available to all systems on the network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
@@ -3303,8 +2986,8 @@ msgstr ""
 "el servidor principal, sino también por las estaciones sin disco, los "
 "servidores de clientes ligeros y las computadoras con Windows en la red. Con "
 "LDAP, la información sobre los estudiantes, docentes y demás, solo necesita "
-"ser ingresada una vez. Una vez que la información ha sido ingresada en "
-"LDAP, estará disponible para todos los sistemas en toda la red Skolelinux."
+"ser ingresada una vez. Una vez que la información ha sido ingresada en LDAP, "
+"estará disponible para todos los sistemas en toda la red Skolelinux."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3317,10 +3000,10 @@ msgid ""
 msgstr ""
 "GOsa² es una herramienta de administración que usa LDAP para almacenar su "
 "información y provee una estructura jerárquica por departamento. Para cada "
-"\"departamento\" puede agregar cuentas de usuario, grupos, sistemas, grupos de "
-"red y demás. En dependencia de la estructura de su institución, puede usar "
-"la estructura en GOsa²/LDAP para transferir su estructura organizacional al "
-"árbol de datos LDAP del servidor principal Debian Edu."
+"\"departamento\" puede agregar cuentas de usuario, grupos, sistemas, grupos "
+"de red y demás. En dependencia de la estructura de su institución, puede "
+"usar la estructura en GOsa²/LDAP para transferir su estructura "
+"organizacional al árbol de datos LDAP del servidor principal Debian Edu."
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -3338,16 +3021,17 @@ msgid ""
 "AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 "Una instalación predeterminada del servidor principal de Debian Edu "
-"actualmente provee dos \"departamentos\": docentes y estudiantes, más el nivel "
-"básico del árbol LDAP. Las cuentas de estudiantes se agregarán al "
-"departamento \"estudiantes\", las de profesores al departamento \"profesores\", "
-"las de los sistemas (servidores, estaciones de trabajo Skolelinux, "
+"actualmente provee dos \"departamentos\": docentes y estudiantes, más el "
+"nivel básico del árbol LDAP. Las cuentas de estudiantes se agregarán al "
+"departamento \"estudiantes\", las de profesores al departamento \"profesores"
+"\", las de los sistemas (servidores, estaciones de trabajo Skolelinux, "
 "computadoras Windows, impresoras, etc) son agregadas al nivel básico. Use su "
 "propio esquema para adaptar esta estructura. (Puede encontrar un ejemplo "
 "sobre como crear usuarios, con directorios personales comunes para cada "
-"grupo en el capítulo  <ulink url=\"https://wiki.debian.org/DebianEdu/Document"
-"ation/Wheezy//HowTo/AdvancedAdministration#User_Customisations_with_GOsa.2BA"
-"LI-\">HowTo/AdvancedAdministration</ulink> de este manual.)"
+"grupo en el capítulo  <ulink url=\"https://wiki.debian.org/DebianEdu/"
+"Documentation/Wheezy//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> de este manual.)"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3444,7 +3128,6 @@ msgid "Search, modify and delete users"
 msgstr "Buscar, modificar y borrar usuarios"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/filterbox.png"
 msgstr "./images/filterbox.png"
 
@@ -3471,10 +3154,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A new page will show up where you can modify information directly "
-#| "belonging to the user, change the password of the user and modify the "
-#| "list of groups the user belongs to."
 msgid ""
 "A new page will show up where you can directly modify information about the "
 "user, change the password of the user and modify the list of groups the user "
@@ -3485,7 +3164,6 @@ msgstr ""
 "grupos a los que pertenece."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/edit_user.png"
 msgstr "./images/edit_user.png"
 
@@ -3524,14 +3202,10 @@ msgstr ""
 "puede ser muy practico durante clases."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "To set a new password for a user"
 msgid "To administratively set a new password for a user"
 msgstr "Para establecer una nueva contraseña para el usuario"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#| msgid ""
-#| "search the user to be modified like explained above and click on the "
-#| "username once found."
 msgid "search for the user to be modified, as explained above"
 msgstr ""
 "Busque el usuario que desea modificar, tal como se explicó anteriormente"
@@ -3552,15 +3226,10 @@ msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Set passwords"
 msgid "Set user password"
 msgstr "Establecer contraseñas de usuario"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "You can now set any password you like, as long as it is at least 5 digits "
-#| "long. <emphasis role=\"strong\">Beware of security implications due to "
-#| "easy to guess passwords!</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
 "guess passwords!</emphasis>"
@@ -3585,13 +3254,13 @@ msgid ""
 "computeroutput> on the command line)."
 msgstr ""
 "Es posible crear usuarios masivamente con GOsa² usando un archivo CSV, que "
-"puede ser creado con un software de hoja de cálculo "
-"(<computeroutput>oocalc</computeroutput> por ejemplo). Se deben proveer, al "
-"menos, datos para los siguientes campos: uid, last name (sn), first name "
-"(givenName) y password. Asegúrese de no duplicar datos en el campo uid. Note "
-"que la revisión de duplicados debe incluir los registros ya existentes en "
-"LDAP (que puede ser obtenido ejecutando <computeroutput>getent passwd | grep "
-"tjener/home | cut -d\":\" -f1</computeroutput> en la linea de comando)."
+"puede ser creado con un software de hoja de cálculo (<computeroutput>oocalc</"
+"computeroutput> por ejemplo). Se deben proveer, al menos, datos para los "
+"siguientes campos: uid, last name (sn), first name (givenName) y password. "
+"Asegúrese de no duplicar datos en el campo uid. Note que la revisión de "
+"duplicados debe incluir los registros ya existentes en LDAP (que puede ser "
+"obtenido ejecutando <computeroutput>getent passwd | grep tjener/home | cut -d"
+"\":\" -f1</computeroutput> en la linea de comando)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3660,9 +3329,6 @@ msgid "click the \"Import\" button in the bottom-right corner"
 msgstr "Haga clic en el botón \"Importar\" en la esquina inferior derecha"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "It's a good idea to do some tests first, best with a .csv file with a few "
-#| "fictional users, which can be deleted later."
 msgid ""
 "It's a good idea to do some tests first, preferably using a CSV file with a "
 "few fictional users, which can be deleted later."
@@ -3671,12 +3337,10 @@ msgstr ""
 "con usuarios ficticios, que pueden ser eliminados después."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "User Management with lwat"
 msgid "Group Management with GOsa²"
 msgstr "Gestión de usuarios con GOsa²"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/create_group.png"
 msgstr "./images/create_group.png"
 
@@ -3685,7 +3349,6 @@ msgid "create group"
 msgstr "crear un grupo"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/list_groups.png"
 msgstr "./images/list_groups.png"
 
@@ -3741,28 +3404,21 @@ msgstr ""
 "net groupmap list\n"
 "\n"
 "# Agrega un grupo nuevo o faltante:\n"
-"net groupmap add unixgroup=GRUPO_NUEVO type=domain "
-"ntgroup=\"GRUPO_NUEVO_GRUPO\"\\\n"
+"net groupmap add unixgroup=GRUPO_NUEVO type=domain ntgroup=\"GRUPO_NUEVO_GRUPO\"\\\n"
 "                 comment=\"DESCRIPCIÓN DEL GRUPO NUEVO\""
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "This is explained in more detail in the <ulink url=\"http://wiki.debian."
-#| "org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/Documentation/"
-#| "Wheezy/HowTo/"
-#| "NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Windowsintegration"
-#| "\">HowTo/NetworkClients</ulink> chapter of this manual."
 msgid ""
 "This is explained in more detail in the <link linkend=\"NetworkClients--"
 "Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
 "\">HowTo/NetworkClients</link> chapter of this manual."
 msgstr ""
-"Esto se explica detalladamente en el capítulo <link linkend=\"NetworkClients"
-"--Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration\">How"
-"To/NetworkClients</link> de este manual."
+"Esto se explica detalladamente en el capítulo <link linkend="
+"\"NetworkClients--"
+"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+"\">HowTo/NetworkClients</link> de este manual."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Machine Management with lwat"
 msgid "Machine Management with GOsa²"
 msgstr "Administración de equipos con GOsa²"
 
@@ -3788,9 +3444,9 @@ msgstr ""
 "direcciones IP en su red DebianEdu. Cada equipo agregado al directorio LDAP "
 "utilizando lwat, tiene un nombre de equipo, dirección IP, dirección MAC y un "
 "dominio, que regularmente es \"interno\". Para una mayor descripción acerca "
-"de la arquitectura de DebianEdu, vea el capítulo  <ulink url=\"http://wiki.de"
-"bian.org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/Documentati"
-"on/Wheezy/Architecture#\">architectura</ulink> en este manual."
+"de la arquitectura de DebianEdu, vea el capítulo  <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/"
+"Documentation/Wheezy/Architecture#\">architectura</ulink> en este manual."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -3806,8 +3462,7 @@ msgid ""
 msgstr ""
 "Esta opción permite iniciar a las estaciones sin disco y clientes delgados a "
 "través de la red principal. Las estaciones sin disco deben de ser agregadas "
-"con GOsa como a las estaciones de trabajo, o servidores de clientes "
-"livianos."
+"con GOsa como a las estaciones de trabajo, o servidores de clientes livianos."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3874,10 +3529,8 @@ msgid ""
 "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
 "enter password:"
 msgstr ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t "
-"workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] "
-"id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
@@ -3885,7 +3538,6 @@ msgstr ""
 "enter password:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "03-select_your_location.png"
 msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
@@ -3894,7 +3546,6 @@ msgid "GOsa² systems listing"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "03-select_your_location.png"
 msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
@@ -3903,7 +3554,6 @@ msgid "Host details"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "03-select_your_location.png"
 msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
@@ -3912,7 +3562,6 @@ msgid "Modify host"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "13-Install the base system.png"
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
@@ -3931,9 +3580,6 @@ msgid "Search and delete machines"
 msgstr "Buscar y eliminar computadoras"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Searching for and deleting machines is quite similar to searching and "
-#| "deleting users, so that information is not repeated here."
 msgid ""
 "Searching for and deleting machines is quite similar to searching for and "
 "deleting users, so that information is not repeated here."
@@ -4007,7 +3653,6 @@ msgid "cups-queue-autoflush-hosts"
 msgstr "cups-queue-autoflush-hosts"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "fs-autoresize-hosts"
 msgid "cups-queue-autoreenable-hosts"
 msgstr "cups-queue-autoreenable-hosts"
 
@@ -4083,9 +3728,6 @@ msgid "fs-autoresize"
 msgstr "fs-autoresize"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "debian edu machines in this group will automatically resize lvm "
-#| "partitions that run out of space"
 msgid ""
 "Debian Edu machines in this group will automatically resize LVM partitions "
 "that run out of space."
@@ -4146,10 +3788,11 @@ msgid ""
 "Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
 "\">HowTo/NetworkClients</link> chapter of this manual."
 msgstr ""
-"Esto se explica detalladamente en el capítulo <ulink url=\"http://wiki.debian"
-".org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/Documentation/W"
-"heezy/HowTo/NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Window"
-"sintegration\">Guía para clientes de red</ulink> en este manual."
+"Esto se explica detalladamente en el capítulo <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/"
+"Documentation/Wheezy/HowTo/"
+"NetworkClients#ConnectingWindowsmachinestothenetwork.2BAC8Windowsintegration"
+"\">Guía para clientes de red</ulink> en este manual."
 
 #. type: Content of: <article><section><title>
 #, fuzzy
@@ -4158,24 +3801,18 @@ msgid "Printer Management"
 msgstr "Gestión de impresoras"
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "For Printer Management point your web browser to <ulink url=\"https://"
-#| "www:631\"/> This is the normal cups management site where you can add/"
-#| "delete/modify your printers and can clean up the printing queue.  Changes "
-#| "that require to login as root need ssl encryption."
 msgid ""
 "For Printer Management point your web browser to <ulink url=\"https://"
 "www:631\"/> This is the normal CUPS management interface where you can add/"
 "delete/modify your printers and can clean up the printing queue.  Changes "
 "that require a root login need SSL encryption."
 msgstr ""
-"Par gestionar las impresoras, dirija su navegador web a <ulink "
-"url=\"https://www:631\"/>. Este es el sitio de gestión de CUPS en el que puede "
-"añadir/borrar/modificar sus impresoras y limpiar la cola de impresión. "
-"Cambios que requieran ingresar como root, necesitan cifrado SSL."
+"Par gestionar las impresoras, dirija su navegador web a <ulink url=\"https://"
+"www:631\"/>. Este es el sitio de gestión de CUPS en el que puede añadir/"
+"borrar/modificar sus impresoras y limpiar la cola de impresión. Cambios que "
+"requieran ingresar como root, necesitan cifrado SSL."
 
 #. type: Content of: <article><section><title>
-#| msgid "Clock synchronization"
 msgid "Clock synchronisation"
 msgstr "Sincronización del reloj"
 
@@ -4189,9 +3826,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "<placeholder type=\"inlinemediaobject\" id=\"0\"/> there are no wheezy "
-#| "images yet <placeholder type=\"inlinemediaobject\" id=\"1\"/>"
 msgid ""
 "If you use dialup or ISDN and pay per minute, you want to change this "
 "default setting."
@@ -4235,15 +3869,12 @@ msgid "Updating the software"
 msgstr "Actualizar el software"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This section explains how to use <computeroutput>aptitude upgrade</"
-#| "computeroutput> and kde-update-notifier."
 msgid ""
 "This section explains how to use <computeroutput>aptitude upgrade</"
 "computeroutput>."
 msgstr ""
-"Esta sección explica como utilizar <computeroutput>aptitude "
-"upgrade</computeroutput>."
+"Esta sección explica como utilizar <computeroutput>aptitude upgrade</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4345,9 +3976,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "<placeholder type=\"inlinemediaobject\" id=\"0\"/> there are no wheezy "
-#| "images yet <placeholder type=\"inlinemediaobject\" id=\"1\"/>"
 msgid ""
 "Be aware that this backup scheme doesn't protect you from failing hard "
 "drives."
@@ -4386,10 +4014,10 @@ msgid ""
 "computeroutput> for <computeroutput><date></computeroutput> in the "
 "folder <computeroutput>/skole/tjener/home0/user_<date></computeroutput>"
 msgstr ""
-"Esto pondrá el contenido de "
-"<computeroutput>/skole/tjener/home0/user</computeroutput> para "
-"<computeroutput><date></computeroutput> en el directorio "
-"<computeroutput>/skole/tjener/home0/user_<date></computeroutput>."
+"Esto pondrá el contenido de <computeroutput>/skole/tjener/home0/user</"
+"computeroutput> para <computeroutput><date></computeroutput> en el "
+"directorio <computeroutput>/skole/tjener/home0/user_<date></"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4404,17 +4032,15 @@ msgid ""
 "If you want to get rid of older backups, choose \"Maintenance\" in the menu "
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
-"Si desea deshacerse de los respaldos viejos, elija \"Maintenance\" en el menú "
-"de la página respaldo y seleccione la instantánea más vieja que desee "
+"Si desea deshacerse de los respaldos viejos, elija \"Maintenance\" en el "
+"menú de la página respaldo y seleccione la instantánea más vieja que desee "
 "conservar:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "pxe-tjener.png"
 msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Maintainance"
 msgid "slbackup-php Maintenance"
 msgstr "Mantenimiento de slbackup-php"
 
@@ -4433,8 +4059,8 @@ msgid ""
 "weekly, monthly and yearly basis, and provides the system administrator with "
 "help when looking for bottlenecks and the source of system problems."
 msgstr ""
-"Los reportes de Munin están disponible en <ulink url=\"https://www/munin/\"/>. "
-"Le provee gráficos de medición en una vista diaría, semanal, mensual y "
+"Los reportes de Munin están disponible en <ulink url=\"https://www/munin/\"/"
+">. Le provee gráficos de medición en una vista diaría, semanal, mensual y "
 "anual. Además le provee ayuda al administrador de sistemas al momento de "
 "buscar cuellos de botella y el origen de problemas en el sistema. "
 
@@ -4450,8 +4076,8 @@ msgid ""
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 "La lista de computadoras monitoreadas por Munin es automáticamente generada, "
-"basada en la lista de hosts reportados a sitesummary. Todos los hosts con "
-"el paquete munin-node instalado son registrados para ser monitoreados por "
+"basada en la lista de hosts reportados a sitesummary. Todos los hosts con el "
+"paquete munin-node instalado son registrados para ser monitoreados por "
 "Munin. Normalmente tomará un día desde que la computadora es instalada hasta "
 "que Munin inicie a monitorear, debido a la orden de ejecución de las tareas "
 "del cron. Para acelerar el proceso, ejecute <computeroutput>sitesummary-"
@@ -4469,21 +4095,18 @@ msgid ""
 msgstr ""
 "El conjunto de mediciones es automáticamente generado en cada computadora "
 "usando el programa <computeroutput>munin-node-configure</computeroutput>, "
-"que prueba los complementos disponibles en "
-"<computeroutput>/usr/share/munin/plugins/</computeroutput> y realiza los "
-"enlaces simbólicos de los complementos relevantes a "
-"<computeroutput>/etc/munin/plugins/</computeroutput>."
+"que prueba los complementos disponibles en <computeroutput>/usr/share/munin/"
+"plugins/</computeroutput> y realiza los enlaces simbólicos de los "
+"complementos relevantes a <computeroutput>/etc/munin/plugins/</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Information about the munin system is available from <ulink url=\"http://"
-#| "munin.projects.linpro.no/\"/> ."
 msgid ""
 "Information about Munin is available from <ulink url=\"http://munin.projects."
 "linpro.no/\"/> ."
 msgstr ""
-"Información sobre munin está disponible en <ulink "
-"url=\"http://munin.projects.linpro.no/\"/> ."
+"Información sobre munin está disponible en <ulink url=\"http://munin."
+"projects.linpro.no/\"/> ."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Nagios"
@@ -4500,8 +4123,8 @@ msgid ""
 "<computeroutput>nagios-nrpe-server</computeroutput> package on the "
 "workstation."
 msgstr ""
-"El sistema y servicio de monitoreo Nagios está disponible en <ulink "
-"url=\"https://www/nagios3/\"/>. La lista de computadoras y servicios "
+"El sistema y servicio de monitoreo Nagios está disponible en <ulink url="
+"\"https://www/nagios3/\"/>. La lista de computadoras y servicios "
 "monitoreados es generada automáticamente con información obtenida de "
 "sitesummary. Las computadoras con perfil de servidor principal y servidor de "
 "clientes ligeros son monitoreadas completamente, mientras que los clientes "
@@ -4537,9 +4160,10 @@ msgid ""
 msgstr ""
 "Por defecto Nagios no envia correos electrónicos. Esto se puede cambiar "
 "reemplazando <computeroutput>notify-by-nothing</computeroutput> por "
-"<computeroutput>host-notify-by-email</computeroutput> y <computeroutput"
-">notify-by-email</computeroutput> en el archivo <computeroutput>/etc/nagios3"
-"/sitesummary-template-contacts.cfg</computeroutput>"
+"<computeroutput>host-notify-by-email</computeroutput> y "
+"<computeroutput>notify-by-email</computeroutput> en el archivo "
+"<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+"computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4548,11 +4172,10 @@ msgid ""
 "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
 "with the list of hosts and services to monitor."
 msgstr ""
-"El archivo de configuración de Nagios usado es "
-"<computeroutput>/etc/nagios3/sitesummary.cfg</computeroutput>. El cron job "
-"de sitesummary genera <computeroutput>/var/lib/sitesummary/nagios-"
-"generated.cfg</computeroutput> con la lista de equipos y servicios por "
-"monitorear."
+"El archivo de configuración de Nagios usado es <computeroutput>/etc/nagios3/"
+"sitesummary.cfg</computeroutput>. El cron job de sitesummary genera "
+"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"con la lista de equipos y servicios por monitorear."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4561,18 +4184,16 @@ msgid ""
 "in the generated file."
 msgstr ""
 "Revisiones extras de Nagios pueden ser puestas en el archivo "
-"<computeroutput>/var/lib/sitesummary/nagios-"
-"generated.cfg.post</computeroutput> para que sean incluidas  en el archivo "
-"generado."
+"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg.post</"
+"computeroutput> para que sean incluidas  en el archivo generado."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Information about Nagios is available from <ulink url=\"http://www.nagios."
 "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
 msgstr ""
-"Información sobre Nagios está disponible en <ulink "
-"url=\"http://www.nagios.org/\"/> o en el paquete "
-"<computeroutput>nagios3-doc</computeroutput>."
+"Información sobre Nagios está disponible en <ulink url=\"http://www.nagios."
+"org/\"/> o en el paquete <computeroutput>nagios3-doc</computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Common Nagios warnings and how to handle them"
@@ -4607,8 +4228,8 @@ msgstr ""
 "archivos. Si hay más espacio disponible en el volumen LVM, ejecutar el "
 "programa <computeroutput>debian-edu-fsautoresize</computeroutput> para "
 "aumentar las particiones debería ayudar. Para ejecutar este programa cada "
-"hora, el equipo debe de ser añadido al grupo de red <computeroutput"
-">fsautoresize-hosts</computeroutput>."
+"hora, el equipo debe de ser añadido al grupo de red "
+"<computeroutput>fsautoresize-hosts</computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><section><title>
 msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
@@ -4628,8 +4249,8 @@ msgstr ""
 "upgrade && apt-get dist-upgrade' como usuario root en una consola o "
 "ingrese por SSH y haga lo mismo. En los servidores de clientes ligeros, "
 "recuerde actualizar también el chroot LTSP ejecutando <computeroutput>ltsp-"
-"chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
@@ -4641,8 +4262,8 @@ msgstr ""
 "Si usted no quiere actualizar paquetes manualmente y confía en que Debian "
 "hace un buen trabajo con las nuevas versiones, puede instalar el paquete "
 "<computeroutput>unattended-upgrades</computeroutput> y configurarlo para que "
-"actualice automáticamente todos los paquetes cada noche. Esto no "
-"actualizará los chroot LTSP."
+"actualice automáticamente todos los paquetes cada noche. Esto no actualizará "
+"los chroot LTSP."
 
 #. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
@@ -4725,8 +4346,8 @@ msgid ""
 "Some documentation on sitesummary is available from <ulink url=\"http://wiki."
 "debian.org/DebianEdu/HowTo/SiteSummary\"/>"
 msgstr ""
-"Documentación sobre sitesummary se encuentra disponible en <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\" />"
+"Documentación sobre sitesummary se encuentra disponible en <ulink url="
+"\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\" />"
 
 #. type: Content of: <article><section><section><title>
 msgid "More information about Debian Edu customisations"
@@ -4741,10 +4362,9 @@ msgid ""
 "\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 "Más información sobre personalizaciones de Debian Edu útil para "
-"administradores de sistema puede encontrarse en link "
-"linkend=\"Administration\">Administration Howto chapter</link> y en el <link "
-"linkend=\"AdvancedAdministration\">Advanced administration Howto "
-"chapter</link>"
+"administradores de sistema puede encontrarse en link linkend=\"Administration"
+"\">Administration Howto chapter</link> y en el <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 
 #. type: Content of: <article><section><title>
 msgid "Upgrades"
@@ -4758,8 +4378,8 @@ msgid ""
 "permitted by applicable law.</emphasis>"
 msgstr ""
 "Antes de leer está guía de actualización, tenga en cuenta que las "
-"actualizaciones en su servidor en producción la hace bajo su propio "
-"riesgo.<emphasis role=\"strong\">Debian Edu/Skolelinux no tiene ABSOLUTAMENTE "
+"actualizaciones en su servidor en producción la hace bajo su propio riesgo."
+"<emphasis role=\"strong\">Debian Edu/Skolelinux no tiene ABSOLUTAMENTE "
 "NINGUNA GARANTÍA más allá de las que indique la ley aplicable.</emphasis>"
 
 #. type: Content of: <article><section><para>
@@ -4803,19 +4423,14 @@ msgstr ""
 "ver si todo funciona como debiera."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Further information can be found in the <ulink url=\"http://www.debian."
-#| "org/releases/wheezy/installmanual\">manual of the Debian Installer</"
-#| "ulink>."
 msgid ""
 "Make sure to also read the information about the current Debian Stable "
 "release in its <ulink url=\"http://www.debian.org/releases/stable/"
 "installmanual\">installation manual</ulink>."
 msgstr ""
 "Asegúrese de leer la información sobre la versión estable de Debian actual "
-"en el <ulink "
-"url=\"http://www.debian.org/releases/stable/installmanual\">manual de "
-"instalación</ulink>."
+"en el <ulink url=\"http://www.debian.org/releases/stable/installmanual"
+"\">manual de instalación</ulink>."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -4872,7 +4487,6 @@ msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
 msgstr "Ejecute <computeroutput>apt-get dist-upgrade</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "LDAP service needs to repaired"
 msgid "LDAP service needs to be reconfigured"
 msgstr "El servicio LDAP necesita ser reconfigurado"
 
@@ -4901,9 +4515,9 @@ msgid ""
 "opt/ltsp/amd64</computeroutput>, depending on your setup). If you have "
 "enough diskspace, consider backing it up."
 msgstr ""
-"Elimine <computeroutput>/opt/ltsp/i386</computeroutput> (o "
-"<computeroutput>/opt/ltsp/amd64</computeroutput>, dependiendo de su "
-"configuración). Si tiene suficiente espacio en disco, considere respaldarlo."
+"Elimine <computeroutput>/opt/ltsp/i386</computeroutput> (o <computeroutput>/"
+"opt/ltsp/amd64</computeroutput>, dependiendo de su configuración). Si tiene "
+"suficiente espacio en disco, considere respaldarlo."
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -4914,8 +4528,8 @@ msgid ""
 "Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
 "computeroutput> as root."
 msgstr ""
-"y luego ejecuta una vez <computeroutput>/usr/sbin/debian-edu-"
-"pxeinstall</computeroutput>"
+"y luego ejecuta una vez <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
+"computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Of course you can also upgrade the chroot as usual."
@@ -4950,9 +4564,8 @@ msgstr "HowTo"
 msgid ""
 "HowTos for <link linkend=\"Administration\">general administration</link>"
 msgstr ""
-"<ulink "
-"url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</ulink> de "
-"este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
@@ -4960,49 +4573,43 @@ msgid ""
 "HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
 "link>"
 msgstr ""
-"<ulink "
-"url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</ulink> de "
-"este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr ""
-"<ulink "
-"url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</ulink> de "
-"este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"NetworkClients\">networked clients</link>"
 msgstr ""
-"<ulink "
-"url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</ulink> de "
-"este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"Samba\">Samba</link>"
 msgstr ""
-"<ulink "
-"url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</ulink> de "
-"este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"TeachAndLearn\">teaching and learning</link>"
 msgstr ""
-"<ulink "
-"url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</ulink> de "
-"este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "HowTos for <link linkend=\"Users\">users</link>"
 msgstr ""
-"<ulink "
-"url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</ulink> de "
-"este documento"
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><title>
 msgid "HowTos for general administration"
@@ -5025,13 +4632,14 @@ msgid ""
 "started with Debian Edu and how to do the basic maintenance work. The howtos "
 "in this chapter have some more \"advanced\" tips and tricks."
 msgstr ""
-"Los capítulos <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Whe"
-"ezy/HowTo/Administration/DebianEdu/Documentation/Wheezy/GettingStarted#\">Ini"
-"ciando</ulink> y <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Wheezy/HowTo/Administration/DebianEdu/Documentation/Wheezy/Maintainance#\">De"
-"bianEdu/Documentation/Wheezy/Maintainance</ulink> describen como empezar con "
-"DebianEdu y como realizar el trabajo de mantenimiento básico. Las guías en "
-"estos capítulos, tienen también trucos y recomendaciones más \"avanzadas\"."
+"Los capítulos <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Wheezy/HowTo/Administration/DebianEdu/Documentation/Wheezy/GettingStarted#"
+"\">Iniciando</ulink> y <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Wheezy/HowTo/Administration/DebianEdu/Documentation/Wheezy/"
+"Maintainance#\">DebianEdu/Documentation/Wheezy/Maintainance</ulink> "
+"describen como empezar con DebianEdu y como realizar el trabajo de "
+"mantenimiento básico. Las guías en estos capítulos, tienen también trucos y "
+"recomendaciones más \"avanzadas\"."
 
 #. type: Content of: <article><section><section><title>
 msgid ""
@@ -5406,8 +5014,7 @@ msgid ""
 "echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
 "apt-get update"
 msgstr ""
-"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt "
-"sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
 "apt-get update"
 
 #. type: Content of: <article><section><section><para>
@@ -5595,7 +5202,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "shutdown-at-night-hosts"
 msgid "How to set up shutdown-at-night"
 msgstr "Como configurar shutdown-at-night"
 
@@ -5803,7 +5409,6 @@ msgid "In this chapter advanced administration tasks are described."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#| msgid "User Management with GOsa²"
 msgid "User Customisations with GOsa²"
 msgstr "Personalizaciones de usuarios con GOsa²"
 
@@ -5819,7 +5424,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgid "<emphasis>(as root on Tjener) </emphasis>"
 msgstr "<emphasis>(como root en Tjener) </emphasis>"
 
@@ -5832,7 +5436,6 @@ msgid "mkdir /skole/tjener/home0/2014"
 msgstr "mkdir /skole/tjener/home0/2014"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "<emphasis role=\"strong\">role</emphasis>"
 msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgstr "<emphasis>(como super usuarios en Gosa</emphasis>"
 
@@ -5860,9 +5463,10 @@ msgid ""
 "(leave 'Base' as is, should be /Students/2014) and click the check box left "
 "of 'Samba group'. 'Ok' to save it."
 msgstr ""
-"Elije \"Groups\" del menú principal; \"Actions\"/Create/Group. Escriba el nombre "
-"del grupo (deje \"Base\", debería estar en /Students/2014) y haga clic en la "
-"caja de selección de la izquierda de \"Samba group\". \"ok\" para guardar."
+"Elije \"Groups\" del menú principal; \"Actions\"/Create/Group. Escriba el "
+"nombre del grupo (deje \"Base\", debería estar en /Students/2014) y haga "
+"clic en la caja de selección de la izquierda de \"Samba group\". \"ok\" para "
+"guardar."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Template"
@@ -5957,8 +5561,7 @@ msgstr ""
 "        chown $user:$group $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 "    else\n"
-"        echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
 " echo \"$created_dir folders have been created\""
@@ -6028,8 +5631,7 @@ msgstr ""
 "        ln -s /media/$home $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 "    else\n"
-"        echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
 " echo \"$created_dir folders has been created\""
@@ -6282,9 +5884,9 @@ msgid ""
 msgstr ""
 "LTSP requiere un minímo de 320MB de memoria RAM para estaciones de trabajo "
 "sin disco. Si el tamaño de RAM es menor, la computadora cargará como cliente "
-"ligero. A diferencia de las estaciones de trabajo, las estaciones de "
-"trabajo sin disco funcionan sin necesidad de ser agregadas a GOsa², debido a "
-"que se usa LDM para ingresar y conectarse al servidor LTSP. "
+"ligero. A diferencia de las estaciones de trabajo, las estaciones de trabajo "
+"sin disco funcionan sin necesidad de ser agregadas a GOsa², debido a que se "
+"usa LDM para ingresar y conectarse al servidor LTSP. "
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -6429,8 +6031,7 @@ msgid ""
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-update-kernels'"
 msgstr ""
-"(1)Abra el archivo /opt/ltsp/i386/etc/ltsp/update-kernerl.conf con un  "
-"editor\n"
+"(1)Abra el archivo /opt/ltsp/i386/etc/ltsp/update-kernerl.conf con un  editor\n"
 "y reemplace la linea\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
 "con\n"
@@ -6450,8 +6051,8 @@ msgid ""
 msgstr ""
 "La configuración PXE se genera usando el script <computeroutput>debian-edu-"
 "pxeinstall</computeroutput>. Se permite que algunas configuraciones sean "
-"reconfiguradas agregando el archivo <computeroutput>/etc/debian-"
-"edu/pxeinstall.conf</computeroutput> con los valores que desea reemplazar."
+"reconfiguradas agregando el archivo <computeroutput>/etc/debian-edu/"
+"pxeinstall.conf</computeroutput> con los valores que desea reemplazar."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Configuring the PXE installation"
@@ -6496,7 +6097,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Additional boot parameters for installations"
 msgid "Adding a custom repository for PXE installations"
 msgstr "Agregar un repositorio personalizado para instalaciones PXE"
 
@@ -6510,8 +6110,8 @@ msgid ""
 "etc/debian-edu/www/debian-edu-install.dat.local</computeroutput>:"
 msgstr ""
 "Para agregar un repositorio personalizado, agregue algo como esto a "
-"<computeroutput>/etc/debian-edu/www/debian-edu-"
-"install.dat.local</computeroutput>:"
+"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</"
+"computeroutput>:"
 
 #. type: CDATA
 #, no-wrap
@@ -6523,25 +6123,20 @@ msgid ""
 "d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 "#add the skole projects local repository\n"
-"d-i     apt-setup/local1/repository string      http://example.org/debian "
-"stable main contrib non-free\n"
+"d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
 "d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A line like the following needs to be added to <computeroutput>tjener:/"
-#| "etc/debian-edu/www/debian-edu-install.dat</computeroutput>"
 msgid ""
 "and then run <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
 "computeroutput> once."
 msgstr ""
-"y luego ejecute una vez <computeroutput>/usr/sbin/debian-edu-"
-"pxeinstall</computeroutput>"
+"y luego ejecute una vez <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
+"computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Changing the PXE menu on an LTSP server"
 msgid "Changing the PXE menu on a combined (main and LTSP) server"
 msgstr ""
 "Cambiar el menú PXE en un servidor combinado (servidor principal y LTSP)"
@@ -7099,9 +6694,6 @@ msgstr ""
 "xdmcp en 192.168.0.254 (en una configuración estándar de Skolelinux). "
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "To achieve that, add a stanza like the following to the file "
-#| "<computeroutput>/etc/lwat/admin.ini</computeroutput>:"
 msgid ""
 "If XDMCP is not accessible on your server which runs KDM, add the following "
 "to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
@@ -7907,12 +7499,13 @@ msgid ""
 "click on \"Start\" then right-click on \"Computer\" and click on \"Properties"
 "\""
 msgstr ""
-"Haga clic en \"inicio\", luego presione clic-derecho en \"Computadora\" y luego "
-"haga clic en \"Propiedades\"."
+"Haga clic en \"inicio\", luego presione clic-derecho en \"Computadora\" y "
+"luego haga clic en \"Propiedades\"."
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "select tab \"Computer Name\" and click on \"Change...\""
-msgstr "Seleccione la pestaña \"Nombre de computadora\" y haga clic en \"Cambiar…\""
+msgstr ""
+"Seleccione la pestaña \"Nombre de computadora\" y haga clic en \"Cambiar…\""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
@@ -7951,8 +7544,8 @@ msgid ""
 "(\"this computer\")"
 msgstr ""
 "Después del reinicio, cuando ingresa por primera vez, haga clic en el botón "
-"\"Opciones >>\" y seleccione el dominio SKOLELINUX en lugar del dominio "
-"local (\"esta computadora\"). "
+"\"Opciones >>\" y seleccione el dominio SKOLELINUX en lugar del "
+"dominio local (\"esta computadora\"). "
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7981,7 +7574,8 @@ msgid ""
 "\\\\tjener\\netlogon\\win7+samba_domain-membership\\Win7_Samba3DomainMember."
 "reg"
 msgstr ""
-"\\\\tjener\\netlogon\\win7+samba_domain-membership\\Win7_Samba3DomainMember.reg"
+"\\\\tjener\\netlogon\\win7+samba_domain-membership\\Win7_Samba3DomainMember."
+"reg"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8367,8 +7961,7 @@ msgstr ""
 "Todos los usuarios pueden enviar y recibir correos electrónicos en la red "
 "interna, el administrador necesita configurar el servidor de correos "
 "<computeroutput>exim4</computeroutput> para adaptarse a la situación local, "
-"iniciando con <computeroutput>dpkg-reconfigure "
-"exim4-config</computeroutput>."
+"iniciando con <computeroutput>dpkg-reconfigure exim4-config</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
 msgid "Every user who wants to use KMail needs to configure it as follows."
@@ -8411,9 +8004,9 @@ msgid ""
 "There should be your recently sent email in the inbox below of \"intern\"."
 msgstr ""
 "Ahora, envíe un correo de prueba a usted mismo. (Esto creará los directorio "
-"IMAP en el servidor.) Espere un poco, después haga clic en \"Revisar correo\" "
-"en el menú KMail. Deberá estar el correo que envió recientemente en el buzón "
-"de entrada debajo de \"intern\"."
+"IMAP en el servidor.) Espere un poco, después haga clic en \"Revisar correo"
+"\" en el menú KMail. Deberá estar el correo que envió recientemente en el "
+"buzón de entrada debajo de \"intern\"."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -8439,9 +8032,8 @@ msgid ""
 "computeroutput>) can be used to change audio volume."
 msgstr ""
 "En clientes ligeros, <computeroutput>pavucontrol</computeroutput> o "
-"<computeroutput>alsamixer</computeroutput> (pero no "
-"<computeroutput>kmix</computeroutput>) puede ser usado para ajustar el "
-"volumen."
+"<computeroutput>alsamixer</computeroutput> (pero no <computeroutput>kmix</"
+"computeroutput>) puede ser usado para ajustar el volumen."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -8470,8 +8062,8 @@ msgid ""
 "http://www.skolelinux.no/slschools/worldmap.php?lang=en&image=worldmap."
 "png"
 msgstr ""
-"http://www.skolelinux.no/slschools/worldmap.php?lang=en&image=worldmap.p"
-"ng"
+"http://www.skolelinux.no/slschools/worldmap.php?lang=en&image=worldmap."
+"png"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -8496,9 +8088,8 @@ msgstr ""
 "sistema para ayudar a encontrarse entre ellos mismos y también para dar una "
 "idea sobre la ubicación de los usuarios. Háganos saber sobre su instalación "
 "de Debian Edu, registrándose en esta base de datos. Para registrar su "
-"escuela, use<ulink "
-"url=\"http://wiki.debian.org/DebianEdu/ReferenceSchools\">este formulario "
-"web</ulink>."
+"escuela, use<ulink url=\"http://wiki.debian.org/DebianEdu/ReferenceSchools"
+"\">este formulario web</ulink>."
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
@@ -8512,23 +8103,19 @@ msgid ""
 "exist in Greece, the Netherlands, Japan and elsewhere."
 msgstr ""
 "Actualmente hay equipos locales en Noruega, Alemania, la región de "
-"Extremadura en España, Taiwan y Francia. Contruibdores y usuarias \"aislados\" "
-"existen en Grecia, Holanda, Japan y otros lugares."
+"Extremadura en España, Taiwan y Francia. Contruibdores y usuarias \"aislados"
+"\" existen en Grecia, Holanda, Japan y otros lugares."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The following <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-#| "Wheezy/GettingStarted/DebianEdu/Documentation/Wheezy/HowTo#\">HowTo</"
-#| "ulink> chapter covers more tips and tricks and some frequently asked "
-#| "questions."
 msgid ""
 "The <link linkend=\"Support\">support chapter</link> has explanations and "
 "links to localised resources, as <emphasis>contribute</emphasis> and "
 "<emphasis>support</emphasis> are two sides of the same coin."
 msgstr ""
-"El <link linkend=\"Support\">capítulo de soporte</link> contiene explicaciones "
-"y enlaces a recursos localizados, ya que <emphasis>contruibuir</emphasis> y "
-"<emphasis>apoyar</emphasis> son dos lados de la misma moneda."
+"El <link linkend=\"Support\">capítulo de soporte</link> contiene "
+"explicaciones y enlaces a recursos localizados, ya que "
+"<emphasis>contruibuir</emphasis> y <emphasis>apoyar</emphasis> son dos lados "
+"de la misma moneda."
 
 #. type: Content of: <article><section><section><title>
 msgid "Contribute globally"
@@ -8539,9 +8126,9 @@ msgid ""
 "Internationally we are organised into various <ulink url=\"http://wiki."
 "debian.org/DebianEdu/Teams/\">teams</ulink> working on different subjects."
 msgstr ""
-"A nivel internacional estamos organizados en varios <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Teams/\">equipos</ulink> que trabajan "
-"en distintas áreas."
+"A nivel internacional estamos organizados en varios <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Teams/\">equipos</ulink> que trabajan en distintas "
+"áreas."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9933,8 +9520,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
+"New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
+"GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
 
@@ -10363,7 +9950,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -10701,7 +10288,7 @@ msgstr ""
 #| "Documentation/Lenny/Installation#\">Installation chapter</ulink> to learn "
 #| "how to install with GNOME instead of KDE as desktop."
 msgid ""
-"Gnome added as a supported desktop; see the <link linkend=\"Installation"
+"GNOME added as a supported desktop; see the <link linkend=\"Installation"
 "\">Installation chapter</link> to learn how to install with GNOME instead of "
 "KDE as desktop."
 msgstr ""
@@ -10924,8 +10511,8 @@ msgid ""
 "For more information see the page <ulink url=\"http://wiki.debian.org/"
 "NewInLenny\">New in Lenny</ulink> on wiki.debian.org"
 msgstr ""
-"Para mayor información, visite la página <ulink "
-"url=\"http://wiki.debian.org/NewInLenny\">Lo nuevo en Lenny</ulink> "
+"Para mayor información, visite la página <ulink url=\"http://wiki.debian.org/"
+"NewInLenny\">Lo nuevo en Lenny</ulink> "
 
 #. type: Content of: <article><section><section><title>
 msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
@@ -11134,14 +10721,10 @@ msgid "KDE version 2.2."
 msgstr "KDE versión 2.2."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "More information on older releases"
 msgid "More information on even older releases"
 msgstr "Más información sobre versiones más anteriores"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "More information on the older releases can be found at <ulink url="
-#| "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgid ""
 "More information on even older releases can be found at <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
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 7608e8e..6512ee9 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-02 22:55+0300\n"
+"POT-Creation-Date: 2013-10-27 13:59-0400\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"
@@ -2788,9 +2788,18 @@ msgid "Minimum steps to get started"
 msgstr "Étapes minimales pour démarrer"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "During installation of the main server a first user account was created. "
+#| "In the following text this account will be referenced as \"first user\". "
+#| "The first user can use <computeroutput>sudo</computeroutput> to become "
+#| "root."
 msgid ""
 "During installation of the main server a first user account was created. In "
-"the following text this account will be referenced as \"first user\". The "
+"the following text this account will be referenced as \"first user\". This "
+"account is special, as there's no Samba account (can be added via GOsa²), "
+"the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</"
+"computeroutput> is needed to make personal web pages accessible), and the "
 "first user can use <computeroutput>sudo</computeroutput> to become root."
 msgstr ""
 "Un premier compte d'utilisateur a été créé pendant l'installation du serveur "
@@ -6755,10 +6764,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 ""
@@ -10638,9 +10647,14 @@ msgstr ""
 "installations autonomes."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+#| "Gnome option, the LXDE desktop option is only supported by the CD "
+#| "installation method."
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
+"New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
+"GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
 "Nouveau option de choix de bureau LXDE, en de KDE (par défaut) et Gnome. "
@@ -11106,9 +11120,13 @@ msgstr ""
 "utilise les boîtes de dialogue KDE dans le bureau KDE."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Change video player setup to install different players in KDE "
+#| "(dragonplayer), Gnome (totem) and LXDE (totem)."
 msgid ""
 "Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 "Changement de la configuration du lecteur vidéo pour installer différents "
 "lecteurs dans KDE (dragonplayer), Gnome (totem) et LXDE (totem)."
@@ -11441,8 +11459,13 @@ msgstr ""
 "l'utilisateur."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Gnome added as a supported desktop; see the <link linkend=\"Installation"
+#| "\">Installation chapter</link> to learn how to install with GNOME instead "
+#| "of KDE as desktop."
 msgid ""
-"Gnome added as a supported desktop; see the <link linkend=\"Installation"
+"GNOME added as a supported desktop; see the <link linkend=\"Installation"
 "\">Installation chapter</link> to learn how to install with GNOME instead of "
 "KDE as desktop."
 msgstr ""
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 db8e967..14c7127 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-02 22:55+0300\n"
+"POT-Creation-Date: 2013-10-27 13:59-0400\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"
@@ -2749,9 +2749,18 @@ msgid "Minimum steps to get started"
 msgstr "I passi essenziali per iniziare"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "During installation of the main server a first user account was created. "
+#| "In the following text this account will be referenced as \"first user\". "
+#| "The first user can use <computeroutput>sudo</computeroutput> to become "
+#| "root."
 msgid ""
 "During installation of the main server a first user account was created. In "
-"the following text this account will be referenced as \"first user\". The "
+"the following text this account will be referenced as \"first user\". This "
+"account is special, as there's no Samba account (can be added via GOsa²), "
+"the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</"
+"computeroutput> is needed to make personal web pages accessible), and the "
 "first user can use <computeroutput>sudo</computeroutput> to become root."
 msgstr ""
 "Durante l'installazione del server principale un primo account è stato "
@@ -6637,8 +6646,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 ""
@@ -10442,9 +10451,14 @@ msgstr ""
 "skolelinux.org/\"/>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
+#| "Gnome option, the LXDE desktop option is only supported by the CD "
+#| "installation method."
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
+"New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
+"GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
 "Nuova opzione per l'ambiente desktop LXDE, in aggiunta a KDE (predefinito) e "
@@ -10899,9 +10913,13 @@ msgstr ""
 "utilizzi i dialoghi di KDE in KDE."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Change video player setup to install different players in KDE "
+#| "(dragonplayer), Gnome (totem) and LXDE (totem)."
 msgid ""
 "Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 "Cambiata la configurazione dei riproduttori video per installare diversi "
 "riproduttori in KDE (dragonplayer), Gnome (totem) e LXDE (totem)."
@@ -11228,8 +11246,13 @@ msgstr ""
 "degli utenti."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Gnome added as a supported desktop; see the <link linkend=\"Installation"
+#| "\">Installation chapter</link> to learn how to install with GNOME instead "
+#| "of KDE as desktop."
 msgid ""
-"Gnome added as a supported desktop; see the <link linkend=\"Installation"
+"GNOME added as a supported desktop; see the <link linkend=\"Installation"
 "\">Installation chapter</link> to learn how to install with GNOME instead of "
 "KDE as desktop."
 msgstr ""
@@ -15880,13 +15903,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 ""
@@ -15898,8 +15921,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"
@@ -15907,8 +15930,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"
@@ -15925,8 +15948,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"
@@ -15934,8 +15957,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 2f872f9..968dd34 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-02 22:55+0300\n"
+"POT-Creation-Date: 2013-10-27 13:59-0400\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>
@@ -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
@@ -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"
@@ -2875,7 +2875,10 @@ msgstr "Minimumssteg for å komme igang"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "During installation of the main server a first user account was created. In "
-"the following text this account will be referenced as \"first user\". The "
+"the following text this account will be referenced as \"first user\". This "
+"account is special, as there's no Samba account (can be added via GOsa²), "
+"the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</"
+"computeroutput> is needed to make personal web pages accessible), and the "
 "first user can use <computeroutput>sudo</computeroutput> to become root."
 msgstr ""
 
@@ -3574,8 +3577,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 +3588,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 +3610,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 +4133,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
@@ -5968,10 +5971,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>"
@@ -10078,8 +10081,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
+"New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
+"GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
 
@@ -10457,7 +10460,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -10717,7 +10720,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"Gnome added as a supported desktop; see the <link linkend=\"Installation"
+"GNOME added as a supported desktop; see the <link linkend=\"Installation"
 "\">Installation chapter</link> to learn how to install with GNOME instead of "
 "KDE as desktop."
 msgstr ""
@@ -11237,8 +11240,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"
@@ -11261,8 +11264,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"
@@ -12525,8 +12528,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"
@@ -14853,13 +14856,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 ""
@@ -14871,8 +14874,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"
@@ -14880,8 +14883,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"
@@ -14897,8 +14900,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"
@@ -14906,8 +14909,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 5046c15..53cc5bf 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-02 22:55+0300\n"
+"POT-Creation-Date: 2013-10-27 13:59-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2070,7 +2070,10 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "During installation of the main server a first user account was created. In "
-"the following text this account will be referenced as \"first user\". The "
+"the following text this account will be referenced as \"first user\". This "
+"account is special, as there's no Samba account (can be added via GOsa²), "
+"the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</"
+"computeroutput> is needed to make personal web pages accessible), and the "
 "first user can use <computeroutput>sudo</computeroutput> to become root."
 msgstr ""
 
@@ -7657,8 +7660,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New LXDE desktop option, in addition to KDE (default) and Gnome. As the "
-"Gnome option, the LXDE desktop option is only supported by the CD "
+"New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
+"GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
 
@@ -8010,7 +8013,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change video player setup to install different players in KDE "
-"(dragonplayer), Gnome (totem) and LXDE (totem)."
+"(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8240,7 +8243,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Gnome added as a supported desktop; see the <link linkend=\"Installation"
+"GNOME added as a supported desktop; see the <link linkend=\"Installation"
 "\">Installation chapter</link> to learn how to install with GNOME instead of "
 "KDE as desktop."
 msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index ad36aac..93d29e0 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -828,7 +828,7 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 <section id="GettingStarted--Minimum_steps_to_get_started">
 <title>Minimum steps to get started
 </title>
-<para>During installation of the main server a first user account was created. In the following text this account will be referenced as "first user". The first user can use <computeroutput>sudo</computeroutput> to become root. 
+<para>During installation of the main server a first user account was created. In the following text this account will be referenced as "first user". This account is special, as there's no Samba account (can be added via GOsa²), the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</computeroutput> is needed to make personal web pages accessible), and the first user can use <computeroutput>sudo</computeroutput> to become root. 
 </para>
 <para>After the installation, the first things you need to do as first user are: 
 </para><orderedlist numeration="arabic">
@@ -3474,7 +3474,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>Show welcome page to users when they first log in. This default start page for Iceweasel is fetched from LDAP at installation and boot time for networked profiles. Set to <ulink url="http://www.skolelinux.org/"/> for Standalone installations.  
 </para></listitem>
 <listitem>
-<para>New LXDE desktop option, in addition to KDE (default) and Gnome. As the Gnome option, the LXDE desktop option is only supported by the CD installation method. 
+<para>New LXDE desktop option, in addition to KDE (default) and GNOME. As the GNOME option, the LXDE desktop option is only supported by the CD installation method. 
 </para></listitem>
 <listitem>
 <para>Speed up LTSP client boot. 
@@ -3701,7 +3701,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in KDE. 
 </para></listitem>
 <listitem>
-<para>Change video player setup to install different players in KDE (dragonplayer), Gnome (totem) and LXDE (totem). 
+<para>Change video player setup to install different players in KDE (dragonplayer), GNOME (totem) and LXDE (totem). 
 </para></listitem>
 <listitem>
 <para>Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the default KDE installation. 
@@ -3828,7 +3828,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>Dynamic desktop icons and menu options that adjust based on user group. 
 </para></listitem>
 <listitem>
-<para>Gnome added as a supported desktop; see the <link linkend="Installation">Installation chapter</link> to learn how to install with GNOME instead of KDE as desktop. 
+<para>GNOME added as a supported desktop; see the <link linkend="Installation">Installation chapter</link> to learn how to install with GNOME instead of KDE as desktop. 
 </para></listitem>
 <listitem>
 <para>Support for more than 50 languages. 
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 05bd6d3..8c0b738 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index e24af17..24438c8 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index 5c881a3..c719be9 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 34f892d..65146f8 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ

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



More information about the debian-edu-commits mailing list