[debian-edu-commits] debian-edu/debian-edu-doc.git (#1574) - master (branch) updated: 1.5_20130727_7.1-23-g1b108f8

Holger Levsen holger at alioth.debian.org
Sat Sep 14 14:06:15 UTC 2013


The branch, master has been updated
       via  1b108f8f3601b2b6d351593f4e9bcb6e7a2d8628 (commit)
      from  bb363547f810aad56d30223612c7f14a59149b84 (commit)

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

- Log -----------------------------------------------------------------
commit 1b108f8f3601b2b6d351593f4e9bcb6e7a2d8628
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Sep 14 16:06:06 2013 +0200

    Update manual and images from the wiki

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

Summary of changes:
 documentation/audacity/audacity-manual.pot         |    2 +-
 .../debian-edu-squeeze-manual.pot                  |    2 +-
 .../debian-edu-squeeze/images/de/worldmap.png      |  Bin 386761 -> 386856 bytes
 .../debian-edu-squeeze/images/es/worldmap.png      |  Bin 386862 -> 386964 bytes
 .../debian-edu-squeeze/images/fr/worldmap.png      |  Bin 386801 -> 386906 bytes
 .../debian-edu-squeeze/images/worldmap.png         |  Bin 386796 -> 386907 bytes
 .../debian-edu-wheezy-manual.da.po                 |   24 +--
 .../debian-edu-wheezy-manual.de.po                 |   38 +++--
 .../debian-edu-wheezy-manual.es.po                 |  116 +++++---------
 .../debian-edu-wheezy-manual.fr.po                 |   32 ++--
 .../debian-edu-wheezy-manual.it.po                 |  169 +++-----------------
 .../debian-edu-wheezy-manual.nb.po                 |  157 +++++++++---------
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot |   13 +-
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml |    6 +-
 .../debian-edu-wheezy/images/de/worldmap.png       |  Bin 386761 -> 386856 bytes
 .../debian-edu-wheezy/images/es/worldmap.png       |  Bin 386862 -> 386964 bytes
 .../debian-edu-wheezy/images/fr/worldmap.png       |  Bin 386801 -> 386906 bytes
 .../debian-edu-wheezy/images/worldmap.png          |  Bin 386796 -> 386907 bytes
 documentation/rosegarden/rosegarden-manual.pot     |    2 +-
 19 files changed, 205 insertions(+), 356 deletions(-)

The diff of changes is:
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index d2f36e0..40e329f 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-30 17:36+0300\n"
+"POT-Creation-Date: 2013-09-14 15:57+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index 57e6e1f..25a3782 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-30 17:35+0300\n"
+"POT-Creation-Date: 2013-09-14 15:56+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 22e382f..34c12da 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index 51a54a9..29dcd3b 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index 69f48c1..f1cc497 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 6d50377..62146d1 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
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 133ba2c..c34ce86 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-08-30 16:38-0400\n"
+"POT-Creation-Date: 2013-09-14 15:57+0300\n"
 "PO-Revision-Date: 2013-07-18 11:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -2124,15 +2124,6 @@ msgstr ""
 "deb http://security.debian.org/ wheezy/updates main \n"
 "deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This image only works for KDE desktop installations.  If you want to install "
-"other desktop options, use the netinst images or PXE installation."
-msgstr ""
-"Dette aftryk virker kun med KDE-skrivebordsinstallationer. Hvis du ønsker at "
-"installere andre skrivebordsindstillinger, så brug netinst-aftrykket eller "
-"PXE-installation."
-
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on CD installs"
 msgstr "En bemærkning om cd-installationer"
@@ -3053,7 +3044,10 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard."
+"wizard. (If you want to be able to edit the proposed username, open "
+"<computeroutput>/etc/gosa/gosa.conf</computeroutput> with an editor and add "
+"<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> as an "
+"additional option to the \"location definition\".)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -11447,6 +11441,14 @@ msgstr ""
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "This image only works for KDE desktop installations.  If you want to "
+#~ "install other desktop options, use the netinst images or PXE installation."
+#~ msgstr ""
+#~ "Dette aftryk virker kun med KDE-skrivebordsinstallationer. Hvis du ønsker "
+#~ "at installere andre skrivebordsindstillinger, så brug netinst-aftrykket "
+#~ "eller PXE-installation."
+
+#~ msgid ""
 #~ "Boot parameters available when installing from the netinstall CD image, "
 #~ "not when installing from the multi-arch image"
 #~ 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 6307452..d2aed45 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-08-30 16:38-0400\n"
+"POT-Creation-Date: 2013-09-14 15:57+0300\n"
 "PO-Revision-Date: 2013-08-26 11:53+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <kde-i18n-doc at kde.org>\n"
@@ -2179,16 +2179,6 @@ msgstr ""
 "deb http://security.debian.org/ wheezy/updates main \n"
 "deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This image only works for KDE desktop installations.  If you want to install "
-"other desktop options, use the netinst images or PXE installation."
-msgstr ""
-"Dieses Image kann nur für Installationen mit der graphischen Arbeitsumgebung "
-"KDE verwendet werden. Benutzen Sie das Medium »netinstall« oder Installation "
-"via PXE, um eine andere Option der graphischen Arbeitsumgebung zu "
-"installieren."
-
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on CD installs"
 msgstr "Eine Bemerkung zur CD-Installation"
@@ -3112,11 +3102,11 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard."
+"wizard. (If you want to be able to edit the proposed username, open "
+"<computeroutput>/etc/gosa/gosa.conf</computeroutput> with an editor and add "
+"<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> as an "
+"additional option to the \"location definition\".)"
 msgstr ""
-"Wenn Ihnen die generierte Kennung nicht gefällt, können Sie aus dem Drop-"
-"Down-Menü eine andere wählen - eine freie Wahl bietet der Assistent jedoch "
-"nicht. "
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -11709,6 +11699,24 @@ msgstr ""
 "werden."
 
 #~ msgid ""
+#~ "This image only works for KDE desktop installations.  If you want to "
+#~ "install other desktop options, use the netinst images or PXE installation."
+#~ msgstr ""
+#~ "Dieses Image kann nur für Installationen mit der graphischen "
+#~ "Arbeitsumgebung KDE verwendet werden. Benutzen Sie das Medium "
+#~ "»netinstall« oder Installation via PXE, um eine andere Option der "
+#~ "graphischen Arbeitsumgebung zu installieren."
+
+#~ msgid ""
+#~ "If you don't like the generated username you can select another username "
+#~ "offered in the drop-down box, but you do not have a free choice here in "
+#~ "the wizard."
+#~ msgstr ""
+#~ "Wenn Ihnen die generierte Kennung nicht gefällt, können Sie aus dem Drop-"
+#~ "Down-Menü eine andere wählen - eine freie Wahl bietet der Assistent "
+#~ "jedoch nicht. "
+
+#~ msgid ""
 #~ "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
 #~ msgstr ""
 #~ "FIXME: two screenshots (pxe) need to be replaced with updated artwork."
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 20fd5ae..95c5e4e 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-08-30 16:38-0400\n"
+"POT-Creation-Date: 2013-09-14 15:57+0300\n"
 "PO-Revision-Date: 2013-09-09 16:37-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -35,7 +35,6 @@ msgid "Manual for Debian Edu 7.1+edu0 Codename Wheezy"
 msgstr "Manual para Debian-Edu 7.1+edu0 nombre código \"Wheezy\""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:23-Tjener-KDM_Login.png]"
 msgid "./images/23-Tjener-KDM_Login.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
@@ -52,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 ""
@@ -65,8 +63,8 @@ msgid ""
 msgstr ""
 "Las <link linkend=\"Translations\">Traducciones</link>son parte del paquete "
 "<computeroutput>debian-edu-doc</computeroutput> que puede ser instalado en "
-"un servidor web, y que está disponible <ulink "
-"url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">en línea</ulink>."
+"un servidor web, y que está disponible <ulink url=\"http://maintainer."
+"skolelinux.org/debian-edu-doc/\">en línea</ulink>."
 
 #. type: Content of: <article><section><title>
 msgid "About Debian Edu and Skolelinux"
@@ -82,17 +80,6 @@ msgstr ""
 "para una red escolar."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "Immediatly after installation a school server running all services needed "
-#| "for a school network is set up (see the next chapter <link linkend="
-#| "\"Architecture\">details of the architecture of this setup</link>), just "
-#| "waiting for users and machines being added via GOsa², a comfortable Web-"
-#| "UI, or any other LDAP editor. A netbooting environmont is prepared using "
-#| "PXE, so after initial installation of the main server from CD, DVD or "
-#| "usbstick all other machines can be installed via the network, this "
-#| "includes \"roaming workstations\" (ones that can be taken away from the "
-#| "school network, usually laptops or netbooks) as well as PXE booting for "
-#| "diskless machines like tradional thin-clients."
 msgid ""
 "Immediatly after installation a school server running all services needed "
 "for a school network is set up (see the next chapter <link linkend="
@@ -107,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 "
@@ -119,11 +106,6 @@ msgstr ""
 "los tradicionales clientes ligeros."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "Several educational applications like celestia, drgeo, gcompris, "
-#| "geogebra, kalzium, kgeography solfege and kgeography are included in the "
-#| "default desktop setup, which can be extended easily and almost endlessly "
-#| "via the Debian universe."
 msgid ""
 "Several educational applications like celestia, drgeo, gcompris, kalzium, "
 "kgeography, solfege and scratch are included in the default desktop setup, "
@@ -150,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 ""
@@ -164,12 +146,6 @@ msgstr ""
 "configurada."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
-#| "the same time Raphael Herzog started Debian-Edu in France. Since 2003 "
-#| "both projects are united, but both names stayed. \"Skole\" and "
-#| "(Debian-)\"Education\" are just too well understood terms in these "
-#| "regions."
 msgid ""
 "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
 "same time Raphael Herzog started Debian-Edu in France. Since 2003 both "
@@ -179,8 +155,8 @@ msgstr ""
 "El proyecto Skolelinux fué fundado en Noruega el 2 de julio de 2001, y casi "
 "a la vez Raphael Herzog 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 ""
@@ -2667,12 +2643,6 @@ msgstr ""
 "deb http://security.debian.org/ wheezy/updates main \n"
 "deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This image only works for KDE desktop installations.  If you want to install "
-"other desktop options, use the netinst images or PXE installation."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on CD installs"
 msgstr "Una nota acerca de de la instalación con CD"
@@ -3694,7 +3664,10 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard."
+"wizard. (If you want to be able to edit the proposed username, open "
+"<computeroutput>/etc/gosa/gosa.conf</computeroutput> with an editor and add "
+"<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> as an "
+"additional option to the \"location definition\".)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4729,8 +4702,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 "
@@ -4766,9 +4739,10 @@ msgid ""
 msgstr ""
 "Por defecto Nagios no enviar 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 ""
@@ -4777,11 +4751,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 ""
@@ -4790,9 +4763,8 @@ 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>
 #, fuzzy
@@ -4800,9 +4772,8 @@ 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"
@@ -4837,8 +4808,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)."
@@ -4858,8 +4829,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 ""
@@ -4871,8 +4842,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 ""
@@ -10508,9 +10479,8 @@ msgid ""
 msgstr ""
 "acceso a los repositorios de Debian son hechos siempre or medio del proxy en "
 "el servidor principal. Lea más acerca de los detalles de "
-"implementación<ulink> "
-"url=\"http://lists.debian.org/20100704221022.GC30542@login1.uio.no\"> usando "
-"DHCP y WPAD</ulink>."
+"implementación<ulink> url=\"http://lists.debian.org/20100704221022."
+"GC30542 at login1.uio.no\"> usando DHCP y WPAD</ulink>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "The home0 partition is mounted nosuid, to increase security."
@@ -11065,11 +11035,11 @@ msgid ""
 msgstr ""
 "Regresión: <computeroutput>webmin</computeroutput> ha sido eliminado de "
 "Debian por problemas de mantenimiento. Hemos agregado una nueva herramienta "
-"de administración de usuarios vía web llamada "
-"<computeroutput>lwat</computeroutput>, que no tiene la misma funcionalidad "
-"que la herramienta anterior de administración de usuarios "
-"<computeroutput>wlus</computeroutput>. <computeroutput>wlus</computeroutput> "
-"requiere de <computeroutput>webmin</computeroutput>."
+"de administración de usuarios vía web llamada <computeroutput>lwat</"
+"computeroutput>, que no tiene la misma funcionalidad que la herramienta "
+"anterior de administración de usuarios <computeroutput>wlus</"
+"computeroutput>. <computeroutput>wlus</computeroutput> requiere de "
+"<computeroutput>webmin</computeroutput>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
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 02b07a6..db8d6db 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-08-30 16:38-0400\n"
+"POT-Creation-Date: 2013-09-14 15:57+0300\n"
 "PO-Revision-Date: 2013-07-23 16:13+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -2191,15 +2191,6 @@ msgstr ""
 "deb http://security.debian.org/ wheezy/updates main \n"
 "deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This image only works for KDE desktop installations.  If you want to install "
-"other desktop options, use the netinst images or PXE installation."
-msgstr ""
-"L’image ne permet d'installer que l'environnement de bureau KDE. Si vous "
-"souhaitez installer d'autres environnements, utilisez l'image d'installation "
-"par le réseau ou l'installation PXE."
-
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on CD installs"
 msgstr "Note concernant l'installation depuis un CD"
@@ -3137,7 +3128,10 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard."
+"wizard. (If you want to be able to edit the proposed username, open "
+"<computeroutput>/etc/gosa/gosa.conf</computeroutput> with an editor and add "
+"<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> as an "
+"additional option to the \"location definition\".)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6744,10 +6738,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 ""
@@ -11789,6 +11783,14 @@ msgstr ""
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
 #~ msgid ""
+#~ "This image only works for KDE desktop installations.  If you want to "
+#~ "install other desktop options, use the netinst images or PXE installation."
+#~ msgstr ""
+#~ "L’image ne permet d'installer que l'environnement de bureau KDE. Si vous "
+#~ "souhaitez installer d'autres environnements, utilisez l'image "
+#~ "d'installation par le réseau ou l'installation PXE."
+
+#~ msgid ""
 #~ "Boot parameters available when installing from the netinstall CD image, "
 #~ "not when installing from the multi-arch image"
 #~ 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 de77193..4eefca8 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-08-30 16:38-0400\n"
+"POT-Creation-Date: 2013-09-14 15:57+0300\n"
 "PO-Revision-Date: 2013-09-03 18:15+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -2088,11 +2088,6 @@ msgstr ""
 "\"Finishing the installation - Running debian-edu-profile-udeb...\""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "After giving the root password, you will be asked to create a normal user "
-#| "account \"for non-administrative tasks\". For Debian Edu this account is "
-#| "very important: It is the account you will use to manage the Skolelinux "
-#| "network."
 msgid ""
 "After giving the root password, you will be asked to create a normal user "
 "account \"for non-administrative tasks\". For Debian Edu this account is "
@@ -2105,11 +2100,6 @@ msgstr ""
 "rete Skolelinux."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The choosen password for this user <emphasis role=\"strong\">must</"
-#| "emphasis> have a length of <emphasis role=\"strong\">at least 5 "
-#| "characters</emphasis> - otherwise login will not be possible. (And that's "
-#| "even though a shorter password will be accepted by the installer.)"
 msgid ""
 "The password for this user <emphasis role=\"strong\">must</emphasis> have a "
 "length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
@@ -2180,28 +2170,11 @@ msgstr ""
 "deb http://security.debian.org/ wheezy/updates main \n"
 "deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This image only works for KDE desktop installations.  If you want to install "
-"other desktop options, use the netinst images or PXE installation."
-msgstr ""
-"Questa immagine installa solo il desktop KDE. Se si desidera installare "
-"altri desktop, utilizzare le immagini netinst o l'installazione PXE."
-
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on CD installs"
 msgstr "Una nota sull'installazione da CD"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "A netinst installation (which is the type of installation our CD "
-#| "provides) will fetch some packages from the CD and the rest from the net. "
-#| "The amount of packages fetched from the net varies from profile to "
-#| "profile but stays below a gigabyte (unless you choose to install all "
-#| "possible desktops). Once you have installed the main-server (whether a "
-#| "pure main-server or combi-server does not matter), further installation "
-#| "will use it's proxy to avoid downloading the same package several times "
-#| "from the net."
 msgid ""
 "A netinst installation (which is the type of installation our CD provides) "
 "will fetch some packages from the CD and the rest from the net. The amount "
@@ -3013,14 +2986,6 @@ msgstr ""
 "del server principale di Debian Edu. "
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A default Debian Edu main server installation currently provides two "
-#| "\"departments\": Teachers and Students, plus the base level of the LDAP "
-#| "tree. Student accounts are intended to be added to the \"Students\" "
-#| "department, teachers to the \"Teachers\" department; systems (servers, "
-#| "Skolelinux workstations, Windows machines, printers etc.) are currently "
-#| "added to the base level. Find your own scheme for customising this "
-#| "structure."
 msgid ""
 "A default Debian Edu main server installation currently provides two "
 "\"departments\": Teachers and Students, plus the base level of the LDAP "
@@ -3121,11 +3086,11 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard."
+"wizard. (If you want to be able to edit the proposed username, open "
+"<computeroutput>/etc/gosa/gosa.conf</computeroutput> with an editor and add "
+"<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> as an "
+"additional option to the \"location definition\".)"
 msgstr ""
-"Se non piace il nome utente generato è possibile selezionare un altro nome "
-"utente visualizzato nell'elenco a discesa, anche se nella procedura guidata "
-"non si può fare una scelta libera."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -3503,10 +3468,6 @@ msgstr ""
 "\"Architecture\">architettura</link> di questo manuale."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Diskless workstations and thin-clients work out-of-the-box when connected "
-#| "to the main network. Only workstations with disks *have* to be added with "
-#| "GOsa², but all *can*."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
@@ -3536,17 +3497,6 @@ msgstr ""
 "riservati al DHCP e assegnati dinamicamente. "
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "To assign a host with the MAC address 52:54:00:12:34:10 a static IP "
-#| "address in GOsa² you have to enter the MAC address, the hostname and the "
-#| "IP; alternatively you might click the <computeroutput>Propose ip</"
-#| "computeroutput> button which will show the first free fixed address in "
-#| "10.0.0.0/8, most probably something like 10.0.0.2 if you add the first "
-#| "machine this way. It may be better to first think about your network: For "
-#| "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
-#| "x>100 for workstations. Don't forget to activate the just added "
-#| "system. With the exception of the main server all systems will then have "
-#| "a matching icon."
 msgid ""
 "To assign a host with the MAC address 52:54:00:12:34:10 a static IP address "
 "in GOsa² you have to enter the MAC address, the hostname and the IP; "
@@ -3571,18 +3521,6 @@ msgstr ""
 "sistemi saranno visualizzati con un'icona."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If the machines have booted as thin clients/diskless workstations or have "
-#| "been installed using any of the networked profiles, the "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
-#| "to automatically add machines to GOsa², "
-#| "<computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage "
-#| "information. Please note, that the IP addresses shown after usage of "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-#| "dynamic IP range. These systems can then be modified though to suite your "
-#| "network: Rename each new system, activate DHCP and DNS, add it to "
-#| "netgroups, if needed; reboot the system afterwards.  The following "
-#| "screenshots show how this looks in practice:"
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
@@ -3854,15 +3792,6 @@ msgstr ""
 "web potrebbero essere utilizzate durante gli esami."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Another important part of machine configuration is the 'Samba host' flag "
-#| "(in the 'Host information' area). If you plan to add existing Windows "
-#| "systems to the Skolelinux Samba domain, you need to add the Windows host "
-#| "to the LDAP tree and set this flag to be able to join the Windows host to "
-#| "the domain. For more information about adding Windows hosts to the "
-#| "Skolelinux network see the <link linkend=\"NetworkClients--"
-#| "Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-#| "\">HowTo/NetworkClients</link> chapter of this manual."
 msgid ""
 "Another important part of machine configuration is the 'Samba host' flag (in "
 "the 'Host information' area). If you plan to add existing Windows systems to "
@@ -4356,13 +4285,6 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#| msgid ""
-#| "New package are available for upgrades.  The critical ones are normally "
-#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-#| "upgrade' as root in a konsole or log in via ssh to do the same.  On thin "
-#| "client servers, remember to also update the LTSP chroot using "
-#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
@@ -4490,10 +4412,6 @@ msgid "More information about Debian Edu customisations"
 msgstr "Maggiori informazioni per personalizzare Debian Edu"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "More information about Debian Edu customisations useful for system "
-#| "administrators can be found in the <link linkend=\"Administration"
-#| "\">Administration Howto chapter</link>."
 msgid ""
 "More information about Debian Edu customisations useful for system "
 "administrators can be found in the <link linkend=\"Administration"
@@ -4698,14 +4616,6 @@ msgstr ""
 "Squeeze)"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "To upgrade from any older release, you will need to upgrade to the "
-#| "Squeeze-based Debian Edu release first, before you can follow the "
-#| "instructions provided above. Instructions are given in the <ulink url="
-#| "\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze#\">Manual for "
-#| "Debian Edu Squeeze</ulink> about how to upgrade to Squeeze from the "
-#| "previous release, Lenny, and the Lenny manual covers the one before that! "
-#| "(Etch was it's name.)"
 msgid ""
 "To upgrade from any older release, you will need to upgrade to the Squeeze-"
 "based Debian Edu release first, before you can follow the instructions "
@@ -4733,8 +4643,6 @@ msgstr ""
 "HowTo per <link linkend=\"Administration\">amministrazione generale</link>"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "HowTos for <link linkend=\"Administration\">general administration</link>"
 msgid ""
 "HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
 "link>"
@@ -5637,7 +5545,6 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-#| msgid "Administration"
 msgid "Advanced administration"
 msgstr "Amministrazione avanzata"
 
@@ -5647,7 +5554,6 @@ msgstr ""
 "In questa sezione sono descritte le operazioni di amministrazione avanzate."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "User Management with GOsa²"
 msgid "User Customisations with GOsa²"
 msgstr "Personalizzazione degli utenti con GOsa²"
 
@@ -5666,7 +5572,6 @@ msgstr ""
 "utenti saranno creati importando un file csv. "
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgid "<emphasis>(as root on Tjener) </emphasis>"
 msgstr "<emphasis>(come root su Tjener) </emphasis>"
 
@@ -5679,7 +5584,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\">Minimal</emphasis>"
 msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgstr "<emphasis>(come superuser in Gosa)</emphasis>"
 
@@ -8512,9 +8416,6 @@ msgid "/usr/sbin/debian-edu-pxeinstall"
 msgstr "/usr/sbin/debian-edu-pxeinstall"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "After this, new installations via PXE will have the <ulink url=\"http://"
-#| "wiki.debian.org/SmartBoard#\">SmartBoard</ulink> software installed."
 msgid ""
 "After this, new installations via PXE will have the <ulink url=\"https://"
 "wiki.debian.org/SmartBoard#\">SmartBoard</ulink> software installed."
@@ -9370,15 +9271,6 @@ msgid "HowTo translate this document"
 msgstr "Come tradurre questo documento"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "As in many free software projects, translations of this document are kept "
-#| "in PO files. More information about the process can be found in "
-#| "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-"
-#| "manual-translations</computeroutput>. The Git repository (see below) "
-#| "contains this file too. Take a look there and at the <ulink url=\"http://"
-#| "wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-#| "specific conventions</ulink> if you want to help translating this "
-#| "document."
 msgid ""
 "As in many free software projects, translations of this document are kept in "
 "PO files. More information about the process can be found in "
@@ -9507,7 +9399,7 @@ msgstr ""
 "lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
 
 #.  <remark>
-#. status ignore</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 "
@@ -10455,11 +10347,6 @@ msgstr ""
 "rilasciata il 11-03-2012"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Replace LWAT with GOsa² as the LDAP administration interface. See below "
-#| "and the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-#| "Squeeze/GettingStarted#\">Getting started chapter</ulink> of the manual "
-#| "for more information on GOsa²."
 msgid ""
 "Replace LWAT with GOsa² as the LDAP administration interface. See below and "
 "the <ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
@@ -10507,11 +10394,6 @@ msgid "Provide a KDE menu entry for changing the password in GOsa²."
 msgstr "Fornita una voce al menu KDE per cambiare la password in GOsa²."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "For more information on how to change passwords (including expired "
-#| "passwords at the KDM/GDM login prompt), please see the <ulink url="
-#| "\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/Users#"
-#| "\">HowTos for users</ulink> chapter of the manual."
 msgid ""
 "For more information on how to change passwords (including expired passwords "
 "at the KDM/GDM login prompt), please see the <ulink url=\"https://wiki."
@@ -10591,10 +10473,6 @@ msgid "New roaming workstation profile for laptops."
 msgstr "Nuovo profilo di workstation mobile per i portatili."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Device access for all users is handled by <ulink url=\"http://wiki.debian."
-#| "org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
-#| "needed to get access to devices."
 msgid ""
 "Device access for all users is handled by <ulink url=\"https://wiki.debian."
 "org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
@@ -11093,10 +10971,6 @@ msgstr ""
 "riavvio del database LDAP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Root logins are denied for both KDM and GDM - see above and <ulink url="
-#| "\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
-#| "\">Getting started</ulink> for details."
 msgid ""
 "Root logins are denied for both KDM and GDM - see above and <ulink url="
 "\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
@@ -11437,16 +11311,6 @@ msgid "New Linux kernel 2.6.26 supports more hardware"
 msgstr "Il nuovo kernel Linux 2.6.26 supporta più hardware."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "With this release, Debian GNU/Linux updates from X.Org 7.1 to X.Org 7.3 "
-#| "(which includes support of newer hardware) and now includes the desktop "
-#| "environments KDE 3.5.10 and GNOME 2.22. Updates of other desktop "
-#| "applications include Iceweasel (version 3.0.6, which is the unbranded "
-#| "Firefox web browser) and Icedove (version 2.0.0.19, which is the "
-#| "unbranded Thunderbird mail client) as well as upgrades to Evolution "
-#| "2.22.3, <ulink url=\"http://wiki.debian.org/OpenOffice#\">OpenOffice</"
-#| "ulink>.org 2.4.1, and Pidgin 2.4.3 (formerly known as Gaim). SWI-prolog "
-#| "is back."
 msgid ""
 "With this release, Debian GNU/Linux updates from X.Org 7.1 to X.Org 7.3 "
 "(which includes support of newer hardware) and now includes the desktop "
@@ -11615,11 +11479,6 @@ msgstr ""
 "richiede <computeroutput>webmin</computeroutput>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Regression: swi-prolog is not part of Etch, but was part of Sarge. The "
-#| "<ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Etch/HowTo/"
-#| "TeachAndLearn#\">HowTo teach and learn</ulink> Chapter describes how to "
-#| "install swi-prolog on Etch."
 msgid ""
 "Regression: swi-prolog is not part of Etch, but was part of Sarge. The "
 "<ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/Etch/HowTo/"
@@ -11688,6 +11547,22 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "This image only works for KDE desktop installations.  If you want to "
+#~ "install other desktop options, use the netinst images or PXE installation."
+#~ msgstr ""
+#~ "Questa immagine installa solo il desktop KDE. Se si desidera installare "
+#~ "altri desktop, utilizzare le immagini netinst o l'installazione PXE."
+
+#~ msgid ""
+#~ "If you don't like the generated username you can select another username "
+#~ "offered in the drop-down box, but you do not have a free choice here in "
+#~ "the wizard."
+#~ msgstr ""
+#~ "Se non piace il nome utente generato è possibile selezionare un altro "
+#~ "nome utente visualizzato nell'elenco a discesa, anche se nella procedura "
+#~ "guidata non si può fare una scelta libera."
+
+#~ msgid ""
 #~ "Boot parameters available when installing from the netinstall CD image, "
 #~ "not when installing from the multi-arch image"
 #~ msgstr ""
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 2c09547..7596c2e 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-08-30 16:38-0400\n"
+"POT-Creation-Date: 2013-09-14 15:57+0300\n"
 "PO-Revision-Date: 2012-03-10 18:32+0100\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -754,10 +754,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>
@@ -1764,8 +1764,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
@@ -2154,12 +2154,6 @@ msgstr ""
 "deb http://security.debian.org/ etch/updates main \n"
 "deb http://ftp.skolelinux.org/skolelinux etch local\n"
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This image only works for KDE desktop installations.  If you want to install "
-"other desktop options, use the netinst images or PXE installation."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on CD installs"
 msgstr "En kommenar om CD-installasjon"
@@ -2583,57 +2577,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
@@ -2698,43 +2692,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
@@ -2765,29 +2759,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: Content of: <article><section><section><para>
 msgid "FIXME: screenshot 22 needs to be updated with new artwork."
@@ -3155,7 +3149,10 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard."
+"wizard. (If you want to be able to edit the proposed username, open "
+"<computeroutput>/etc/gosa/gosa.conf</computeroutput> with an editor and add "
+"<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> as an "
+"additional option to the \"location definition\".)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3572,8 +3569,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"
@@ -3583,8 +3580,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"
@@ -3605,8 +3602,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"
@@ -4128,8 +4125,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
@@ -5965,10 +5962,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>"
@@ -11213,8 +11210,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"
@@ -11237,8 +11234,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"
@@ -12501,8 +12498,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"
@@ -14829,13 +14826,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 ""
@@ -14847,8 +14844,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"
@@ -14856,8 +14853,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"
@@ -14873,8 +14870,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"
@@ -14882,8 +14879,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 e4207bb..8452cd1 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-08-30 16:38-0400\n"
+"POT-Creation-Date: 2013-09-14 15:57+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1592,12 +1592,6 @@ msgid ""
 "deb http://ftp.skolelinux.org/skolelinux wheezy local"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This image only works for KDE desktop installations.  If you want to install "
-"other desktop options, use the netinst images or PXE installation."
-msgstr ""
-
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on CD installs"
 msgstr ""
@@ -2319,7 +2313,10 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard."
+"wizard. (If you want to be able to edit the proposed username, open "
+"<computeroutput>/etc/gosa/gosa.conf</computeroutput> with an editor and add "
+"<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> as an "
+"additional option to the \"location definition\".)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 1d26dd6..64b03f4 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -670,8 +670,6 @@ FIXME: the source DVD download URL currently doesn't work
 </para><screen><![CDATA[deb http://ftp.debian.org/debian/ wheezy main 
 deb http://security.debian.org/ wheezy/updates main 
 deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
-<para>This image only works for KDE desktop installations.  If you want to install other desktop options, use the netinst images or PXE installation. 
-</para>
 </section>
 
 <section id="Installation--A_note_on_CD_installs">
@@ -940,10 +938,10 @@ FIXME: screenshot 22 needs to be updated with new artwork.
 <para>The most important thing to add is the template (newstudent or newteacher) and the full name of your user (see image). 
 </para></listitem>
 <listitem>
-<para>As you follow the wizard, you will see that GOsa² generates a username automatically based on the real name. It automatically chooses a username that doesn't exist yet, so multiple users with the same full name are not a problem.  Note that GOsa² can generate invalid usernames if the full name contains non-ASCII characters. 
+<para>As you follow the wizard, you will see that GOsa² generates a username automatically based on the real name. It automatically chooses a username that doesn't exist yet, so multiple users with the same full name are not a problem.  Note that GOsa² can generate invalid usernames if the full name contains non-ASCII characters.  
 </para></listitem>
 <listitem>
-<para>If you don't like the generated username you can select another username offered in the drop-down box, but you do not have a free choice here in the wizard.  
+<para>If you don't like the generated username you can select another username offered in the drop-down box, but you do not have a free choice here in the wizard. (If you want to be able to edit the proposed username, open <computeroutput>/etc/gosa/gosa.conf</computeroutput> with an editor and add <computeroutput>allowUIDProposalModification="true"</computeroutput> as an additional option to the "location definition".)  
 </para></listitem>
 <listitem>
 <para>When the wizard has finished, you are presented with the GOsa² screen for your new user object. Use the tabs at the top to check the completed fields. 
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 22e382f..34c12da 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 51a54a9..29dcd3b 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 69f48c1..f1cc497 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 6d50377..62146d1 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 9bb4a29..7774ddd 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-30 17:36+0300\n"
+"POT-Creation-Date: 2013-09-14 15:57+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"


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

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




More information about the debian-edu-commits mailing list