[debian-edu-commits] debian-edu/ 01/01: Updated wheezy manual and images from the wiki.

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Sun Jun 22 09:21:07 UTC 2014


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

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

commit 607fd38b0ec74a765dec5504c86dc846350e9d92
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Jun 22 11:20:14 2014 +0200

    Updated wheezy manual and images from the wiki.
---
 .../debian-edu-wheezy-manual.nb.po                 |  187 +-
 .../debian-edu-wheezy-manual.nl.po                 |  148 +-
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 3260 ++++++--------------
 .../debian-edu-wheezy/images/de/worldmap.png       |  Bin 386972 -> 386969 bytes
 .../debian-edu-wheezy/images/es/worldmap.png       |  Bin 387077 -> 387075 bytes
 .../debian-edu-wheezy/images/fr/worldmap.png       |  Bin 387015 -> 387012 bytes
 .../debian-edu-wheezy/images/worldmap.png          |  Bin 387010 -> 387007 bytes
 7 files changed, 962 insertions(+), 2633 deletions(-)

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 cd9d773..27387f0 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2014-05-11 00:07+0300\n"
+"POT-Creation-Date: 2014-05-29 19:55+0300\n"
 "PO-Revision-Date: 2014-06-15 16:48+0200\n"
 "Last-Translator: Ole-Erik Yrvin <oeyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -188,15 +188,6 @@ msgid "The Debian Edu network topology"
 msgstr "Krav for nettverksoppsett"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The figure is a sketch of the assumed network topology. The default setup "
-#| "of a Skolelinux network assumes that there is one (and only one) main-"
-#| "server, while allowing the inclusion of both normal workstations and thin-"
-#| "client-servers (with associated thin-clients). The number of workstations "
-#| "can be as large or small as you want (starting from none to a lot). The "
-#| "same goes for the thin-client servers, each of which is on a separate "
-#| "network so that the traffic between the thin-clients and the thin-client "
-#| "server doesn't affect the rest of the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
@@ -1860,8 +1851,8 @@ msgid ""
 "parameter."
 msgstr ""
 "Du kan bruke en eksisterende HTTP mellomtjener i nettverket for å fremskynde "
-"installasjonen av profilen til hovedserveren fra CD-en. Legg til <"
-"computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> som "
+"installasjonen av profilen til hovedserveren fra CD-en. Legg til "
+"<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> som "
 "et ekstra oppstartsparameter."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -1871,8 +1862,8 @@ msgid ""
 "installations should be done via PXE, as this will automatically use the "
 "proxy of the main server."
 msgstr ""
-"Hvis du allerede har installert profilen til hovedtjeneren på en maskin, skal "
-"videre installasjoner gjøres  via PXE, da denne automatisk vil bruke "
+"Hvis du allerede har installert profilen til hovedtjeneren på en maskin, "
+"skal videre installasjoner gjøres  via PXE, da denne automatisk vil bruke "
 "hovedtjenerens mellomlager."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -1924,9 +1915,9 @@ msgid ""
 "least two network cards (NICs) if you plan on setting up a thin client "
 "server."
 msgstr ""
-"Husk  <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Requi"
-"rements\">systemkrav</ulink> og pass på at du har minst to nettverkskort "
-"(NICer) hvis du planlegger å sette opp en tynnklient."
+"Husk  <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/"
+"Requirements\">systemkrav</ulink> og pass på at du har minst to "
+"nettverkskort (NICer) hvis du planlegger å sette opp en tynnklient."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a language (for the installation and the installed system)"
@@ -2084,12 +2075,13 @@ msgstr ""
 "tynnklient</emphasis> er forhåndsvalgt. Disse profilene kan være installert "
 "sammen på en maskin hvis du ønsker å installere en såkalt <emphasis> "
 "kombinert hovedtjener</emphasis>. Da vil hovedtjeneren både vil være en "
-"tynnklient, og bli brukt som en arbeidsstasjon. Dette er forhåndsvalgt, fordi "
-"vi regner med at de fleste senere vil installere dette <link "
-"linkend=\"Installation--installation_over_the_network_.28PXE.29_and_booting_di"
-"skless_clients\">via PXE</link>. Vær oppmerksom på at du må ha to "
-"nettverkskort installert i en maskin som skal gjøres til en kombinert "
-"hovedtjener om den skal komme til nytte etter installasjon. "
+"tynnklient, og bli brukt som en arbeidsstasjon. Dette er forhåndsvalgt, "
+"fordi vi regner med at de fleste senere vil installere dette <link linkend="
+"\"Installation--"
+"installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
+"PXE</link>. Vær oppmerksom på at du må ha to nettverkskort installert i en "
+"maskin som skal gjøres til en kombinert hovedtjener om den skal komme til "
+"nytte etter installasjon. "
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -2103,10 +2095,10 @@ msgid ""
 msgstr ""
 "Etter installasjonen kan rekkefølgen for nettverkskortene avvike fra "
 "oppsettet under installasjonen. Den ønskede rekkefølgen kan oppnås ved å "
-"redigere  "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>. "
-"Vanligvis.  <emphasis>hvis det skjer</emphasis>, kan du erstatte eth0 med "
-"eth1 og eth1 med eth0. Omstart må til for å at endringene skal tre i kraft."
+"redigere  <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+"computeroutput>. Vanligvis.  <emphasis>hvis det skjer</emphasis>, kan du "
+"erstatte eth0 med eth1 og eth1 med eth0. Omstart må til for å at endringene "
+"skal tre i kraft."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
@@ -2164,8 +2156,8 @@ msgid ""
 "accepted by the installer)."
 msgstr ""
 "Passordet for denne brukeren <emphasis role=\"strong\">må</emphasis> ha en "
-"lengde på <emphasis role=\"strong\">minst fem 5 tegn </emphasis> - ellers vil "
-"ikke innlogging være mulig (selv om et kortere passord er godkjent av "
+"lengde på <emphasis role=\"strong\">minst fem 5 tegn </emphasis> - ellers "
+"vil ikke innlogging være mulig (selv om et kortere passord er godkjent av "
 "installereren)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2193,9 +2185,9 @@ msgstr ""
 "Sannsynligvis vil du kanskje bruke \"Roaming workstation\"-profilen (se "
 "ovenfor). Vær oppmerksom på at alle data er lagret lokalt (så vær ekstra "
 "oppmerksom på å ta sikkerhetskopier) og påloggingsinformasjonen blir lagret "
-"(så etter en endring i passord, kan pålogginger kreve ditt gamle passord hvis "
-"du ikke har knyttet din bærbare til nettverket og logget inn med det nye "
-"passordet."
+"(så etter en endring i passord, kan pålogginger kreve ditt gamle passord "
+"hvis du ikke har knyttet din bærbare til nettverket og logget inn med det "
+"nye passordet."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
@@ -2244,11 +2236,12 @@ msgid ""
 msgstr ""
 "En netinst installasjon (som er den type installasjon vår CD gir) vil hente "
 "noen pakker fra CD-en og de øvrige fra nettet.  Mengden av pakker fra nettet "
-"vil varier fra profil til profil med holder seg under en gigabyte (med mindre "
-"du velger å installere alle skrivebordalternativene). Når du har installert "
-"hovedtjeneren (enten det er en ren hovedtjener eller en kombinasjonstjener "
-"har ikke betydning), vil videre installasjon bruke sin mellomtjener til å "
-"unngå til å laste ned den samme pakken flere ganger fra nettet."
+"vil varier fra profil til profil med holder seg under en gigabyte (med "
+"mindre du velger å installere alle skrivebordalternativene). Når du har "
+"installert hovedtjeneren (enten det er en ren hovedtjener eller en "
+"kombinasjonstjener har ikke betydning), vil videre installasjon bruke sin "
+"mellomtjener til å unngå til å laste ned den samme pakken flere ganger fra "
+"nettet."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on thin-client-server installations"
@@ -3603,10 +3596,8 @@ msgstr ""
 #. type: CDATA
 #, no-wrap
 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"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
@@ -4237,9 +4228,9 @@ msgstr "Munin"
 #, fuzzy
 msgid ""
 "The Munin trend reporting system is available from <ulink url=\"https://www/"
-"munin/\"/>. It provides system status measurement graphs on a daily, weekly, "
-"monthly and yearly basis, and provides the system administrator with help "
-"when looking for bottlenecks and the source of system problems."
+"munin/\"/>.  It provides system status measurement graphs on a daily, "
+"weekly, monthly and yearly basis, and provides the system administrator with "
+"help when looking for bottlenecks and the source of system problems."
 msgstr ""
 "Trendrapportsystemet Munin er tilgjengelig fra <ulink url=\"https://www/"
 "munin/\"/>. Det viser grafer for systemstatus på en daglig, ukentlig, "
@@ -5307,8 +5298,7 @@ msgstr "Bruk av backports.org"
 #. type: CDATA
 #, fuzzy, no-wrap
 msgid ""
-"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt "
-"sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
 "apt-get update"
 msgstr "deb http://ftp.debian.org/debian/ squeeze main contrib non-free"
 
@@ -5927,8 +5917,7 @@ msgid ""
 "        chown $user:$group $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 "    else\n"
-"        echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
 " echo \"$created_dir folders have been created\""
@@ -5948,8 +5937,7 @@ msgstr ""
 "        chown $user:$group $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 " else\n"
-"  . echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"  . echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 " . fi\n"
 "done\n"
 "echo \"$created_dir folders has been created\""
@@ -6024,20 +6012,17 @@ msgid ""
 "        ln -s /media/$home $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 "    else\n"
-"        echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
 " echo \"$created_dir folders has been created\""
 msgstr ""
-"home_path=\"/skole/tjener/home0\"; shared_folder=\"Media\"; "
-"permissions=\"775\"; created_dir=0;\n"
+"home_path=\"/skole/tjener/home0\"; shared_folder=\"Media\"; permissions=\"775\"; created_dir=0;\n"
 "for home in $(ls $home_path); do\n"
 "  if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
 "    ln -s /media/$home $home_path/$home/$shared_folder ((created_dir+=1))\n"
 "  else\n"
-"    echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"    echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "  fi\n"
 "done\n"
 "echo \"$created_dir folders has been created\""
@@ -6174,8 +6159,7 @@ msgid ""
 "add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "    objectClass: automount\n"
 "    cn: nas-server\n"
-"    automountInformation: -fstype=autofs --timeout=60 "
-"ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "\n"
 "    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "    objectClass: top\n"
@@ -6185,8 +6169,7 @@ msgid ""
 "    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "    objectClass: automount\n"
 "    cn: /\n"
-"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard"
-",nodev,nosuid,noatime nas-server.intern:/&"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -6368,10 +6351,8 @@ msgid ""
 "apt-get install debian-keyring\n"
 "# fetch the deb-multimedia key insecurely:\n"
 "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT "
-"if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && "
-"gpg --export 1F41B907 | apt-key add -\n"
+"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
 "echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
@@ -6381,12 +6362,9 @@ msgstr ""
 "aptitude install debian-keyring\n"
 "# hent deb-multimedianøkkelen usikret:\n"
 "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# sjekk sikkert om nøkkelen er korrekt og legg den til nøkkelingen apt "
-"benytter hvis den er det:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && "
-"gpg --export 1F41B907 | apt-key add -\n"
-"# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for "
-"speil!\n"
+"# sjekk sikkert om nøkkelen er korrekt og legg den til nøkkelingen apt benytter hvis den er det:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for speil!\n"
 "echo \"deb http://deb-multimedia.org squeeze main\" >> /etc/apt/sources.list\n"
 "# oppdater listen over tilgjengelige pakker:\n"
 "aptitude update"
@@ -6708,6 +6686,16 @@ msgstr ""
 "verdier er tilgjengelig i <computeroutput>/etc/debian-edu/www/debian-edu-"
 "install.dat</computeroutput>."
 
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+msgid ""
+"More information about modifying PXE installations can be found in the <link "
+"linkend=\"Installation--Modifying_PXE_installations\">Installation</link> "
+"chapter."
+msgstr ""
+"Mer info om nettverksklienter kan man finne i avsnittet <link linkend="
+"\"NetworkClients\">nettverksklienter</link>"
+
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
 msgid "Adding a custom repository for PXE installations"
@@ -6726,8 +6714,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "#add the skole projects local repository\n"
-"d-i     apt-setup/local1/repository string      http://example.org/debian "
-"stable main contrib non-free\n"
+"d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
 "d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
 "d-i     apt-setup/local1/key    string          http://example.org/key.asc"
@@ -6774,12 +6761,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
-msgstr ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -6792,12 +6775,8 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
-msgstr ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -6866,10 +6845,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img "
-"nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet "
-"ipappend 2"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7377,8 +7353,7 @@ msgstr ""
 #. type: CDATA
 #, fuzzy, no-wrap
 msgid ""
-"ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it "
-"also prevents daemons from being started\n"
+"ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
@@ -8871,8 +8846,7 @@ msgstr ""
 #. type: CDATA
 #, fuzzy, no-wrap
 msgid ""
-"# move the tar.gz file to a repository directory on the school network's "
-"webroot (by default located on tjener):\n"
+"# move the tar.gz file to a repository directory on the school network's webroot (by default located on tjener):\n"
 "root at tjener:~# \n"
 "mkdir /etc/debian-edu/www/debian\n"
 "mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -8881,8 +8855,7 @@ msgid ""
 "# extract the file\n"
 "root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
 msgstr ""
-"# Flytte tar.gz fil til en depotkatalog på skolens nettverketswebroot (som "
-"standard plassert på tjener):\n"
+"# Flytte tar.gz fil til en depotkatalog på skolens nettverketswebroot (som standard plassert på tjener):\n"
 "root @ tjener: ~ #\n"
 "mkdir /etc/debian-edu/www/debian\n"
 "mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -8911,14 +8884,12 @@ msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,sma"
-"rt-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,sma"
-"rt-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -8992,18 +8963,14 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-galle"
-"rysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-prod"
-"uct-drivers"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 "ltsp-chroot -a i386 wget http://www/debian/swbuild.asc\n"
 "ltsp-chroot -a i386 apt-key add swbuild.asc\n"
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-galle"
-"rysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-prod"
-"uct-drivers"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -9823,8 +9790,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
-"version."
+"2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "Den italienske oversettelsen er gjort av Claudio Carboncini med opphavsrett "
 "2007 og er utgitt under GPL2 eller senere versjoner."
@@ -10010,7 +9977,7 @@ msgstr ""
 "språk, hvis det ikke finnes allerede, og hvordan oppdatere oversettelser."
 
 #.  <remark>
-#. status ignore</remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
@@ -10054,10 +10021,8 @@ msgstr "Vedlegg A - GNU Generell Offentlig Lisens"
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"Note to translators: there is no need to translate the GPL license text."
-msgstr ""
-"Note to translators: there is no need to translate the GPL license text."
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note to translators: there is no need to translate the GPL license text."
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
index f9f447f..3aac264 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-05-11 00:07+0300\n"
+"POT-Creation-Date: 2014-05-29 19:55+0300\n"
 "PO-Revision-Date: 2014-06-05 23:54+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -2247,12 +2247,6 @@ msgid "A note on thin-client-server installations"
 msgstr "Een noot bij installaties van thin-clientservers"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "First of all, this profile name is confusing for historic reasons. "
-#| "Currently this profile actually installs an LTSP server environment for "
-#| "thin-clients and for workstations. Debian bug <ulink url=\"http://bugs."
-#| "debian.org/588510#\">588510</ulink> has been filed to change the name of "
-#| "the profile into a better suited one."
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
@@ -4021,9 +4015,6 @@ msgid "Updating the software"
 msgstr "Programmatuur bijwerken"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This section explains how to use <computeroutput>aptitude upgrade</"
-#| "computeroutput>."
 msgid ""
 "This section explains how to use <computeroutput>apt-get upgrade</"
 "computeroutput>."
@@ -4032,13 +4023,6 @@ msgstr ""
 "computeroutput> uit."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Using <computeroutput>aptitude</computeroutput> is really simply. To "
-#| "update a system you need to execute two commands on the command line as "
-#| "root: <computeroutput>aptitude update</computeroutput> (which updates the "
-#| "lists of available packages) and <computeroutput>aptitude upgrade</"
-#| "computeroutput> (which upgrades the packages for which an upgrade is "
-#| "available)."
 msgid ""
 "Using <computeroutput>apt-get</computeroutput> is really simply. To update a "
 "system you need to execute two commands on the command line as root: "
@@ -4109,12 +4093,6 @@ msgstr ""
 "regelmatig leest."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
-#| "email about any packages that can be upgraded. It does not install these "
-#| "upgrades, but does download them (usually in the night), so you don't "
-#| "have to wait for the download when you do <computeroutput>aptitude "
-#| "upgrade</computeroutput>."
 msgid ""
 "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
 "email about any packages that can be upgraded. It does not install these "
@@ -4129,10 +4107,6 @@ msgstr ""
 "get upgrade</computeroutput> uitvoert."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Automatic installation of updates can be done easily if desired, it just "
-#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
-#| "be installed."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
@@ -4163,16 +4137,6 @@ msgid "Keep yourself informed about security updates"
 msgstr "Op de hoogte blijven van beveiligingsbijwerkingen"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Running <computeroutput>cron-apt</computeroutput> as described above is a "
-#| "good way to learn when security updates are available for installed "
-#| "packages.  Another way to stay informed about security updates is to "
-#| "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
-#| "announce/\">Debian security-announce mailinglist</ulink>, which has the "
-#| "benefit of also telling you what the security update is about. The "
-#| "downside (compared to <computeroutput>cron-apt</computeroutput>) is that "
-#| "it also includes information about updates for packages which aren't "
-#| "installed."
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
@@ -4667,12 +4631,6 @@ msgid "General notes on upgrading"
 msgstr "Algemene opmerkingen over opwaarderingen"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Upgrading Debian from one distribution to the next is generally rather "
-#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
-#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
-#| "url=\"http://bugs.debian.org/311188#\">311188</ulink> for more "
-#| "information.) Upgrading is still possible but may require some work."
 msgid ""
 "Upgrading Debian from one distribution to the next is generally rather easy. "
 "For Debian Edu this is unfortunately not yet true as we heavily modify "
@@ -6538,12 +6496,6 @@ msgstr ""
 "onderhoudskost als het geval is bij thin clients."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
-#| "workstations. If the amount of RAM is less, the machine will boot as thin "
-#| "client. Unlike workstations, diskless workstations run without any need "
-#| "to add them with GOsa², cause LDM is used to login and connect to the "
-#| "LTSP server."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
@@ -6565,9 +6517,6 @@ msgstr ""
 "schijfloze werkstations."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The following steps can be used to get back the behaviour from Debian Edu "
-#| "Squeeze:"
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
 "Squeeze, using automount, NFS and a display manager other than ldm:"
@@ -6823,6 +6772,19 @@ msgstr ""
 "computeroutput> creëren met daarin de door u gewenste bijkomende waarden "
 "voor debconf."
 
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information about network clients can be found in the <link linkend="
+#| "\"NetworkClients\">Network clients HowTo</link> chapter."
+msgid ""
+"More information about modifying PXE installations can be found in the <link "
+"linkend=\"Installation--Modifying_PXE_installations\">Installation</link> "
+"chapter."
+msgstr ""
+"U vindt bijkomende informatie over netwerkclients in het hoofdstuk <link "
+"linkend=\"NetworkClients\">HowTo voor netwerkclients</link>."
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Adding a custom repository for PXE installations"
 msgstr "Een eigen pakketbron gebruiken bij installaties met PXE"
@@ -8794,14 +8756,6 @@ msgid "Moodle"
 msgstr "Moodle"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> "
-#| "is a free, Open Source course management system - software designed using "
-#| "sound pedagogical principles to help educators create effective online "
-#| "learning communities. You can download and use it on any computer "
-#| "(including webhosts), yet it can scale from a single-teacher site to a "
-#| "University with 200,000 students. Some schools in France use Moodle to "
-#| "keep track of students' facilities and credit points."
 msgid ""
 "<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
 "a free, Open Source course management system - software designed using sound "
@@ -8845,10 +8799,6 @@ msgid "Teaching Prolog"
 msgstr "Prolog aanleren"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "<ulink url=\"http://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
-#| "ulink> is an open source implementation of the programming language "
-#| "Prolog, commonly used for teaching and semantic web applications."
 msgid ""
 "<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
 "ulink> is an open source implementation of the programming language Prolog, "
@@ -8864,14 +8814,6 @@ msgid "Monitoring pupils"
 msgstr "Leerlingen opvolgen"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Some schools use control tools like <ulink url=\"http://packages.debian."
-#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"http://"
-#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
-#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
-#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
-#| "documentation in bug <ulink url=\"http://bugs.debian.org/511387#"
-#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
@@ -8903,11 +8845,6 @@ msgid "Restricting pupils' network access"
 msgstr "De netwerktoegang voor leerlingen beperken"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Some schools use <ulink url=\"http://packages.debian.org/stable/"
-#| "squidguard#\">Squidguard</ulink> or <ulink url=\"http://packages.debian."
-#| "org/stable/dansguardian#\">Dansguardian</ulink> to restrict Internet "
-#| "access."
 msgid ""
 "Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
 "\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
@@ -9785,19 +9722,6 @@ msgid "Copyright and authors"
 msgstr "Auteursrechten en auteurs"
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
-#| "2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz "
-#| "(2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
-#| "(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), "
-#| "Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
-#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012), "
-#| "Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
-#| "Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel "
-#| "(2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, "
-#| "2013) and Bernhard Hammes (2012) and is released under the GPL2 or any "
-#| "later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
@@ -9825,11 +9749,6 @@ msgstr ""
 "uitgegeven onder een GPL-licentie versie 2 of later. Geniet ervan!"
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "If you add content to it, <emphasis role=\"strong\">please only do so if "
-#| "you are the author. You need to release it under the same conditions</"
-#| "emphasis>! Then add your name here and release it under the GPL2 or later "
-#| "version."
 msgid ""
 "If you add content to it, <emphasis role=\"strong\">please only do so if you "
 "are the author. You need to release it under the same conditions</emphasis>! "
@@ -9847,10 +9766,6 @@ msgid "Translation copyright and authors"
 msgstr "Auteursrechten en auteurs van vertalingen"
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Spanish translation is copyrighted by José L. Redrejo Rodríguez "
-#| "(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
-#| "2012, 2013) and is released under the GPL2 or any later version."
 msgid ""
 "The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
 "Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
@@ -9862,11 +9777,6 @@ msgstr ""
 "2 of later."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
-#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
-#| "(2010) and Jan Roar Rød (2010) and is released under the GPL2 or any "
-#| "later version."
 msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
 "Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
@@ -9880,13 +9790,6 @@ msgstr ""
 "versie 2 of later."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
-#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
-#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011), Ludger Sicking "
-#| "(2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert "
-#| "(2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang "
-#| "Schweer (2012, 2013) and is released under the GPL2 or any later version."
 msgid ""
 "The German translation is copyrighted by Holger Levsen (2007), Patrick "
 "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -9904,26 +9807,21 @@ msgstr ""
 "GPL-licentie versie 2 of later."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
 #| msgid ""
 #| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013) and is released under the GPL2 or any later "
-#| "version."
+#| "2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any "
+#| "later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013) and is released under the GPL v2 or any later "
-"version."
+"2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de Italiaanse vertaling berusten bij Claudio "
 "Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013). De vertaling is "
 "vrijgegeven onder de GPL-licentie versie 2 of later."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The French translation is copyrighted by Christophe Masson (2008), "
-#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
-#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
-#| "French l10n team (2009, 2010, 2012) and is released under the GPL2 or any "
-#| "later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
@@ -9937,9 +9835,6 @@ msgstr ""
 "licentie versie 2 of later."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-#| "released under the GPL2 or any later version."
 msgid ""
 "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
 "released under the GPL v2 or any later version."
@@ -9948,9 +9843,6 @@ msgstr ""
 "2013). De vertaling is vrijgegeven onder de GPL-licentie versie 2 of later."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-#| "released under the GPL2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
 "released under the GPL v2 or any later version."
@@ -10114,7 +10006,7 @@ msgstr ""
 "over hoe u vertalingen moet bijwerken."
 
 #.  <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 "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 6d8869c..2034726 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -17,81 +17,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Attribute 'lang' of: <article>
-#: debian-edu-wheezy-manual.xml:3
 msgid "en"
 msgstr ""
 
 #. type: Content of: <article><articleinfo><title>
-#: debian-edu-wheezy-manual.xml:3
 msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:5
 msgid "Manual for Debian Edu 7.1+edu0 Codename Wheezy"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:7 debian-edu-wheezy-manual.xml:807
 msgid "./images/23-Tjener-KDM_Login.png"
 msgstr ""
 
 #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:7
 msgid "Debian Edu login"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:9
 msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:11
 msgid ""
-"The version at <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy\"/> is a wiki "
-"and updated frequently."
+"The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Wheezy\"/> is a wiki and updated frequently."
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:13
 msgid ""
 "<link linkend=\"Translations\">Translations</link> are part of the "
 "<computeroutput>debian-edu-doc</computeroutput> package which can be "
-"installed on a webserver, and is available <ulink "
-"url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">online</ulink>."
+"installed on a webserver, and is available <ulink url=\"http://maintainer."
+"skolelinux.org/debian-edu-doc/\">online</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:18
 msgid "About Debian Edu and Skolelinux"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:20
 msgid ""
 "Debian Edu aka Skolelinux is a Linux distribution based on Debian providing "
 "an out-of-the box environment of a completely configured school network."
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:22
 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 environment is prepared using "
-"PXE, so after initial installation of the main server from CD, Blue-ray disc "
-"or USB flash drive all other machines can be installed via the network, this "
+"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 environment is prepared using PXE, so "
+"after initial installation of the main server from CD, Blue-ray disc or USB "
+"flash drive 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 traditional thin-clients."
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:24
 msgid ""
 "Several educational applications like celestia, drgeo, gcompris, kalzium, "
 "kgeography, solfege and scratch are included in the default desktop setup, "
@@ -99,30 +86,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:28
 msgid "Some history and why two names"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:30
 msgid ""
 "<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> is a Linux "
-"distribution created by the Debian Edu project. As a <ulink "
-"url=\"http://wiki.debian.org/DebianPureBlends\">Debian Pure Blends</ulink> "
-"distribution it is an official <ulink "
-"url=\"http://www.debian.org\">Debian</ulink> subproject."
+"distribution created by the Debian Edu project. As a <ulink url=\"http://"
+"wiki.debian.org/DebianPureBlends\">Debian Pure Blends</ulink> distribution "
+"it is an official <ulink url=\"http://www.debian.org\">Debian</ulink> "
+"subproject."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:32
 msgid ""
 "What this means for your school is that Skolelinux is a version of Debian "
-"providing an out-of-the box environment of a completely configured "
-"school-network."
+"providing an out-of-the box environment of a completely configured school-"
+"network."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:34
 msgid ""
 "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
 "same time Raphaël Hertzog started Debian-Edu in France. Since 2003 both "
@@ -131,7 +114,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:36
 msgid ""
 "The main target group in Norway initially were schools serving the 6-16 "
 "years age bracket. Today the system is in use in several countries around "
@@ -139,48 +121,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:42
 msgid "Architecture"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:44
 msgid ""
 "This section of the document describes the network architecture and services "
 "provided by a Skolelinux installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:48
 msgid "Network"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:50
 msgid "./images/Debian_Edu_Network_Wheezy.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:50
 msgid "The Debian Edu network topology"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:52
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and "
-"thin-client-servers (with associated thin-clients and/or diskless "
-"workstations). The number of workstations can be as large or small as you "
-"want (starting from none to a lot). The same goes for the thin-client "
-"servers, each of which is on a separate network so that the traffic between "
-"the clients and the thin-client server doesn't affect the rest of the "
-"network services."
+"while allowing the inclusion of both normal workstations and thin-client-"
+"servers (with associated thin-clients and/or diskless workstations). The "
+"number of workstations can be as large or small as you want (starting from "
+"none to a lot). The same goes for the thin-client servers, each of which is "
+"on a separate network so that the traffic between the clients and the thin-"
+"client server doesn't affect the rest of the network services."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:54
 msgid ""
 "The reason that there can only be one main server in each school network is "
 "that the main server provides DHCP, and there can be only one machine doing "
@@ -191,7 +165,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:56
 msgid ""
 "In order to simplify the standard setup of Skolelinux, the Internet "
 "connection runs over a separate router. It is possible to set up Debian with "
@@ -201,12 +174,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:60
 msgid "The default network setup"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:62
 msgid ""
 "DHCPD on Tjener serves the 10.0.0.0/8 network, providing a syslinux menu via "
 "PXE-boot where you can choose whether to install a new server/workstation, "
@@ -215,7 +186,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:64
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
 "syslinux point to one of the LTSP servers or change the DHCP next-server "
@@ -224,7 +194,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:66
 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 "
@@ -232,33 +201,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:68
 msgid "The configuration of all subnets is stored in LDAP."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:73
 msgid "Main server (tjener)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:75
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the "
-"thin-client-server and workstation profiles in addition to the main server "
-"profile."
+"possible (but not required) to also select and install the thin-client-"
+"server and workstation profiles in addition to the main server profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:80 debian-edu-wheezy-manual.xml:854
 msgid "Services running on the main server"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:82
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
@@ -273,7 +236,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:84
 msgid ""
 "To ensure security all connections where passwords are transmitted over the "
 "network are encrypted, so no passwords are sent over the network as plain "
@@ -281,7 +243,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:86
 msgid ""
 "Below is a table of the services that are set up by default in a Skolelinux "
 "network and the DNS name of each service. If possible all configuration "
@@ -291,264 +252,212 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:88
 msgid "<emphasis role=\"strong\"> Table of services</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:90
 msgid "<emphasis role=\"strong\">Service description</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:92
 msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:94
 msgid "<emphasis role=\"strong\">DNS service name</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:96
 msgid "Centralised Logging"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:98
 msgid "rsyslog"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:100
 msgid "syslog"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:102
 msgid "Domain Name Service"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:104
 msgid "DNS (BIND)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:106
 msgid "domain"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:108
 msgid "Automatic Network Configuration of Machines"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:110
 msgid "DHCP"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:112
 msgid "bootps"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:114
 msgid "Clock Synchronisation"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:116
 msgid "NTP"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:118
 msgid "ntp"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:120
 msgid "Home Directories via Network File System"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:122
 msgid "SMB / NFS"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:124
 msgid "homes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:126
 msgid "Electronic Post Office"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:128
 msgid "IMAP (Dovecot)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:130
 msgid "postoffice"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:132
 msgid "Directory Service"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:134
 msgid "OpenLDAP"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:136
 msgid "ldap"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:138 debian-edu-wheezy-manual.xml:868
 msgid "User Administration"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:140
 msgid "GOsa²"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:142
 msgid "---"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:144
 msgid "Web Server"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:146
 msgid "Apache/PHP"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:148
 msgid "www"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:150
 msgid "Central Backup"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:152
 msgid "sl-backup, slbackup-php"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:154
 msgid "backup"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:156
 msgid "Web Cache"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:158
 msgid "Proxy (Squid)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:160
 msgid "webcache"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:162
 msgid "Printing"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:164
 msgid "CUPS"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:166
 msgid "ipp"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:168
 msgid "Secure Remote Login"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:170
 msgid "OpenSSH"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:172
 msgid "ssh"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:174
 msgid "Automatic Configuration"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:176
 msgid "Cfengine"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:178
 msgid "cfengine"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:180
 msgid "Thin Client Server/s"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:182
 msgid "LTSP"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:184
 msgid "ltsp"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:186
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:188 debian-edu-wheezy-manual.xml:190
 msgid "munin, nagios and site-summary"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:192
 msgid ""
 "Personal files for each user are stored in their home directories, which are "
 "made available by the server. Home directories are accessible from all "
@@ -558,26 +467,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:194
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
 "a permanent Internet connection. Mailing lists are set up based on the user "
 "database, giving each class their own mailing list. Clients are set up to "
-"deliver mail to the server (using 'smarthost'), and users can <link "
-"linkend=\"Users--Using_email\">access their personal mail</link> through "
-"IMAP."
+"deliver mail to the server (using 'smarthost'), and users can <link linkend="
+"\"Users--Using_email\">access their personal mail</link> through IMAP."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:196
 msgid ""
 "All services are accessible using the same username and password, thanks to "
 "the central user database for authentication and authorisation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:198
 msgid ""
 "To increase performance on frequently accessed sites a web proxy that caches "
 "files locally (Squid) is used. In conjunction with blocking web-traffic in "
@@ -586,18 +491,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:200
 msgid ""
-"Network configuration on the clients is done automatically using "
-"DHCP. Normal clients are allocated IP addresses in the private subnet "
-"10.0.0.0/8, while thin clients are connected to the corresponding "
-"thin-client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
-"that the network traffic of the thin clients doesn't interfere with the rest "
-"of the network services)."
+"Network configuration on the clients is done automatically using DHCP. "
+"Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
+"while thin clients are connected to the corresponding thin-client-server via "
+"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
+"traffic of the thin clients doesn't interfere with the rest of the network "
+"services)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:202
 msgid ""
 "Centralised logging is set up so that all machines send their syslog "
 "messages to the server. The syslog service is set up so that it only accepts "
@@ -605,16 +508,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:204
 msgid ""
-"By default the DNS server is set up with a domain for internal use only "
-"(*.intern), until a real (\"external\") DNS domain can be set up. The DNS "
+"By default the DNS server is set up with a domain for internal use only (*."
+"intern), until a real (\"external\") DNS domain can be set up. The DNS "
 "server is set up as caching DNS server so that all machines on the network "
 "can use it as the main DNS Server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:206
 msgid ""
 "Pupils and teachers have the ability to publish websites. The web server "
 "provides mechanisms for authenticating users, and for limiting access to "
@@ -624,7 +525,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:208
 msgid ""
 "Information on users and machines can be changed in one central location, "
 "and is made accessible to all computers on the network automatically. To "
@@ -637,7 +537,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:210
 msgid ""
 "Administration of services and users will mainly be via the web, and follow "
 "established standards, functioning well in the web browsers which are part "
@@ -646,7 +545,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:212
 msgid ""
 "In order to avoid certain problems with NFS, and to make it simpler to debug "
 "problems, the different machines need synchronised clocks. To achieve this "
@@ -658,7 +556,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:214
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
 "network, or connected to a server, workstation or thin-client-server. Access "
@@ -668,31 +565,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:219
 msgid "LTSP server(s) (Thin client server(s))"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:221
 msgid ""
 "A Skolelinux network can have many LTSP servers (also called thin client "
 "servers), which are installed by selecting the Thin client server profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:223
 msgid ""
 "The thin client servers are set up to receive syslog from the thin clients, "
 "and forward these messages to the central syslog recipient."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:228
 msgid "Thin clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:230
 msgid ""
 "A thin client setup enables ordinary PCs to function as (X-)terminals. This "
 "means that the machine boots from a diskette or directly from the server "
@@ -701,7 +593,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:232
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
@@ -715,12 +606,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:237
 msgid "Diskless workstations"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:239
 msgid ""
 "For diskless workstations the terms \"stateless workstations\", \"lowfat "
 "clients\" or \"half-thick clients\" are also used. For the sake of clarity "
@@ -728,7 +617,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:241
 msgid ""
 "A diskless workstation runs all software on the PC without a locally "
 "installed operating system. This means that client machines boot directly "
@@ -737,7 +625,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:243
 msgid ""
 "Diskless workstations are an excellent way of reusing newer hardware with "
 "the same low maintenance cost as with thin clients. Software is administered "
@@ -747,19 +634,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:245
 msgid ""
 "Diskless workstations were introduced as part of the Linux Terminal Server "
 "Project (LTSP) with version 5.0."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:250
 msgid "Networked clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:252
 msgid ""
 "The term \"networked clients\" is used in this manual to refer to both thin "
 "clients and diskless workstations, as well as computers running Mac OS or "
@@ -767,12 +651,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:258
 msgid "Administration"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:260
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
@@ -781,7 +663,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:262
 msgid ""
 "We use cfengine to edit configuration files. These files are updated from "
 "the server to the clients. In order to change the client configuration, it "
@@ -790,7 +671,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:264
 msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
@@ -798,12 +678,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:268
 msgid "Installation"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:270
 msgid ""
 "Currently there are two kinds of installation media images: netinstall (CD)  "
 "and multi-arch USB flash drive. Both images can also be booted from USB "
@@ -811,19 +689,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:272
 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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:274
-msgid "Only the netinstall image needs access to the Internet during installation."
+msgid ""
+"Only the netinstall image needs access to the Internet during installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:276
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
@@ -833,12 +709,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:281
 msgid "File system access configuration"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:283
 msgid ""
 "Each Skolelinux user account is assigned a section of the file system on the "
 "file server. This section (home directory) contains the user's configuration "
@@ -849,20 +723,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:285
 msgid ""
 "To ensure that all disks that are used for user directories or shared "
 "directories can be uniquely named across all the computers in the "
-"installation, they can be mounted as "
-"<computeroutput>/skole/host/directory/</computeroutput>. Initially, one "
-"directory is created on the file server, "
+"installation, they can be mounted as <computeroutput>/skole/host/directory/</"
+"computeroutput>. Initially, one directory is created on the file server, "
 "<computeroutput>/skole/tjener/home0/</computeroutput>, in which all the user "
 "accounts are created. More directories may then be created when needed to "
 "accommodate particular user groups or particular patterns of usage."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:287
 msgid ""
 "To enable shared access to files under the normal UNIX permissions system, "
 "users need to be in supplementary shared groups (such as \"students\") as "
@@ -874,13 +745,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:289
 msgid ""
-"The initial access settings for newly created files are a matter of "
-"policy. The Debian default umask is 022 (which would not allow group-access "
-"as described above), but Debian Edu uses a default of 002 - meaning that "
-"files are created with read access for everybody, which can later be removed "
-"by explicit user action. This can alternatively be changed (by editing "
+"The initial access settings for newly created files are a matter of policy. "
+"The Debian default umask is 022 (which would not allow group-access as "
+"described above), but Debian Edu uses a default of 002 - meaning that files "
+"are created with read access for everybody, which can later be removed by "
+"explicit user action. This can alternatively be changed (by editing "
 "<computeroutput>/etc/pam.d/common-session</computeroutput>) to a umask of "
 "007 - meaning read access is initially blocked, necessitating user action to "
 "make them accessible.  The first approach encourages knowledge sharing, and "
@@ -897,12 +767,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:296
 msgid "Requirements"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:298
 msgid ""
 "There are different ways of setting up a Skolelinux solution. It can be "
 "installed on just one standalone PC, or as a region-wide solution at many "
@@ -911,50 +779,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:302
 msgid "Hardware requirements"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:304
 msgid ""
-"The purpose of the different profiles is explained in the <link "
-"linkend=\"Architecture\">network architecture</link> chapter."
+"The purpose of the different profiles is explained in the <link linkend="
+"\"Architecture\">network architecture</link> chapter."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:308
 msgid ""
 "The computers running Debian Edu / Skolelinux must have either i386 or amd64 "
 "processors."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:311
 msgid ""
 "Thin client servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:315
 msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:318
 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>
-#: debian-edu-wheezy-manual.xml:321
 msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:324
 msgid ""
 "Disk space requirements depend on profiles used, but any disk larger than 25 "
 "GiB will be sufficient for a workstation or standalone installation, 30 Gib "
@@ -963,21 +822,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:327
 msgid ""
 "Thin clients can run on as low as 64 MiB RAM and 133 MHz processor, though "
 "128 MiB RAM and somewhat faster processors are recommended."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:331
 msgid ""
 "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
 "requirement."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:334
 msgid ""
 "For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
 "RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
@@ -985,24 +841,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:338
 msgid ""
 "Swapping over the network is automatically enabled; the swap size is 512 "
-"MiB, and if you need more you can tune this by editing "
-"/etc/ltsp/nbdswapd.conf on tjener to set the SIZE variable. Please "
-"<emphasis>tune up the swap size</emphasis> either locally on the PC or on "
-"the server."
+"MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+"conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap "
+"size</emphasis> either locally on the PC or on the server."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:342
 msgid ""
 "If your diskless workstations have hard drives, it is recommended to use "
 "them for swap as it is a lot faster than network swapping."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:345
 msgid ""
 "On workstations with little RAM the spell checker can cause LibreOffice to "
 "hang if the swap space is too small. Then the system administrator has to "
@@ -1012,37 +864,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:348
 msgid ""
 "Laptops have the same requirements as for workstations since they are just "
 "movable workstations."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:353
 msgid "Hardware known to work"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:355
 msgid ""
-"A list of tested hardware is provided at <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Hardware/\"/> . This list is not "
-"nearly complete"
+"A list of tested hardware is provided at <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/Hardware/\"/> . This list is not nearly complete"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:355 debian-edu-wheezy-manual.xml:417 debian-edu-wheezy-manual.xml:475 debian-edu-wheezy-manual.xml:637 debian-edu-wheezy-manual.xml:2281 debian-edu-wheezy-manual.xml:2899 debian-edu-wheezy-manual.xml:2957
 msgid "./images/smile.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:355 debian-edu-wheezy-manual.xml:475 debian-edu-wheezy-manual.xml:637 debian-edu-wheezy-manual.xml:2281
 msgid ":)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:357
 msgid ""
 "<ulink url=\"http://wiki.debian.org/InstallingDebianOn\"/> is an effort to "
 "document how to install, configure and use Debian on some specific hardware, "
@@ -1051,70 +896,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:359
 msgid ""
 "An excellent database of hardware supported by Debian is online at <ulink "
 "url=\"http://kmuto.jp/debian/hcl/\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:365
 msgid "Requirements for network setup"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:369
 msgid "Default Setup"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:371
 msgid "When using the default network architecture, these rules apply:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:375
 msgid "You need exactly one main server, the tjener."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:378
 msgid "You can have hundreds of workstations on the main network."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:381
 msgid ""
 "You can have a lot of LTSP servers on the main network; two different "
 "subnets are preconfigured in LDAP."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:384
 msgid ""
 "You can have hundreds of thin clients and/or diskless workstations on each "
 "LTSP server network."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:387
 msgid ""
 "You can have hundreds of other machines which will have dynamic IP addresses "
 "assigned."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:390
 msgid "For access to the Internet you need a router/gateway (see below)."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:395
 msgid "Internet router"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:397
 msgid ""
 "A router/gateway, connected to the Internet on the external interface and "
 "running on the IP address 10.0.0.1 with netmask 255.0.0.0 on the internal "
@@ -1122,14 +955,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:399
 msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:401
 msgid ""
 "If you are looking for a router firewall solution capable of running on an "
 "old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
@@ -1137,21 +968,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:403
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "you can also use the original firmware. Using the original firmware is "
 "easier; using OpenWRT gives you more choices and control. Check the OpenWRT "
-"webpages for a list of <ulink "
-"url=\"http://wiki.openwrt.org/TableOfHardware\">supported hardware</ulink>."
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/TableOfHardware"
+"\">supported hardware</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:405
 msgid ""
-"It is possible to use a different network setup (there is a <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented "
+"It is possible to use a different network setup (there is a <ulink url="
+"\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented "
 "procedure</ulink> to do this), but if you are not forced to do this by an "
 "existing network infrastructure, we recommend against doing so and recommend "
 "you stay with the default <link linkend=\"Architecture\">network "
@@ -1159,41 +988,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:411
 msgid "Installation and download options"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:415
 msgid "Where to find additional information"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:417
 msgid ""
-"We recommend that you read or at least take a look at the <ulink "
-"url=\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
+"We recommend that you read or at least take a look at the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes for "
 "Debian Wheezy</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:417 debian-edu-wheezy-manual.xml:2899 debian-edu-wheezy-manual.xml:2957
 msgid ":-)"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:419 debian-edu-wheezy-manual.xml:630 debian-edu-wheezy-manual.xml:645 debian-edu-wheezy-manual.xml:846 debian-edu-wheezy-manual.xml:945 debian-edu-wheezy-manual.xml:1151 debian-edu-wheezy-manual.xml:1195 debian-edu-wheezy-manual.xml:1224 debian-edu-wheezy-manual.xml:1250 debian-edu-wheezy-manual.xml:1364 debian-edu-wheezy-manual.xml:1387 debian-edu-wheezy-manual.xml:1550 debian-edu-wheezy-manual.xml:1845 debian-edu-wheezy-manual.xml:2117 debian-edu-wheezy- [...]
 msgid "./images/alert.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:419 debian-edu-wheezy-manual.xml:630 debian-edu-wheezy-manual.xml:645 debian-edu-wheezy-manual.xml:846 debian-edu-wheezy-manual.xml:945 debian-edu-wheezy-manual.xml:1151 debian-edu-wheezy-manual.xml:1195 debian-edu-wheezy-manual.xml:1224 debian-edu-wheezy-manual.xml:1250 debian-edu-wheezy-manual.xml:1364 debian-edu-wheezy-manual.xml:1387 debian-edu-wheezy-manual.xml:1550 debian-edu-wheezy-manual.xml:1845 debian-edu-wheezy-manual.xml:2117 debian-edu-wheezy- [...]
 msgid "/!\\"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:419
 msgid ""
 "Be sure to read the <link linkend=\"GettingStarted\">getting started</link> "
 "chapter of this manual, though, as it explains how to log in for the first "
@@ -1201,60 +1023,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:421
 msgid ""
 "Even more information about the Debian Wheezy release is available in its "
-"<ulink "
-"url=\"http://www.debian.org/releases/wheezy/installmanual\">installation "
-"manual</ulink>."
+"<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:426
-msgid "Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
+msgid ""
+"Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:430
 msgid "netinstall CD image for i386, amd64"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:432
 msgid ""
 "The netinstall CD, which also can be used for installation from USB flash "
 "drives, is suited to install on i386 and amd64 machines. It's available via"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:435
 msgid ""
-"<ulink "
-"url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0-CD.iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+"edu-7.1+edu0-CD.iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:437
 msgid ""
-"<ulink "
-"url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-CD.iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-CD."
+"iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:439
 msgid ""
-"<computeroutput>rsync "
-"ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-CD.iso|debian-edu-7.1+edu0-CD.iso "
-"</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:444
 msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:446
 msgid ""
 "The multi-architecture ISO image is 5.2 GiB large and can be used for "
 "installation of amd64 and i386 machines. It behaves like the former DVD "
@@ -1263,87 +1075,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:449
 msgid ""
-"<ulink "
-"url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0-USB.iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+"edu-7.1+edu0-USB.iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:451
 msgid ""
-"<ulink "
-"url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-USB.iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-USB."
+"iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:453
 msgid ""
-"<computeroutput>rsync "
-"ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-USB.iso|debian-edu-7.1+edu0-USB.iso "
-"</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:458
 msgid "Source image"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:460
 msgid "The source image is available via"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:463
 msgid ""
-"<ulink "
-"url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-USB.iso\">debian-edu-7.1+edu0-source-USB.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-USB.iso\">debian-edu-7.1+edu0-source-USB.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:465
 msgid ""
-"<ulink "
-"url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-USB.iso\">debian-edu-7.1+edu0-source-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-USB.iso\">debian-edu-7.1+edu0-source-USB.iso</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:467
 msgid ""
-"<computeroutput>rsync "
-"ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-source-USB.iso "
-"debian-edu-7.1+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-USB.iso debian-edu-7.1+edu0-source-USB.iso</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:473
 msgid "Request a CD / DVD by mail"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:475
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
-"for the cost of the CD or DVD and shipping. Just send an email to <ulink "
-"url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss "
-"the payment details (for shipping and media)"
+"for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
+"\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
+"payment details (for shipping and media)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:475
 msgid ""
 "Remember to include the address you want the CD or DVD to be sent to in the "
 "email."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:480
 msgid "Installing Debian Edu"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:482
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
@@ -1354,136 +1151,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:486
 msgid "Select type of installation"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:488 debian-edu-wheezy-manual.xml:757
 msgid "./images/01-Installer_boot_menu.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:488
 msgid "Installer boot menu"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:490
 msgid ""
 "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
 "installation on i386 and amd64."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:492
 msgid ""
 "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
 "install."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:494
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:496
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
 "GTK installer where you can use the mouse."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:498
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:500
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:502
 msgid "./images/Installer_advanced_options_a.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:502
 msgid "Installer advanced options screen 1"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:504
-msgid "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
+msgid ""
+"<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:506
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:508
 msgid ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
 "become a rescue disk for emergency tasks."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:510
-msgid "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
+msgid ""
+"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:512
 msgid ""
 "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
 "all available questions in text mode on amd64."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:514
 msgid ""
 "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
 "medium become a rescue disk for emergency tasks on amd64."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:516
 msgid ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
 "preseed file."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:518
 msgid "./images/Installer_advanced_options_b.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:518
 msgid "Installer advanced options screen 2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:520
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
 "to all available questions in graphical mode."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:522
 msgid ""
 "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
 "install medium become a rescue disk for emergency tasks with a graphical GTK "
@@ -1491,21 +1268,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:524
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:526
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
 "access to all available questions in graphical mode on amd64."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:528
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
 "install medium become a rescue disk for emergency tasks on amd64 with a "
@@ -1513,43 +1287,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:530
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
 "needs a preseed file."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:532
 msgid "./images/Installer_help.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:532
 msgid "Installer help screen"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:534
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:538
 msgid "Additional boot parameters for installations"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:540
 msgid ""
 "On i386/amd64, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:544
 msgid ""
 "The multi-architecture USB flash drive / Blue-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
@@ -1557,21 +1324,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:547
 msgid ""
 "If you want to boot the amd64 text mode with the multi-architecture image, "
 "that would be <computeroutput>amd64-install</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:550
 msgid ""
 "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
 "get the GUI version on amd64."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:553
 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> "
@@ -1579,16 +1343,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:556
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
-"installation of the main server profile from CD. Add "
-"<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> as "
-"an additional boot parameter."
+"installation of the main server profile from CD. Add <computeroutput>mirror/"
+"http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
+"parameter."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:559
 msgid ""
 "If you have already installed the main server profile on a machine, further "
 "installations should be done via PXE, as this will automatically use the "
@@ -1596,16 +1358,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:562
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-"parameters."
+"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:565
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
@@ -1613,7 +1372,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:568
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
@@ -1621,61 +1379,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:574
 msgid "The installation process"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:576
 msgid ""
-"Remember the <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Requirements\">system "
-"requirements</ulink> and make sure you have at least two network cards "
-"(NICs) if you plan on setting up a thin client server."
+"Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Wheezy/Requirements\">system requirements</ulink> and make sure you have at "
+"least two network cards (NICs) if you plan on setting up a thin client "
+"server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:580
 msgid "Choose a language (for the installation and the installed system)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:583
 msgid "Choose a location which normally should be the location where you live."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:586
 msgid "Choose a keyboard keymap (the country's default is usually fine)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:589
 msgid "Choose profile(s) from the following list:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:593
 msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:596
 msgid ""
-"This is the main server (tjener) for your school providing all services "
-"pre-configured to work out of the box. You must only install one main server "
-"per school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or "
-"Thin-Client-Server in addition to this one."
+"This is the main server (tjener) for your school providing all services pre-"
+"configured to work out of the box. You must only install one main server per "
+"school! This profile does not include a graphical user interface. If you "
+"want a graphical user interface, then select Workstation or Thin-Client-"
+"Server in addition to this one."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:599
 msgid "<emphasis role=\"strong\">Workstation</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:602
 msgid ""
 "A computer booting from its local hard drive, and running all software and "
 "devices locally like an ordinary computer, except that user logins are "
@@ -1684,12 +1432,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:605
 msgid "<emphasis role=\"strong\">Roaming workstation</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:608
 msgid ""
 "Same as workstation but capable of authentication using cached credentials, "
 "meaning it can be used outside the school network. The users' files and "
@@ -1699,42 +1445,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:611
 msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:614
 msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP "
-"server. Clients without hard drives boot and run software from this "
-"server. This computer needs two network cards, a lot of memory, and ideally "
-"more than one processor or core. See the chapter about <link "
-"linkend=\"NetworkClients\">networked clients</link> for more information on "
-"this subject. Choosing this profile also enables the workstation profile "
-"(even if it is not selected) - a thin client server can always be used as a "
-"workstation, too."
+"A thin client (and diskless workstation) server, also called a LTSP server. "
+"Clients without hard drives boot and run software from this server. This "
+"computer needs two network cards, a lot of memory, and ideally more than one "
+"processor or core. See the chapter about <link linkend=\"NetworkClients"
+"\">networked clients</link> for more information on this subject. Choosing "
+"this profile also enables the workstation profile (even if it is not "
+"selected) - a thin client server can always be used as a workstation, too."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:617
 msgid "<emphasis role=\"strong\">Standalone</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:620
 msgid ""
 "An ordinary computer that can function without a main server (that is, it "
 "doesn't need to be on the network). Includes laptops."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:623
 msgid "<emphasis role=\"strong\">Minimal</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:626
 msgid ""
 "This profile will install the base packages and configure the machine to "
 "integrate into the Debian Edu network, but without any services and "
@@ -1743,23 +1482,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:628
 msgid ""
-"The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis "
-"role=\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
-"Client Server</emphasis> profiles are preselected. These profiles can be "
-"installed on one machine together if you want to install a so called "
-"<emphasis>combined main server</emphasis>. This means the main server will "
-"be a thin client server and also be used as a workstation. This is the "
-"default choice, since we assume most people will install <link "
-"linkend=\"Installation--Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
+"The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
+"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"emphasis> profiles are preselected. These profiles can be installed on one "
+"machine together if you want to install a so called <emphasis>combined main "
+"server</emphasis>. This means the main server will be a thin client server "
+"and also be used as a workstation. This is the default choice, since we "
+"assume most people will install <link linkend=\"Installation--"
+"Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
 "PXE</link> afterwards. Please note that you must have 2 network cards "
 "installed in a machine which is going to be installed as a combined main "
 "server or as a thin client server to become usefull after the installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:630
 msgid ""
 "The ordering of the network cards after installation might differ from the "
 "ordering during installation. The wanted ordering can be achieved by editing "
@@ -1770,25 +1507,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:634
 msgid ""
-"Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying "
-"\"yes\" will destroy all data on the hard drives! Saying \"no\" on the other "
-"hand will require more work - you will need to make sure that the required "
+"Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
+"\" will destroy all data on the hard drives! Saying \"no\" on the other hand "
+"will require more work - you will need to make sure that the required "
 "partitions are created and are big enough."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:637
 msgid ""
-"Please say \"yes\" to submitting information to <ulink "
-"url=\"http://popcon.skolelinux.org/\"/> to allow us to know which packages "
-"are popular and should be kept for future releases.  Although you don't have "
-"to, it is a simple way for you to help."
+"Please say \"yes\" to submitting information to <ulink url=\"http://popcon."
+"skolelinux.org/\"/> to allow us to know which packages are popular and "
+"should be kept for future releases.  Although you don't have to, it is a "
+"simple way for you to help."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:640
 msgid ""
 "Wait. If the selected profiles include Thin-client-server then the installer "
 "will spend quite some time at the end, \"Finishing the installation - "
@@ -1796,7 +1530,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:643
 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 "
@@ -1805,7 +1538,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:645
 msgid ""
 "The password for this user <emphasis role=\"strong\">must</emphasis> have a "
 "length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
@@ -1814,22 +1546,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:648
 msgid "Be happy"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:653
 msgid "Notes on some characteristics"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:657
 msgid "A note on notebooks"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:659
 msgid ""
 "Most likely you will want to use the 'Roaming workstation' profile (see "
 "above). Be aware that all data is stored locally (so take some extra care "
@@ -1839,12 +1567,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:664
 msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:666
 msgid ""
 "After you install from the multi-arch USB flash drive / Blue-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
@@ -1854,7 +1580,6 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:667
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian/ wheezy main \n"
@@ -1863,48 +1588,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:673
 msgid "A note on CD installs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:675
 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 its proxy to "
-"avoid downloading the same package several times from the net."
+"you have installed the main-server (whether a pure main-server or combi-"
+"server does not matter), further installation will use its proxy to avoid "
+"downloading the same package several times from the net."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:680
 msgid "A note on thin-client-server installations"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:682
 msgid ""
 "First of all, this profile name is confusing for historic reasons. Currently "
 "this profile actually installs an LTSP server environment for thin-clients "
-"and for workstations. Debian bug <ulink "
-"url=\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
-"change the name of the profile into a better suited one."
+"and for workstations. Debian bug <ulink url=\"https://bugs.debian.org/588510#"
+"\">588510</ulink> has been filed to change the name of the profile into a "
+"better suited one."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:684
 msgid ""
-"Providing the kernel boot parameter "
-"<computeroutput>edu-skip-ltsp-make-client</computeroutput> makes it possible "
-"to skip the step which converts the LTSP chroot from a thin-client chroot "
-"into a combined thin-client/diskless workstation chroot."
+"Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+"client</computeroutput> makes it possible to skip the step which converts "
+"the LTSP chroot from a thin-client chroot into a combined thin-client/"
+"diskless workstation chroot."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:686
 msgid ""
 "This is useful in certain situations, such as if you want a pure thin client "
 "chroot or if there is already a diskless chroot on another server, which can "
@@ -1913,19 +1632,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:688
 msgid ""
 "Except for the longer installation time there is no harm in always creating "
 "combined chroots, which is why this is done by default."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:694
 msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:696
 msgid ""
 "Since the Squeeze release it is possible to directly copy the CD/DVD/BD "
 "<computeroutput>.iso</computeroutput> images to a USB flash drive (also "
@@ -1934,26 +1650,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:698
 msgid ""
 "<computeroutput>sudo dd if=debian-edu-amd64-i386-XXX.iso of=/dev/sdX "
 "bs=1024</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:700
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
 "like a CD or Blue-ray disc."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:705
 msgid "Installation over the network (PXE) and booting diskless clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:707
 msgid ""
 "For this installation method it is required that you have a running main "
 "server. When clients boot via the main network, a new PXE menu with "
@@ -1966,37 +1678,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:709
 msgid ""
-"This is how the PXE menu looks with the <emphasis "
-"role=\"strong\">Main-Server</emphasis> profile only:"
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+"Server</emphasis> profile only:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:711
 msgid "./images/pxe-tjener.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:711 debian-edu-wheezy-manual.xml:715
 msgid "width=400"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:713
 msgid ""
-"This is how the PXE menu looks with the <emphasis "
-"role=\"strong\">Main-Server</emphasis> and <emphasis "
-"role=\"strong\">Thin-Client-Server</emphasis> profiles:"
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+"emphasis> profiles:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:715 debian-edu-wheezy-manual.xml:815
 msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:717
 msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
@@ -2005,117 +1711,99 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:719
 msgid ""
-"More information about network clients can be found in the <link "
-"linkend=\"NetworkClients\">Network clients HowTo</link> chapter."
+"More information about network clients can be found in the <link linkend="
+"\"NetworkClients\">Network clients HowTo</link> chapter."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:723
 msgid "Modifying PXE installations"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:725
 msgid ""
 "The PXE installation uses a debian-installer preseed file, which can be "
 "modified to ask for more packages to install."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:727
 msgid ""
-"A line like the following needs to be added to "
-"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat</computeroutput>"
+"A line like the following needs to be added to <computeroutput>tjener:/etc/"
+"debian-edu/www/debian-edu-install.dat</computeroutput>"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:728
 #, no-wrap
 msgid "d-i    pkgsel/include string my-extra-package(s)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:729
 msgid ""
-"The PXE installation uses "
-"<computeroutput>/var/lib/tftpboot/debian-edu/install.cfg</computeroutput> "
-"and the preseeding file in "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput>. "
-"These files can be changed to adjust the preseeding used during "
-"installation, to avoid more questions when installing over the net. Another "
-"way to achieve this is to provide extra settings in "
-"<computeroutput>/etc/debian-edu/pxeinstall.conf</computeroutput> and "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</computeroutput> "
-"and to run <computeroutput>/usr/sbin/debian-edu-pxeinstall</computeroutput> "
-"to update the generated files."
+"The PXE installation uses <computeroutput>/var/lib/tftpboot/debian-edu/"
+"install.cfg</computeroutput> and the preseeding file in <computeroutput>/etc/"
+"debian-edu/www/debian-edu-install.dat</computeroutput>. These files can be "
+"changed to adjust the preseeding used during installation, to avoid more "
+"questions when installing over the net. Another way to achieve this is to "
+"provide extra settings in <computeroutput>/etc/debian-edu/pxeinstall.conf</"
+"computeroutput> and <computeroutput>/etc/debian-edu/www/debian-edu-install."
+"dat.local</computeroutput> and to run <computeroutput>/usr/sbin/debian-edu-"
+"pxeinstall</computeroutput> to update the generated files."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:731
 msgid ""
-"Further information can be found in the <ulink "
-"url=\"http://www.debian.org/releases/wheezy/installmanual\">manual of the "
-"Debian Installer</ulink>."
+"Further information can be found in the <ulink url=\"http://www.debian.org/"
+"releases/wheezy/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:733
 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 "
+"<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 http_proxy=\"http://webcache:3128\"; "
-"</computeroutput>\" part from the last one."
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
+"computeroutput>\" part from the last one."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:735
 msgid ""
 "Some settings can not be preseeded because they are needed before the "
 "preseeding file is downloaded.  These are configured in the PXElinux-based "
-"boot arguments available from "
-"<computeroutput>/var/lib/tftproot/debian-edu/install.cfg</computeroutput>.  "
-"Language, keyboard layout and desktop are examples of such settings."
+"boot arguments available from <computeroutput>/var/lib/tftproot/debian-edu/"
+"install.cfg</computeroutput>.  Language, keyboard layout and desktop are "
+"examples of such settings."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:741
 msgid "Custom images"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:743
 msgid ""
 "Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
-"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
-"installer</ulink>, which has a modular design and other nice "
-"features. <ulink "
-"url=\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> "
-"allows you to define answers to the questions normally asked."
+"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
+"ulink>, which has a modular design and other nice features. <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
+"you to define answers to the questions normally asked."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:745
 msgid ""
 "So all you need to do is to create a preseeding file with your answers (this "
-"is described in the appendix of the debian installer manual) and <ulink "
-"url=\"http://wiki.debian.org/DebianInstaller/Modify/CD\">remaster the "
-"CD/DVD</ulink>."
+"is described in the appendix of the debian installer manual) and <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Modify/CD\">remaster the CD/DVD</"
+"ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:751
 msgid "Screenshot tour"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:753
 msgid ""
 "The text mode and the graphical installation are functionally identical - "
 "only the appearance is different. The graphical mode offers the opportunity "
@@ -2125,7 +1813,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:755
 msgid ""
 "So here is a screenshot tour through a graphical Main-Server + Workstation + "
 "Thin Client Server installation and how it looks at the first boot of the "
@@ -2133,350 +1820,284 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:757
 msgid "01-Installer_boot_menu.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:759
 msgid "./images/02-select_a_language.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:759
 msgid "02-select_a_language.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:761
 msgid "./images/03-select_your_location.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:761
 msgid "03-select_your_location.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:763
 msgid "./images/04-Configure_the_keyboard.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:763
 msgid "04-Configure_the_keyboard.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:765
 msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:765
 msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:767
 msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:767
 msgid "06-Load_installer_components_from_CD.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:769
 msgid "./images/07-Detect_network_hardware.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:769
 msgid "07-Detect_network_hardware.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:771
 msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:771
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:773
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:773
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:775
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:775
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:777
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:777
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:779
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:779
 msgid "12-Set_up_users_and_passwords.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:781
 msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:781
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:783
 msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:783
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:785
 msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:785
 msgid "12c-Set_up_users_and_passwords.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:787
 msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:787
 msgid "12d-Setting-up-the-partitioner.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:789
 msgid "./images/12e-creating_ext4.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:789
 msgid "12e-creating_ext4.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:791
 msgid "./images/13-Install+the+base+system.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:791
 msgid "13-Install the base system.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:793
 msgid "./images/14-Select_and_install_software.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:793
 msgid "14-Select_and_install_software.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:795
 msgid "./images/17-Select_and_install_software.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:795
 msgid "17-Select_and_install_software.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:797
 msgid "./images/18-Build+LTSP+chroot.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:797
 msgid "18-Build LTSP chroot.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:799
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:799
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:801
 msgid "./images/20-Finish_the_Installation.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:801
 msgid "20-Finish_the_Installation.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:803
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:803
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:805
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:805
 msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:807
 msgid "tjener KDM Login"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:809
 msgid "./images/24-Tjener-KDE_Start.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:809
 msgid "KDE starting..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:811
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:811
 msgid "KDE and Browser"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:813 debian-edu-wheezy-manual.xml:850
 msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:813 debian-edu-wheezy-manual.xml:819
 msgid "KDE Desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:815
 msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:817
 msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:817
 msgid "Diskless Workstation Login"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:819
 msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:825
 msgid "Getting started"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:829
 msgid "Minimum steps to get started"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:831
 msgid ""
 "During installation of the main server a first user account was created. In "
 "the following text this account will be referenced as \"first user\". This "
 "account is special, as there's no Samba account (can be added via GOsa²), "
-"the home directory permission is set to 700 (so <computeroutput>chmod o+x "
-"~</computeroutput> is needed to make personal web pages accessible), and the "
+"the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</"
+"computeroutput> is needed to make personal web pages accessible), and the "
 "first user can use <computeroutput>sudo</computeroutput> to become root."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:833
-msgid "After the installation, the first things you need to do as first user are:"
+msgid ""
+"After the installation, the first things you need to do as first user are:"
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:836
-msgid "Log into the server - with the root account you cannot log in graphically."
+msgid ""
+"Log into the server - with the root account you cannot log in graphically."
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:839
 msgid "Add users with GOsa²"
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:842
 msgid ""
 "Add workstations with GOsa² - thin-client and diskless workstation can be "
 "used directly without this step."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:844
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
 "this chapter completely. It covers how to perform these minumum steps "
@@ -2484,41 +2105,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:846
 msgid ""
 "If generic DNS traffic is blocked out of your network and you need to use "
 "some specific DNS server to look up internet hosts, you need to tell the DNS "
-"server to use this server as its \"forwarder\".  Update "
-"/etc/bind/named.conf.options and specify the IP address of the DNS server to "
-"use."
+"server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
+"options and specify the IP address of the DNS server to use."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:848
 msgid ""
 "The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
 "and some frequently asked questions."
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:850
 msgid "Debian Edu KDE desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:856
 msgid ""
 "There are several services running on the main server which can be managed "
 "via a web management interface. We'll describe each service below."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:862
 msgid "Introduction to GOsa²"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:864
 msgid ""
 "GOsa² is a web based management tool that helps to manage some important "
 "parts of your Debian Edu setup. With GOsa² you can manage (add, modify, or "
@@ -2526,57 +2140,49 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:871
 msgid "Group Administration"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:874
 msgid "NIS Netgroup Administrator"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:877
 msgid "Machine Administration"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:880
 msgid "DNS Administration"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:883
 msgid "DHCP Administration"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:885
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
 "installed as a so called combined server (main server + thin client server + "
 "workstation). If all of the mentioned before is not available, see: <link "
-"linkend=\"Administration--Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-\">Installing "
-"a graphical environment on the main-server to use GOsa²</link>."
+"linkend=\"Administration--Installing_a_graphical_environment_on_the_main-"
+"server_to_use_GOsa.2BALI-\">Installing a graphical environment on the main-"
+"server to use GOsa²</link>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:887
 msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:891
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:894
 msgid ""
 "Otherwise, you will get an error message about the SSL certificate being "
 "wrong. If you know you are alone on your network, just tell the browser to "
@@ -2584,34 +2190,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:896
 msgid ""
-"For general information on GOsa² have a look at: <ulink "
-"url=\"https://oss.gonicus.de/labs/gosa/wiki/documentation\"/>."
+"For general information on GOsa² have a look at: <ulink url=\"https://oss."
+"gonicus.de/labs/gosa/wiki/documentation\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:900
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:902
 msgid "./images/gosa2_overview.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:902
 msgid "GOsa² overview page after login as the first user"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:904
 msgid "After logging in to GOsa² you will see the overview page of GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:906
 msgid ""
 "Next, you can choose a task in the menu or click any of the task icons on "
 "the overview page. For navigation, we recommend using the menu on the left "
@@ -2620,7 +2220,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:908
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
@@ -2632,18 +2231,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:910
 msgid ""
 "GOsa² is an administration tool that uses LDAP to store its information and "
 "provide a hierarchical department structure. To each \"department\" you can "
 "add user accounts, groups, systems, netgroups, etc. Depending on the "
-"structure of your institution, you can use the department structure in "
-"GOsa²/LDAP to transfer your organisational structure into the LDAP data tree "
-"of the Debian Edu main server."
+"structure of your institution, you can use the department structure in GOsa²/"
+"LDAP to transfer your organisational structure into the LDAP data tree of "
+"the Debian Edu main server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:912
 msgid ""
 "A default Debian Edu main server installation currently provides two "
 "\"departments\": Teachers and Students, plus the base level of the LDAP "
@@ -2652,13 +2249,13 @@ msgid ""
 "Skolelinux workstations, Windows machines, printers etc.) are currently "
 "added to the base level. Find your own scheme for customising this "
 "structure. (You can find an example how to create users in year groups, with "
-"common home directories for each group in the <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/AdvancedAdministration</ulink> "
-"chapter of this manual.)"
+"common home directories for each group in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:914
 msgid ""
 "Depending on the task that you want to work on (manage users, manage groups, "
 "manage systems, etc.) GOsa² presents you with a different view on the "
@@ -2666,30 +2263,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:920
 msgid "User Management with GOsa²"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:922
 msgid ""
 "First, click on \"Users\" in the left navigation menu. The right side of the "
 "screen will change to show a table with department folders for \"Students\" "
 "and \"Teachers\" and the account of the GOsa² Super-Administrator (the first "
-"created user). Above this table you can see a field called "
-"<emphasis>Base</emphasis> that allows you to navigate through your tree "
-"structure (move your mouse over that area and a drop-down menu will appear) "
-"and to select a base folder for your intended operations (e.g. adding a new "
-"user)."
+"created user). Above this table you can see a field called <emphasis>Base</"
+"emphasis> that allows you to navigate through your tree structure (move your "
+"mouse over that area and a drop-down menu will appear) and to select a base "
+"folder for your intended operations (e.g. adding a new user)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:926
 msgid "Adding users"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:928
 msgid ""
 "Next to that tree navigation item you can see the \"Actions\" menu. Move "
 "your mouse over this item and a submenu appears on screen; choose \"Create\" "
@@ -2697,14 +2289,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:932
 msgid ""
 "The most important thing to add is the template (newstudent or newteacher) "
 "and the full name of your user (see image)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:935
 msgid ""
 "As you follow the wizard, you will see that GOsa² generates a username "
 "automatically based on the real name. It automatically chooses a username "
@@ -2714,7 +2304,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:938
 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 "
@@ -2725,33 +2314,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:941
 msgid ""
 "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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:943
 msgid ""
 "After you have created the user (no need to customise fields the wizard has "
 "left empty for now), click on the \"Ok\" button in the bottom-right corner."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:945
 msgid ""
 "As the last step GOsa² will ask for a password for the new user. Type that "
 "in twice and then click \"Set password\" in the bottom-right corner."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:945
 msgid "Some characters may not be allowed as part of the password."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:947
 msgid ""
 "If all went well, you can now see the new user in the user list table. You "
 "should now be able to log in with that username on any Skolelinux machine "
@@ -2759,22 +2343,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:952
 msgid "Search, modify and delete users"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:954
 msgid "./images/filterbox.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:954
 msgid "Filterbox"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:956
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
 "system. On the middle of the screen you may open the \"Filter\" box, a "
@@ -2784,7 +2364,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:958
 msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
@@ -2794,7 +2373,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:960
 msgid ""
 "A new page will show up where you can directly modify information about the "
 "user, change the password of the user and modify the list of groups the user "
@@ -2802,22 +2380,18 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:962
 msgid "./images/edit_user.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:962
 msgid "Editing user data"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:967
 msgid "Set passwords"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:969
 msgid ""
 "The students can change their own passwords by logging into GOsa² with their "
 "own usernames. To ease the access of GOsa², an entry called Gosa is provided "
@@ -2827,7 +2401,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:971
 msgid ""
 "Teachers logged in under their own usernames have special privileges in "
 "GOsa². They are shown a more privileged view of GOsa², and can change the "
@@ -2835,51 +2408,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:973
 msgid "To administratively set a new password for a user"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:976
 msgid "search for the user to be modified, as explained above"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:979
-msgid "click on the key symbol at the end of the line that the username is shown in"
+msgid ""
+"click on the key symbol at the end of the line that the username is shown in"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:982
 msgid ""
 "on the page subsequently presented you can set a new password chosen by "
 "yourself"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:984
 msgid "./images/change_password_administratively.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:984
 msgid "Set user password"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:986
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
 "guess passwords!</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:991
 msgid "Advanced user management"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:993
 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 "
@@ -2888,116 +2453,97 @@ msgid ""
 "(givenName) and password. 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)."
+"<computeroutput>getent passwd | grep tjener/home | cut -d\":\" -f1</"
+"computeroutput> on the command line)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:995
 msgid ""
 "These are the format guidelines for such a CSV file (GOsa² is quite "
 "intolerant about them):"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:999
 msgid "Use \",\" as field separator"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1002
 msgid "Do not use quotes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1005
 msgid ""
 "The CSV file <emphasis role=\"strong\">must not</emphasis> contain a header "
 "line (of the sort that normally contains the column names)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1008
 msgid ""
 "The order of the fields is not relevant, and can be defined in GOsa² during "
 "the mass import"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1010
 msgid "The mass import steps are:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1013
 msgid "click the \"LDAP Manager\" link in the navigation menu on the left"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1016
 msgid "click the \"Import\" tab in the screen on the right"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1019
 msgid ""
 "browse your local disk and select a CSV file with the list of users to be "
 "imported"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1022
 msgid ""
 "choose an available user template that should be applied during mass import "
 "(such as NewTeacher or NewStudent)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1025
 msgid "click the \"Import\" button in the bottom-right corner"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1027
 msgid ""
 "It's a good idea to do some tests first, preferably using a CSV file with a "
 "few fictional users, which can be deleted later."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1033
 msgid "Group Management with GOsa²"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:1035
 msgid "./images/create_group.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:1035 debian-edu-wheezy-manual.xml:1037
 msgid "create group"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:1037
 msgid "./images/list_groups.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1039
 msgid "The management of groups is very similar to the management of users."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1041
 msgid ""
 "You can enter a name and a description per group. Make sure that you choose "
 "the right level in the LDAP tree when creating a new group."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1043
 msgid ""
 "By default, the appropriate Samba group isn't created. If you forgot to "
 "check the Samba group option during group creation, you can modify the group "
@@ -3005,7 +2551,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1045
 msgid ""
 "Adding users to a newly created group takes you back to the user list, where "
 "you most probably would like to use the filter box to find users. Check the "
@@ -3013,19 +2558,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1047
 msgid ""
 "The groups entered in the group management are also regular unix groups, so "
 "you can use them for file permissions too."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1051
 msgid "Group Management on the command line"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1052
 #, no-wrap
 msgid ""
 "# List existing group mapping between UNIX and Windows groups.\n"
@@ -3037,20 +2579,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1058
 msgid ""
-"This is explained in more detail in the <link "
-"linkend=\"NetworkClients--Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration\">HowTo/NetworkClients</link> "
-"chapter of this manual."
+"This is explained in more detail in the <link linkend=\"NetworkClients--"
+"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+"\">HowTo/NetworkClients</link> chapter of this manual."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1064
 msgid "Machine Management with GOsa²"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1066
 msgid ""
 "Machine management basically allows you to manage all networked devices in "
 "your Debian Edu network. Every machine added to the LDAP directory using "
@@ -3061,16 +2600,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1068
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
-"the main network. Only workstations with disks <emphasis "
-"role=\"strong\">have</emphasis> to be added with GOsa², but all <emphasis "
-"role=\"strong\">can</emphasis>."
+"the main network. Only workstations with disks <emphasis role=\"strong"
+"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">can</emphasis>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1070
 msgid ""
 "To add a machine, use the GOsa² main menu, systems, add. You can use an IP "
 "address/hostname from the preconfigured address space 10.0.0.0/8. Currently "
@@ -3081,44 +2618,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1072
 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 "
+"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."
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1074
 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 suit 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:"
+"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 suit 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:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1075
 #, no-wrap
 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"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
 "\n"
 "Enter password if you want to activate these changes, and ^c to abort.\n"
 "\n"
@@ -3127,71 +2658,58 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:1082
 msgid "./images/gosa_systems_list.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:1082
 msgid "GOsa² systems listing"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:1084
 msgid "./images/gosa_systems_host_details.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:1084
 msgid "Host details"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:1086
 msgid "./images/gosa_systems_edit_host.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:1086
 msgid "Modify host"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:1088
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:1088
 msgid "Add netgroup"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1090
 msgid ""
-"A cronjob updating DNS runs every hour; <computeroutput>su -c "
-"ldap2bind</computeroutput> can be used to trigger the update manually."
+"A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
+"computeroutput> can be used to trigger the update manually."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1094
 msgid "Search and delete machines"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1096
 msgid ""
 "Searching for and deleting machines is quite similar to searching for and "
 "deleting users, so that information is not repeated here."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1101
 msgid "Modify existing machines / Netgroup management"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1103
 msgid ""
 "After adding a machine to the LDAP tree using GOsa², you can modify its "
 "properties using the search functionality and clicking on the machine name "
@@ -3199,7 +2717,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1105
 msgid ""
 "The format of these system entries is similar to the one you already know "
 "from modifying user entries, but the fields mean different things in this "
@@ -3207,7 +2724,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1107
 msgid ""
 "For example, adding a machine to a <computeroutput>NetGroup</computeroutput> "
 "does not modify the file access or command execution permissions for that "
@@ -3216,76 +2732,62 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1109
 msgid ""
-"The default installation provides the "
-"<computeroutput>NetGroups</computeroutput>"
+"The default installation provides the <computeroutput>NetGroups</"
+"computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1113
 msgid "cups-queue-autoflush-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1116
 msgid "cups-queue-autoreenable-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1119
 msgid "fsautoresize-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1122
 msgid "ltsp-server-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1125 debian-edu-wheezy-manual.xml:1172
 msgid "netblock-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1128
 msgid "printer-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1131
 msgid "server-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1134
 msgid "shutdown-at-night-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1137
 msgid "winstation-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1140
 msgid "workstation-hosts"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1142
 msgid ""
 "Currently the <computeroutput>NetGroup</computeroutput> functionality is "
 "used for"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1146
 msgid "NFS."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1149
 msgid ""
 "The home directories are exported by the main-server to be mounted by the "
 "workstations and the LTSP servers. For security reasons, only hosts within "
@@ -3297,7 +2799,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1151
 msgid ""
 "Remember to configure workstations and ltsp-servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -3306,43 +2807,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1154
 msgid "fs-autoresize"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1157
 msgid ""
 "Debian Edu machines in this group will automatically resize LVM partitions "
 "that run out of space."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1160
 msgid "shutdown at night"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1163
 msgid ""
 "Debian Edu machines in this group will automatically shut down at night to "
 "save energy."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1166
 msgid "CUPS (cups-queue-autoflush-hosts and cups-queue-autoreenable-hosts)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1169
 msgid ""
 "Debian Edu machines in these groups will automatically flush all print "
 "queues every night, and re-enable any disabled print queue every hour."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1175
 msgid ""
 "Debian Edu machines in this group will only be allowed to connect to "
 "machines on the local network.  Combined with web proxy restrictions this "
@@ -3350,39 +2844,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1177
 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."
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1184
 msgid "Printer Management"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:1186
 msgid ""
-"For Printer Management point your web browser to <ulink "
-"url=\"https://www:631\"/> This is the normal CUPS management interface where "
-"you can add/delete/modify your printers and can clean up the printing "
-"queue.  Changes that require a root login need SSL encryption."
+"For Printer Management point your web browser to <ulink url=\"https://"
+"www:631\"/> This is the normal CUPS management interface where you can add/"
+"delete/modify your printers and can clean up the printing queue.  Changes "
+"that require a root login need SSL encryption."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1191
 msgid "Clock synchronisation"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:1193
 msgid ""
 "The default configuration in Debian Edu is to keep the clocks on all "
 "machines synchronous but not necessarily correct.  NTP is used to update the "
@@ -3392,59 +2881,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:1195
 msgid ""
 "If you use dialup or ISDN and pay per minute, you want to change this "
 "default setting."
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:1197
 msgid ""
 "To disable synchronisation with an external clock, the file /etc/ntp.conf on "
 "the main-server and all clients and LTSP chroots need to be modified.  Add "
-"comment (\"#\") marks in front of the "
-"<computeroutput>server</computeroutput> entries.  After this, the NTP server "
-"needs to be restarted by running <computeroutput>/etc/init.d/ntp "
-"restart</computeroutput> as root.  To test if a machine is using the "
-"external clock sources, run <computeroutput>ntpq -c lpeer</computeroutput>."
+"comment (\"#\") marks in front of the <computeroutput>server</"
+"computeroutput> entries.  After this, the NTP server needs to be restarted "
+"by running <computeroutput>/etc/init.d/ntp restart</computeroutput> as "
+"root.  To test if a machine is using the external clock sources, run "
+"<computeroutput>ntpq -c lpeer</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1202
 msgid "Extending full partitions"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:1204
 msgid ""
 "Because of a possible bug with automatic partitioning, some partitions might "
 "be too full after installation.  To extend these partitions, run "
 "<computeroutput>debian-edu-fsautoresize -n</computeroutput> as root.  See "
-"the \"Resizing Partitions\" HowTo in the <link "
-"linkend=\"Administration--Resizing_Partitions\">administration HowTo "
-"chapter</link> for more information."
+"the \"Resizing Partitions\" HowTo in the <link linkend=\"Administration--"
+"Resizing_Partitions\">administration HowTo chapter</link> for more "
+"information."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1209
 msgid "Maintenance"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1213
 msgid "Updating the software"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1215
 msgid ""
-"This section explains how to use <computeroutput>apt-get "
-"upgrade</computeroutput>."
+"This section explains how to use <computeroutput>apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1217
 msgid ""
 "Using <computeroutput>apt-get</computeroutput> is really simply. To update a "
 "system you need to execute two commands on the command line as root: "
@@ -3454,7 +2935,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1219
 msgid ""
 "As Debian Edu uses libpam-tmpdir, setting a per user TMP directory, it is a "
 "good idea to run apt-get without the TMP and TMPDIR variables set in the "
@@ -3464,7 +2944,6 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1220
 #, no-wrap
 msgid ""
 "LC_ALL=C apt-get update ; LC_ALL=C TMP= TMPDIR= ltsp-chroot apt-get update\n"
@@ -3474,7 +2953,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1224
 msgid ""
 "It is important to run <computeroutput>ltsp-update-kernels</computeroutput> "
 "if a new kernel was installed in the LTSP chroot, to keep the kernel and "
@@ -3483,7 +2961,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1226
 msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
@@ -3491,100 +2968,86 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1228
 msgid ""
 "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
 "email about any packages that can be upgraded. It does not install these "
 "upgrades, but does download them (usually in the night), so you don't have "
-"to wait for the download when you do <computeroutput>apt-get "
-"upgrade</computeroutput>."
+"to wait for the download when you do <computeroutput>apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1230
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed and configured as described on <ulink "
-"url=\"https://wiki.debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
+"installed and configured as described on <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1232
 msgid ""
 "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
 "entries to you via email, or alternativly display them in the terminal when "
-"running <computeroutput>aptitude</computeroutput> or "
-"<computeroutput>apt-get</computeroutput>."
+"running <computeroutput>aptitude</computeroutput> or <computeroutput>apt-"
+"get</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1236
 msgid "Keep yourself informed about security updates"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1238
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
 "packages. Another way to stay informed about security updates is to "
-"subscribe to the <ulink "
-"url=\"http://lists.debian.org/debian-security-announce/\">Debian "
-"security-announce mailinglist</ulink>, which has the benefit of also telling "
-"you what the security update is about. The downside (compared to "
-"<computeroutput>cron-apt</computeroutput>) is that it also includes "
-"information about updates for packages which aren't installed."
+"subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
+"announce/\">Debian security-announce mailinglist</ulink>, which has the "
+"benefit of also telling you what the security update is about. The downside "
+"(compared to <computeroutput>cron-apt</computeroutput>) is that it also "
+"includes information about updates for packages which aren't installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1244
 msgid "Backup Management"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1246
 msgid ""
-"For backup management point your browser to <ulink "
-"url=\"https://www/slbackup-php\"/>. Please note that you need to access this "
-"site via SSL, since you have to enter the root password there. If you try to "
-"access this site without using SSL it will fail."
+"For backup management point your browser to <ulink url=\"https://www/"
+"slbackup-php\"/>. Please note that you need to access this site via SSL, "
+"since you have to enter the root password there. If you try to access this "
+"site without using SSL it will fail."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1248
 msgid ""
-"By default tjener will back up "
-"<computeroutput>/skole/tjener/home0</computeroutput>, "
-"<computeroutput>/etc/</computeroutput>, "
-"<computeroutput>/root/.svk</computeroutput> and LDAP to /skole/backup which "
-"is under the LVM. If you only want to have spare copies of things (in case "
-"you delete them) this setup should be fine for you."
+"By default tjener will back up <computeroutput>/skole/tjener/home0</"
+"computeroutput>, <computeroutput>/etc/</computeroutput>, <computeroutput>/"
+"root/.svk</computeroutput> and LDAP to /skole/backup which is under the LVM. "
+"If you only want to have spare copies of things (in case you delete them) "
+"this setup should be fine for you."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1250
 msgid ""
 "Be aware that this backup scheme doesn't protect you from failing hard "
 "drives."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1252
 msgid ""
 "If you want to back up your data to an external server, a tape device or "
 "another hard drive you'll have to modify the existing configuration a bit."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1254
 msgid ""
 "If you want to restore a complete folder, your best option is to use the "
 "command-line:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1255
 #, no-wrap
 msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
@@ -3593,60 +3056,49 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1258
 msgid ""
-"This will leave the content from "
-"<computeroutput>/skole/tjener/home0/user</computeroutput> for "
-"<computeroutput><date></computeroutput> in the folder "
-"<computeroutput>/skole/tjener/home0/user_<date></computeroutput>"
+"This will leave the content from <computeroutput>/skole/tjener/home0/user</"
+"computeroutput> for <computeroutput><date></computeroutput> in the "
+"folder <computeroutput>/skole/tjener/home0/user_<date></computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1260
 msgid ""
 "If you want to restore a single file, then you should be able to select the "
 "file (and the version) from the web interface, and download only that file."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1262
 msgid ""
 "If you want to get rid of older backups, choose \"Maintenance\" in the menu "
 "on the backup page and select the oldest snapshot to keep:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:1264
 msgid "./images/slbackup-php_maintenance.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:1264
 msgid "slbackup-php Maintenance"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1269
 msgid "Server Monitoring"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1273
 msgid "Munin"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1275
 msgid ""
-"The Munin trend reporting system is available from <ulink "
-"url=\"https://www/munin/\"/>.  It provides system status measurement graphs "
-"on a daily, weekly, monthly and yearly basis, and provides the system "
-"administrator with help when looking for bottlenecks and the source of "
-"system problems."
+"The Munin trend reporting system is available from <ulink url=\"https://www/"
+"munin/\"/>.  It provides system status measurement graphs on a daily, "
+"weekly, monthly and yearly basis, and provides the system administrator with "
+"help when looking for bottlenecks and the source of system problems."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1277
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -3659,42 +3111,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1279
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from "
-"<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks the "
-"relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
+"program, which probes the plugins available from <computeroutput>/usr/share/"
+"munin/plugins/</computeroutput> and symlinks the relevant ones to "
+"<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1281
 msgid ""
-"Information about Munin is available from <ulink "
-"url=\"http://munin.projects.linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin.projects."
+"linpro.no/\"/> ."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1286
 msgid "Nagios"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1288
 msgid ""
-"Nagios system and service monitoring is available from <ulink "
-"url=\"https://www/nagios3/\"/>. The set of machines and services being "
-"monitored is automatically generated using information collected by the "
-"sitesummary system. The machines with the profile Main-server and "
-"Thin-client-server receive full monitoring, while workstations and thin "
-"clients receive simple monitoring. To enable full monitoring on a "
-"workstation, install the <computeroutput>nagios-nrpe-server</computeroutput> "
-"package on the workstation."
+"Nagios system and service monitoring is available from <ulink url=\"https://"
+"www/nagios3/\"/>. The set of machines and services being monitored is "
+"automatically generated using information collected by the sitesummary "
+"system. The machines with the profile Main-server and Thin-client-server "
+"receive full monitoring, while workstations and thin clients receive simple "
+"monitoring. To enable full monitoring on a workstation, install the "
+"<computeroutput>nagios-nrpe-server</computeroutput> package on the "
+"workstation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1290
 msgid ""
 "The username is <computeroutput>nagiosadmin</computeroutput> and the default "
 "password is <computeroutput>skolelinux</computeroutput>. For security "
@@ -3703,64 +3150,53 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1291
 #, no-wrap
 msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1292
 msgid ""
 "By default Nagios does not send email. This can be changed by replacing "
-"<computeroutput>notify-by-nothing</computeroutput> with "
-"<computeroutput>host-notify-by-email</computeroutput> and "
-"<computeroutput>notify-by-email</computeroutput> in the file "
-"<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</computeroutput>."
+"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
+"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
+"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
+"template-contacts.cfg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1294
 msgid ""
-"The Nagios configuration file used is "
-"<computeroutput>/etc/nagios3/sitesummary.cfg</computeroutput>.  The "
-"sitesummary cron job generates "
+"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"sitesummary.cfg</computeroutput>.  The sitesummary cron job generates "
 "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
 "with the list of hosts and services to monitor."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1296
 msgid ""
-"Extra Nagios checks can be put in the file "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg.post</computeroutput> "
-"to get them included in the generated file."
+"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"in the generated file."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1298
 msgid ""
-"Information about Nagios is available from <ulink "
-"url=\"http://www.nagios.org/\"/> or in the "
-"<computeroutput>nagios3-doc</computeroutput> package."
+"Information about Nagios is available from <ulink url=\"http://www.nagios."
+"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1302
 msgid "Common Nagios warnings and how to handle them"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1304
 msgid "Here are instructions on how to handle the most common Nagios warnings."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1308
 msgid "DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1310
 msgid ""
 "The partition (/usr/ in the example) is too full.  There are in general two "
 "ways to handle this: (1) remove some files or (2) increase the size of the "
@@ -3769,38 +3205,33 @@ msgid ""
 "there is more room available in the LVM volume group, running the program "
 "<computeroutput>debian-edu-fsautoresize</computeroutput> to extend the "
 "partitions might help.  To run this program automatically every hour, the "
-"host in question can be added to the "
-"<computeroutput>fsautoresize-hosts</computeroutput> netgroup."
+"host in question can be added to the <computeroutput>fsautoresize-hosts</"
+"computeroutput> netgroup."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1315
 msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1317
 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 terminal or log in via ssh to do the same.  On "
-"thin client servers, remember to also update the LTSP chroot using "
+"security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
+"upgrade' as root in a terminal 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>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1319
 msgid ""
 "If you do not want to manually upgrade packages and trust Debian to do a "
-"good job with new versions, you can install the "
-"<computeroutput>unattended-upgrades</computeroutput> package and configure "
-"it to automatically upgrade all new packages every night.  This will not "
-"upgrade the LTSP chroots."
+"good job with new versions, you can install the <computeroutput>unattended-"
+"upgrades</computeroutput> package and configure it to automatically upgrade "
+"all new packages every night.  This will not upgrade the LTSP chroots."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1321
 msgid ""
 "To upgrade the LTSP chroot, one can use <computeroutput>ltsp-chroot apt-get "
 "update && ltsp-chroot apt-get upgrade</computeroutput>.  On 64-bit "
@@ -3810,14 +3241,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1326
 msgid ""
 "WARNING - Reboot required : running kernel = 2.6.32-37.81.0, installed "
 "kernel = 2.6.32-38.83.0"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1328
 msgid ""
 "The running kernel is older than the newest installed kernel, and a reboot "
 "is required to activate the newest installed kernel.  This is normally "
@@ -3826,31 +3255,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1333
 msgid "WARNING: CUPS queue size - 61"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1335
 msgid ""
 "The printer queues in CUPS have a lot of jobs pending.  This is most likely "
 "because of a unavailable printer.  Disabled print queues are enabled every "
-"hour on hosts that are member of the "
-"<computeroutput>cups-queue-autoreenable-hosts</computeroutput> netgroup, so "
-"for such hosts no manual action should be required.  The print queues are "
-"emptied every night on hosts that are member of the "
-"<computeroutput>cups-queue-autoflush-hosts</computeroutput> netgroup.  If a "
-"host have a lot of jobs in their queue, consider adding this host to one or "
-"both of these netgroups."
+"hour on hosts that are member of the <computeroutput>cups-queue-autoreenable-"
+"hosts</computeroutput> netgroup, so for such hosts no manual action should "
+"be required.  The print queues are emptied every night on hosts that are "
+"member of the <computeroutput>cups-queue-autoflush-hosts</computeroutput> "
+"netgroup.  If a host have a lot of jobs in their queue, consider adding this "
+"host to one or both of these netgroups."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1342
 msgid "Sitesummary"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1344
 msgid ""
 "Sitesummary is used to collect information from each computer and submit it "
 "to the central server.  The information collected is available in "
@@ -3860,70 +3284,59 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1346
 msgid ""
 "A simple report from sitesummary without any details is available from "
 "<ulink url=\"https://www/sitesummary/\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1348
 msgid ""
-"Some documentation on sitesummary is available from <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+"Some documentation on sitesummary is available from <ulink url=\"http://wiki."
+"debian.org/DebianEdu/HowTo/SiteSummary\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1354
 msgid "More information about Debian Edu customisations"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1356
 msgid ""
 "More information about Debian Edu customisations useful for system "
-"administrators can be found in the <link "
-"linkend=\"Administration\">Administration Howto chapter</link> and in the "
-"<link linkend=\"AdvancedAdministration\">Advanced administration Howto "
-"chapter</link>"
+"administrators can be found in the <link linkend=\"Administration"
+"\">Administration Howto chapter</link> and in the <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1362
 msgid "Upgrades"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:1364
 msgid ""
 "Before reading this upgrade guide, please note that live updates to your "
-"production servers are carried out at your own risk. <emphasis "
-"role=\"strong\">Debian Edu/Skolelinux comes with ABSOLUTELY NO WARRANTY, to "
-"the extent permitted by applicable law.</emphasis>"
+"production servers are carried out at your own risk. <emphasis role=\"strong"
+"\">Debian Edu/Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent "
+"permitted by applicable law.</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:1366
 msgid "Please read this chapter completely before attempting to upgrade."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1370
 msgid "General notes on upgrading"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1372
 msgid ""
-"Upgrading Debian from one distribution to the next is generally rather "
-"easy. For Debian Edu this is unfortunately not yet true as we heavily modify "
-"configuration files in ways we shouldn't. (See Debian bug <ulink "
-"url=\"https://bugs.debian.org/311188#\">311188</ulink> for more "
-"information.) Upgrading is still possible but may require some work."
+"Upgrading Debian from one distribution to the next is generally rather easy. "
+"For Debian Edu this is unfortunately not yet true as we heavily modify "
+"configuration files in ways we shouldn't. (See Debian bug <ulink url="
+"\"https://bugs.debian.org/311188#\">311188</ulink> for more information.) "
+"Upgrading is still possible but may require some work."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1374
 msgid ""
 "In general, upgrading the servers is more difficult than the workstations "
 "and the main-server is the most difficult to upgrade. The diskless machines "
@@ -3933,7 +3346,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1376
 msgid ""
 "If you want to be sure that after the upgrade everything works as before, "
 "you should test the upgrade on a test system or systems configured the same "
@@ -3942,16 +3354,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1378
 msgid ""
 "Make sure to also read the information about the current Debian Stable "
-"release in its <ulink "
-"url=\"http://www.debian.org/releases/stable/installmanual\">installation "
-"manual</ulink>."
+"release in its <ulink url=\"http://www.debian.org/releases/stable/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1380
 msgid ""
 "It may also be wise to wait a bit and keep running Oldstable for a few weeks "
 "longer, so that others can test the upgrade and document any problems they "
@@ -3962,157 +3371,132 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1385
 msgid "Upgrades from Debian Edu Squeeze"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1387
 msgid ""
 "Be prepared: make sure you have tested the upgrade from Squeeze in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1391
 msgid "The basic upgrade operation"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1394
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
 "occurrences of \"squeeze\" with \"wheezy\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1397
 msgid "run <computeroutput>apt-get update</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1400
 msgid "run <computeroutput>apt-get upgrade</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1403
 msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1408
 msgid "LDAP service needs to be reconfigured"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1410
 msgid ""
 "The LDAP setup has changed slightly from Squeeze to Wheezy. Nevertheless, "
-"LDAP has to be rebuild from scratch. There's a script "
-"<computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/bin) that "
-"could be used to achieve this. Read the comment at the beginning of that "
-"script carefully before doing anything."
+"LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
+"debian-edu-install</computeroutput> (in /usr/bin) that could be used to "
+"achieve this. Read the comment at the beginning of that script carefully "
+"before doing anything."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1415
 msgid "Recreating an LTSP chroot"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1417
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
 "will still support both thin-clients and diskless workstations."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1419
 msgid ""
-"Remove <computeroutput>/opt/ltsp/i386</computeroutput> (or "
-"<computeroutput>/opt/ltsp/amd64</computeroutput>, depending on your "
-"setup). If you have enough diskspace, consider backing it up."
+"Remove <computeroutput>/opt/ltsp/i386</computeroutput> (or <computeroutput>/"
+"opt/ltsp/amd64</computeroutput>, depending on your setup). If you have "
+"enough diskspace, consider backing it up."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1421
 msgid ""
-"Recreate the chroot by running "
-"<computeroutput>debian-edu-ltsp</computeroutput> as root."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
+"computeroutput> as root."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1423
 msgid "Of course you can also upgrade the chroot as usual."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1429
-msgid "Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
+msgid ""
+"Upgrades from older Debian Edu / Skolelinux installations (before Squeeze)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1431
 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=\"https://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.)"
+"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=\"https://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.)"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1437
 msgid "HowTo"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1441
-msgid "HowTos for <link linkend=\"Administration\">general administration</link>"
+msgid ""
+"HowTos for <link linkend=\"Administration\">general administration</link>"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1444
 msgid ""
-"HowTos for <link linkend=\"AdvancedAdministration\">advanced "
-"administration</link>"
+"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
+"link>"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1447
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1450
 msgid "HowTos for <link linkend=\"NetworkClients\">networked clients</link>"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1453
 msgid "HowTos for <link linkend=\"Samba\">Samba</link>"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1456
 msgid "HowTos for <link linkend=\"TeachAndLearn\">teaching and learning</link>"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1459
 msgid "HowTos for <link linkend=\"Users\">users</link>"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1464
 msgid "HowTos for general administration"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:1466
 msgid ""
 "The <link linkend=\"GettingStarted\">Getting Started</link> and <link "
 "linkend=\"Maintenance\">Maintenance</link> chapters describe how to get "
@@ -4121,22 +3505,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1470
-msgid "Configuration history: tracking /etc/ using the git version control system"
+msgid ""
+"Configuration history: tracking /etc/ using the git version control system"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1472
 msgid ""
 "With the introduction of <computeroutput>etckeeper</computeroutput> in "
-"Debian Edu Squeeze (previous versions used "
-"<computeroutput>etcinsvk</computeroutput> which was removed from Debian), "
-"all files in <computeroutput>/etc/</computeroutput> are tracked using <ulink "
-"url=\"http://www.git-scm.com/\">git</ulink> as a version control system."
+"Debian Edu Squeeze (previous versions used <computeroutput>etcinsvk</"
+"computeroutput> which was removed from Debian), all files in "
+"<computeroutput>/etc/</computeroutput> are tracked using <ulink url=\"http://"
+"www.git-scm.com/\">git</ulink> as a version control system."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1474
 msgid ""
 "This makes it possible to see when a file is added, changed and removed, as "
 "well as what was changed if the file is a text file. The git repository is "
@@ -4144,35 +3526,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1476
 msgid ""
 "Every hour, any changes are automatically recorded, allowing configuration "
 "history to be extracted and reviewed."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1478
 msgid ""
-"To look at the history, the command <computeroutput>etckeeper vcs "
-"log</computeroutput> is used.  To check the differences between two points "
-"in time, a command like <computeroutput>etcinsvk vcs diff </computeroutput> "
-"can be used."
+"To look at the history, the command <computeroutput>etckeeper vcs log</"
+"computeroutput> is used.  To check the differences between two points in "
+"time, a command like <computeroutput>etcinsvk vcs diff </computeroutput> can "
+"be used."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1480
 msgid ""
 "See the output of <computeroutput>man etckeeper</computeroutput> for more "
 "information."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1482
 msgid "List of useful commands:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1483
 #, no-wrap
 msgid ""
 "etckeeper vcs log\n"
@@ -4184,129 +3561,111 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1491
 msgid "Usage examples"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1493
 msgid ""
 "On a freshly installed system, try this to see all changes done since the "
 "system was installed:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1494
 #, no-wrap
 msgid "etckeeper vcs log"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1495
 msgid "See which files are currently not tracked and which are not up-to-date:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1496
 #, no-wrap
 msgid "etckeeper vcs status"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1497
-msgid "To manually commit a file, because you don't want to wait up to an hour:"
+msgid ""
+"To manually commit a file, because you don't want to wait up to an hour:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1498
 #, no-wrap
 msgid "etckeeper vcs commit -a /etc/resolv.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1503
 msgid "Resizing Partitions"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1505
 msgid ""
-"In Debian Edu, all partitions other than the "
-"<computeroutput>/boot/</computeroutput> partition are on logical LVM "
-"volumes. With Linux kernels since version 2.6.10, it is possible to extend "
-"partitions while they are mounted. Shrinking partitions still needs to "
-"happen while the partition is unmounted."
+"In Debian Edu, all partitions other than the <computeroutput>/boot/</"
+"computeroutput> partition are on logical LVM volumes. With Linux kernels "
+"since version 2.6.10, it is possible to extend partitions while they are "
+"mounted. Shrinking partitions still needs to happen while the partition is "
+"unmounted."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1507
 msgid ""
 "It is a good idea to avoid creating very large partitions (over, say, "
-"20GiB), because of the time it takes to run "
-"<computeroutput>fsck</computeroutput> on them or to restore them from backup "
-"if the need arises.  It is better, if possible, to create several smaller "
-"partitions than one very large one."
+"20GiB), because of the time it takes to run <computeroutput>fsck</"
+"computeroutput> on them or to restore them from backup if the need arises.  "
+"It is better, if possible, to create several smaller partitions than one "
+"very large one."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1509
 msgid ""
 "The helper script <computeroutput>debian-edu-fsautoresize</computeroutput> "
 "is provided to make it easier to extend full partitions.  When invoked, it "
-"reads the configuration from "
-"<computeroutput>/usr/share/debian-edu-config/fsautoresizetab</computeroutput>, "
-"<computeroutput>/site/etc/fsautoresizetab</computeroutput> and "
-"<computeroutput>/etc/fsautoresizetab</computeroutput>.  It then proposes to "
-"extend partitions with too little free space, according to the rules "
-"provided in these files.  If run with no arguments, it will only show the "
-"commands needed to extend the file system. The argument "
+"reads the configuration from <computeroutput>/usr/share/debian-edu-config/"
+"fsautoresizetab</computeroutput>, <computeroutput>/site/etc/fsautoresizetab</"
+"computeroutput> and <computeroutput>/etc/fsautoresizetab</computeroutput>.  "
+"It then proposes to extend partitions with too little free space, according "
+"to the rules provided in these files.  If run with no arguments, it will "
+"only show the commands needed to extend the file system. The argument "
 "<computeroutput>-n</computeroutput> is needed to actually execute these "
 "commands to extend the file systems."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1511
 msgid ""
 "The script is executed automatically every hour on every client listed in "
 "the <computeroutput>fsautoresize-hosts</computeroutput> netgroup."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1513
 msgid ""
 "When the partition used by the Squid proxy is resized, the value for cache "
 "size in <computeroutput>etc/squid/squid.conf</computeroutput> needs to be "
-"updated as well.  The helper script "
-"<computeroutput>/usr/share/debian-edu-config/tools/squid-update-cachedir</computeroutput> "
-"is provided to do this automatically, checking the current partition size of "
-"<computeroutput>/var/spool/squid/</computeroutput> and configuring Squid to "
-"use 80% of this as its cache size."
+"updated as well.  The helper script <computeroutput>/usr/share/debian-edu-"
+"config/tools/squid-update-cachedir</computeroutput> is provided to do this "
+"automatically, checking the current partition size of <computeroutput>/var/"
+"spool/squid/</computeroutput> and configuring Squid to use 80% of this as "
+"its cache size."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1517
 msgid "Logical Volume Management"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1519
 msgid ""
 "Logical Volume Management (LVM) enables resizing the partitions while they "
-"are mounted and in use. You can learn more about LVM from the <ulink "
-"url=\"http://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo</ulink>."
+"are mounted and in use. You can learn more about LVM from the <ulink url="
+"\"http://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1521
 msgid ""
 "To extend a logical volume manually you simply tell the "
 "<computeroutput>lvextend</computeroutput> command how large you want it to "
-"grow to. For example, to extend home0 to 30GB you use the following "
-"commands:"
+"grow to. For example, to extend home0 to 30GB you use the following commands:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1522
 #, no-wrap
 msgid ""
 "lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
@@ -4314,17 +3673,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1524
 msgid "To extend home0 by additional 30G, you insert a '+' (-L+30G)"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1530
 msgid "Installing a graphical environment on the main-server to use GOsa²"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1532
 msgid ""
 "If you (probably accidentally) installed a pure main-server profile and "
 "don't have a client with a web-browser handy, it's easy to install a minimal "
@@ -4334,7 +3690,6 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1533
 #, no-wrap
 msgid ""
 "$ sudo apt-get update\n"
@@ -4344,46 +3699,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1540
 msgid "Using ldapvi"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1542
 msgid ""
 "<ulink url=\"http://www.lichteblau.com/ldapvi/manual/\">ldapvi</ulink> is a "
 "tool to edit the LDAP database with a normal text editor on the commandline."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1544
 msgid "The following needs to be executed:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1545
 #, no-wrap
 msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1546
 msgid ""
 "Note: <computeroutput>ldapvi</computeroutput> will use whatever is the "
-"default editor. By executing <computeroutput>export "
-"EDITOR=vim</computeroutput> in the shell prompt one can configure the "
-"environment to get a vi clone as editor."
+"default editor. By executing <computeroutput>export EDITOR=vim</"
+"computeroutput> in the shell prompt one can configure the environment to get "
+"a vi clone as editor."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1548
 msgid ""
 "To add an LDAP object using ldapvi, use object sequence number with the "
 "string <computeroutput>add</computeroutput> in front of the new LDAP object."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1550
 msgid ""
 "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
 "careful and don't mess up the LDAP database, same warning applies for "
@@ -4391,12 +3739,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1555
 msgid "JXplorer, an LDAP GUI"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1557
 msgid ""
 "If you prefer a GUI to work with the LDAP database, check out the "
 "<computeroutput>jxplorer</computeroutput> package, wich is installed by "
@@ -4404,7 +3750,6 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1558
 #, no-wrap
 msgid ""
 "host: ldap.intern\n"
@@ -4417,12 +3762,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1568
 msgid "ldap-createuser-krb, a command-line tool"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1570
 msgid ""
 "<computeroutput>ldap-createuser-krb</computeroutput> is a small command line "
 "tool to create LDAP users and set their passwords in Kerberos. It's mostly "
@@ -4430,20 +3773,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1575
 msgid "Using stable-updates (formerly known as volatile)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1577
 msgid ""
 "Since the Squeeze release, Debian has included packages formerly maintained "
-"in volatile.debian.org in the 2011 created <ulink "
-"url=\"http://wiki.debian.org/StableUpdates\">stable-updates suite</ulink>."
+"in volatile.debian.org in the 2011 created <ulink url=\"http://wiki.debian."
+"org/StableUpdates\">stable-updates suite</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1579
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
 "are pushed into the stable suite regularily when stable point releases are "
@@ -4451,21 +3791,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1584
 msgid "Using backports.debian.org to install newer software"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1586
 msgid ""
-"You are running Debian Edu because you prefer the stability of Debian "
-"Edu. It runs great; there is just one problem: sometimes software is a "
-"little bit more outdated than you like. This is where backports.debian.org "
-"steps in."
+"You are running Debian Edu because you prefer the stability of Debian Edu. "
+"It runs great; there is just one problem: sometimes software is a little bit "
+"more outdated than you like. This is where backports.debian.org steps in."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1588
 msgid ""
 "Backports are recompiled packages from Debian testing (mostly) and Debian "
 "unstable (in a few cases only, e.g. security updates), so they will run "
@@ -4476,56 +3812,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1590
 msgid "Using backports is simple:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1591
 #, no-wrap
 msgid ""
-"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt "
-"sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
 "apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1593
 msgid ""
 "After which one can install backported packages easily, the following "
 "command will install a backported version of <emphasis>tuxtype</emphasis>:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1594
 #, no-wrap
 msgid "apt-get install -t wheezy-backports tuxtype"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1595
 msgid ""
-"Backports are automatically updated (if available) just like other "
-"packages. (Previously, extra configuration was needed to achieve this, but "
-"since 2011 this [[<ulink "
-"url=\"http://backports.debian.org/news/squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> "
-"not needed anymore]."
+"Backports are automatically updated (if available) just like other packages. "
+"(Previously, extra configuration was needed to achieve this, but since 2011 "
+"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1597
 msgid ""
-"Like the normal archive, backports has three sections: main, contrib and "
-"non-free."
+"Like the normal archive, backports has three sections: main, contrib and non-"
+"free."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1602
 msgid "Upgrading with a CD or similar image"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1604
 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 "
@@ -4533,14 +3859,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1606
 msgid ""
 "Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1607
 #, no-wrap
 msgid ""
 "mount /media/cdrom\n"
@@ -4548,21 +3872,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1609
 msgid "To quote the apt-cdrom(8) man page:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1612
 msgid ""
-"apt-cdrom is used to add a new CDROM to APTs list of available "
-"sources. apt-cdrom takes care of determining the structure of the disc as "
-"well as correcting for several possible mis-burns and verifying the index "
-"files."
+"apt-cdrom is used to add a new CDROM to APTs list of available sources. apt-"
+"cdrom takes care of determining the structure of the disc as well as "
+"correcting for several possible mis-burns and verifying the index files."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1614
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
 "done by hand. Furthermore each disk in a multi-cd set must be inserted and "
@@ -4570,12 +3890,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1616
 msgid "Then run these two commands to upgrade the system:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1617
 #, no-wrap
 msgid ""
 "apt-get update\n"
@@ -4583,12 +3901,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1622
 msgid "Automatic cleanup of leftover processes"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1624
 msgid ""
 "<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
 "background jobs. Background jobs are defined as processes that belong to "
@@ -4597,23 +3913,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1626
 msgid "To install it run the following command as root:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1627
 #, no-wrap
 msgid "apt-get install killer"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1631
 msgid "Automatic installation of security upgrades"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1633
 msgid ""
 "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
 "which will install security (and other) updates automatically. If you plan "
@@ -4624,40 +3936,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1635
 msgid "To install these packages run the following command as root:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1636
 #, no-wrap
 msgid "apt-get install unattended-upgrades apt-listchanges"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1640
 msgid "Automatic shutdown of machines during the night"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1642
 msgid ""
 "It is possible to save energy and money by automatically turning client "
 "machines off at night and back on in the morning. The package will try to "
 "turn off the machine every hour on the hour from 16:00 in the afternoon, but "
 "will not turn it off if it seems to have users.  It will try to tell the "
 "BIOS to turn on the machine around 07:00 in the morning, and the main-server "
-"will try to turn on machines from 06:30 by sending wake-on-lan "
-"packets. These times can be changed in the crontabs of individual machines."
+"will try to turn on machines from 06:30 by sending wake-on-lan packets. "
+"These times can be changed in the crontabs of individual machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1644
 msgid "Some considerations should be kept in mind when setting this up:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1648
 msgid ""
 "The clients should not be shut down when someone is using them. This is "
 "ensured by checking the output from <computeroutput>who</computeroutput>, "
@@ -4666,65 +3972,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1651
 msgid ""
 "To avoid blowing electrical fuses, it is a good idea to make sure all "
 "clients do not start at the same time."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1654
 msgid ""
 "There are two different methods available to wake up clients.  One uses a "
 "BIOS feature and requires a working and correct hardware clock, as well as a "
-"motherboard and BIOS version supported by "
-"<computeroutput>nvram-wakeup</computeroutput>; the other requires clients to "
-"have support for wake-on-lan, and the server to know about all the clients "
-"that need to be woken up."
+"motherboard and BIOS version supported by <computeroutput>nvram-wakeup</"
+"computeroutput>; the other requires clients to have support for wake-on-lan, "
+"and the server to know about all the clients that need to be woken up."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1658
 msgid "How to set up shutdown-at-night"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1660
 msgid ""
-"On clients that should turn off at night, touch "
-"<computeroutput>/etc/shutdown-at-night/shutdown-at-night</computeroutput>, "
-"or add the hostname (that is, the output from <computeroutput>'uname "
-"-n'</computeroutput> on the client) to the netgroup "
-"\"shutdown-at-night-hosts\". Adding hosts to the netgroup in LDAP can be "
-"done using the <computeroutput>GOsa²</computeroutput> web tool. The clients "
-"might need to have wake-on-lan configured in the BIOS. It is also important "
-"that the switches and routers used between the wake-on-lan server and the "
-"clients will pass the WOL packets to the clients even if the clients are "
-"turned off. Some switches fail to pass on packets to clients that are "
-"missing in the ARP table on the switch, and this blocks the WOL packets."
+"On clients that should turn off at night, touch <computeroutput>/etc/"
+"shutdown-at-night/shutdown-at-night</computeroutput>, or add the hostname "
+"(that is, the output from <computeroutput>'uname -n'</computeroutput> on the "
+"client) to the netgroup \"shutdown-at-night-hosts\". Adding hosts to the "
+"netgroup in LDAP can be done using the <computeroutput>GOsa²</"
+"computeroutput> web tool. The clients might need to have wake-on-lan "
+"configured in the BIOS. It is also important that the switches and routers "
+"used between the wake-on-lan server and the clients will pass the WOL "
+"packets to the clients even if the clients are turned off. Some switches "
+"fail to pass on packets to clients that are missing in the ARP table on the "
+"switch, and this blocks the WOL packets."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1662
 msgid ""
-"To enable wake-on-lan on the server, add the clients to "
-"<computeroutput>/etc/shutdown-at-night/clients</computeroutput>, with one "
-"line per client, IP address first, followed by MAC address (ethernet "
-"address), separated by a space; or create a script "
-"<computeroutput>/etc/shutdown-at-night/clients-generator</computeroutput> to "
-"generate the list of clients on the fly."
+"To enable wake-on-lan on the server, add the clients to <computeroutput>/etc/"
+"shutdown-at-night/clients</computeroutput>, with one line per client, IP "
+"address first, followed by MAC address (ethernet address), separated by a "
+"space; or create a script <computeroutput>/etc/shutdown-at-night/clients-"
+"generator</computeroutput> to generate the list of clients on the fly."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1664
 msgid ""
-"Here is an example "
-"<computeroutput>/etc/shutdown-at-night/clients-generator</computeroutput> "
-"for use with sitesummary:"
+"Here is an example <computeroutput>/etc/shutdown-at-night/clients-generator</"
+"computeroutput> for use with sitesummary:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1665
 #, no-wrap
 msgid ""
 "#!/bin/sh\n"
@@ -4734,15 +4030,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1669
 msgid ""
 "An alternative if the netgroup is used to activate shutdown-at-night on "
-"clients is this script using the netgroup tool from the "
-"<computeroutput>ng-utils</computeroutput> package:"
+"clients is this script using the netgroup tool from the <computeroutput>ng-"
+"utils</computeroutput> package:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1670
 #, no-wrap
 msgid ""
 "#!/bin/sh\n"
@@ -4752,12 +4046,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1678
 msgid "Access Debian-Edu servers located behind a firewall"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1680
 msgid ""
 "To access machines behind a firewall from the Internet, consider installing "
 "the package <computeroutput>autossh</computeroutput>.  It can be used to set "
@@ -4767,14 +4059,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1685
 msgid ""
-"Installing additional service machines for spreading the load from "
-"main-server"
+"Installing additional service machines for spreading the load from main-"
+"server"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1687
 msgid ""
 "In the default installation, all services are running on the main-server, "
 "tjener. To simplify moving some to another machine, there is a "
@@ -4784,44 +4074,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1689
-msgid "These are the required steps to setup a machine dedicated to some services:"
+msgid ""
+"These are the required steps to setup a machine dedicated to some services:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1693
 msgid ""
-"install the <emphasis>minimal</emphasis> profile using the "
-"<emphasis>debian-edu-expert</emphasis> boot-option"
+"install the <emphasis>minimal</emphasis> profile using the <emphasis>debian-"
+"edu-expert</emphasis> boot-option"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1696
 msgid "install the packages for the service"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1699
 msgid "configure the service"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1702
 msgid "disable the service on main-server"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1705
 msgid "update DNS (via LDAP/GOsa²) on main-server"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1710 debian-edu-wheezy-manual.xml:2548 debian-edu-wheezy-manual.xml:2815
 msgid "HowTos from wiki.debian.org"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1712 debian-edu-wheezy-manual.xml:2550
 msgid ""
 "The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
 "either user- or developer-specific. Let's move the user-specific HowTos over "
@@ -4831,54 +4114,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1716
 msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1719
 msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1722
 msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1725
 msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1728
 msgid ""
-"<ulink "
-"url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication\"/>"
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
+"\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1734
 msgid "Advanced administration"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:1736
 msgid "In this chapter advanced administration tasks are described."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1740
 msgid "User Customisations with GOsa²"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1744
 msgid "Create Users in Year Groups"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1746
 msgid ""
 "In this example we want to create users in year groups, with common home "
 "directories for each group (home0/2014, home0/2015, etc.) We want to create "
@@ -4886,48 +4159,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1748
 msgid "<emphasis>(as root on Tjener) </emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1752
 msgid "Make the necessary year group directories"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1754
 msgid "mkdir /skole/tjener/home0/2014"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1756
 msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1760
 msgid "Department"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1762
 msgid ""
 "Main menu: goto 'Directory structure', click the 'Students' department. The "
 "'Base' field should show '/Students'. From the drop box 'Actions' choose "
 "'Create'/'Department'. Fill in values for Name (2014) and Description fields "
-"(students graduating in 2014), leave the Base field as is (should be "
-"'/Students'). Save it clicking 'Ok'. Now the new department (2014) should "
-"show up below /Students. Click it."
+"(students graduating in 2014), leave the Base field as is (should be '/"
+"Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
+"up below /Students. Click it."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1766
 msgid "Group"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1768
 msgid ""
 "Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name "
 "(leave 'Base' as is, should be /Students/2014) and click the check box left "
@@ -4935,55 +4200,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1772
 msgid "Template"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1774
 msgid ""
-"Choose 'users' from the main menu. Change to 'Students' in the Base "
-"field. An Entry <computeroutput>'NewStudent'</computeroutput> should show "
-"up, click it. This is the 'students' template, not a real user. As you'll "
-"have to create such a template (to be able to use csv import for your "
-"structure) based on this one, notice all entries showing up in the Generic, "
-"POSIX and Samba tabs, maybe take screenshots. Now change to /Students/2014 "
-"in the Base field; choose Create/Template and start to fill in your desired "
-"values, first the Generic tab (add your new 2014 group under Group "
-"Membership, too), then add POSIX and Samba account."
+"Choose 'users' from the main menu. Change to 'Students' in the Base field. "
+"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"it. This is the 'students' template, not a real user. As you'll have to "
+"create such a template (to be able to use csv import for your structure) "
+"based on this one, notice all entries showing up in the Generic, POSIX and "
+"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base "
+"field; choose Create/Template and start to fill in your desired values, "
+"first the Generic tab (add your new 2014 group under Group Membership, too), "
+"then add POSIX and Samba account."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1778
 msgid "Import users"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1780
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
 "recommended."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1786
 msgid "Other User Customisations"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1790
 msgid "Creating folders in the home directories of all users"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1792
 msgid ""
 "With this script the administrator can create a folder in each user's home "
 "directory and set access permissions and ownership."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1794
 msgid ""
 "In the example shown below with group=teachers and permissions=2770 a user "
 "can hand in an assignment by saving the file to the folder \"assignments\" "
@@ -4991,7 +4248,6 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1795
 #, no-wrap
 msgid ""
 "#!/bin/bash\n"
@@ -5010,20 +4266,17 @@ msgid ""
 "        chown $user:$group $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 "    else\n"
-"        echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
 " echo \"$created_dir folders have been created\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1818
 msgid "Easy access to USB drives and CDROMs/DVDs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1820
 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 "
@@ -5031,16 +4284,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1822
 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 "
-"automatically mounted and it is possible to access it browsing to the "
-"/media/$user folder. This is quite difficult for many non experienced users."
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1824
 msgid ""
 "It is possible to have the default KDE \"Plasma\" file manager Dolphin "
 "showing up if KDE \"Plasma\" (or LDXE, if installed in parallel to KDE "
@@ -5051,17 +4302,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1826
 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."
+"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."
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1827
 #, no-wrap
 msgid ""
 "#!/bin/bash\n"
@@ -5074,69 +4322,59 @@ msgid ""
 "        ln -s /media/$home $home_path/$home/$shared_folder\n"
 "        ((created_dir+=1))\n"
 "    else\n"
-"        echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+"        echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
 "    fi\n"
 " done\n"
 " echo \"$created_dir folders has been created\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:1843
 msgid "A warning about removable media on LTSP servers"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1845
 msgid ""
 "Warning: When inserted into an LTSP server USB drives and other removable "
 "media cause popup messages on remote LTSP clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1847
 msgid ""
 "If remote users acknowledge the popup or use pmount from the console, they "
 "can even mount the removable devices and access the files."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:1849
 msgid ""
-"This is being tracked as <ulink "
-"url=\"http://bugs.skolelinux.org/1376\">Debian Edu bug #1376</ulink>."
+"This is being tracked as <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian Edu bug #1376</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1856
 msgid "Use a dedicated storage server"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1858
 msgid ""
 "Take these steps to set up a dedicated storage server for user home "
 "directories and possibly other data."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1862
 msgid ""
-"Add a new system of type server using GOsa² as outlined in the <link "
-"linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
-"started</link> chapter of this manual."
+"Add a new system of type server using GOsa² as outlined in the <link linkend="
+"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
+"link> chapter of this manual."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1865
 msgid ""
-"This example uses 'nas-server.intern' as the server name. Once "
-"'nas-server.intern' ist configured, check if the NFS export points on the "
-"new storage server are exported to the relevant subnets or machines:"
+"This example uses 'nas-server.intern' as the server name. Once 'nas-server."
+"intern' ist configured, check if the NFS export points on the new storage "
+"server are exported to the relevant subnets or machines:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1866
 #, no-wrap
 msgid ""
 "root at tjener:~# showmount -e nas-server\n"
@@ -5146,7 +4384,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1870
 msgid ""
 "Here everything on the backbone network is granted access to the /storage "
 "export. (This could be restricted to netgroup membership or single IP "
@@ -5155,29 +4392,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1873
 msgid ""
 "Add automount information about 'nas-server.intern' in LDAP to allow all "
 "clients to automatically mount the new export on request."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1876
 msgid ""
-"This can't be done using GOsa², because a module for automount is "
-"missing. Instead, use ldapvi and add the required LDAP objects using an "
-"editor."
+"This can't be done using GOsa², because a module for automount is missing. "
+"Instead, use ldapvi and add the required LDAP objects using an editor."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1878
 msgid ""
-"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b "
-"ou=automount,dc=skole,dc=skolelinux,dc=no</computeroutput>"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1880
 msgid ""
 "When the editor shows up, add the following LDAP objects at the bottom of "
 "the document. (The \"/&\" part in the last LDAP object is a wild card "
@@ -5186,14 +4418,12 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1881
 #, no-wrap
 msgid ""
 "add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "    objectClass: automount\n"
 "    cn: nas-server\n"
-"    automountInformation: -fstype=autofs --timeout=60 "
-"ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+"    automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "\n"
 "    add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "    objectClass: top\n"
@@ -5203,28 +4433,23 @@ msgid ""
 "    add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
 "    objectClass: automount\n"
 "    cn: /\n"
-"    automountInformation: "
-"-fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime "
-"nas-server.intern:/&"
+"    automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1896
 msgid ""
 "Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern "
 "does not use automount to avoid mounting loops:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1899
 msgid ""
 "Create the mount directories using <computeroutput>mkdir</computeroutput>, "
-"edit '/etc/fstab' as adequate and run <computeroutput>mount "
-"-a</computeroutput> to mount the new resources."
+"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
+"computeroutput> to mount the new resources."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1901
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
@@ -5232,17 +4457,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1907
 msgid "HowTos for the desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1911
 msgid "Modifying the KDM login screen"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1913
 msgid ""
 "Customisations to the KDM login screen are made by adding a file in "
 "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
@@ -5250,14 +4472,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1915
 msgid ""
 "Here is one example used to activate the theme in the "
 "<computeroutput>desktop-base</computeroutput> package:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1916
 #, no-wrap
 msgid ""
 "USETHEME=\"true\"\n"
@@ -5265,19 +4485,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1918
 msgid ""
 "See the code in <computeroutput>/etc/init.d/kdm</computeroutput> for "
 "information on how these variables are used."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1923
 msgid "Using KDE \"Plasma\", GNOME and LXDE together"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1925
 msgid ""
 "If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
 "linkend=\"Installation--The_installation_process\">installation "
@@ -5285,20 +4502,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1927
 msgid ""
-"To install other desktop environments after installation, simply use "
-"apt-get:"
+"To install other desktop environments after installation, simply use apt-get:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1928
 #, no-wrap
 msgid "apt-get install gnome lxde"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1929
 msgid ""
 "Users will then be able to choose the desktop environment via the login "
 "manager before logging in. The usage of LXDE as default on thin clients can "
@@ -5307,29 +4520,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1934
 msgid "Flash"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1936
 msgid ""
 "The free software flash-player <computeroutput>gnash</computeroutput> is "
 "installed by default, but switching to Adobe Flash is an option. To install "
 "the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
-"<computeroutput>contrib</computeroutput> enabled in "
-"<computeroutput>/etc/apt/sources.list</computeroutput>."
+"<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
+"sources.list</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1941
 msgid "Playing DVDs"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1943
 msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
@@ -5338,47 +4547,38 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1944
 #, no-wrap
 msgid "apt-get install libdvdcss2 w32codecs"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1948
 msgid "Using the multimedia repository"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1950
 msgid "To use www.deb-multimedia.org do the following:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:1951
 #, no-wrap
 msgid ""
 "# install the debian-keyring securely:\n"
 "apt-get install debian-keyring\n"
 "# fetch the deb-multimedia key insecurely:\n"
 "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT "
-"if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 "
-"&& gpg --export 1F41B907 | apt-key add -\n"
+"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
 "# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org wheezy main\" >> "
-"/etc/apt/sources.list\n"
+"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
 "# update the list of available packages:\n"
 "apt-get update"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1964
 msgid "Handwriting fonts"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1966
 msgid ""
 "The package <computeroutput>ttf-linex</computeroutput> (which is installed "
 "by default) installs the font \"Abecedario\" which is a nice handwriting "
@@ -5387,17 +4587,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:1972
 msgid "HowTos for networked clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:1976
 msgid "Introduction to thin clients and diskless workstations"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1978
 msgid ""
 "One generic term for both thin clients and diskless workstations is "
 "<emphasis>LTSP client</emphasis>. <ulink url=\"http://ltsp.org\">LTSP is the "
@@ -5405,12 +4602,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1980
 msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1982
 msgid ""
 "A thin client setup enables an ordinary PC to function as an (X-)terminal, "
 "where all software runs on the LTSP server. This means that this machine "
@@ -5419,12 +4614,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1984
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1986
 msgid ""
 "A diskless workstation runs all software locally. The client machines boot "
 "directly from the LTSP server without a local hard drive. Software is "
@@ -5435,7 +4628,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1988
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
@@ -5447,14 +4639,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1990
 msgid ""
 "The following steps can be used to get back the behaviour from Debian Edu "
 "Squeeze, using automount, NFS and a display manager other than ldm:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1994
 msgid ""
 "Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
 "lts.conf (or set this in LDAP). Make sure, that the display manager is "
@@ -5462,32 +4652,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:1997
 msgid "Add the diskless workstations to LDAP with GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:1999
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2001
 msgid ""
 "LTSP client boot will fail if the client's network card requires a non-free "
 "firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing "
-"XXX.bin file then non-free firmware has to be added to the initrd used by "
-"LTSP clients."
+"netbooting a machine; if the Debian Installer complains about a missing XXX."
+"bin file then non-free firmware has to be added to the initrd used by LTSP "
+"clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2003
 msgid "In this case execute the following commands on an LTSP server."
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2004
 #, no-wrap
 msgid ""
 "# First get information about firmware packages\n"
@@ -5506,41 +4691,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2017
 msgid ""
 "As a shorter alternative -- installing all available firmware and updating "
 "the tftpboot directory -- you could execute:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2018
 #, no-wrap
 msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2019
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2021
 msgid ""
-"In order to support older hardware the package "
-"<computeroutput>linux-image-486</computeroutput> is installed by default. If "
-"all LTSP client machines support the 686 processor architecture the "
-"<computeroutput>linux-image-686</computeroutput> package could be installed "
-"in the chroot. Make sure to execute "
-"<computeroutput>ltsp-update-kernels</computeroutput> after installation."
+"In order to support older hardware the package <computeroutput>linux-"
+"image-486</computeroutput> is installed by default. If all LTSP client "
+"machines support the 686 processor architecture the <computeroutput>linux-"
+"image-686</computeroutput> package could be installed in the chroot. Make "
+"sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after "
+"installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2025
 msgid "LTSP client type selection"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2027
 msgid ""
 "Each LTSP server has two ethernet cards: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
@@ -5549,14 +4728,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2029
 msgid ""
 "On the main subnet the complete PXE menu is provided; the separate subnet "
 "for each LTSP server allows only diskless and thin LTSP client selection."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2031
 msgid ""
 "Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be "
 "started as diskless workstation or thin client. By default clients in the "
@@ -5566,11 +4743,9 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2032
 #, no-wrap
 msgid ""
-"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an "
-"editor\n"
+"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
 "with\n"
@@ -5579,27 +4754,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2042
 msgid "Configuring the PXE menu"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2044
 msgid ""
-"The PXE configuration is generated using the script "
-"<computeroutput>debian-edu-pxeinstall</computeroutput>.  It allows some "
-"settings to be overridden by adding a file "
-"<computeroutput>/etc/debian-edu/pxeinstall.conf</computeroutput> with "
-"replacement values."
+"The PXE configuration is generated using the script <computeroutput>debian-"
+"edu-pxeinstall</computeroutput>.  It allows some settings to be overridden "
+"by adding a file <computeroutput>/etc/debian-edu/pxeinstall.conf</"
+"computeroutput> with replacement values."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2048
 msgid "Configuring the PXE installation"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2050
 msgid ""
 "The PXE installation option is by default available to anyone able to PXE "
 "boot a machine. To password protect the PXE installation options, a file "
@@ -5608,42 +4778,36 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2051
 #, no-wrap
 msgid "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2052
 msgid ""
 "The password hash should be replaced with an MD5 hash for the desired "
 "password."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2054
 msgid ""
 "The PXE installation will inherit the language, keyboard layout and mirror "
 "settings from the settings used when installing the main-server, and the "
 "other questions will be asked during installation (profile, popcon "
 "participation, partitioning and root password). To avoid these questions, "
-"the file "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput> "
-"can be modified to provide preselected answers to debconf values. Some "
-"examples of available debconf values are already commented in "
+"the file <computeroutput>/etc/debian-edu/www/debian-edu-install.dat</"
+"computeroutput> can be modified to provide preselected answers to debconf "
+"values. Some examples of available debconf values are already commented in "
 "<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput>. "
-"Your changes will be lost as soon as "
-"<computeroutput>debian-edu-pxeinstall</computeroutput> is used to recreate "
-"the PXE-installation environment. To append debconf values to "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput> "
-"during recreation with "
-"<computeroutput>debian-edu-pxeinstall</computeroutput>, add the file "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</computeroutput> "
-"with your additional debconf values."
+"Your changes will be lost as soon as <computeroutput>debian-edu-pxeinstall</"
+"computeroutput> is used to recreate the PXE-installation environment. To "
+"append debconf values to <computeroutput>/etc/debian-edu/www/debian-edu-"
+"install.dat</computeroutput> during recreation with <computeroutput>debian-"
+"edu-pxeinstall</computeroutput>, add the file <computeroutput>/etc/debian-"
+"edu/www/debian-edu-install.dat.local</computeroutput> with your additional "
+"debconf values."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2056
 msgid ""
 "More information about modifying PXE installations can be found in the <link "
 "linkend=\"Installation--Modifying_PXE_installations\">Installation</link> "
@@ -5651,111 +4815,90 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2061
 msgid "Adding a custom repository for PXE installations"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2063
 msgid ""
-"For adding a custom repository add something like this to "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</computeroutput>:"
+"For adding a custom repository add something like this to <computeroutput>/"
+"etc/debian-edu/www/debian-edu-install.dat.local</computeroutput>:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2064
 #, no-wrap
 msgid ""
 "#add the skole projects local repository\n"
-"d-i     apt-setup/local1/repository string      http://example.org/debian "
-"stable main contrib non-free\n"
-"d-i     apt-setup/local1/comment string         Example Software "
-"Repository\n"
+"d-i     apt-setup/local1/repository string      http://example.org/debian stable main contrib non-free\n"
+"d-i     apt-setup/local1/comment string         Example Software Repository\n"
 "d-i     apt-setup/local1/source boolean         true\n"
 "d-i     apt-setup/local1/key    string          http://example.org/key.asc"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2069
 msgid ""
-"and then run "
-"<computeroutput>/usr/sbin/debian-edu-pxeinstall</computeroutput> once."
+"and then run <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
+"computeroutput> once."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2074
 msgid "Changing the PXE menu on a combined (main and LTSP) server"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2076
 msgid ""
 "The PXE menu allows network booting of LTSP clients, the installer and other "
-"alternatives.  The file "
-"<computeroutput>/var/lib/tftpboot/pxelinux.cfg/default</computeroutput> is "
-"used by default if no other file in that directory matches the client, and "
-"out of the box it is set to link to "
-"<computeroutput>/var/lib/tftpboot/debian-edu/default-menu.cfg</computeroutput>."
+"alternatives.  The file <computeroutput>/var/lib/tftpboot/pxelinux.cfg/"
+"default</computeroutput> is used by default if no other file in that "
+"directory matches the client, and out of the box it is set to link to "
+"<computeroutput>/var/lib/tftpboot/debian-edu/default-menu.cfg</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2078
 msgid ""
 "If all clients should boot as diskless workstations instead of getting the "
 "full PXE menu, this can be implemented by changing the symlink:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2079
 #, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2080
 msgid ""
 "If all clients should boot as thin clients instead, change the symlink like "
 "this:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2081
 #, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2082
 msgid ""
-"See also the PXELINUX documentation at <ulink "
-"url=\"http://syslinux.zytor.com/wiki/index.php/PXELINUX\"/> ."
+"See also the PXELINUX documentation at <ulink url=\"http://syslinux.zytor."
+"com/wiki/index.php/PXELINUX\"/> ."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2087
 msgid "Separate main and LTSP server"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2089
 msgid ""
 "For performance and security considerations it might be desired to set up a "
 "separate main server which doesn't act as LTSP server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2091
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
 "network, when tjener is not a combined server, follow these steps:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2095
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
@@ -5763,64 +4906,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2098
 msgid ""
-"copy "
-"<computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput> "
-"to the same directory on tjener."
+"copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+"computeroutput> to the same directory on tjener."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2101
 msgid ""
-"edit "
-"<computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput> "
-"to use the IP address of ltspserver00; the following example uses 10.0.2.10 "
-"for the IP address of ltspserver00 on the main network:"
+"edit <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+"computeroutput> to use the IP address of ltspserver00; the following example "
+"uses 10.0.2.10 for the IP address of ltspserver00 on the main network:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2102
 #, no-wrap
-msgid ""
-"DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img "
-"nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet "
-"ipappend 2"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2105
 msgid ""
-"set the symlink in "
-"<computeroutput>/var/lib/tftpboot/pxelinux.cfg</computeroutput> on tjener to "
-"point to "
-"<computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+"set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+"debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2107
 msgid ""
 "As an alternative, you could use <computeroutput>ldapvi</computeroutput>, "
 "search for 'next server tjener' and replace tjener with ltspserver00."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2113
 msgid "Changing network settings"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2115
 msgid ""
 "The debian-edu-config package comes with a tool which helps in changing the "
-"network from 10.0.0.0/8 to something else. Have a look at "
-"<computeroutput>/usr/share/debian-edu-config/tools/subnet-change</computeroutput>.  "
-"It is intended for use just after installation on the main server, to update "
-"LDAP and other files that need to be edited to change the subnet."
+"network from 10.0.0.0/8 to something else. Have a look at <computeroutput>/"
+"usr/share/debian-edu-config/tools/subnet-change</computeroutput>.  It is "
+"intended for use just after installation on the main server, to update LDAP "
+"and other files that need to be edited to change the subnet."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2117
 msgid ""
 "Note that changing to one of the subnets already used elsewhere in Debian "
 "Edu will not work.  192.168.1.0/24 is already set up as the thin client "
@@ -5829,7 +4958,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2119
 msgid ""
 "There is no easy way to change the DNS domain name.  Changing it would "
 "require changes to both the LDAP structure and several files in the main "
@@ -5840,45 +4968,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2124
 msgid "LTSP in detail"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2128
 msgid "LTSP client configuration in LDAP (and lts.conf)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2130
 msgid ""
 "To configure specific thin clients with particular features, you can add "
-"settings in LDAP or edit the file "
-"<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>."
+"settings in LDAP or edit the file <computeroutput>/opt/ltsp/i386/etc/lts."
+"conf</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2132
 msgid ""
-"We recommend to configure clients in LDAP (and not edit "
-"<computeroutput>lts.conf</computeroutput> directly--however, configuration "
-"webforms for LTSP are currently not available in GOsa², you have to use a "
-"plain LDAP browser/explorer or <computeroutput>ldapvi</computeroutput>), as "
-"this makes it possible to add and/or replace LTSP servers without loosing "
-"(or having to redo) configuration."
+"We recommend to configure clients in LDAP (and not edit <computeroutput>lts."
+"conf</computeroutput> directly--however, configuration webforms for LTSP are "
+"currently not available in GOsa², you have to use a plain LDAP browser/"
+"explorer or <computeroutput>ldapvi</computeroutput>), as this makes it "
+"possible to add and/or replace LTSP servers without loosing (or having to "
+"redo) configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2134
 msgid ""
 "The default values in LDAP are defined in the "
-"<computeroutput>cn=ltspConfigDefault,ou=ltsp,dc=skole,dc=skolelinux,dc=no</computeroutput> "
-"LDAP object using the <computeroutput>ltspConfig</computeroutput> "
-"attribute.  One can also add host specific entries in LDAP."
+"<computeroutput>cn=ltspConfigDefault,ou=ltsp,dc=skole,dc=skolelinux,dc=no</"
+"computeroutput> LDAP object using the <computeroutput>ltspConfig</"
+"computeroutput> attribute.  One can also add host specific entries in LDAP."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2136
 msgid ""
 "Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
 "lts.conf\" to have a look at available configuration options (see "
@@ -5887,23 +5009,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2138
 msgid ""
-"The default values are defined under "
-"<computeroutput>[default]</computeroutput>; to configure one client, specify "
-"it in terms of its MAC address or IP address like this: "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"The default values are defined under <computeroutput>[default]</"
+"computeroutput>; to configure one client, specify it in terms of its MAC "
+"address or IP address like this: <computeroutput>[192.168.0.10]</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2140
 msgid ""
 "Example: To make the thin client ltsp010 use 1280x1024 resolution, add "
 "something like this:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2141
 #, no-wrap
 msgid ""
 "[192.168.0.10]\n"
@@ -5913,19 +5032,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2145
 msgid "somewhere below the default settings."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2147
 msgid ""
 "To force usage of a specific xserver on an LTSP client, set the "
 "<computeroutput>XSERVER</computeroutput> variable. For example:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2148
 #, no-wrap
 msgid ""
 "[192.168.0.11]\n"
@@ -5933,69 +5049,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2150
 msgid ""
 "Depending on what changes you make, it may be necessary to restart the "
 "client."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2152
 msgid ""
 "To use IP addresses in <computeroutput>lts.conf</computeroutput> you need to "
 "add the client MAC address to your DHCP server. Otherwise you should use the "
-"client MAC address directly in your "
-"<computeroutput>lts.conf</computeroutput> file."
+"client MAC address directly in your <computeroutput>lts.conf</"
+"computeroutput> file."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2157
 msgid "Force all thin clients to use LXDE as default desktop environment"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2159
 msgid ""
 "Make sure that LXDE is installed on the thin client server; then add a line "
 "like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2160
 #, no-wrap
 msgid "LDM_SESSION=/usr/bin/startlxde"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2161
 msgid ""
 "Note, that users will still be able to select other installed desktop "
 "environments using the \"Settings\" feature of LDM."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2166
 msgid "Load-balancing LTSP servers"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2170
 msgid "Part 1"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2172
 msgid ""
 "It is possible to set up the clients to connect to one of several LTSP "
-"servers for load-balancing. This is done by providing "
-"<computeroutput>/opt/ltsp/i386/usr/share/ltsp/get_hosts</computeroutput> as "
-"a script printing one or more servers for LDM to connect to. In addition to "
-"this, each LTSP chroot needs to include the SSH host key for each of the "
-"servers."
+"servers for load-balancing. This is done by providing <computeroutput>/opt/"
+"ltsp/i386/usr/share/ltsp/get_hosts</computeroutput> as a script printing one "
+"or more servers for LDM to connect to. In addition to this, each LTSP chroot "
+"needs to include the SSH host key for each of the servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2174
 msgid ""
 "First of all, you must choose one LTSP server to be the load-balancing "
 "server. All the clients will PXE-boot from this server and load the "
@@ -6005,22 +5110,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2176
 msgid ""
-"The load-balancing server must be announced to the clients as the "
-"\"next-server\" via DHCP. As DHCP configuration is in LDAP, modifications "
-"have to be done there. Use <computeroutput>ldapvi --ldap-conf -ZD "
-"'(cn=admin)'</computeroutput> to edit the appropriate entry in LDAP. (Enter "
-"the main server's root password at the prompt; if VISUAL isn't set, the "
-"default editor will be nano.) Search for a line reading "
-"<computeroutput>dhcpStatements: next-server tjener</computeroutput> "
-"Next-server should be the IP address or hostname of the server you chose to "
-"be the load-balancing server. If you use hostname you must have a working "
-"DNS. Remember to restart the DHCP service."
+"The load-balancing server must be announced to the clients as the \"next-"
+"server\" via DHCP. As DHCP configuration is in LDAP, modifications have to "
+"be done there. Use <computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)'</"
+"computeroutput> to edit the appropriate entry in LDAP. (Enter the main "
+"server's root password at the prompt; if VISUAL isn't set, the default "
+"editor will be nano.) Search for a line reading "
+"<computeroutput>dhcpStatements: next-server tjener</computeroutput> Next-"
+"server should be the IP address or hostname of the server you chose to be "
+"the load-balancing server. If you use hostname you must have a working DNS. "
+"Remember to restart the DHCP service."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2178
 msgid ""
 "Now you have to move your clients from the 192.168.1.0 network to the "
 "10.0.0.0 network; attach them to the backbone network instead of the network "
@@ -6032,12 +5135,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2183
 msgid "Part 2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2185
 msgid ""
 "Now you have to make a \"get_hosts\" script that prints a server for LDM to "
 "connect to. The parameter LDM_SERVER overrides this script. In consequence, "
@@ -6047,27 +5148,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2187
 msgid "Edit \"/opt/ltsp/i386/etc/lts.conf\" and add something like this:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2188
 #, no-wrap
 msgid "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2189
 msgid ""
 "Replace xxxx with either the IP addresses or hostnames of the servers as a "
-"space-separated list. Then, put the following script in "
-"<computeroutput>/opt/ltsp/i386/usr/lib/ltsp/get_hosts</computeroutput> on "
-"the server you chose to be the load-balancing server."
+"space-separated list. Then, put the following script in <computeroutput>/opt/"
+"ltsp/i386/usr/lib/ltsp/get_hosts</computeroutput> on the server you chose to "
+"be the load-balancing server."
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2190
 #, no-wrap
 msgid ""
 "#!/bin/bash\n"
@@ -6087,81 +5184,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2207
 msgid "Part 3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2209
 msgid ""
 "Now that you've made the \"get_hosts\" script, it's time to make the SSH "
 "host key for the LTSP chroots. This can be done by making a file containing "
-"the content of "
-"<computeroutput>/opt/ltsp/i386/etc/ssh/ssh_known_hosts</computeroutput> from "
-"all the LTSP servers that will be load-balanced. Save this file as "
-"<computeroutput>/etc/ltsp/ssh_known_hosts.extra</computeroutput> on all "
-"load-balanced servers. The last step is very important because "
-"ltsp-update-sshkeys runs every time a server is booted, and "
-"<computeroutput>/etc/ltsp/ssh_known_hosts.extra</computeroutput> is included "
-"if it exists."
+"the content of <computeroutput>/opt/ltsp/i386/etc/ssh/ssh_known_hosts</"
+"computeroutput> from all the LTSP servers that will be load-balanced. Save "
+"this file as <computeroutput>/etc/ltsp/ssh_known_hosts.extra</"
+"computeroutput> on all load-balanced servers. The last step is very "
+"important because ltsp-update-sshkeys runs every time a server is booted, "
+"and <computeroutput>/etc/ltsp/ssh_known_hosts.extra</computeroutput> is "
+"included if it exists."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2211
 msgid ""
-"If you save your new host file as "
-"<computeroutput>/opt/ltsp/i386/etc/ssh/ssh_known_hosts</computeroutput>, it "
-"will be erased when you reboot the server."
+"If you save your new host file as <computeroutput>/opt/ltsp/i386/etc/ssh/"
+"ssh_known_hosts</computeroutput>, it will be erased when you reboot the "
+"server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2213
 msgid ""
 "There are some obvious weaknesses with this setup. All clients get their "
 "image from the same server, which causes high loads on the server if many "
 "clients are booted at the same time. Also, the clients require that server "
-"to be always available; without it they cannot boot or get an LDM "
-"server. Therefore this setup is very dependent on one server, which isn't "
-"very good."
+"to be always available; without it they cannot boot or get an LDM server. "
+"Therefore this setup is very dependent on one server, which isn't very good."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2215
 msgid "Your clients should now be load-balanced!"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2221
 msgid "Sound with LTSP clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2223
 msgid ""
 "LTSP thin clients support three different audio systems for applications: "
 "ESD, PulseAudio and ALSA.  ESD and PulseAudio support networked audio and "
 "are used to pass audio from the server to the clients.  ALSA is configured "
 "to redirect its sound via PulseAudio.  For selected applications only "
-"supporting the OSS audio system, a wrapper is created by "
-"<computeroutput>/usr/sbin/debian-edu-ltsp-audiodivert</computeroutput> to "
-"redirect their sound to PulseAudio.  Run this script without arguments to "
-"get a list of applications with such redirection enabled."
+"supporting the OSS audio system, a wrapper is created by <computeroutput>/"
+"usr/sbin/debian-edu-ltsp-audiodivert</computeroutput> to redirect their "
+"sound to PulseAudio.  Run this script without arguments to get a list of "
+"applications with such redirection enabled."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2225
 msgid ""
 "LTSP diskless workstations handle audio locally and have none of the special "
 "setup needed for networked audio."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2230
 msgid "Upgrading the LTSP environment"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2232
 msgid ""
 "It is useful to upgrade the LTSP environment with new packages fairly often, "
 "to make sure security fixes and improvements are made available.  To "
@@ -6169,11 +5254,9 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2233
 #, no-wrap
 msgid ""
-"ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it "
-"also prevents daemons from being started\n"
+"ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
 "aptitude update\n"
 "aptitude upgrade\n"
 "aptitude dist-upgrade\n"
@@ -6181,19 +5264,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2240
 msgid "Installing additional software in the LTSP environment"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2242
 msgid ""
 "To install additional software for an LTSP client you must perform the "
 "installation inside the chroot of the LTSP server."
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2243
 #, no-wrap
 msgid ""
 "ltsp-chroot -a i386\n"
@@ -6205,12 +5285,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2253
 msgid "Slow login and security"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2255
 msgid ""
 "Skolelinux has added several security features on the client network "
 "preventing unauthorised superuser access, password sniffing, and other "
@@ -6218,19 +5296,16 @@ msgid ""
 "secure login using SSH, which is the default with LDM. This can slow down "
 "some client machines which are more than about ten years old, with as little "
 "as a 160 MHz processor and 32 MB RAM. Although it's not recommended, you can "
-"add the value \"True\" in the "
-"<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput> file on the "
-"server:"
+"add the value \"True\" in the <computeroutput>/opt/ltsp/i386/etc/lts.conf</"
+"computeroutput> file on the server:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2256
 #, no-wrap
 msgid "LDM_DIRECTX=True"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2257
 msgid ""
 "<emphasis role=\"strong\">Warning</emphasis>: The above protects initial "
 "login, but all activities after that use unencrypted networked X. Passwords "
@@ -6239,7 +5314,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2259
 msgid ""
 "Note: Since such ten-year-old thin clients may also have trouble running "
 "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
@@ -6249,12 +5323,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2265
 msgid "Replacing LDM with KDM"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2267
 msgid ""
 "Since version 3.0 Skolelinux has been running LDM as its login manager, "
 "which uses a secure SSH tunnel to log in. Switching to KDM also requires a "
@@ -6263,103 +5335,86 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2269
 msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use "
-"encryption. Passwords will travel in cleartext over the network, as well as "
-"anything else."
+"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
+"Passwords will travel in cleartext over the network, as well as anything "
+"else."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2271
 msgid ""
 "Note: local devices with <computeroutput>ltspfs</computeroutput> will stop "
 "working without LDM."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2273
 msgid "To check if XDMCP is running, run this command from a workstation:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2274
 #, no-wrap
 msgid "X -query ltspserverXX"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2275
 msgid "If you are on the thin client network, run this command:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2276
 #, no-wrap
 msgid "X -query 192.168.0.254"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2277
 msgid ""
 "The goal is to let your \"real\" thin client contact the xdmcp-server on "
 "192.168.0.254 (given a standard Skolelinux configuration)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2279
 msgid ""
 "If XDMCP is not accessible on your server which runs KDM, add the following "
 "to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2280
 #, no-wrap
 msgid "* # any host can get a login window"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2281
 msgid ""
 "The star before the comment '#' is important; the rest is a comment, of "
 "course"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2283
 msgid "Then turn on XDMCP in KDM with the command:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2284
 #, no-wrap
 msgid "sudo update-ini-file /etc/kde4/kdm/kdmrc Xdmcp Enable true"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2285
 msgid "Finally, restart KDM by running:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2286
 #, no-wrap
 msgid "sudo service kdm restart"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2290
 msgid "Connecting Windows machines to the network / Windows integration"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2294
 msgid "Joining a domain"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2296
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
 "joined. A special service called Samba, installed on the main-server tjener, "
@@ -6368,14 +5423,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2298
 msgid ""
 "Joining a domain with a Windows client requires the steps described in the "
 "<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2300
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
@@ -6385,23 +5438,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2304
 msgid "User groups in Windows"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2306
 msgid ""
 "Groupmaps must also be added for any other user group you add through "
 "<computeroutput>GOsa²</computeroutput>. If you want your user groups to be "
 "available in Windows, e.g. for netlogon scripts or other group dependant "
 "actions, you can add them using variations of the following command. Samba "
-"will function without these groupmaps, but Windows machines won't be "
-"group-aware."
+"will function without these groupmaps, but Windows machines won't be group-"
+"aware."
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2307
 #, no-wrap
 msgid ""
 "/usr/bin/net groupmap add unixgroup=students \\\n"
@@ -6410,14 +5460,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2311
 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)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2313
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
@@ -6426,12 +5474,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2319
 msgid "XP home"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2321
 msgid ""
 "Users bringing in their XP laptops from home can still connect to tjener "
 "using their skolelinux credentials, provided the workgroup is set to "
@@ -6440,12 +5486,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2326
 msgid "Managing roaming profiles"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2328
 msgid ""
 "Roaming profiles contain user work environments which include desktop items "
 "and settings. Examples include personal files, desktop icons and menus, "
@@ -6455,7 +5499,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2330
 msgid ""
 "Since the profile is copied from the server to the machine during logon, and "
 "copied back to the server during logout, a large profile can make Windows "
@@ -6467,7 +5510,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2332
 msgid ""
 "<emphasis>The educational approach</emphasis>: one way to deal with "
 "overlarge profiles is to explain the situation to the users. Tell them not "
@@ -6476,140 +5518,117 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2334
 msgid ""
 "<emphasis>Tweaking the profile</emphasis>: a different approach to dealing "
 "with the problem is to remove parts of the profile, and redirect other parts "
 "to regular file storage. This moves the workload from the users to the "
 "administrator, while adding complexity to the installation. There are at "
-"least three ways to edit the parts that are removed from the roaming "
-"profile."
+"least three ways to edit the parts that are removed from the roaming profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2338
 msgid "Example smb.conf files for roaming profiles"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2340
 msgid ""
 "You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under "
-"<computeroutput>/usr/share/debian-edu-config/examples/</computeroutput>. The "
-"source file is in English and is called "
-"<computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look for a "
-"file with the appropriate code in the filename (the German translation, for "
-"example, will be named "
-"<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside the "
-"config file are a lot of explanations which you should have a look at."
+"delivered by the installation on tjener under <computeroutput>/usr/share/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
+"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
+"de.conf</computeroutput>). Inside the config file are a lot of explanations "
+"which you should have a look at."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2345
 msgid "Machine policies for roaming profiles"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2347
 msgid "Machine policies can be edited and copied to all the other computers."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2350
 msgid ""
-"Pick a freshly installed Windows computer, and run "
-"<computeroutput>gpedit.msc</computeroutput>"
+"Pick a freshly installed Windows computer, and run <computeroutput>gpedit."
+"msc</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2353
 msgid ""
-"Under the selection \"User Configuration\" -> \"Administrative "
-"Templates\" -> \"System\" -> \"User Profiles\" -> \"Exclude "
-"directories in roaming profile\", you can enter a semicolon-separated list "
-"of directories to exclude from the profile.  The directories are "
-"internationalised and must be written in your own language the way they are "
-"in the profile. Examples of directories to exclude are:"
+"Under the selection \"User Configuration\" -> \"Administrative Templates"
+"\" -> \"System\" -> \"User Profiles\" -> \"Exclude directories in "
+"roaming profile\", you can enter a semicolon-separated list of directories "
+"to exclude from the profile.  The directories are internationalised and must "
+"be written in your own language the way they are in the profile. Examples of "
+"directories to exclude are:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2357
 msgid "log"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2360
 msgid "Locale settings"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2363 debian-edu-wheezy-manual.xml:2372
 msgid "Temporary Internet Files"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2366
 msgid "My Documents"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2369
 msgid "Application Data"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2375
 msgid "Save your changes, and exit the editor."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2378
 msgid ""
 "Copy <computeroutput>c:\\windows\\system32\\GroupPolicy</computeroutput> to "
 "all other Windows machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2382
 msgid ""
 "It's a good idea to copy it to your Windows OS deployment system to have it "
 "included at install time."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2387
 msgid "Global policies for roaming profiles"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2389
 msgid ""
-"By using the legacy Windows policy editor "
-"(<computeroutput>poledit.exe</computeroutput>), you can can create a Policy "
-"file (NTConfig.pol) and put it in your netlogon share on tjener. This has "
-"the advantage of working almost instantly on all Windows machines."
+"By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
+"computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
+"in your netlogon share on tjener. This has the advantage of working almost "
+"instantly on all Windows machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2391
 msgid ""
 "For some time, the policy editor standalone download has been removed from "
 "the Microsoft web site, but it's still available as part of the ORK Tools."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2393
 msgid ""
-"With <computeroutput>poledit.exe</computeroutput> you can create .pol "
-"files. If you put such a file on tjener as "
-"<computeroutput>/etc/samba/netlogon/NTLOGON.POL</computeroutput> it will "
-"automatically be read by Windows machines and temporarily overwrite the "
-"registry, thus applying the changes."
+"With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
+"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
+"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
+"machines and temporarily overwrite the registry, thus applying the changes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2395
 msgid ""
 "To make sensible use of <computeroutput>poledit.exe</computeroutput> you "
 "also need to download appropriate .adm files for your operating system and "
@@ -6618,112 +5637,94 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2397
 msgid ""
-"Be aware that the new group policy tools, "
-"<computeroutput>gpedit.msc</computeroutput> and "
-"<computeroutput>gpmc.msc</computeroutput>, cannot create .pol files; they "
-"either only work for the local machine or need an Active Directory server."
+"Be aware that the new group policy tools, <computeroutput>gpedit.msc</"
+"computeroutput> and <computeroutput>gpmc.msc</computeroutput>, cannot "
+"create .pol files; they either only work for the local machine or need an "
+"Active Directory server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2399
 msgid ""
 "If you understand German, <ulink url=\"http://gruppenrichtlinien.de\"/> is a "
 "very good web site on this topic."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2404
 msgid "Editing Windows registry"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2406
 msgid ""
 "You can edit the registry of the local computer, and copy this registry key "
 "to other computers"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2409
 msgid "Start the Registry Editor."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2412
 msgid ""
 "Navigate to <computeroutput>HKEY_CURRENT_USER\\Software\\Microsoft\\Windows "
 "NT\\CurrentVersion\\Winlogon</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2415
 msgid "Use the menu \"Edit menu\" -> \"New\" -> \"String Value\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2418
 msgid "Call it <computeroutput>ExcludeProfileDirs</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2421
 msgid ""
 "Enter a semicolon-separated list of paths to exclude (in the same way as for "
 "a machine policy)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2424
 msgid ""
 "Now you can choose to export this registry key as a .reg file. Mark a "
 "selection, right-click, and select \"Export\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2427
 msgid ""
 "Save the file and you can double click it, or add it to a script to spread "
 "it to other machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2429
 msgid "Sources:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2433
 msgid ""
-"<ulink "
-"url=\"http://technet2.microsoft.com/windowsserver/en/technologies/featured/gp/default.mspx\"/>"
+"<ulink url=\"http://technet2.microsoft.com/windowsserver/en/technologies/"
+"featured/gp/default.mspx\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2436
 msgid ""
-"<ulink "
-"url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/PolicyMgmt.html\"/>"
+"<ulink url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/"
+"PolicyMgmt.html\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2439
 msgid "<ulink url=\"http://isg.ee.ethz.ch/tools/realmen/det/skel.en.html\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2442
 msgid "<ulink url=\"http://www.css.taylor.edu/~nehresma/samba.html\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2448
 msgid "Redirecting profile directories"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2450
 msgid ""
 "Sometimes just removing directories from the profile is not enough. You may "
 "find that users lose files because they mistakenly save things into \"My "
@@ -6733,23 +5734,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2454
 msgid "Redirecting using machine policies"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2456
 msgid ""
 "All the instructions given above about machine policies apply here too.  You "
 "can use <computeroutput>gpedit.msc</computeroutput> to edit the policy and "
 "copy it to all machines. The redirection should be available under \"User "
-"Configuration\" -> \"Windows Settings\" -> \"Folder "
-"Redirection\". Directories that it can be useful to redirect include "
-"\"Desktop\" and \"My Documents\"."
+"Configuration\" -> \"Windows Settings\" -> \"Folder Redirection\". "
+"Directories that it can be useful to redirect include \"Desktop\" and \"My "
+"Documents\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2458
 msgid ""
 "One thing to remember is that if you enable folder redirection, those "
 "folders are automatically added to the synchronised folders list. If you do "
@@ -6757,43 +5755,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2462
 msgid ""
-"\"User Configuration\" -> \"Administrative Templates\" -> \"Network\" "
-"-> \"Offline Files\""
+"\"User Configuration\" -> \"Administrative Templates\" -> \"Network\" -"
+"> \"Offline Files\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2465
 msgid ""
-"\"Computer Configuration\" -> \"Administrative Templates\" -> "
-"\"Network\" -> \"Offline Files\""
+"\"Computer Configuration\" -> \"Administrative Templates\" -> \"Network"
+"\" -> \"Offline Files\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2470
 msgid "Redirecting using global policies"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2473
 msgid ""
 "FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2479
 msgid "Avoiding roaming profiles"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2483
 msgid "Disabling roaming using a local policy"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2485
 msgid ""
 "Using local policies, you can disable the roaming profile on individual "
 "machines. This is often wanted on special machines - for instance on "
@@ -6801,7 +5792,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2487
 msgid ""
 "You can use the machine policy method describe above; the key is in "
 "\"Administrative Templates\" -> \"System\" -> \"User Profiles\" -> "
@@ -6809,22 +5799,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2492
 msgid "Disabling roaming using global policies"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2495
 msgid "FIXME: describe roaming profile key for the global policy editor here"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2500
 msgid "Disabling roaming in smb.conf"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2502
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
@@ -6834,7 +5820,6 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2503
 #, no-wrap
 msgid ""
 "logon path = \"\"\n"
@@ -6842,17 +5827,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2510
 msgid "Remote Desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2514
 msgid "Remote Desktop Service"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2516
 msgid ""
 "Beginning with this release, choosing the thin client server profile or the "
 "combined server profile installs xrdp, a package which uses the Remote "
@@ -6863,12 +5845,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2518
 msgid "Additionally, xrdp can connect to a VNC server or another RDP server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2520
 msgid ""
 "Some municipalities provide a remote desktop solution so that students and "
 "teachers can access Skolelinux from their home computer running Windows, Mac "
@@ -6876,34 +5856,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2525
 msgid "Available Remote Desktop clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2529
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default and is "
 "captable of RDP and VNC."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2533
 msgid ""
 "RDP - the easiest way to access Windows terminal server. An alternative "
 "client package is <computeroutput>rdesktop</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2536
 msgid ""
 "VNC client (Virtual Network Computer) gives access to Skolelinux remotely.  "
-"An alternative client package is "
-"<computeroutput>xvncviewer</computeroutput>."
+"An alternative client package is <computeroutput>xvncviewer</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2539
 msgid ""
 "NX graphical client gives students and teachers access to Skolelinux "
 "remotely on Windows, Mac or Linux PC. One municipality in Norway has "
@@ -6912,45 +5886,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2542
 msgid ""
 "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/CitrixApps\">Citrix ICA "
 "client HowTo</ulink> to access Windows terminal server from Skolelinux."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2554
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs\"/>"
+msgid ""
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2557
 msgid ""
-"<ulink "
-"url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation\"/>"
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation"
+"\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:2563
 msgid "Samba in Debian Edu"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:2565
 msgid ""
-"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an "
-"NT4-style domain controller with Windows XP, Windows Vista and Windows 7 as "
+"Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
+"style domain controller with Windows XP, Windows Vista and Windows 7 as "
 "clients. After a machine has joined the domain, this machine can be fully "
 "managed with GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2569
 msgid "Getting Started"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2571
 msgid ""
 "This documentation presumes that you have installed the Debian Edu main "
 "server and maybe also a Debian Edu workstation to verify that working under "
@@ -6961,7 +5929,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2573
 msgid ""
 "After installation of the Debian Edu main server the Samba host \\\\TJENER "
 "should be visible in your Windows Network Neighbourhood. Debian Edu's "
@@ -6970,73 +5937,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2576 debian-edu-wheezy-manual.xml:2591
 msgid "START -> Run command"
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2579
 msgid "enter \\\\TJENER and press return"
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2582
 msgid ""
-"-> a Windows Explorer window should open and show the netlogon share on "
-"\\\\TJENER, and maybe printers you already have configured for printing "
-"under Unix/Linux (CUPS queues)."
+"-> a Windows Explorer window should open and show the netlogon share on \\"
+"\\TJENER, and maybe printers you already have configured for printing under "
+"Unix/Linux (CUPS queues)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2586
 msgid "Accessing files via Samba"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2588
 msgid ""
 "Student and teacher user accounts that have been configured via GOsa² should "
-"be able to authenticate against \\\\TJENER\\HOMES or "
-"\\\\TJENER\\<username> and access their home directories with Windows "
-"machines <emphasis role=\"strong\">not</emphasis> joined to the Windows "
-"SKOLELINUX domain."
+"be able to authenticate against \\\\TJENER\\HOMES or \\\\TJENER\\<"
+"username> and access their home directories with Windows machines "
+"<emphasis role=\"strong\">not</emphasis> joined to the Windows SKOLELINUX "
+"domain."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2594
-msgid "enter \\\\TJENER\\HOMES or \\\\TJENER\\<username> and press return"
+msgid ""
+"enter \\\\TJENER\\HOMES or \\\\TJENER\\<username> and press return"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2597
 msgid ""
 "enter your login credentials (username, password) in the authentication "
 "dialog window that appears"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2600
 msgid ""
 "-> a Windows Explorer window should open and show files and folders in "
 "your Debian Edu home directory."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2602
 msgid ""
 "By default only the [homes] and the [netlogon] shares are exported; further "
-"share examples for students and teachers can be found in "
-"<computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on your "
-"Debian Edu main server."
+"share examples for students and teachers can be found in <computeroutput>/"
+"etc/samba/smb-debian-edu.conf</computeroutput> on your Debian Edu main "
+"server."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2608
 msgid "Domain Membership"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2610
 msgid ""
 "To use Samba on TJENER as a domain controller, your network's Windows "
 "workstations have to join the SKOLELINUX domain provided by the Debian Edu "
@@ -7044,7 +6001,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2612
 msgid ""
 "The first thing you have to do is to enable the SKOLELINUX\\Administrator "
 "account. This account is not intended for day-to-day usage; its current main "
@@ -7054,12 +6010,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2615
 msgid "$ sudo smbpasswd -e Administrator"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2617
 msgid ""
 "The password of SKOLELINUX\\Administrator has been preconfigured during the "
 "main server's installation. Please use the system's root account when "
@@ -7067,24 +6021,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2619
 msgid ""
 "Once you are done with your administrative work make sure to disable the "
 "SKOLELINUX\\Administrator account again:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2622
 msgid "$ sudo smbpasswd -d Administrator"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2626
 msgid "Windows hostname"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2628
 msgid ""
 "Make sure your Windows machine has the name that you want to use in the "
 "SKOLELINUX domain. If not, rename it first (and then reboot). The NetBIOS "
@@ -7093,52 +6043,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2633
 msgid "Joining the SKOLELINUX Domain with Windows XP"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2635
 msgid ""
 "Joining Windows XP machines (tested with Service Pack 3) works out of the "
 "box."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2637
 msgid ""
 "NOTE: Windows XP Home does not support domain membership; Windows XP "
 "Professional is required here."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2640
 msgid ""
 "log on to the Windows XP machine as Administrator (or any other account with "
 "Administrator privileges)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2643 debian-edu-wheezy-manual.xml:2676
 msgid ""
-"click on \"Start\" then right-click on \"Computer\" and click on "
-"\"Properties\""
+"click on \"Start\" then right-click on \"Computer\" and click on \"Properties"
+"\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2646
 msgid "select tab \"Computer Name\" and click on \"Change...\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2649 debian-edu-wheezy-manual.xml:2685
 msgid ""
 "under \"Member of\", select the radio button beside \"Domain:\", type "
 "SKOLELINUX and then click \"OK\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2652 debian-edu-wheezy-manual.xml:2688
 msgid ""
 "a pop up box will request to enter credentials of an account with rights to "
 "join the domain. Type username SKOLELINUX\\Administrator and the root "
@@ -7146,36 +6088,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2655 debian-edu-wheezy-manual.xml:2691
 msgid ""
-"a confirmation pop up box will welcome you to the SKOLELINUX "
-"domain. Clicking on \"OK\", will result in having another message informing "
-"that a reboot for the machine is required to apply the changes. Click on "
-"\"OK\""
+"a confirmation pop up box will welcome you to the SKOLELINUX domain. "
+"Clicking on \"OK\", will result in having another message informing that a "
+"reboot for the machine is required to apply the changes. Click on \"OK\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2657 debian-edu-wheezy-manual.xml:2693
 msgid ""
-"After the reboot, when you login the first time, click on the \"Options "
-">>\" button and select the domain SKOLELINUX instead of the local "
-"domain (\"this computer\")"
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2659 debian-edu-wheezy-manual.xml:2695
 msgid ""
 "If joining the domain has been successful you should then be able to view "
 "the host details within GOsa² (under the menu section \"Systems\")."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2664
 msgid "Joining the SKOLELINUX Domain with Windows Vista/7"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2666
 msgid ""
 "Joining Windows Vista/7 machines to the SKOLELINUX domain requires the "
 "installation of a registry patch on the Windows Vista/7 client. This patch "
@@ -7183,44 +6119,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2669
-msgid "\\\\tjener\\netlogon\\win7+samba_domain-membership\\Win7_Samba3DomainMember.reg"
+msgid ""
+"\\\\tjener\\netlogon\\win7+samba_domain-membership\\Win7_Samba3DomainMember."
+"reg"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2671
 msgid ""
-"For further information please consult the included "
-"README_Win7-Domain-Membership.txt in the same folder. Make sure you apply "
-"this patch as a local Administrator of the Windows system."
+"For further information please consult the included README_Win7-Domain-"
+"Membership.txt in the same folder. Make sure you apply this patch as a local "
+"Administrator of the Windows system."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2673
 msgid ""
 "After applying the above patch and rebooting the client system you should be "
 "able to join the SKOLELINUX domain:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2679
 msgid ""
 "the basic system information page will open. Under \"Computer name, domain, "
 "and workgroup settings\", click on \"Change Settings\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2682
 msgid "on the System Properties page, click on \"Change...\""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2701
 msgid "First Domain Logon"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2703
 msgid ""
 "Debian Edu ships some logon scripts that pre-configure the Windows user "
 "profile on first logon. When logging on to a Windows workstation that has "
@@ -7228,31 +6159,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2706
 msgid ""
 "copy the user's Firefox profile to a separate location and register that "
 "with Mozilla Firefox on Windows"
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2709
 msgid "set up Web-Proxy and start page in Firefox"
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2712
 msgid "set up Web-Proxy and start page in IE"
 msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2715
 msgid ""
 "add a MyHome icon to the Desktop that points to drive H: and opens Windows "
 "Explorer on double-click"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2717
 msgid ""
 "Other tasks are run on every logon. For further information on this, please "
 "refer to the <computeroutput>/etc/samba/netlogon</computeroutput> folder on "
@@ -7260,12 +6186,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:2723
 msgid "HowTos for teaching and learning"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:2725
 msgid ""
 "All the Debian packages on this page can be installed by running either "
 "<computeroutput>aptitude install <package></computeroutput> or "
@@ -7273,12 +6197,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2729
 msgid "Moodle"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2731
 msgid ""
 "<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
 "a free, Open Source course management system - software designed using sound "
@@ -7290,51 +6212,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2733
 msgid ""
 "There are <ulink url=\"http://moodle.org/sites/\">moodle sites</ulink> all "
 "over the world, mostly concentrated in Europe and North America. Check the "
 "site of an <ulink url=\"http://moodle.org/sites/\">institution</ulink> near "
-"you to get an idea about it. More information is available at the <ulink "
-"url=\"http://moodle.org\">moodle project page,</ulink> including <ulink "
-"url=\"http://docs.moodle.org/en/Main_Page\">documentation</ulink> and <ulink "
-"url=\"http://moodle.org/support/\">support</ulink>."
+"you to get an idea about it. More information is available at the <ulink url="
+"\"http://moodle.org\">moodle project page,</ulink> including <ulink url="
+"\"http://docs.moodle.org/en/Main_Page\">documentation</ulink> and <ulink url="
+"\"http://moodle.org/support/\">support</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2738
 msgid "Teaching Prolog"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2740
 msgid ""
-"<ulink "
-"url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</ulink> is "
-"an open source implementation of the programming language Prolog, commonly "
-"used for teaching and semantic web applications."
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"ulink> is an open source implementation of the programming language Prolog, "
+"commonly used for teaching and semantic web applications."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2745
 msgid "Monitoring pupils"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2747
 msgid ""
-"Some schools use control tools like <ulink "
-"url=\"https://packages.debian.org/stable/controlaula#\">Controlaula</ulink> "
-"or <ulink "
-"url=\"https://packages.debian.org/stable/italc-master#\">iTALC</ulink> to "
-"supervise their students.  See also the <ulink "
-"url=\"http://sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page\">iTALC "
-"Wiki</ulink> (and the documentation in bug <ulink "
-"url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
+"debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
+"students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2749
 msgid ""
 "<emphasis role=\"strong\">Warning</emphasis>: make sure you know the status "
 "of the laws about monitoring and restricting computer users' activities in "
@@ -7342,55 +6255,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2754
 msgid "Restricting pupils' network access"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2756
 msgid ""
-"Some schools use <ulink "
-"url=\"https://packages.debian.org/stable/squidguard#\">Squidguard</ulink> or "
-"<ulink "
-"url=\"https://packages.debian.org/stable/dansguardian#\">Dansguardian</ulink> "
-"to restrict Internet access."
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
+"dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2761
 msgid "Smart-Board integration"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2763
 msgid ""
-"Some schools use the products of <ulink "
-"url=\"http://smarttech.com\">Smarttech</ulink> for their teaching. You need "
-"a workstation with drivers and software for this, Smarttech has published "
-"some working non-free Software in a Debian Repository as a download. A local "
-"copy of this repository needs to be put inside the school network, so that "
-"the smartboard software could be installed on our machines. So teachers and "
-"pupils can prepare for class on every computer:"
+"Some schools use the products of <ulink url=\"http://smarttech.com"
+"\">Smarttech</ulink> for their teaching. You need a workstation with drivers "
+"and software for this, Smarttech has published some working non-free "
+"Software in a Debian Repository as a download. A local copy of this "
+"repository needs to be put inside the school network, so that the smartboard "
+"software could be installed on our machines. So teachers and pupils can "
+"prepare for class on every computer:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2767
 msgid "Providing the repository on tjener"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2769
 msgid ""
-"Download the repository as a tar.gz file from <ulink "
-"url=\"http://smarttech.com/us/Support/Browse+Support/Download+Software/Software/SMART+Notebook+collaborative+learning+software/Previous+versions/SMART+Notebook+10_2+for+Linux\"/>."
+"Download the repository as a tar.gz file from <ulink url=\"http://smarttech."
+"com/us/Support/Browse+Support/Download+Software/Software/SMART+Notebook"
+"+collaborative+learning+software/Previous+versions/SMART+Notebook+10_2+for"
+"+Linux\"/>."
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2770
 #, no-wrap
 msgid ""
-"# move the tar.gz file to a repository directory on the school network's "
-"webroot (by default located on tjener):\n"
+"# move the tar.gz file to a repository directory on the school network's webroot (by default located on tjener):\n"
 "root at tjener:~# \n"
 "mkdir /etc/debian-edu/www/debian\n"
 "mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -7401,66 +6306,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2781
 msgid "Add the needed packages to the PXE installation image"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2783
 msgid ""
-"Add the following lines to "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</computeroutput>:"
+"Add the following lines to <computeroutput>/etc/debian-edu/www/debian-edu-"
+"install.dat.local</computeroutput>:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2784
 #, no-wrap
 msgid ""
 "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string "
-"smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2788
 msgid "Update the preseed file:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2789
 #, no-wrap
 msgid "/usr/sbin/debian-edu-pxeinstall"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2790
 msgid ""
-"After this, new installations via PXE will have the <ulink "
-"url=\"https://wiki.debian.org/SmartBoard#\">SmartBoard</ulink> software "
-"installed."
+"After this, new installations via PXE will have the <ulink url=\"https://"
+"wiki.debian.org/SmartBoard#\">SmartBoard</ulink> software installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2795
 msgid "Adding the SmartBoard software manually after installation"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2797
 msgid "The following instructions are for updating LTSP chroots."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2799
 msgid ""
-"Using an editor add the following lines to "
-"<computeroutput>/etc/apt/sources.list</computeroutput> in the chroot:"
+"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"list</computeroutput> in the chroot:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2800
 #, no-wrap
 msgid ""
 "### SMART Repo\n"
@@ -7468,23 +6361,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2802
 msgid "Start the editor like this:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2803
 #, no-wrap
 msgid "ltsp-chroot -a i386 editor /etc/apt/sources.list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2804
 msgid "Add the repository key and install the software:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:2805
 #, no-wrap
 msgid ""
 "ltsp-chroot -a i386 wget http://www/debian/swbuild.asc\n"
@@ -7492,12 +6381,10 @@ msgid ""
 "ltsp-chroot -a i386 rm swbuild.asc\n"
 "# update the dpkg database and install the wanted packages\n"
 "ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install "
-"smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2817
 msgid ""
 "The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
 "either user- or developer-specific. Let's move the user-specific HowTos over "
@@ -7507,31 +6394,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2821
 msgid ""
 "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/TeacherFirstStep\"/> - "
 "incomplete but interesting"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:2827
 msgid "HowTos for users"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2831
 msgid "Changing passwords"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2833
 msgid ""
 "Every user should change her or his password by using GOsa². To do so, just "
 "use a browser and go to <computeroutput>https://www/gosa/</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2835
 msgid ""
 "Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
 "LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
@@ -7539,7 +6421,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2837
 msgid ""
 "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
 "but this will only update the Kerberos password, and not the Samba and GOsa² "
@@ -7548,64 +6429,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2842
 msgid "Java"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2846
 msgid "running standalone Java applications"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2848
 msgid ""
 "Standalone Java applications are supported out of the box by the OpenJDK "
 "Java runtime."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2853
 msgid "Running Java applications in the web browser"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2855
 msgid ""
 "Running Java applets in the browser are supported out of the box by the "
 "OpenJDK Java runtime."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2861
 msgid "Using email"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2863
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
 "mail outside the internal network, the adminstrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
-"situation, starting with <computeroutput>dpkg-reconfigure "
-"exim4-config</computeroutput>."
+"situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2865
 msgid "Every user who wants to use KMail needs to configure it as follows."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2867
 msgid ""
 "Start KMail, click \"Next\" in the Account Wizard, select "
 "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
-"real name and e-mail address "
-"<computeroutput>username at postoffice.intern</computeroutput>, click "
-"\"Next\". Check if the username is correct, don't enter the password, click "
-"\"Next\". (Kerberos provides single sign on concerning SMTP and IMAP, so you "
-"don't have to enter your password.) Enter "
+"real name and e-mail address <computeroutput>username at postoffice.intern</"
+"computeroutput>, click \"Next\". Check if the username is correct, don't "
+"enter the password, click \"Next\". (Kerberos provides single sign on "
+"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
 "<computeroutput>postoffice.intern</computeroutput> twice as server name, "
 "click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
 "menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
@@ -7614,21 +6485,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2869
 msgid ""
 "Now send a test email to yourself. (This will create the IMAP folders on the "
-"server.) Wait a little bit, then click \"Check Mail\" in the KMail "
-"menu. There should be your recently sent email in the inbox below of "
-"\"intern\"."
+"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
+"There should be your recently sent email in the inbox below of \"intern\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2873
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-#: debian-edu-wheezy-manual.xml:2875
 msgid ""
 "If working on a diskless workstation, you don't have a Kerberos TGT by "
 "default. To get one, click the credentials button in the system tray. Enter "
@@ -7636,48 +6503,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2881
 msgid "Volume control"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2883
 msgid ""
 "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
-"<computeroutput>alsamixer</computeroutput> (but not "
-"<computeroutput>kmix</computeroutput>) can be used to change audio volume."
+"<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+"computeroutput>) can be used to change audio volume."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2885
 msgid ""
 "On other machines (workstations, LTSP servers, and diskless workstations), "
-"<computeroutput>kmix</computeroutput> or "
-"<computeroutput>alsamixer</computeroutput> can be used."
+"<computeroutput>kmix</computeroutput> or <computeroutput>alsamixer</"
+"computeroutput> can be used."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:2891
 msgid "Contribute"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2895
 msgid "Let us know you exist"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:2897
 msgid "./images/worldmap.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:2897
-msgid "http://www.skolelinux.no/slschools/worldmap.php?lang=en&image=worldmap.png"
+msgid ""
+"http://www.skolelinux.no/slschools/worldmap.php?lang=en&image=worldmap."
+"png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2899
 msgid ""
 "There are Debian Edu users all over the world. A very easy form of "
 "contribution is to let us know you exist and use Debian Edu - this motivates "
@@ -7685,7 +6546,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2901
 msgid ""
 "The Debian Edu projects provide a database of schools and users of the "
 "system to help the users find each other, and also to have an idea about "
@@ -7696,12 +6556,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2906
 msgid "Contribute locally"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2908
 msgid ""
 "Currently there are local teams in Norway, Germany, the region of "
 "Extremadura in Spain, Taiwan and France. \"Isolated\" contributors and users "
@@ -7709,7 +6567,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2910
 msgid ""
 "The <link linkend=\"Support\">support chapter</link> has explanations and "
 "links to localised resources, as <emphasis>contribute</emphasis> and "
@@ -7717,47 +6574,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2915
 msgid "Contribute globally"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2917
 msgid ""
-"Internationally we are organised into various <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Teams/\">teams</ulink> working on "
-"different subjects."
+"Internationally we are organised into various <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Teams/\">teams</ulink> working on different subjects."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2919
 msgid ""
-"Most of the time, the <ulink "
-"url=\"http://lists.debian.org/debian-edu\">developer mailing list</ulink> is "
-"our main medium for communication, though we have monthly IRC meetings on "
-"#debian-edu on irc.debian.org and even, less frequently, real gatherings, "
-"where we meet each other in person. <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/NewContributor\">New "
-"contributors</ulink> should read our <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/ArchivePolicy\"/>."
+"Most of the time, the <ulink url=\"http://lists.debian.org/debian-edu"
+"\">developer mailing list</ulink> is our main medium for communication, "
+"though we have monthly IRC meetings on #debian-edu on irc.debian.org and "
+"even, less frequently, real gatherings, where we meet each other in person. "
+"<ulink url=\"http://wiki.debian.org/DebianEdu/NewContributor\">New "
+"contributors</ulink> should read our <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/ArchivePolicy\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2921
 msgid ""
 "A good way to learn what is happening in the development of Debian Edu is to "
-"subscribe to the <ulink "
-"url=\"http://lists.alioth.debian.org/mailman/listinfo/debian-edu-commits\">commit "
-"mailinglist</ulink>."
+"subscribe to the <ulink url=\"http://lists.alioth.debian.org/mailman/"
+"listinfo/debian-edu-commits\">commit mailinglist</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2926
 msgid "Documentation writers and translators"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2928
 msgid ""
 "This document needs your help! First and foremost, it is not finished yet: "
 "if you read it, you will notice various FIXMEs within the text. If you "
@@ -7766,203 +6614,168 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2931
 msgid ""
-"The source of the text is a wiki and can be edited with a simple "
-"webbrowser. Just go to <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/\"/> and you can "
-"contribute easily. Note: a user account is needed to edit the pages; you "
-"need to <ulink url=\"http://wiki.debian.org/UserPreferences\">create a wiki "
-"user</ulink> first."
+"The source of the text is a wiki and can be edited with a simple webbrowser. "
+"Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Wheezy/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:2933
 msgid ""
 "Another very good way to contribute and to help users is by translating "
 "software and documentation. Information on how to translate this document "
-"can be found in the <link linkend=\"Translations\">translations "
-"chapter</link> of this book. Please consider helping the translation effort "
-"of this book!"
+"can be found in the <link linkend=\"Translations\">translations chapter</"
+"link> of this book. Please consider helping the translation effort of this "
+"book!"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:2939
 msgid "Support"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:2943
 msgid "Volunteer based support"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2947
 msgid "in English"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2951
 msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2954
 msgid ""
-"<ulink "
-"url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss\"/> "
-"- support mailing list"
+"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
+"discuss\"/> - support mailing list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2957
 msgid ""
 "#debian-edu on irc.debian.org - IRC channel, mostly development related; do "
 "not expect real time support even though it frequently happens"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2962
 msgid "in Norwegian"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2966
 msgid ""
-"<ulink "
-"url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/> - "
-"support mailing list"
+"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
+"> - support mailing list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2969
 msgid ""
-"<ulink "
-"url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/linuxiskolen\"/> "
-"- mailing list for the development member organisation in Norway (FRISK)"
+"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+"linuxiskolen\"/> - mailing list for the development member organisation in "
+"Norway (FRISK)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2972
 msgid "#skolelinux on irc.debian.org - IRC channel to support Norwegian users"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2977
 msgid "in German"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2981
 msgid ""
 "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\"/> - support "
 "mailing list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2984
-msgid "<ulink url=\"http://wiki.skolelinux.de\"/> - wiki with lots of HowTos etc."
+msgid ""
+"<ulink url=\"http://wiki.skolelinux.de\"/> - wiki with lots of HowTos etc."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2987
 msgid "#skolelinux.de on irc.debian.org - IRC channel to support German users"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:2992
 msgid "in French"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:2996
 msgid ""
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - support mailing "
 "list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3001
 msgid "in Spanish"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3005
 msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3011
 msgid "Professional support"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3013
 msgid ""
 "Lists of companies providing professional support are available from <ulink "
 "url=\"http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:3019
 msgid "New features in Debian Edu Wheezy"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3023
-msgid "New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
+msgid ""
+"New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3027 debian-edu-wheezy-manual.xml:3522
 msgid "User visible changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3031 debian-edu-wheezy-manual.xml:3526
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
 "installation, in the login screen and as desktop wallpaper."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3036 debian-edu-wheezy-manual.xml:3562
 msgid "Installation changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3040 debian-edu-wheezy-manual.xml:3095
 msgid ""
-"New version of debian-installer from Debian Wheezy, see <ulink "
-"url=\"http://www.debian.org/releases/wheezy/installmanual\">installation "
-"manual</ulink> for more details."
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3043
 msgid ""
 "The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a "
-"DVD."
+"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3048 debian-edu-wheezy-manual.xml:3595
 msgid "Software updates"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3052
 msgid "Everything which is new in Debian Wheezy 7.1, eg:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3056
 msgid "Linux kernel 3.2.x"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3059
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
 "0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
@@ -7970,89 +6783,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3062
 msgid "Web browser Iceweasel 17 ESR"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3065
 msgid "LibreOffice 3.5.4"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3068
 msgid "LTSP 5.4.2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3071
 msgid "GOsa 2.7.4"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3074
 msgid "CUPS print system 1.5.3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3077
 msgid "Educational toolbox GCompris 12.01"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3080
 msgid "Music creator Rosegarden 12.04"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3083
 msgid "Image editor Gimp 2.8.2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3086
 msgid "Virtual universe Celestia 1.6.1"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3089
 msgid "Virtual stargazer Stellarium 0.11.3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3092
 msgid "Scratch visual programming environment 1.4.0.6"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3098
 msgid "Debian Wheezy includes about 37000 packages available for installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3102
 msgid ""
-"More information about Debian Wheezy 7.1 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>."
+"More information about Debian Wheezy 7.1 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>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3107 debian-edu-wheezy-manual.xml:3686
 msgid "Documentation and translation updates"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3111
 msgid ""
 "Translation updates for the templates used in the installer. These templates "
 "are now available in 29 languages."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3114
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
 "and Danish. Partly translated versions exist for Norwegian Bokmal and "
@@ -8060,12 +6856,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3119
 msgid "LDAP related changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3123
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
 "when adding systems in GOsa. Now systems can be of type server, workstation, "
@@ -8073,22 +6867,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3128 debian-edu-wheezy-manual.xml:3821
 msgid "Other changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3132
 msgid "New Xfce desktop task."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3135
 msgid "LTSP diskless workstations run without any configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3138
 msgid ""
 "On the dedicated client network of thin client servers (default "
 "192.168.0.0/24), machines run by default as diskless workstations if they "
@@ -8096,7 +6886,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3141
 msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
@@ -8104,12 +6893,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3146
 msgid "Known issues"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3150
 msgid ""
 "Using KDE \"Plasma\" on standalone and roaming workstations, at least "
 "Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
@@ -8119,12 +6906,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:3157
 msgid "Copyright and authors"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3159
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
@@ -8140,7 +6925,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3161
 msgid ""
 "If you add content to it, <emphasis role=\"strong\">please only do so if you "
 "are the author. You need to release it under the same conditions</emphasis>! "
@@ -8149,12 +6933,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:3166
 msgid "Translation copyright and authors"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3168
 msgid ""
 "The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
 "Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) "
@@ -8162,7 +6944,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3170
 msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
 "Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
@@ -8171,7 +6952,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3172
 msgid ""
 "The German translation is copyrighted by Holger Levsen (2007), Patrick "
 "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -8182,7 +6962,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3174
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
 "2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) and "
@@ -8190,7 +6969,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3176
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
@@ -8199,63 +6977,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3178
 msgid ""
 "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
 "released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3180
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
 "released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:3185
 msgid "Translations of this document"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3187
 msgid ""
 "Versions of this document fully translated into German, Italian, French and "
 "Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish. This is an <ulink "
-"url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">online overview of "
-"all languages</ulink>."
+"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
+"doc/\">online overview of all languages</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3191
 msgid "HowTo translate this document"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3193
 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=\"https://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
+"<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=\"https://"
+"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
 "specific conventions</ulink> if you want to help translating this document."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3195
 msgid ""
 "To commit your translations you need to be a member of the Alioth project "
 "<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
-"from your local one, create or edit "
-"<computeroutput>~/.ssh/config</computeroutput>. There should be an entry "
-"like:"
+"from your local one, create or edit <computeroutput>~/.ssh/config</"
+"computeroutput>. There should be an entry like:"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:3196
 #, no-wrap
 msgid ""
 "Host git.debian.org\n"
@@ -8263,15 +7031,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3198
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone "
-"git+ssh://git.debian.org/git/debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+"debian-edu/debian-edu-doc.git</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3200
 msgid ""
 "If you only want to translate, you just need to check out some files from "
 "from Git (which can be done anonymously) and create patches. Please file a "
@@ -8282,7 +7048,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3202
 msgid ""
 "You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
 "anonymously with the following command (you need to have the "
@@ -8290,110 +7055,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3205
 msgid ""
-"<computeroutput>git clone "
-"git://anonscm.debian.org/debian-edu/debian-edu-doc.git</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3207
 msgid ""
-"Then edit the file "
-"<computeroutput>documentation/debian-edu-wheezy/debian-edu-wheezy-manual.$CC.po</computeroutput> "
-"(replacing $CC with your language code). There are many tools for "
-"translating available; we suggest using "
+"Then edit the file <computeroutput>documentation/debian-edu-wheezy/debian-"
+"edu-wheezy-manual.$CC.po</computeroutput> (replacing $CC with your language "
+"code). There are many tools for translating available; we suggest using "
 "<computeroutput>lokalize</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3209
 msgid ""
 "Then you either commit the file directly to Git (if you have the rights to "
 "do so) or send the file to the bugreport."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3211
 msgid ""
 "To update your local copy of the repository use the following command inside "
 "the <computeroutput>debian-edu-doc</computeroutput> directory:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3214
 msgid "<computeroutput>git pull</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3216
 msgid ""
-"Read "
-"/usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-translations "
-"to find information how to create a new PO file for your language if there "
-"isn't one yet, and how to update translations."
+"Read /usr/share/doc/debian-edu-doc/README.debian-edu-wheezy-manual-"
+"translations to find information how to create a new PO file for your "
+"language if there isn't one yet, and how to update translations."
 msgstr ""
 
 #.  <remark>
 #. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3218
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
 "translate any string which contains \" FIXME\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3221
 msgid ""
 "Basic information about Alioth (the host where our Git repository is "
-"located) and Git is available at <ulink "
-"url=\"http://wiki.debian.org/Alioth/Git\"/>."
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3223
 msgid ""
-"If you are new to Git, look at the <ulink "
-"url=\"http://git-scm.com/book\">Pro Git</ulink> book; it has a chapter on "
-"the <ulink "
-"url=\"http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
 "changes to the repository</ulink>. Also you might want to look at the "
 "<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3225
 msgid "Please report any problems."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:3231
 msgid "Appendix A - The GNU General Public License"
 msgstr ""
 
 #. type: CDATA
-#: debian-edu-wheezy-manual.xml:3232
 #, no-wrap
 msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3235
 msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3237
 msgid ""
-"Copyright (C) 2007-2013 Holger Levsen < <ulink "
-"url=\"mailto:holger at layer-acht.org\">holger at layer-acht.org</ulink> > and "
-"others, see the <link linkend=\"CopyRight\">Copyright chapter</link> for the "
-"full list of copyright owners."
+"Copyright (C) 2007-2013 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
+"linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
+"copyright owners."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3239
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -8402,7 +7149,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3241
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -8411,7 +7157,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3243
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -8419,17 +7164,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3248
 msgid "GNU GENERAL PUBLIC LICENSE"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3250
 msgid "Version 2, June 1991"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3252
 msgid ""
 "Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and "
@@ -8438,12 +7180,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3257
 msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3259
 msgid ""
 "<emphasis role=\"strong\">0.</emphasis> This License applies to any program "
 "or other work which contains a notice placed by the copyright holder saying "
@@ -8457,7 +7197,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3261
 msgid ""
 "Activities other than copying, distribution and modification are not covered "
 "by this License; they are outside its scope.  The act of running the Program "
@@ -8468,7 +7207,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3263
 msgid ""
 "<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
 "copies of the Program's source code as you receive it, in any medium, "
@@ -8480,14 +7218,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3265
 msgid ""
 "You may charge a fee for the physical act of transferring a copy, and you "
 "may at your option offer warranty protection in exchange for a fee."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3267
 msgid ""
 "<emphasis role=\"strong\">2.</emphasis> You may modify your copy or copies "
 "of the Program or any portion of it, thus forming a work based on the "
@@ -8496,7 +7232,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3270
 msgid ""
 "<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
 "carry prominent notices stating that you changed the files and the date of "
@@ -8504,7 +7239,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3272
 msgid ""
 "<emphasis role=\"strong\">b)</emphasis> You must cause any work that you "
 "distribute or publish, that in whole or in part contains or is derived from "
@@ -8513,7 +7247,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3274
 msgid ""
 "<emphasis role=\"strong\">c)</emphasis> If the modified program normally "
 "reads commands interactively when run, you must cause it, when started "
@@ -8528,7 +7261,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3276
 msgid ""
 "These requirements apply to the modified work as a whole.  If identifiable "
 "sections of that work are not derived from the Program, and can be "
@@ -8542,7 +7274,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3278
 msgid ""
 "Thus, it is not the intent of this section to claim rights or contest your "
 "rights to work written entirely by you; rather, the intent is to exercise "
@@ -8551,7 +7282,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3280
 msgid ""
 "In addition, mere aggregation of another work not based on the Program with "
 "the Program (or with a work based on the Program) on a volume of a storage "
@@ -8560,7 +7290,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3282
 msgid ""
 "<emphasis role=\"strong\">3.</emphasis> You may copy and distribute the "
 "Program (or a work based on it, under Section 2) in object code or "
@@ -8569,7 +7298,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3285
 msgid ""
 "<emphasis role=\"strong\">a)</emphasis> Accompany it with the complete "
 "corresponding machine-readable source code, which must be distributed under "
@@ -8578,7 +7306,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3287
 msgid ""
 "<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
 "valid for at least three years, to give any third party, for a charge no "
@@ -8589,7 +7316,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3289
 msgid ""
 "<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
 "you received as to the offer to distribute corresponding source code.  (This "
@@ -8599,7 +7325,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3291
 msgid ""
 "The source code for a work means the preferred form of the work for making "
 "modifications to it.  For an executable work, complete source code means all "
@@ -8613,7 +7338,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3293
 msgid ""
 "If distribution of executable or object code is made by offering access to "
 "copy from a designated place, then offering equivalent access to copy the "
@@ -8623,7 +7347,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3295
 msgid ""
 "<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
 "sublicense, or distribute the Program except as expressly provided under "
@@ -8635,7 +7358,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3297
 msgid ""
 "<emphasis role=\"strong\">5.</emphasis> You are not required to accept this "
 "License, since you have not signed it.  However, nothing else grants you "
@@ -8648,7 +7370,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3299
 msgid ""
 "<emphasis role=\"strong\">6.</emphasis> Each time you redistribute the "
 "Program (or any work based on the Program), the recipient automatically "
@@ -8660,7 +7381,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3301
 msgid ""
 "<emphasis role=\"strong\">7.</emphasis> If, as a consequence of a court "
 "judgment or allegation of patent infringement or for any other reason (not "
@@ -8677,7 +7397,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3303
 msgid ""
 "If any portion of this section is held invalid or unenforceable under any "
 "particular circumstance, the balance of the section is intended to apply and "
@@ -8685,7 +7404,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3305
 msgid ""
 "It is not the purpose of this section to induce you to infringe any patents "
 "or other property right claims or to contest validity of any such claims; "
@@ -8699,14 +7417,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3307
 msgid ""
 "This section is intended to make thoroughly clear what is believed to be a "
 "consequence of the rest of this License."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3309
 msgid ""
 "<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
 "the Program is restricted in certain countries either by patents or by "
@@ -8718,7 +7434,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3311
 msgid ""
 "<emphasis role=\"strong\">9.</emphasis> The Free Software Foundation may "
 "publish revised and/or new versions of the General Public License from time "
@@ -8727,7 +7442,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3313
 msgid ""
 "Each version is given a distinguishing version number.  If the Program "
 "specifies a version number of this License which applies to it and \"any "
@@ -8739,7 +7453,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3315
 msgid ""
 "<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
 "the Program into other free programs whose distribution conditions are "
@@ -8752,12 +7465,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3317
 msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3319
 msgid ""
 "<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
 "FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
@@ -8771,7 +7482,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3321
 msgid ""
 "<emphasis role=\"strong\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
 "APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY "
@@ -8785,240 +7495,195 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3323
 msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:3329
 msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
 msgstr ""
 
 #. type: Content of: <article><section><para>
-#: debian-edu-wheezy-manual.xml:3331
 msgid "Debian Edu Live CD/DVDs for Wheezy are not available at the moment."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3335
 msgid "Features of the Standalone image"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3339
 msgid "Almost all packages from the Standalone profile"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3342
 msgid "All packages from the laptop task"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3345
 msgid "The KDE desktop profile for students/pupils."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3350
 msgid "Activating translations and regional support"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3352
 msgid ""
-"To activate a specific translation, boot using "
-"<computeroutput>locale=ll_CC.UTF-8</computeroutput> as a boot option, where "
-"ll_CC.UTF-8 is the locale name you want.  To activate a given keyboard "
-"layout, use the <computeroutput>keyb=KB</computeroutput> option where KB is "
-"the desired keyboard layout.  More information on this feature <ulink "
-"url=\"http://wiki.debian.org/DebianLive/l10n\">is available from the live CD "
-"build script documentation</ulink>.  Here is a list of commonly used locale "
-"codes:"
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3354
 msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3356
 msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3358
 msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3360
 msgid "Norwegian Bokmål"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3362
 msgid "nb_NO.UTF-8"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3364 debian-edu-wheezy-manual.xml:3370
 msgid "no"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3366
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3368
 msgid "nn_NO.UTF-8"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3372
 msgid "German"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3374
 msgid "de_DE.UTF-8"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3376
 msgid "de"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3378
 msgid "French (France)"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3380
 msgid "fr_FR.UTF-8"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3382
 msgid "fr"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3384
 msgid "Greek (Greece)"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3386
 msgid "el_GR.UTF-8"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3388
 msgid "el"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3390
 msgid "Japanese"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3392
 msgid "ja_JP.UTF-8"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3394
 msgid "jp"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3396
 msgid "Northern Sami (Norway)"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3398
 msgid "se_NO"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#: debian-edu-wheezy-manual.xml:3400
 msgid "no(smi)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3402
 msgid ""
-"A complete list of locale codes is available in "
-"<computeroutput>/usr/share/i18n/SUPPORTED</computeroutput>, but only the "
-"UTF-8 locales are supported by the live images. Not all locales have "
-"translations installed, though.  The keyboard layout names can be found in "
-"/usr/share/keymaps/i386/."
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3407
 msgid "Stuff to know"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3411
 msgid "The password for the user is \"user\"; root has no passwd set."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3416
 msgid "Known issues with the image"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3420
 msgid "There are no wheezy images yet"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
-#: debian-edu-wheezy-manual.xml:3420
 msgid "./images/sad.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
-#: debian-edu-wheezy-manual.xml:3420
 msgid ":("
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3425
 msgid "Download"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:3427
 msgid ""
 "The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink "
-"url=\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
-"<computeroutput>ftp.skolelinux.org</computeroutput> under "
-"<computeroutput>cd-wheezy-live/</computeroutput>."
+"url=\"ftp://ftp.skolelinux.org/cd-wheezy-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-wheezy-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"wheezy-live/</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><title>
-#: debian-edu-wheezy-manual.xml:3433
 msgid "Appendix C - Features in older releases"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3437
-msgid "Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
+msgid ""
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3441
 msgid ""
 "Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to Debian "
 "Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and 6.0.7 as "
@@ -9026,142 +7691,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3444
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3448
 msgid "Make Nagios configuration more robust and efficient"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3451
 msgid "Comply with 3.X kernel"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3454
 msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3458
 msgid "Minor updates from the wiki"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3461
 msgid "Danish translation now complete"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3464
 msgid "debian-edu-config from 1.453 to 1.455"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3468
 msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3471
 msgid "Make ltsp_local_mount script work for multiple devices."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3474
 msgid ""
 "Correct Kerberos user policy: don't expire password after 2 days. Closes: "
 "#664596"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3477
-msgid "Handle '#' characters in the root or first users password. Closes: #664976"
+msgid ""
+"Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3480
 msgid "Fixes for gosa-sync:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3484
 msgid "Don't fail if password contains \""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3487
 msgid "Don't disclose new password string in syslog"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3490
 msgid "Fixes for gosa-create:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3494
 msgid "Invalidate libnss cache before applying changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3497
 msgid "Multiple failures during mass user import into GOsa²"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3500
 msgid ""
 "gosa-netgroups plugin: don't erase entries of attribute type "
 "\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3503
 msgid "First user now uses the same Kerberos policy as all other users"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3506
 msgid "Add Danish web page"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3509
 msgid "debian-edu-install from 1.528 to 1.530"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3513
 msgid "Improve preseeding support and documentation"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3518
 msgid ""
-"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
-"2012-03-11"
+"New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3529
 msgid ""
 "Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#\">Getting "
-"started chapter</ulink> of the manual for more information on GOsa²."
+"the <ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3532
 msgid "See below for a list of updated software."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3535
 msgid ""
 "Show welcome page to users when they first log in. This default start page "
 "for Iceweasel is fetched from LDAP at installation and boot time for "
@@ -9170,7 +7809,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3538
 msgid ""
 "New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
 "GNOME option, the LXDE desktop option is only supported by the CD "
@@ -9178,41 +7816,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3541
 msgid "Speed up LTSP client boot."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3544
 msgid "Provide a KDE menu entry for changing the password in GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3548
 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.debian.org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos "
-"for users</ulink> chapter of the manual."
+"at the KDM/GDM login prompt), please see the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</"
+"ulink> chapter of the manual."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3551
 msgid ""
 "Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
 "shown to new users."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3554
 msgid ""
-"All LTSP servers are also <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
 "servers</ulink> by default."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3557
 msgid ""
 "Improve handing of removable media on thin clients. Show desktop "
 "notification longer when inserting new media and provide an option to start "
@@ -9220,15 +7852,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3566
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink "
-"url=\"http://www.debian.org/releases/squeeze/installmanual\">installation "
-"manual</ulink> for more details."
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3569
 msgid ""
 "Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
 "is set up during installation of the Main Server. This user is up as GOsa² "
@@ -9238,7 +7868,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3572
 msgid ""
 "The <computeroutput>.iso</computeroutput> images can directly be copied onto "
 "USB flash drives, for example by using <computeroutput>dd</computeroutput> "
@@ -9246,41 +7875,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3575
 msgid "New roaming workstation profile for laptops."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3578
 msgid ""
-"Device access for all users is handled by <ulink "
-"url=\"https://wiki.debian.org/PolicyKit#\">PolicyKit</ulink>, and no extra "
-"group memberships are needed to get access to devices."
+"Device access for all users is handled by <ulink url=\"https://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3581
 msgid ""
 "A warning will be issued when installing on too small disks for the selected "
 "profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3584
 msgid ""
 "Simplify partitioning for Standalone installs to only have a separate /home/ "
 "but no seperate /usr anymore."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3587
 msgid ""
 "More tests in the test suite, and correct some of the tests that failed "
 "earlier."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3590
 msgid ""
 "Make sure to report an error and abort the installation when trying to use "
 "the netinst images without a working Internet connection, instead of "
@@ -9288,149 +7911,122 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3599
 msgid "Everything which is new in Debian Squeeze:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3603
 msgid ""
 "compatibility with the FHS v2.3 and software developed for version 3.2 of "
 "the LSB."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3606
 msgid "Linux kernel 2.6.32"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3609
 msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3612
 msgid "Web browser Iceweasel 3.5"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3615
 msgid "OpenOffice.org 3.2.1"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3618
 msgid "Educational toolbox GCompris 9.3"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3621
 msgid "Music creator Rosegarden 10.04.2"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3624
 msgid "Image editor Gimp 2.6.10"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3627
 msgid "Virtual universe Celestia 1.6.0"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3630
 msgid "Virtual stargazer Stellarium 0.10.4"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3633
 msgid ""
 "Debian Squeeze includes over 10,000 new packages available for installation, "
 "including the browser Chromium"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3637
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink "
-"url=\"http://www.debian.org/releases/squeeze/releasenotes\">release "
-"notes</ulink> and the <ulink "
-"url=\"http://www.debian.org/releases/squeeze/installmanual\">installation "
-"manual</ulink>."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3642
 msgid "Infrastructural changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3646
 msgid ""
 "The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
 "gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3650
 msgid ""
 "The dynamic DHCP range was extended on the backbone network to around 4k IP "
 "addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3653
 msgid ""
 "The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to "
-"<computeroutput>intern</computeroutput>"
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3656
 msgid ""
 "There are no pre-defined host entries for client systems in DNS anymore "
 "(staticXX, ..., dhcpYY...)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3659
 msgid "MIT Kerberos5 used for user authentication, enabled for:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3663
 msgid "PAM"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3666
 msgid "IMAP"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3669
 msgid "SMTP"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3672
 msgid ""
 "NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the "
-"<computeroutput>workstation</computeroutput> netgroup to be able to mount "
-"the home directories"
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3675
 msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3678
 msgid ""
 "A complete PXE boot environment is setup when installing from the DVD, so "
 "that further installations can be done using PXE network installs only. A "
@@ -9439,31 +8035,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3681
 msgid ""
 "Remove all hard coded settings on workstations, and configure workstations "
 "and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink "
-"url=\"http://people.skolelinux.org/pere/blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog "
-"post with more information on the changes</ulink>."
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3690
 msgid ""
 "Translation updates for the templates used in the installer. These templates "
 "are now available in 28 languages."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3693
 msgid ""
 "The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
 "proof-read with corrections was done by a native English linguist."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3696
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
 "Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
@@ -9471,83 +8063,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3699
 msgid "Improvements to many language tasks, especially French and Danish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3702
 msgid "Improvements to the welcome web page shown at first logins."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3706
 msgid ""
 "Add new Japanese, Portuguese and Catalan translations of the welcome web "
 "page."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3711
 msgid "Regressions"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3715
 msgid ""
-"<ulink "
-"url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no\">CD and "
-"DVD installs are different</ulink> - the DVD is only suitable for installing "
-"a KDE environemnt."
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3718
 msgid ""
 "Drop support for <computeroutput>powerpc</computeroutput> architecture from "
 "netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less "
-"automated."
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3721
 msgid ""
 "Drop gtick in the default installation, because it doesn't work on thin "
 "clients (BTS #566335)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3726
 msgid "New administration tool: GOsa²"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3730
 msgid ""
 "gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
 "with:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3734
 msgid "Fix DHCP host removal. Closes: #650258"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3737
-msgid "Backport user generator unicode character transliteration. Closes: #657086"
+msgid ""
+"Backport user generator unicode character transliteration. Closes: #657086"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3740
 msgid ""
 "Customized GOsa² configuration to better suit the Debian Edu network "
 "architecture."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3744
 msgid ""
 "GOsa² updates DNS and NFS exports immediately when a system is updated in "
 "LDAP, making diskless workstations work right after they are added to the "
@@ -9555,7 +8133,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3747
 msgid ""
 "Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
 "objects using information gathered by sitesummary, to make it easier to add "
@@ -9563,66 +8140,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3752
 msgid "More software changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3756
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra "
-"3.2.42"
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3759
 msgid ""
 "Change default package manager from adept to synaptic, to avoid getting two "
 "graphical package managers installed by default."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3762
 msgid ""
 "Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
 "KDE."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3765
 msgid ""
 "Change video player setup to install different players in KDE "
 "(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3768
 msgid ""
 "Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
 "default KDE installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3771
 msgid ""
 "Replace network-manager-kde with plasma-widget-networkmanagement in the "
 "standalone KDE profile"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3774
 msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3777
 msgid ""
 "Add cifs-utils to the default installation to ensure SMB mounting can work "
 "in any profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3780
 msgid ""
 "Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
 "and valgrind from the default installation and the DVD to make room for "
@@ -9630,14 +8196,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3783
 msgid ""
 "Drop libnss-mdns from stationary profiles, to make sure DNS is the "
 "authoritive source of host names."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3786
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
 "and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
@@ -9645,26 +8209,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-#: debian-edu-wheezy-manual.xml:3791
 msgid "Other LDAP related changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3795
 msgid ""
 "Make the LDAP server handle more clients after increasing the server's file "
 "descriptor limit from 1024 to 32768."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3798
 msgid ""
 "Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
 "flush all CUPS queues every night. Both can be disabled in LDAP."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3801
 msgid ""
 "Provide network blocking / exam mode by default, controlled by LDAP. In "
 "addition to network blocking, changes to the Squid proxy configuration is "
@@ -9672,105 +8232,90 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3804
 msgid ""
 "Enable automatic extending of full file systems on the Main Server by "
 "default. This can be disabled in LDAP."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3807
 msgid ""
 "Change SSL certificate name used by the LDAP server and adjust clients to "
 "use the new name to be able to enable certificate checking on clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3810
 msgid ""
 "Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
 "setup used for DNS."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3813
 msgid ""
 "Simplify autofs LDAP rules to make sure they work with extra home directory "
 "partitions exported from the main-server without any changes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3816
-msgid "Make backup system more robust in handling LDAP database dump and restart."
+msgid ""
+"Make backup system more robust in handling LDAP database dump and restart."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3825
 msgid ""
-"Root logins are denied for both KDM and GDM - see above and <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#\">Getting "
-"started</ulink> for details."
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3828
 msgid ""
 "Clients set up to shut down at night will stay up for at least an hour if "
 "they are turned on manually between 16:00 and 07:00."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3831
 msgid ""
 "Additionally use local NTP clock on the main-server to ensure clients and "
 "server sync clocks also when disconnected from the Internet."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3834
 msgid ""
 "Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink "
-"url=\"http://lists.debian.org/20100704221022.GC30542@login1.uio.no\">using "
-"DHCP and WPAD</ulink>"
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3837
 msgid "The home0 partition is mounted nosuid, to increase security."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3840
 msgid ""
 "Change KDE/Akonadi configuration to reduce the disk footprint of every user "
 "from 144 to 24 MiB."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3843
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
 "users on a machine.  Useful for thin client servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3849
 msgid "New in Debian Edu 5.0.6+edu1 Codename \"Lenny\" released 2010-10-05"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3853
 msgid ""
-"Everything that is new in Debian <ulink "
-"url=\"http://www.debian.org/News/2010/20100626\">5.0.5</ulink> and <ulink "
-"url=\"http://www.debian.org/News/2010/20100904\">5.0.6</ulink>, which "
-"includes support for some new hardware. 5.0.5 and 5.0.6 are maintenance "
-"releases and generally don't add new features"
+"Everything that is new in Debian <ulink url=\"http://www.debian.org/"
+"News/2010/20100626\">5.0.5</ulink> and <ulink url=\"http://www.debian.org/"
+"News/2010/20100904\">5.0.6</ulink>, which includes support for some new "
+"hardware. 5.0.5 and 5.0.6 are maintenance releases and generally don't add "
+"new features"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3856
 msgid ""
 "Several bugfixes, including fixes for Skolelinux bugs #1436, #1427, #1441, "
 "#1413, #1450 and Debian bugs #585966, #585772, #585968, #586035 and #585966 "
@@ -9778,73 +8323,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3859
 msgid ""
 "Merge new web pages from Squeeze - the text is the same, but it provides a "
 "new translation for <computeroutput>zh</computeroutput>, compete "
-"translations for all included languages "
-"(<computeroutput>de</computeroutput>, <computeroutput>es</computeroutput>, "
-"<computeroutput>fr</computeroutput>, <computeroutput>it</computeroutput>, "
-"<computeroutput>nb</computeroutput>, <computeroutput>nl</computeroutput>, "
-"<computeroutput>ru</computeroutput>, <computeroutput>zh</computeroutput>), "
-"and a rename of the <computeroutput>.no</computeroutput> page to "
-"<computeroutput>.nb</computeroutput> to reflect the language used"
+"translations for all included languages (<computeroutput>de</"
+"computeroutput>, <computeroutput>es</computeroutput>, <computeroutput>fr</"
+"computeroutput>, <computeroutput>it</computeroutput>, <computeroutput>nb</"
+"computeroutput>, <computeroutput>nl</computeroutput>, <computeroutput>ru</"
+"computeroutput>, <computeroutput>zh</computeroutput>), and a rename of the "
+"<computeroutput>.no</computeroutput> page to <computeroutput>.nb</"
+"computeroutput> to reflect the language used"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3862
 msgid ""
 "Debian-edu-install: Slovak translation added, updates to German, Basque, "
 "Italian, Bokmal, Vietnamese and Chinese translations."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3865
 msgid ""
 "Debian-edu-doc: improvements to Italian, Bokmal and German translations as "
 "well as overall content and layout"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3868
 msgid ""
 "Sitesummary: various improvements; most notably, several Nagios checks were "
 "added to monitor system health"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3871
 msgid ""
 "Shutdown-at-night: fix #1435 (did not work with the LDAP host groups "
 "populated by lwat)."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3876
-msgid "New features in Debian Edu 5.0.4+edu0 Codename \"Lenny\" released 2010-02-08"
+msgid ""
+"New features in Debian Edu 5.0.4+edu0 Codename \"Lenny\" released 2010-02-08"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3880
 msgid ""
-"Everything that is new in Debian 5.0.4; see the <link "
-"linkend=\"AppendixC--New_features_in_Debian_5.0.4_upon_which_Debian_Edu_5.0.4.2B-edu0_is_based\">following "
-"paragraph</link> for details."
+"Everything that is new in Debian 5.0.4; see the <link linkend=\"AppendixC--"
+"New_features_in_Debian_5.0.4_upon_which_Debian_Edu_5.0.4.2B-edu0_is_based"
+"\">following paragraph</link> for details."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3883
 msgid ""
 "More than 80 applications relevant for education are included based on user "
-"feedback and user statistics (through <ulink "
-"url=\"http://popcon.skolelinux.org/\">Debian Edu popularity "
-"contest</ulink>).  The full list of packages is given in the <ulink "
-"url=\"http://blends.alioth.debian.org/edu/tasks/\">task overview "
-"page</ulink>."
+"feedback and user statistics (through <ulink url=\"http://popcon.skolelinux."
+"org/\">Debian Edu popularity contest</ulink>).  The full list of packages is "
+"given in the <ulink url=\"http://blends.alioth.debian.org/edu/tasks/\">task "
+"overview page</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3886
 msgid ""
 "Improved student desktop with educational software shortcuts to GCompris, "
 "Kalzium, KGeography, KMplot, KStars, Stopmotion and OpenOffice Write and "
@@ -9852,65 +8388,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3889
 msgid "Dynamic desktop icons and menu options that adjust based on user group."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3892
 msgid ""
-"GNOME added as a supported desktop; see the <link "
-"linkend=\"Installation\">Installation chapter</link> to learn how to install "
-"with GNOME instead of KDE as desktop."
+"GNOME added as a supported desktop; see the <link linkend=\"Installation"
+"\">Installation chapter</link> to learn how to install with GNOME instead of "
+"KDE as desktop."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3895
 msgid "Support for more than 50 languages."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3898
 msgid "Improved system for user administration and machine identification."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3901
 msgid "Improved diskless and thin client setup."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3904
 msgid ""
 "New startup menu letting users choose diskless workstation, thin client or "
 "workstation."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3907
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
 "all servers with the thin-client-server profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3910
 msgid ""
 "Main-server is set up as a PXE server for booting thin clients and diskless "
 "workstations, and for installing to clients' hard or flash drives."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3913
 msgid ""
 "The configuration for DNS and DHCP is stored in LDAP and can be edited using "
 "<computeroutput>lwat</computeroutput>. The DNS server has been switched from "
-"<computeroutput>bind9</computeroutput> to "
-"<computeroutput>powerdns</computeroutput>."
+"<computeroutput>bind9</computeroutput> to <computeroutput>powerdns</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3916
 msgid ""
 "LDAP server for directory services (NSS) is located using a SRV record in "
 "DNS instead of hardcoding the 'ldap' DNS name.  LDAP server for password "
@@ -9918,56 +8444,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3919
 msgid "Multi-architecture (amd64/i386/powerpc) net installer CD."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3922
 msgid "(Most) Packages are downloaded over the Internet."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3925
 msgid ""
 "Multi-architecture (amd64/i386) installer DVD capable of installing without "
 "network."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3928
 msgid ""
 "PulseAudio is provided in addition to ALSA and OSS for sound on workstations "
 "and diskless workstation machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3931
 msgid ""
 "The <emphasis>Barebone</emphasis> profile has been renamed to "
 "<emphasis>Minimal</emphasis>, to better reflect what it is."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3934
 msgid "The Nagios3 configuration is now automatically created by sitesummary."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3937
 msgid ""
 "The per-user file <computeroutput>~/.xsession-errors</computeroutput> is now "
 "truncated automatically when the user logs in to avoid filling up the home "
 "directory partition with a log that grows indefinitely.  The user can "
-"disable this by creating "
-"<computeroutput>~/.xsession-errors-enable</computeroutput>.  The system "
-"administrator can configure the system to redirect the file to /dev/null by "
-"editing "
-"<computeroutput>/etc/X11/Xsession.d/05debian-edu-truncate-xerrorlog</computeroutput>."
+"disable this by creating <computeroutput>~/.xsession-errors-enable</"
+"computeroutput>.  The system administrator can configure the system to "
+"redirect the file to /dev/null by editing <computeroutput>/etc/X11/Xsession."
+"d/05debian-edu-truncate-xerrorlog</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3940
 msgid ""
 "To ease installation of Debian Edu on hardware needing non-free firmware, "
 "the CD and DVD include the following firmware packages: firmware-bnx2, "
@@ -9976,152 +8493,125 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3945
 msgid "New features in Debian 5.0.4 upon which Debian Edu 5.0.4+edu0 is based"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3949
 msgid "New Linux kernel 2.6.26 supports more hardware"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3952
 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=\"https://wiki.debian.org/OpenOffice#\">OpenOffice</ulink>.org 2.4.1, "
-"and Pidgin 2.4.3 (formerly known as Gaim). SWI-prolog is back."
+"Thunderbird mail client) as well as upgrades to Evolution 2.22.3, <ulink url="
+"\"https://wiki.debian.org/OpenOffice#\">OpenOffice</ulink>.org 2.4.1, and "
+"Pidgin 2.4.3 (formerly known as Gaim). SWI-prolog is back."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3955
 msgid "Installation from CD/DVD from within Windows"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3958
 msgid "Switched from sysklogd to rsyslog as the syslog collector."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3961
 msgid ""
-"For more information see the page <ulink "
-"url=\"http://wiki.debian.org/NewInLenny\">New in Lenny</ulink> on "
-"wiki.debian.org"
+"For more information see the page <ulink url=\"http://wiki.debian.org/"
+"NewInLenny\">New in Lenny</ulink> on wiki.debian.org"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3966
 msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3970
 msgid ""
 "Much improved documentation with updated translations to German, Norwegian "
 "Bokmal and Italian"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3973
 msgid ""
 "Includes more than 40 bug fixes, improvements and security updates that came "
 "to our attention after the 3.0r0 release"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:3978
 msgid "New features in the \"3.0r0 Terra\" release 2007-07-22"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3982
 msgid "Based on Debian 4.0 Etch released 2007-04-08."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3985
 msgid "Graphical installer with mouse support"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3988
 msgid "Boot splash with usplash"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3991
 msgid "LSB 3.1 compatible"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3994
 msgid "Linux kernel version 2.6.18"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:3998
 msgid "Support for SATA controllers and hard disks"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4001
 msgid "X.org version 7.1."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4004
 msgid "KDE desktop environment version 3.5.5"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4007
 msgid "OpenOffice.org version 2.0."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4010
 msgid "LTSP5 (version 0.99debian12)"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4013
 msgid "Automatic tracking of installed machines using Sitesummary."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4016
 msgid "Automatic configuration of munin using data from Sitesummary."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4019
 msgid "Automatic version control of configuration files in /etc/ using svk."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4022
 msgid "File systems can be extended while the file system is mounted."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4026
-msgid "Support for automatically extending file systems based on predefined rules."
+msgid ""
+"Support for automatically extending file systems based on predefined rules."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4029
 msgid "Local Device Support on thin clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4032
 msgid ""
 "New processor architectures: amd64 (fully supported) and powerpc "
 "(experimental support, installation media only boots on the newworld "
@@ -10129,20 +8619,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4035
 msgid "Multi-architecture DVD for i386, amd64 and powerpc"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4038
 msgid ""
-"Regression: the CD-install requires Internet access during "
-"installation. Previous versions could be installed from one CD without "
-"Internet access."
+"Regression: the CD-install requires Internet access during installation. "
+"Previous versions could be installed from one CD without Internet access."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4041
 msgid ""
 "Regression: <computeroutput>webmin</computeroutput> is now removed from "
 "Debian because of problems supporting it. We've added a new web based user "
@@ -10153,77 +8639,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4044
 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/TeachAndLearn#\">HowTo "
-"teach and learn</ulink> Chapter describes how to install swi-prolog on Etch."
+"<ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/Etch/HowTo/"
+"TeachAndLearn#\">HowTo teach and learn</ulink> Chapter describes how to "
+"install swi-prolog on Etch."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:4049
 msgid "Features in 2.0 release 2006-03-14"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4053
 msgid "Based on Debian 3.1 Sarge released 2005-06-06."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4056
 msgid "Linux kernel version 2.6.8."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4059
 msgid "XFree86 version 4.3."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4062
 msgid "KDE version 3.3."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4065
 msgid "OpenOffice.org 1.1."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:4070
 msgid "Features in \"1.0 Venus\" release 2004-06-20"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4074
 msgid "Based on Debian 3.0 Woody released 2002-07-19."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4077
 msgid "Linux kernel version 2.4.26."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4080
 msgid "XFree86 version 4.1."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#: debian-edu-wheezy-manual.xml:4083
 msgid "KDE version 2.2."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-#: debian-edu-wheezy-manual.xml:4088
 msgid "More information on even older releases"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-#: debian-edu-wheezy-manual.xml:4090
 msgid ""
-"More information on even older releases can be found at <ulink "
-"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+"More information on even older releases can be found at <ulink url=\"http://"
+"developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgstr ""
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index d0ccb40..d5626e6 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 b6e35cf..6376f93 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 56f68e5..b69d358 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 d1f8aad..ec1d0c8 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ

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



More information about the debian-edu-commits mailing list