[debian-edu-commits] debian-edu/debian-edu-doc.git (#1530) - master (branch) updated: 1.5_20130706_7.1-10-gb2477bf

David Prévot taffit at alioth.debian.org
Sat Jul 13 23:43:47 UTC 2013


The branch, master has been updated
       via  b2477bf3004902311a8a58d703a58581def41cbe (commit)
      from  6dba9dc8eb23b7ac65d68131270a353da1804023 (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 b2477bf3004902311a8a58d703a58581def41cbe
Author: David Prévot <taffit at debian.org>
Date:   Sat Jul 13 19:42:53 2013 -0400

    tfix: spurious space (trivial unfuzzy)
    
    Git-Dch: Ignore

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

Summary of changes:
 .../debian-edu-wheezy-manual.da.po                 |    5 +-
 .../debian-edu-wheezy-manual.de.po                 |    5 +-
 .../debian-edu-wheezy-manual.es.po                 |    5 +-
 .../debian-edu-wheezy-manual.fr.po                 |  219 +-------------------
 .../debian-edu-wheezy-manual.it.po                 |   33 ++-
 .../debian-edu-wheezy-manual.nb.po                 |  149 +++++++------
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot |    5 +-
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml |    2 +-
 8 files changed, 102 insertions(+), 321 deletions(-)

The diff of changes is:
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index db94e7d..3e26495 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-07-09 20:37+0300\n"
+"POT-Creation-Date: 2013-07-13 19:39-0400\n"
 "PO-Revision-Date: 2013-02-15 11:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1104,8 +1104,7 @@ msgstr "eth0 er forbundet til hovednetværket (10.0.0.0/8),"
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-"192.168.1.0/24) ."
+"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
 msgstr "eth1 bruges for betjening af tynde klienter (192.168.0.0/24)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
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 29d5600..f7c991e 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-07-09 20:37+0300\n"
+"POT-Creation-Date: 2013-07-13 19:39-0400\n"
 "PO-Revision-Date: 2013-07-09 23:59+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1105,8 +1105,7 @@ msgstr "eth0 ist verbunden mit dem Hauptnetzwerk (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-"192.168.1.0/24) ."
+"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
 msgstr "eth1 bedient Thin Clients (192.168.0.0/24 oder 192.168.1.0/24)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
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 af01ed7..76e4f90 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-07-09 20:37+0300\n"
+"POT-Creation-Date: 2013-07-13 19:39-0400\n"
 "PO-Revision-Date: 2012-06-16 18:34-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1297,8 +1297,7 @@ msgstr "eth0 conectada a la red principal (10.0.0.0/8),"
 #, fuzzy
 #| msgid "eth1 is used for serving the thin-clients (192.168.0.0/24) ."
 msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-"192.168.1.0/24) ."
+"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
 msgstr "eth1 es usada para servir la red de clientes livianos (192.168.0.0/24)"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
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 d7c1d18..eaaa8a2 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-07-09 20:37+0300\n"
+"POT-Creation-Date: 2013-07-13 19:39-0400\n"
 "PO-Revision-Date: 2013-07-13 19:32-0400\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -25,17 +25,14 @@ msgid "en"
 msgstr "fr"
 
 #. type: Content of: <article><articleinfo><title>
-#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
 msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
 msgstr "Manuel de Debian Edu / Skolelinux Wheezy 7.1+edu0"
 
 #. type: Content of: <article><section><title>
-#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgid "Manual for Debian Edu 7.1+edu0 Codename Wheezy"
 msgstr "Manuel de Debian Edu 7.1+edu0 nom de code 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"
 
@@ -44,7 +41,6 @@ msgid "Debian Edu login"
 msgstr "Connexion à Debian Edu"
 
 #. type: Content of: <article><section><para>
-#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
 msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
 msgstr "Voici le manuel de la version de Debian Edu Wheezy 7.1+edu0"
 
@@ -287,9 +283,6 @@ msgstr ""
 "directement avec PXE depuis le serveur LTSP."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "DHCPD on the LTSP servers only serves a dedicated 192.168.0.0/24 network "
-#| "on the second interface and should seldom need to be changed."
 msgid ""
 "DHCPD on the LTSP servers only serves a dedicated network on the second "
 "interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) and "
@@ -949,10 +942,6 @@ msgstr ""
 "peuvent également être amorcés à partir de clés USB."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The aim is to be able to install a server from a CD/DVD type medium once, "
-#| "and install all other clients over the network by booting from the "
-#| "network."
 msgid ""
 "The aim is to be able to install a server from any type medium once, and "
 "install all other clients over the network by booting from the network."
@@ -1135,10 +1124,8 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 reliée au réseau principal (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "eth1 is used for serving the thin-clients (192.168.0.0/24) ."
 msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-"192.168.1.0/24) ."
+"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
 msgstr ""
 "eth1 est utilisée pour servir les clients légers (192.168.0.0/24 ou "
 "192.168.1.0/24)."
@@ -1449,9 +1436,6 @@ msgstr ""
 "d'installation</ulink>."
 
 #. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy"
-#| "\""
 msgid ""
 "Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr ""
@@ -1477,9 +1461,6 @@ msgstr ""
 "machines i386 et amd64 est disponible :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
 "edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
@@ -1488,9 +1469,6 @@ msgstr ""
 "edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
-#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
 "CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
@@ -1499,9 +1477,6 @@ msgstr ""
 "CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
@@ -1530,9 +1505,6 @@ msgstr ""
 "utilisant FTP, HTTP ou rsync :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
 "edu-7.1+edu0~a3-USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
@@ -1541,9 +1513,6 @@ msgstr ""
 "edu-7.1+edu0~a3-USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
-#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
 "USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
@@ -1552,9 +1521,6 @@ msgstr ""
 "USB.iso\">debian-edu-7.1+edu0~a3-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-7.1+edu0~a3-USB.iso|debian-edu-7.1+edu0~a3-USB.iso </computeroutput>"
@@ -1577,9 +1543,6 @@ msgid "The source DVD is available via"
 msgstr "Les sources sont disponibles :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
 "source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
@@ -1588,9 +1551,6 @@ msgstr ""
 "source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
 "source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
@@ -1599,10 +1559,6 @@ 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/debian-"
-#| "edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</"
-#| "computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
 "source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
@@ -1611,7 +1567,6 @@ msgstr ""
 "source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Request a CD/DVD by mail"
 msgid "Request a CD / DVD by mail"
 msgstr "Demande d'un CD ou DVD par courrier"
 
@@ -1661,7 +1616,6 @@ msgid "Select type of installation"
 msgstr "Choisir un type d'installation"
 
 #. 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"
 
@@ -1718,7 +1672,6 @@ msgstr ""
 "utiliser l'installateur"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:Installer_advanced_options_a.png]"
 msgid "./images/Installer_advanced_options_a.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
@@ -1782,7 +1735,6 @@ msgstr ""
 "fichier de configuration."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:Installer_advanced_options_b.png]"
 msgid "./images/Installer_advanced_options_b.png"
 msgstr "./images/Installer_advanced_options_b.png"
 
@@ -1843,7 +1795,6 @@ msgstr ""
 "besoin d'un fichier de configuration."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/alert.png"
 msgid "./images/Installer_help.png"
 msgstr "./images/Installer_help.png"
 
@@ -1885,9 +1836,6 @@ msgstr ""
 "machines x86 64 bits et installgui sur les machines 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 multi-architecture DVD, "
-#| "that 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>."
@@ -1904,11 +1852,6 @@ msgstr ""
 "computeroutput> pour activer la version graphique sur amd64."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "If you want to boot the i386 mode with the multi-arch 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> "
@@ -1950,12 +1893,6 @@ msgstr ""
 "de l’image multiarchitecture"
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
@@ -1967,11 +1904,6 @@ msgstr ""
 "d'initialisation du noyau."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
@@ -1982,11 +1914,6 @@ msgstr ""
 "d'initialisation du noyau."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
@@ -2296,9 +2223,6 @@ msgstr ""
 "deb http://ftp.skolelinux.org/skolelinux wheezy local"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "The DVD only works with KDE desktop installations.  If you want to "
-#| "install other desktop options, use the netinst images or PXE installation."
 msgid ""
 "This image only works for KDE desktop installations.  If you want to install "
 "other desktop options, use the netinst images or PXE installation."
@@ -2453,7 +2377,6 @@ msgstr ""
 "\"strong\">Serveur principal</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"
 
@@ -2472,7 +2395,6 @@ msgstr ""
 "clients légers</emphasis> :"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment: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"
 
@@ -2558,16 +2480,6 @@ msgstr ""
 "manuel d'installation."
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "To disable or change the use of the proxy when installing via PXE, the "
-#| "lines containing <computeroutput>mirror/http/proxy</computeroutput>, "
-#| "<computeroutput>mirror/ftp/proxy</computeroutput> and "
-#| "<computeroutput>preseed/early_command</computeroutput> in "
-#| "<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
-#| "computeroutput> need to be changed.  To disable the use of a proxy when "
-#| "installing, put '#' in front of the first two lines, and remove the "
-#| "\"<computeroutput>export xhttp_proxy=\"http://webcache:3128\"; </"
-#| "computeroutput>\" part from the last one."
 msgid ""
 "To disable or change the use of the proxy when installing via PXE, the lines "
 "containing <computeroutput>mirror/http/proxy</computeroutput>, "
@@ -2677,7 +2589,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"
 
@@ -2686,7 +2597,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"
 
@@ -2695,7 +2605,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"
 
@@ -2704,7 +2613,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"
 
@@ -2713,7 +2621,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"
 
@@ -2722,7 +2629,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"
 
@@ -2731,7 +2637,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"
 
@@ -2740,7 +2645,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"
 
@@ -2749,7 +2653,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"
 
@@ -2758,7 +2661,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"
 
@@ -2767,7 +2669,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"
 
@@ -2776,7 +2677,6 @@ 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 "12a-Set_up_users_and_passwords.png"
 msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
@@ -2785,7 +2685,6 @@ 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 "12b-Set_up_users_and_passwords.png"
 msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "./images/12b-Set_up_users_and_passwords.png"
 
@@ -2794,7 +2693,6 @@ 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 "12c-Set_up_users_and_passwords.png"
 msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "./images/12c-Set_up_users_and_passwords.png"
 
@@ -2811,7 +2709,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 "./images/alert.png"
 msgid "./images/12e-creating_ext4.png"
 msgstr "./images/12e-creating_ext4.png"
 
@@ -2820,7 +2717,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"
 
@@ -2829,7 +2725,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"
 
@@ -2838,7 +2733,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"
 
@@ -2847,7 +2741,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"
 
@@ -2856,7 +2749,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"
 
@@ -2865,7 +2757,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"
 
@@ -2874,7 +2765,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"
 
@@ -2883,7 +2773,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"
 
@@ -2898,7 +2787,6 @@ msgid "tjener KDM Login"
 msgstr "23-Tjener-KDM_Login.png"
 
 #. 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"
 
@@ -2907,7 +2795,6 @@ msgid "KDE starting..."
 msgstr ""
 
 #. 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"
 
@@ -2916,7 +2803,6 @@ msgid "KDE and Browser"
 msgstr ""
 
 #. 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"
 
@@ -2927,12 +2813,10 @@ msgid "KDE Desktop"
 msgstr "Bureaux distants"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "[attachment: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"
 
@@ -2943,7 +2827,6 @@ msgid "Diskless Workstation Login"
 msgstr "Stations de travail sans disque dur"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "30-ThinClient-LDM_Login.png"
 msgid "./images/30-ThinClient-LDM_Login.png"
 msgstr "./images/30-ThinClient-LDM_Login.png"
 
@@ -2954,7 +2837,6 @@ msgid "Thin Client Login"
 msgstr "Clients légers"
 
 #. 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"
 
@@ -3029,7 +2911,6 @@ msgstr ""
 "d'astuces et de réponses à des questions courantes."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Debian Edu desktop"
 msgid "Debian Edu KDE desktop"
 msgstr "bureau Debian Edu KDE"
 
@@ -3135,7 +3016,6 @@ msgid "GOsa² Login plus Overview"
 msgstr "Connexion à GOsa² et aperçu"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/smile.png"
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
 
@@ -3195,13 +3075,6 @@ msgstr ""
 "données LDAP du serveur principal 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, 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 "
@@ -3366,7 +3239,6 @@ msgid "Search, modify and delete users"
 msgstr "Rechercher, modifier et supprimer des utilisateurs"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/smile.png"
 msgid "./images/filterbox.png"
 msgstr "./images/filterbox.png"
 
@@ -3430,7 +3302,6 @@ msgstr ""
 "modifier la liste des groupes auxquels il appartient."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/smile.png"
 msgid "./images/edit_user.png"
 msgstr "./images/edit_user.png"
 
@@ -3495,7 +3366,6 @@ msgstr ""
 "par vous-même."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:change_password_administratively.png]"
 msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
@@ -3516,16 +3386,6 @@ msgid "Advanced user management"
 msgstr "Gestion avancée des utilisateurs"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "It is possible to mass-create users with GOsa² by using a CSV file, which "
-#| "can be created with any good spreadsheet software (for example "
-#| "<computeroutput>oocalc</computeroutput>). At least, entries for the "
-#| "following fields have to be provided: uid, last name (sn) and first name "
-#| "(givenName). Make sure that there are no duplicate entries in the uid "
-#| "field. Please note that the check for duplicates must include already "
-#| "existing uid entries in LDAP (which could be obtained by executing "
-#| "<computeroutput>getent passwd | grep tjener/home | cut -d\":\" -f1</"
-#| "computeroutput> on the command line)."
 msgid ""
 "It is possible to mass-create users with GOsa² by using a CSV file, which "
 "can be created with any good spreadsheet software (for example "
@@ -3627,7 +3487,6 @@ msgid "Group Management with GOsa²"
 msgstr "Gestion des groupes avec GOsa²"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/alert.png"
 msgid "./images/create_group.png"
 msgstr "./images/create_group.png"
 
@@ -3636,7 +3495,6 @@ msgid "create group"
 msgstr "Créer un groupe"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/smile.png"
 msgid "./images/list_groups.png"
 msgstr "./images/list_groups.png"
 
@@ -3833,16 +3691,6 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-#| msgid ""
-#| "root at tjener:~# sitesummary2ldapdhcp -a\n"
-#| "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-#| "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-#| "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
-#| "\n"
-#| "Enter password if you want to activate these changes, and ^c to abort.\n"
-#| "\n"
-#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-#| "enter password: █"
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
 "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
@@ -3861,7 +3709,6 @@ msgstr ""
 "enter password:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:gosa_systems_list.png]"
 msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
@@ -3870,7 +3717,6 @@ msgid "GOsa² systems listing"
 msgstr "Liste des systèmes dans GOsa²"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:gosa_systems_host_details.png]"
 msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
@@ -3879,7 +3725,6 @@ msgid "Host details"
 msgstr "Renseignements sur le système"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:gosa_systems_edit_host.png]"
 msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
@@ -3888,7 +3733,6 @@ msgid "Modify host"
 msgstr "Modification du système"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:gosa_systems_add_netgroup.png]"
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
@@ -4401,7 +4245,6 @@ msgstr ""
 "dernier instantané à garder :"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "[attachment:slbackup-php_maintenance.png]"
 msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
@@ -5245,9 +5088,6 @@ msgstr ""
 "resize2fs /dev/vg_system/skole+tjener+home0"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "To extend home0 <emphasis role=\"strong\">by</emphasis> 30G, you insert a "
-#| "'+' (-L+30G)"
 msgid "To extend home0 by additional 30G, you insert a '+' (-L+30G)"
 msgstr "Pour ajouter 30 Gio à home0, insérez un « + » (-L+30G)"
 
@@ -5329,9 +5169,6 @@ msgstr ""
 "<computeroutput>add</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
-#| "Be careful and don't mess up the LDAP database, same applies for jxplorer."
 msgid ""
 "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
 "careful and don't mess up the LDAP database, same warning applies for "
@@ -5342,7 +5179,6 @@ msgstr ""
 "données LDAP. Le même avertissement s'applique à JXplorer."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "jxplorer, an LDAP GUI"
 msgid "JXplorer, an LDAP GUI"
 msgstr "JXplorer, une interface graphique à LDAP"
 
@@ -5505,10 +5341,6 @@ msgid "Upgrading with a CD or similar image"
 msgstr "Mettre à jour avec un CD ou DVD"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If you want to upgrade from one version to another (for example from "
-#| "Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only "
-#| "physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Wheezy "
 "7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
@@ -5679,10 +5511,6 @@ msgid "Easy access to USB drives and CDROMs/DVDs"
 msgstr "Accès facile aux disques USB et aux CD et DVD"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "When users insert a USB drive or DVD/CDROM into a (diskless) workstation, "
-#| "a popup window appears asking what to do with it, just like in any other "
-#| "normal installation."
 msgid ""
 "When users insert a USB drive or a DVD / CDROM into a (diskless) "
 "workstation, a popup window appears asking what to do with it, just like in "
@@ -5693,12 +5521,6 @@ msgstr ""
 "faire avec, comme dans toute autre installation."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "When users insert a USB drive or DVD/CDROM into a thin client there is "
-#| "only a notify-window showing up for a few seconds. The media is "
-#| "automatically mounted and it is possible to access it browsing to the /"
-#| "media/$user folder. This is quite difficult for many non experienced "
-#| "users."
 msgid ""
 "When users insert a USB drive or a DVD / CDROM into a thin client there is "
 "only a notify-window showing up for a few seconds. The media is "
@@ -5729,12 +5551,6 @@ msgstr ""
 "le bureau permettant un accès facile)."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "In addition the following script could be used to create the symlink "
-#| "\"media\" for all users in their home folder for easy access to USB "
-#| "drives, CDROM/DVD or whatever media is connected to the thin client. This "
-#| "might come in handy if users want to edit files directly on their plugged "
-#| "in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
 "\" for all users in their home folder for easy access to USB drives, CDROM / "
@@ -7477,7 +7293,6 @@ msgstr "Finalement, veuillez redémarrer KDM en lançant :"
 
 #. type: CDATA
 #, no-wrap
-#| msgid "sudo invoke-rc.d kdm restart"
 msgid "sudo service kdm restart"
 msgstr "sudo service kdm restart"
 
@@ -7486,7 +7301,6 @@ msgid "Connecting Windows machines to the network / Windows integration"
 msgstr "Connexion de machines Windows au réseau / intégration de Windows"
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Joining the domain"
 msgid "Joining a domain"
 msgstr "Rejoindre un domaine"
 
@@ -7564,9 +7378,6 @@ msgstr ""
 "             comment=\"Tous les élèves de l'école\""
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "FIXME: would it be better to explain user groups in Windows first with "
-#| "GOsa², and then with an example for the command line?"
 msgid ""
 "FIXME: it would be even better to first/also explain user groups for Windows "
 "with GOsa² (and then show an example for the command line)"
@@ -8001,9 +7812,6 @@ msgid "Redirecting using global policies"
 msgstr "Redirection à l'aide de stratégies globales"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "FIXME explain how to use profiles from global policies for Windows "
-#| "machines in the skolelinux network"
 msgid ""
 "FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
@@ -9294,9 +9102,6 @@ msgid "New features in Debian Edu Wheezy"
 msgstr "Nouvelles fonctionnalités dans Debian Edu Wheezy"
 
 #. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released "
-#| "2013-??-??"
 msgid ""
 "New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-??-??"
 msgstr ""
@@ -9340,7 +9145,6 @@ msgid "Software updates"
 msgstr "Mises à jour des logiciels"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Everything which is new in Debian Wheezy, eg:"
 msgid "Everything which is new in Debian Wheezy 7.1, eg:"
 msgstr "Toutes les nouveautés de Debian Wheezy 7.1, comme par exemple :"
 
@@ -9349,9 +9153,6 @@ msgid "Linux kernel 3.2.x"
 msgstr "Noyau Linux version 3.2.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
-#| "installed by default; to choose GNOME or LXDE: see manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
 "0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
@@ -9362,7 +9163,6 @@ msgstr ""
 "le manuel)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Web browser Iceweasel 10 ESR"
 msgid "Web browser Iceweasel 17 ESR"
 msgstr "Navigateur web Iceweasel 17 ESR"
 
@@ -9411,11 +9211,6 @@ msgid "Debian Wheezy includes about 37000 packages available for installation."
 msgstr "Debian Wheezy contient environ 37 000 paquets prêts à être installés."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "More information about Debian Wheezy 7.0 is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
-#| "installmanual\">installation manual</ulink>."
 msgid ""
 "More information about Debian Wheezy 7.1 is provided in the <ulink url="
 "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
@@ -9432,9 +9227,6 @@ msgid "Documentation and translation updates"
 msgstr "Mises à jour des documentations et des traductions"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Translation updates for the templates used in the installer. These "
-#| "templates are now available in 28 languages."
 msgid ""
 "Translation updates for the templates used in the installer. These templates "
 "are now available in 29 languages."
@@ -9770,7 +9562,7 @@ msgstr ""
 "langue s'il n'existe pas déjà et comment mettre à jour les traductions."
 
 #.  <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 "
@@ -9818,7 +9610,6 @@ msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr "Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la licence GPL."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr "Manuel de Debian Edu 7.1+edu0 nom de code « Wheezy »"
 
@@ -10846,10 +10637,6 @@ msgstr ""
 "ajouté au groupe <computeroutput>teachers</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The <computeroutput>.iso</computeroutput> images can directly be copied "
-#| "onto USB sticks, for example by using <computeroutput>dd</computeroutput> "
-#| "or even <computeroutput>cat</computeroutput>.."
 msgid ""
 "The <computeroutput>.iso</computeroutput> images can directly be copied onto "
 "USB flash drives, for example by using <computeroutput>dd</computeroutput> "
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 b0d1468..1338488 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-07-09 20:37+0300\n"
+"POT-Creation-Date: 2013-07-13 19:39-0400\n"
 "PO-Revision-Date: 2013-05-12 17:17+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -1105,8 +1105,7 @@ msgstr "eth0 connessa alla rete principale (10.0.0.0/8)"
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-"192.168.1.0/24) ."
+"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
 msgstr "eth1 è usata peri thin-clients (192.168.0.0/24) ."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -6612,8 +6611,8 @@ msgid ""
 msgstr ""
 "Il valore di default è definito 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 ""
@@ -15768,13 +15767,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 ""
@@ -15786,8 +15785,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"
@@ -15795,8 +15794,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"
@@ -15813,8 +15812,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"
@@ -15822,8 +15821,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 df22103..de920cd 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-07-09 20:37+0300\n"
+"POT-Creation-Date: 2013-07-13 19:39-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"
@@ -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>
@@ -1070,8 +1070,7 @@ msgstr "eth0 koblet til hovednettverket (10.0.2.0/23)"
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-"192.168.1.0/24) ."
+"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
 msgstr "eth1 brukes for å dele ut tynnklientnettet (192.168.0.0/24)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1764,8 +1763,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
@@ -2589,57 +2588,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
@@ -2704,43 +2703,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
@@ -2771,29 +2770,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"
@@ -3589,8 +3588,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"
@@ -3600,8 +3599,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"
@@ -3622,8 +3621,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"
@@ -4145,8 +4144,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
@@ -5902,10 +5901,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>"
@@ -11105,8 +11104,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"
@@ -11129,8 +11128,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"
@@ -12393,8 +12392,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"
@@ -14721,13 +14720,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 ""
@@ -14739,8 +14738,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"
@@ -14748,8 +14747,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"
@@ -14765,8 +14764,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"
@@ -14774,8 +14773,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 7e1dea0..386ddd1 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-07-09 20:37+0300\n"
+"POT-Creation-Date: 2013-07-13 19:39-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"
@@ -806,8 +806,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-"192.168.1.0/24) ."
+"eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24)."
 msgstr ""
 
 #. type: Content of: <article><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 6a1202e..9b14077 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -315,7 +315,7 @@
 <para>eth0 is connected to the main network (10.0.0.0/8), 
 </para></listitem>
 <listitem>
-<para>eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24) . 
+<para>eth1 is used for serving the thin-clients (192.168.0.0/24 or 192.168.1.0/24). 
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para>Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients. 


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