[debian-edu-commits] debian-edu/ 01/01: (nb, nl) Fix po files by updating both using msgmerge.

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Sun Nov 30 10:23:36 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 2bc5dd851a2ab9cd3d85a018941de55215f46eab
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Nov 30 11:23:25 2014 +0100

    (nb, nl) Fix po files by updating both using msgmerge.
---
 debian/changelog                                   |    1 +
 .../debian-edu-jessie-manual.nb.po                 | 1581 +++++++-------------
 .../debian-edu-jessie-manual.nl.po                 |  104 +-
 3 files changed, 541 insertions(+), 1145 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5bc3378..ed38a70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ debian-edu-doc (1.6~20141203~8.0+edu0~alpha1) UNRELEASED; urgency=medium
   * Update manuals and images from the wiki.
   * (it) Fix typos in wheezy and jessie manual translations.
   * (en, de, fr) Update jessie network architecture images.
+  * (nb, nl) Fix po files by updating both using msgmerge.
 
   [ Jessie Manual translation updates ]
   * German (Wolfgang Schweer)
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index d9675ea..8d2c435 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -15,14 +15,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-11-26 10:26+0100\n"
+"POT-Creation-Date: 2014-11-29 16:49+0100\n"
 "PO-Revision-Date: 2014-11-30 06:56+0000\n"
 "Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Attribute 'lang' of: <article>
@@ -37,13 +37,11 @@ msgstr "Debian Edu / Skolelinux Jessie 8.0+edu0~alpha0 utgivelsesmanual"
 msgid "Manual for Debian Edu 8.0+edu0~alpha0 Codename Jessie"
 msgstr "Utgivelsesmanual for Debian Edu 8.0+edu0~alpha0 kodenavn Jessie"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/23-Tjener-KDM_Login.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of:
-#. <article><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu login"
 msgstr "Skolelinux innlogging"
 
@@ -185,13 +183,11 @@ msgstr ""
 msgid "Network"
 msgstr "Nettverk"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/Debian_Edu_Network_Jessie.png"
 msgstr "./images/Debian_Edu_Network_Jessie.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "The Debian Edu network topology"
 msgstr "Nettverket Debian Edu sitt oppsett"
 
@@ -357,128 +353,103 @@ msgstr ""
 "domenenavnet). Dette gjør det enkelt for skoler å enten bytte domenet\n"
 "(hvis de har eget DNS-domene) eller IP-adressene de bruker."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\"> Table of services</emphasis>"
 msgstr "<emphasis role='strong'>Tabell over tjenester</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Service description</emphasis>"
 msgstr "<emphasis role='strong'>Tjenestebeskrivelse</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgstr "<emphasis role='strong'>vertsnavn</emphasis>:"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">DNS service name</emphasis>"
 msgstr "<emphasis role='strong'>vertsnavn</emphasis>:"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Centralised Logging"
 msgstr "Sentralisert logging"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "rsyslog"
 msgstr "rsyslog"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "syslog"
 msgstr "syslog"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Domain Name Service"
 msgstr "Domenenavntjeneste"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "DNS (BIND)"
 msgstr "DNS (BIND)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "domain"
 msgstr "domain"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Automatic Network Configuration of Machines"
 msgstr "Automatisk nettverksoppsett for maskiner"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "DHCP"
 msgstr "DHCP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "bootps"
 msgstr "bootps"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Clock Synchronisation"
 msgstr "Klokkesynkronisering"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "NTP"
 msgstr "NTP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ntp"
 msgstr "ntp"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Home Directories via Network File System"
 msgstr "Hjemmeområder på nettverksfilsystem (SMB/NFS) [homes]"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "SMB / NFS"
 msgstr "SMB / NFS"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "homes"
 msgstr "homes"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Electronic Post Office"
 msgstr "Elektronisk postkontor"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "IMAP (Dovecot)"
 msgstr "IMAP (Dovecot)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "postoffice"
 msgstr "Postkontor"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Directory Service"
 msgstr "Katalogtjeneste"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "OpenLDAP"
 msgstr "OpenLDAP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ldap"
 msgstr "ldap"
 
@@ -486,123 +457,99 @@ msgstr "ldap"
 msgid "User Administration"
 msgstr "Brukeradministrasjon"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "GOsa²"
 msgstr "GOsa²"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "---"
 msgstr "---"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Web Server"
 msgstr "Webtjener"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Apache/PHP"
 msgstr "Apache/PHP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "www"
 msgstr "www"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Central Backup"
 msgstr "Sentral sikkerhetskopi"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "sl-backup, slbackup-php"
 msgstr "sl-backup, slbackup-php"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "backup"
 msgstr "sikkerhetskopi"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Web Cache"
 msgstr "Web-mellomlager"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Proxy (Squid)"
 msgstr "Proxy (Squid)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "webcache"
 msgstr "webcache"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Printing"
 msgstr "Utskrift"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "CUPS"
 msgstr "CUPS"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ipp"
 msgstr "ipp"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Secure Remote Login"
 msgstr "Sikker ekstern pålogging"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "OpenSSH"
 msgstr "OpenSSH"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ssh"
 msgstr "ssh"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Automatic Configuration"
 msgstr "Automatisk oppsett"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Cfengine"
 msgstr "Cfengine"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "cfengine"
 msgstr "cfengine"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Thin Client Server/s"
 msgstr "Tynnklienttjener(e)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
 msgstr "LTSP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ltsp"
 msgstr "ltsp"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -610,8 +557,7 @@ msgstr ""
 "Maskin og tjenesteovervåkning med feilrapportering, pluss status og historie "
 "på web. Feilrapportering via e-post"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "munin, nagios and site-summary"
 msgstr "munin, nagios og site-summary"
 
@@ -812,11 +758,11 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som (X-)"
-"terminaler. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. Tynnklientoppsettet som er brukt er Linux Terminal "
-"Server Project (LTSP)."
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som "
+"(X-)terminaler. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er Linux "
+"Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1105,13 +1051,11 @@ msgstr ""
 "Tynnklienttjenere trenger to nettverkskort ved bruk av standard "
 "nettverksarkitektur:"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 koblet til hovednettverket (10.0.2.0/23)"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
 "192.168.1.0/24)."
@@ -1144,8 +1088,7 @@ msgstr ""
 "Tynnklienter kan kjøres på så lite som 64 MB RAM og en 133 MHz prosessor, "
 "men 128MB RAM og noe raskere prosessor anbefales."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
 "requirement."
@@ -1163,8 +1106,7 @@ msgstr ""
 "anbefales det minimum 320 MB RAM og 800MHz prosessor, men 512 eller 1024 MB "
 "RAM vil gi langt bedre ytelse. En raskere CPU vil også økte ytelsen."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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."
@@ -1177,8 +1119,7 @@ msgstr ""
 "endre SIZE-variabelen her. Vennligst <emphasis> juster vekselminnestørrelsen "
 "(swap)</emphasis> enten lokalt på PC eller på serveren. "
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 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."
@@ -1186,8 +1127,7 @@ msgstr ""
 "Hvis din diskløse arbeidsstasjon har harddisker, er det anbefalt å bruke dem "
 "for lokal swap da dette er raskere enn nettverks-swap."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "On workstations with little RAM the spell checker can cause LibreOffice to "
 "hang if the swap space is too small. Then the system administrator has to "
@@ -1223,13 +1163,11 @@ msgstr ""
 "En liste over testet maskinvare kan finnes på <ulink url=\"http://wiki."
 "debian.org/DebianEdu/Hardware/\"/>. Denne listen er på ingen måte komplett. "
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/smile.png"
 msgstr "./images/smile.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid ":)"
 msgstr ":)"
 
@@ -1390,18 +1328,15 @@ msgstr ""
 "Hvis du bare vil prøve Debian Edu/Skolelinux, så trenger du ikke det. Det "
 "skal bare fungere. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid ":-)"
 msgstr ":-)"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/alert.png"
 msgstr "./images/alert.png"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid "/!\\"
 msgstr "/!\\"
 
@@ -1445,8 +1380,7 @@ msgstr ""
 "nettinstall (CD), som kan brukes til installasjon fra USB flash-disker, er "
 "egnet for installasjon på  i386-, amd64-maskiner.  Den er tilgjengelig via"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
@@ -1454,8 +1388,7 @@ msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
@@ -1463,8 +1396,7 @@ msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso debian-edu-8.0+edu0~alpha0-CD.iso </"
@@ -1491,8 +1423,7 @@ msgstr ""
 "under installasjonen. Som de andre kan den lastes ned via FTP, HTTP eller "
 "rsync via:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
@@ -1500,8 +1431,7 @@ msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
@@ -1509,8 +1439,7 @@ msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso debian-edu-8.0+edu0~alpha0-USB.iso </"
@@ -1528,8 +1457,7 @@ msgstr "Kildebilde"
 msgid "The source image is available via"
 msgstr "Kildekodebildet er tilgjengelig via"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
@@ -1539,8 +1467,7 @@ msgstr ""
 "edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
 "iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
@@ -1550,8 +1477,7 @@ msgstr ""
 "edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
 "iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-source-USB.iso debian-edu-8.0+edu0~alpha0-source-USB."
@@ -1609,18 +1535,15 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Velg type installasjon"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01-Installer_boot_menu.png"
 msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer boot menu"
 msgstr "Installasjons-oppstartmeny"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
 "installation on i386 and amd64."
@@ -1628,8 +1551,7 @@ msgstr ""
 "<emphasis role=\"strong\">Install</emphasis>  er den standardiserte "
 "tekstmodus-innstallasjonen for i386- og amd64-maskiner."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
 "install."
@@ -1637,8 +1559,7 @@ msgstr ""
 "<computeroutput>64-bit install</computeroutput> kjører en amd64 installasjon "
 "i tekstmodus. "
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1646,8 +1567,7 @@ msgstr ""
 "<emphasis role=\"strong\">Grafisk installasjon</emphasis> bruker en GTK "
 "innstallasjon hvor du kan bruke musen."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
 "GTK installer where you can use the mouse."
@@ -1655,8 +1575,7 @@ msgstr ""
 "<emphasis role=\"strong\">64-bit grafisk installasjon</emphasis> for å kjøre "
 "en 64-bit GTK-innstallasjon hvor du kan bruke en mus."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose"
@@ -1664,8 +1583,7 @@ msgstr ""
 "<emphasis role=\"strong\">Avanserte opsjoner ></emphasis> viser en "
 "undermeny med flere detaljerte valg å velge mellom"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer"
@@ -1673,129 +1591,109 @@ msgstr ""
 "<emphasis role=\"strong\">Hjelp</emphasis> gir noen hint i bruk av "
 "installasjonsprosessen"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/Installer_advanced_options_a.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer advanced options screen 1"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
 "become a rescue disk for emergency tasks."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/Installer_advanced_options_b.png"
 msgstr "./images/Installer_advanced_options_b.png"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer advanced options screen 2"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
 "install medium become a rescue disk for emergency tasks with a graphical GTK "
 "look."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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 "
 "graphical GTK look."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 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>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/Installer_help.png"
 msgstr "./images/Installer_help.png"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1811,38 +1709,33 @@ msgid ""
 "boot menu."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 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 "
 "machines."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you want to boot the amd64 text mode with the multi-architecture image, "
 "that would be <computeroutput>amd64-install</computeroutput>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you want to boot the i386 mode with the multi-arch image on an amd64 "
 "machine you need to manually select <computeroutput>install</computeroutput> "
 "(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 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/"
@@ -1850,16 +1743,14 @@ msgid ""
 "parameter."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 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 "
 "proxy of the main server."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
@@ -1870,24 +1761,21 @@ msgstr ""
 "legg til <computeroutput>desktop=gnome</computeroutput> i kjernens "
 "oppstartparametere. "
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
 "parameters."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
 "parameters."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
 "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
@@ -1906,33 +1794,27 @@ msgid ""
 "server."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a language (for the installation and the installed system)"
 msgstr "Velg et språk (for installasjonen og det installerte systemet)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a location which normally should be the location where you live."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a keyboard keymap (the country's default is usually fine)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose profile(s) from the following list:"
 msgstr "Velg profil(er) fra denne listen:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
@@ -1941,13 +1823,11 @@ msgid ""
 "Server in addition to this one."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Workstation</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "A computer booting from its local hard drive, and running all software and "
 "devices locally like an ordinary computer, except that user logins are "
@@ -1955,13 +1835,11 @@ msgid ""
 "are stored."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Roaming workstation</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Same as workstation but capable of authentication using cached credentials, "
 "meaning it can be used outside the school network. The users' files and "
@@ -1970,13 +1848,11 @@ msgid ""
 "suggested in earlier releases."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 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 "
@@ -1987,25 +1863,21 @@ msgid ""
 "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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Standalone</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "An ordinary computer that can function without a main server (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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Minimal</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This profile will install the base packages and configure the machine to "
 "integrate into the Debian Edu network, but without any services and "
@@ -2013,8 +1885,7 @@ msgid ""
 "out from the main-server."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
 "\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
@@ -2039,8 +1910,7 @@ msgid ""
 "effect."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 "
@@ -2048,8 +1918,7 @@ msgid ""
 "partitions are created and are big enough."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Please say \"yes\" to submitting information to <ulink url=\"http://popcon."
 "skolelinux.org/\"/> to allow us to know which packages are popular and "
@@ -2057,16 +1926,14 @@ msgid ""
 "simple way for you to help."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Wait. If the selected profiles include Thin-client-server then the installer "
 "will spend quite some time at the end, \"Finishing the installation - "
 "Running debian-edu-profile-udeb...\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "After giving the root password, you will be asked to create a normal user "
 "account \"for non-administrative tasks\". For Debian Edu this account is "
@@ -2074,8 +1941,7 @@ msgid ""
 "network."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The password for this user <emphasis role=\"strong\">must</emphasis> have a "
 "length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
@@ -2083,8 +1949,7 @@ msgid ""
 "accepted by the installer)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Vær glad"
 
@@ -2222,13 +2087,11 @@ msgid ""
 "Server</emphasis> profile only:"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/pxe-tjener.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "width=400"
 msgstr ""
 
@@ -2239,8 +2102,7 @@ msgid ""
 "emphasis> profiles:"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
@@ -2361,303 +2223,243 @@ msgid ""
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "01-Installer_boot_menu.png"
 msgstr "01-Installer_boot_menu.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
 msgstr "./images/02-select_a_language.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "02-select_a_language.png"
 msgstr "02-select_a_language.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/03-select_your_location.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "03-select_your_location.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/04-Configure_the_keyboard.png"
 msgstr "./images/04-Configure_the_keyboard.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "04-Configure_the_keyboard.png"
 msgstr "04-Configure_the_keyboard.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr "05-Detect_and_mount_CD-ROM.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "06-Load_installer_components_from_CD.png"
 msgstr "06-Load_installer_components_from_CD.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/07-Detect_network_hardware.png"
 msgstr "./images/07-Detect_network_hardware.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "07-Detect_network_hardware.png"
 msgstr "07-Detect_network_hardware.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "./images/12-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12-Set_up_users_and_passwords.png"
 msgstr "12-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "12a-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "./images/12b-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "12b-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "./images/12c-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12c-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12e-creating_ext4.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12e-creating_ext4.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/13-Install+the+base+system.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "13-Install the base system.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/14-Select_and_install_software.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "14-Select_and_install_software.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/17-Select_and_install_software.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "17-Select_and_install_software.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/18-Build+LTSP+chroot.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "18-Build LTSP chroot.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/20-Finish_the_Installation.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "20-Finish_the_Installation.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "tjener KDM Login"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/24-Tjener-KDE_Start.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE starting..."
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE and Browser"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE Desktop"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Diskless Workstation Login"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr ""
 
@@ -2720,8 +2522,7 @@ msgid ""
 "and some frequently asked questions."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu KDE desktop"
 msgstr ""
 
@@ -2802,13 +2603,11 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² overview page after login as the first user"
 msgstr ""
 
@@ -2893,15 +2692,13 @@ msgid ""
 "here, and then \"User\". You will be guided by the user creation wizard."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 "
@@ -2910,8 +2707,7 @@ msgid ""
 "contains non-ASCII characters."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 "
@@ -2921,8 +2717,7 @@ msgid ""
 "additional option to the \"location definition\".)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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."
@@ -2955,13 +2750,11 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/filterbox.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Filterbox"
 msgstr ""
 
@@ -2990,13 +2783,11 @@ msgid ""
 "belongs to."
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/edit_user.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Editing user data"
 msgstr ""
 
@@ -3024,31 +2815,26 @@ msgstr ""
 msgid "To administratively set a new password for a user"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "search for the user to be modified, as explained above"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/change_password_administratively.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Set user password"
 msgstr "Sett brukerpassord"
 
@@ -3081,25 +2867,21 @@ msgid ""
 "intolerant about them):"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Use \",\" as field separator"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Do not use quotes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The order of the fields is not relevant, and can be defined in GOsa² during "
 "the mass import"
@@ -3109,32 +2891,27 @@ msgstr ""
 msgid "The mass import steps are:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "click the \"LDAP Manager\" link in the navigation menu on the left"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "click the \"Import\" tab in the screen on the right"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "click the \"Import\" button in the bottom-right corner"
 msgstr ""
 
@@ -3148,18 +2925,15 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/create_group.png"
 msgstr "./images/create_group.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "create group"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/list_groups.png"
 msgstr "./images/list_groups.png"
 
@@ -3287,43 +3061,35 @@ msgid ""
 "enter password:"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² systems listing"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Host details"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Modify host"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Add netgroup"
 msgstr ""
 
@@ -3375,53 +3141,43 @@ msgid ""
 "computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "cups-queue-autoflush-hosts"
 msgstr "cups-queue-autoflush-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "cups-queue-autoreenable-hosts"
 msgstr "cups-queue-autoreenable-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "fsautoresize-hosts"
 msgstr "fsautoresize-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "ltsp-server-hosts"
 msgstr "ltsp-server-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "netblock-hosts"
 msgstr "netblock-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "printer-hosts"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "server-hosts"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "shutdown-at-night-hosts"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "winstation-hosts"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "workstation-hosts"
 msgstr ""
 
@@ -3431,13 +3187,11 @@ msgid ""
 "used for"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "NFS."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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 "
@@ -3448,8 +3202,7 @@ msgid ""
 "static IP addresses from LDAP."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Remember to configure workstations and ltsp-servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -3457,44 +3210,37 @@ msgid ""
 "configured."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "fs-autoresize"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Debian Edu machines in this group will automatically resize LVM partitions "
 "that run out of space."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "shutdown at night"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "CUPS (cups-queue-autoflush-hosts and cups-queue-autoreenable-hosts)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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 "
@@ -3755,13 +3501,11 @@ msgstr ""
 "i menyen på sikkerhetskopi-siden og velg å beholde det eldste "
 "øyeblikksbildet:"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "slbackup-php Maintenance"
 msgstr "slbackup-php Vedlikehold"
 
@@ -3879,13 +3623,11 @@ msgstr ""
 msgid "Here are instructions on how to handle the most common Nagios warnings."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid "DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 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 "
@@ -3898,13 +3640,11 @@ msgid ""
 "computeroutput> netgroup."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
@@ -3914,8 +3654,7 @@ msgid ""
 "upgrade</computeroutput>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 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-"
@@ -3923,8 +3662,7 @@ msgid ""
 "all new packages every night.  This will not upgrade the LTSP chroots."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "To upgrade the LTSP chroot, one can use <computeroutput>ltsp-chroot apt-get "
 "update && ltsp-chroot apt-get upgrade</computeroutput>.  On 64-bit "
@@ -3933,15 +3671,13 @@ msgid ""
 "updating the host system."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 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>
+#. type: Content of: <article><section><section><section><section><section><para>
 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 "
@@ -3949,13 +3685,11 @@ msgid ""
 "issues."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid "WARNING: CUPS queue size - 61"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 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 "
@@ -4087,25 +3821,21 @@ msgstr ""
 msgid "The basic upgrade operation"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
 "occurrences of \"wheezy\" with \"jessie\"."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get update</computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get upgrade</computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
 msgstr ""
 
@@ -4870,8 +4600,7 @@ msgstr ""
 msgid "<emphasis>(as root on Tjener) </emphasis>"
 msgstr "<emphasis>(as root on Tjener) </emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Make the necessary year group directories"
 msgstr "Lage de nødvendige årsgruppe-mapper"
 
@@ -4883,8 +4612,7 @@ msgstr ""
 msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Department"
 msgstr ""
 
@@ -4898,8 +4626,7 @@ msgid ""
 "up below /Students. Click it."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Group"
 msgstr "Gruppe"
 
@@ -4910,8 +4637,7 @@ msgid ""
 "of 'Samba group'. 'Ok' to save it."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Template"
 msgstr "Mal"
 
@@ -4928,8 +4654,7 @@ msgid ""
 "then add POSIX and Samba account."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Importer brukere"
 
@@ -5080,8 +4805,7 @@ msgid ""
 "link> chapter of this manual."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
 "intern' is configured, check if the NFS export points on the new storage "
@@ -5097,8 +4821,7 @@ msgid ""
 "    root at tjener:~#"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Here everything on the backbone network is granted access to the /storage "
 "export. (This could be restricted to netgroup membership or single IP "
@@ -5112,22 +4835,19 @@ msgid ""
 "clients to automatically mount the new export on request."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "<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>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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 "
@@ -5160,8 +4880,7 @@ msgid ""
 "does not use automount to avoid mounting loops:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Create the mount directories using <computeroutput>mkdir</computeroutput>, "
 "edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
@@ -5200,32 +4919,24 @@ msgstr ""
 msgid "Managing this case with GOsa is quite simple:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Create a group <computeroutput>sshusers</computeroutput> on the root level "
-"(where already other system management related groups like"
-msgstr ""
-
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "'gosa-admins' show up)."
+"(where already other system management related groups like "
+"<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add <computeroutput>AllowGroups sshusers</computeroutput> to /etc/ssh/"
 "sshd_config."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Execute <computeroutput>service ssh restart</computeroutput>."
 msgstr ""
 
@@ -5239,13 +4950,11 @@ msgid ""
 "different approach using PAM is needed."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Enable pam_access.so in the LTSP server's /etc/pam.d/sshd file."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Configure /etc/security/access.conf to allow connections for (sample) users "
 "alice, jane, bob and john from everywhere and for all other users only from "
@@ -5724,23 +5433,20 @@ msgid ""
 "network, when tjener is not a combined server, follow these steps:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
 "same directory on tjener."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "edit <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> to use the IP address of ltspserver00; the following example "
@@ -5752,8 +5458,7 @@ msgstr ""
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
 "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
@@ -6410,15 +6115,13 @@ msgstr ""
 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>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Pick a freshly installed Windows computer, and run <computeroutput>gpedit."
 "msc</computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Under the selection \"User Configuration\" -> \"Administrative Templates"
 "\" -> \"System\" -> \"User Profiles\" -> \"Exclude directories in "
@@ -6428,45 +6131,37 @@ msgid ""
 "directories to exclude are:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "log"
 msgstr "logg"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Locale settings"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Temporary Internet Files"
 msgstr "Midlertidige Internettfiler"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "My Documents"
 msgstr "Mine Dokumenter"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Application Data"
 msgstr "Applikasjonsdata"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Save your changes, and exit the editor."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "It's a good idea to copy it to your Windows OS deployment system to have it "
 "included at install time."
@@ -6530,44 +6225,37 @@ msgid ""
 "to other computers"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Start the Registry Editor."
 msgstr "Start registereditoren"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Use the menu \"Edit menu\" -> \"New\" -> \"String Value\"."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Call it <computeroutput>ExcludeProfileDirs</computeroutput>"
 msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Save the file and you can double click it, or add it to a script to spread "
 "it to other machines."
@@ -6577,8 +6265,7 @@ msgstr ""
 msgid "Sources:"
 msgstr "Kilder:"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://technet2.microsoft.com/windowsserver/en/technologies/"
 "featured/gp/default.mspx\"/>"
@@ -6586,8 +6273,7 @@ msgstr ""
 "<ulink url=\"http://technet2.microsoft.com/windowsserver/en/technologies/"
 "featured/gp/default.mspx\"/>"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/"
 "PolicyMgmt.html\"/>"
@@ -6595,13 +6281,11 @@ msgstr ""
 "<ulink url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/"
 "PolicyMgmt.html\"/>"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://isg.ee.ethz.ch/tools/realmen/det/skel.en.html\"/>"
 msgstr "<ulink url=\"http://isg.ee.ethz.ch/tools/realmen/det/skel.en.html\"/>"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://www.css.taylor.edu/~nehresma/samba.html\"/>"
 msgstr "<ulink url=\"http://www.css.taylor.edu/~nehresma/samba.html\"/>"
 
@@ -6639,15 +6323,13 @@ msgid ""
 "not want this, you should disable it via one of the following routes:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "\"User Configuration\" -> \"Administrative Templates\" -> \"Network\" -"
 "> \"Offline Files\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "\"Computer Configuration\" -> \"Administrative Templates\" -> \"Network"
 "\" -> \"Offline Files\""
@@ -6746,29 +6428,25 @@ msgstr ""
 msgid "Available Remote Desktop clients"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "VNC client (Virtual Network Computer) gives access to Skolelinux remotely.  "
 "An alternative client package is <computeroutput>xvncviewer</computeroutput>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "NX graphical client gives students and teachers access to Skolelinux "
 "remotely on Windows, Mac or Linux PC. One municipality in Norway has "
@@ -6776,8 +6454,7 @@ msgid ""
 "solution is stable."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/CitrixApps\">Citrix ICA "
 "client HowTo</ulink> to access Windows terminal server from Skolelinux."
@@ -6831,8 +6508,7 @@ msgid ""
 "smbclient) to browse your Windows/Samba network environment."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "START -> Run command"
 msgstr "START -> Kjør kommando"
 
@@ -6860,21 +6536,18 @@ msgid ""
 "domain."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "enter \\\\TJENER\\HOMES or \\\\TJENER\\<username> and press return"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "-> a Windows Explorer window should open and show files and folders in "
 "your Debian Edu home directory."
@@ -6957,42 +6630,36 @@ msgid ""
 "Professional is required here."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "click on \"Start\" then right-click on \"Computer\" and click on \"Properties"
 "\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "select tab \"Computer Name\" and click on \"Change...\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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 "
 "password, click \"OK\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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 "
@@ -7023,8 +6690,7 @@ msgid ""
 "is provided at this location:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "\\\\tjener\\netlogon\\win7+samba_domain-membership\\Win7_Samba3DomainMember."
 "reg"
@@ -7043,15 +6709,13 @@ msgid ""
 "able to join the SKOLELINUX domain:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "on the System Properties page, click on \"Change...\""
 msgstr ""
 
@@ -7442,13 +7106,11 @@ msgstr ""
 msgid "Let us know you exist"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/worldmap.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid ""
 "http://www.skolelinux.no/slschools/worldmap.php?lang=en&image=worldmap."
 "png"
@@ -7559,20 +7221,17 @@ msgstr ""
 msgid "in English"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "#debian-edu on irc.debian.org - IRC channel, mostly development related; do "
 "not expect real time support even though it frequently happens"
@@ -7582,23 +7241,20 @@ msgstr ""
 msgid "in Norwegian"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "#skolelinux on irc.debian.org - IRC channel to support Norwegian users"
 msgstr ""
 
@@ -7606,21 +7262,18 @@ msgstr ""
 msgid "in German"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\"/> - support "
 "mailing list"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://wiki.skolelinux.de\"/> - wiki with lots of HowTos etc."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "#skolelinux.de on irc.debian.org - IRC channel to support German users"
 msgstr ""
 
@@ -7628,8 +7281,7 @@ msgstr ""
 msgid "in French"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - support mailing "
 "list"
@@ -7639,8 +7291,7 @@ msgstr ""
 msgid "in Spanish"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
 msgstr ""
 
@@ -7668,18 +7319,15 @@ msgstr ""
 msgid "User visible changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "new optional desktop environment: MATE"
 msgstr "nytt valgfritt skrivebordsmiljø: MATE"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "new manual translation: Dutch"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "TBD"
 msgstr ""
 
@@ -7687,8 +7335,7 @@ msgstr ""
 msgid "Installation changes"
 msgstr "Installasjonsendringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New version of debian-installer from Debian Jessie, see <ulink url=\"http://"
 "www.debian.org/releases/jessie/installmanual\">installation manual</ulink> "
@@ -7702,59 +7349,49 @@ msgstr ""
 msgid "Software updates"
 msgstr "Programvareoppdateringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian Jessie 8.0, eg:"
 msgstr "Alt som er nytt i Debian Jessie 8.0, for eksempel:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Linux kernel 3.16.x; for the i386 architecture, support for i486 processors "
 "has been dropped; oldest supported ones: i586 (like Intel Pentium and AMD "
 "K5)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
 "0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
 "the others see this manual.)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "the browsers Iceweasel 31 ESR and Chromium 38"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LibreOffice 4.3.3"
 msgstr "LibreOffice 4.3.3"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Educational toolbox GCompris 14.07"
 msgstr "Pedagogisk verktøykasse GCompris 14.07"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Music creator Rosegarden 14.02"
 msgstr "Musikkskaperen Rosegarden 14.02"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "GOsa 2.7.4"
 msgstr "GOsa 2.7.4"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LTSP 5.5.4"
 msgstr "LTSP 5.5.4"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "new boot framework: systemd. More information is available in the Debian "
 "<ulink url=\"https://wiki.debian.org/systemd\">systemd wiki page</ulink> and "
@@ -7762,14 +7399,12 @@ msgid ""
 "\">systemd manual</ulink>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Debian Jessie includes about 42000 packages available for installation."
 msgstr ""
 "Debian Jessie omfatter omtrent 42 000 pakker tilgjengelig for installasjon."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "More information about Debian Jessie 8.0 is provided in the <ulink url="
 "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</ulink> "
@@ -7781,15 +7416,13 @@ msgstr ""
 msgid "Documentation and translation updates"
 msgstr "Dokumentasjons- og oversettelsesoppdateringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Translation updates for the templates used in the installer. These templates "
 "are now available in 29 languages."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
 "Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
@@ -7808,8 +7441,7 @@ msgstr "Andre endringer"
 msgid "Known issues"
 msgstr "Kjente problemer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "None yet."
 msgstr "Ingen kjente ennå."
 
@@ -8010,7 +7642,7 @@ msgid ""
 msgstr ""
 
 #.  <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 "
@@ -8464,118 +8096,95 @@ msgid ""
 "documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Norwegian Bokmål"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "nb_NO.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "no"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "nn_NO.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "German"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "de_DE.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "de"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "French (France)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "fr_FR.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "fr"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Greek (Greece)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "el_GR.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "el"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Japanese"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ja_JP.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "jp"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Northern Sami (Norway)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "se_NO"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "no(smi)"
 msgstr ""
 
@@ -8603,13 +8212,11 @@ msgstr ""
 msgid "There are no jessie images yet"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/sad.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid ":("
 msgstr ""
 
@@ -8634,40 +8241,34 @@ msgstr ""
 msgid "New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian Wheezy 7.1, eg:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Linux kernel 3.2.x"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
 "0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
@@ -8677,63 +8278,51 @@ msgstr ""
 "(KDE «Plasma» er installert som standard, for å velge GNOME, Xfce eller "
 "LXDE, se håndbok)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Web browser Iceweasel 17 ESR"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LibreOffice 3.5.4"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LTSP 5.4.2"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "CUPS print system 1.5.3"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Educational toolbox GCompris 12.01"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Music creator Rosegarden 12.04"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Image editor Gimp 2.8.2"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual universe Celestia 1.6.1"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual stargazer Stellarium 0.11.3"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Scratch visual programming environment 1.4.0.6"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Debian Wheezy includes about 37000 packages available for installation."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "More information about Debian Wheezy 7.1 is provided in the <ulink url="
 "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
@@ -8741,50 +8330,43 @@ msgid ""
 "\">installation manual</ulink>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
 "and Danish. Partly translated versions exist for Norwegian Bokmal and "
 "Spanish."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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, "
 "printer, terminal or netdevice."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "LTSP diskless workstations run without any configuration."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 "
 "are powerful enough."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 "
 "hidden to the end user, others even to the GOsa admin."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 "
@@ -8814,13 +8396,11 @@ msgstr ""
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Make Nagios configuration more robust and efficient"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Comply with 3.X kernel"
 msgstr ""
 
@@ -8828,13 +8408,11 @@ msgstr ""
 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>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Minor updates from the wiki"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Danish translation now complete"
 msgstr ""
 
@@ -8842,73 +8420,60 @@ msgstr ""
 msgid "debian-edu-config from 1.453 to 1.455"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Make ltsp_local_mount script work for multiple devices."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fixes for gosa-sync:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Don't fail if password contains \""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Don't disclose new password string in syslog"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fixes for gosa-create:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Invalidate libnss cache before applying changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Multiple failures during mass user import into GOsa²"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Add Danish web page"
 msgstr ""
 
@@ -8916,8 +8481,7 @@ msgstr ""
 msgid "debian-edu-install from 1.528 to 1.530"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Improve preseeding support and documentation"
 msgstr ""
 
@@ -8926,8 +8490,7 @@ msgid ""
 "New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Replace LWAT with GOsa² as the LDAP administration interface. See below and "
 "the <ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
@@ -8935,13 +8498,11 @@ msgid ""
 "information on GOsa²."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "See below for a list of updated software."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 "
@@ -8949,26 +8510,22 @@ msgid ""
 "Standalone installations."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
 "GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Speed up LTSP client boot."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "For more information on how to change passwords (including expired passwords "
 "at the KDM/GDM login prompt), please see the <ulink url=\"https://wiki."
@@ -8976,39 +8533,34 @@ msgid ""
 "ulink> chapter of the manual."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Improve handing of removable media on thin clients. Show desktop "
 "notification longer when inserting new media and provide an option to start "
 "dolphin when such media is inserted."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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² "
@@ -9017,122 +8569,102 @@ msgid ""
 "<computeroutput>teachers</computeroutput> group."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The <computeroutput>.iso</computeroutput> images can directly be copied onto "
 "USB flash drives, for example by using <computeroutput>dd</computeroutput> "
 "or even <computeroutput>cat</computeroutput>.."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New roaming workstation profile for laptops."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 "
 "silently installing a broken system."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian Squeeze:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Linux kernel 2.6.32"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgstr "Skrivebordsomgivelser KDE «Plasma» 4.4 and GNOME 2.30"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Web browser Iceweasel 3.5"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "OpenOffice.org 3.2.1"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Educational toolbox GCompris 9.3"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Music creator Rosegarden 10.04.2"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Image editor Gimp 2.6.10"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual universe Celestia 1.6.0"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual stargazer Stellarium 0.10.4"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "More information about Debian Squeeze 6.0 is provided in the <ulink url="
 "\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
@@ -9144,70 +8676,59 @@ msgstr ""
 msgid "Infrastructural changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "The DHCP network for 10.0.0.0/8 has been renamed from "
 "<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
 "computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "MIT Kerberos5 used for user authentication, enabled for:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "PAM"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "IMAP"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "SMTP"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 "
@@ -9215,8 +8736,7 @@ msgid ""
 "needing firmware."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Remove all hard coded settings on workstations, and configure workstations "
 "and roaming workstations using settings detected from the environment using "
@@ -9225,40 +8745,34 @@ msgid ""
 "information on the changes</ulink>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Translation updates for the templates used in the installer. These templates "
 "are now available in 28 languages."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
 "Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
 "and Spanish."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to many language tasks, especially French and Danish."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to the welcome web page shown at first logins."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Add new Japanese, Portuguese and Catalan translations of the welcome web "
 "page."
@@ -9268,24 +8782,21 @@ msgstr ""
 msgid "Regressions"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop gtick in the default installation, because it doesn't work on thin "
 "clients (BTS #566335)."
@@ -9295,41 +8806,35 @@ msgstr ""
 msgid "New administration tool: GOsa²"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fix DHCP host removal. Closes: #650258"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Backport user generator unicode character transliteration. Closes: #657086"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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 "
 "required netgroup."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
 "objects using information gathered by sitesummary, to make it easier to add "
@@ -9340,76 +8845,65 @@ msgstr ""
 msgid "More software changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change video player setup to install different players in KDE "
 "(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
 "and valgrind from the default installation and the DVD to make room for "
 "higher priority packages."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
 "and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
@@ -9420,106 +8914,91 @@ msgstr ""
 msgid "Other LDAP related changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Provide network blocking / exam mode by default, controlled by LDAP. In "
 "addition to network blocking, changes to the Squid proxy configuration is "
 "needed."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make backup system more robust in handling LDAP database dump and restart."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Root logins are denied for both KDM and GDM - see above and <ulink url="
 "\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
 "\">Getting started</ulink> for details."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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 at login1.uio.no\">using DHCP and WPAD</ulink>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "The home0 partition is mounted nosuid, to increase security."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 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>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
 "users on a machine.  Useful for thin client servers."
@@ -9789,8 +9268,7 @@ msgstr ""
 msgid "Linux kernel version 2.6.18"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Support for SATA controllers and hard disks"
 msgstr ""
 
@@ -9826,8 +9304,7 @@ msgstr ""
 msgid "File systems can be extended while the file system is mounted."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Support for automatically extending file systems based on predefined rules."
 msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 07669b9..44ea8fa 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-11-26 10:26+0100\n"
+"POT-Creation-Date: 2014-11-29 16:49+0100\n"
 "PO-Revision-Date: 2014-11-29 21:05+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -781,9 +781,9 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Een thin-clientopstelling laat toe om eenvoudige PC's te gebruiken als (X-)"
-"terminals. Dit houdt in dat de machine wordt opgestart met een diskette of "
-"rechtstreeks vanaf de server met behulp van netwerk-PROM (of PXE) zonder "
+"Een thin-clientopstelling laat toe om eenvoudige PC's te gebruiken als "
+"(X-)terminals. Dit houdt in dat de machine wordt opgestart met een diskette "
+"of rechtstreeks vanaf de server met behulp van netwerk-PROM (of PXE) zonder "
 "gebruik te maken van de lokale harde schijf. Het thin-clientsysteem dat "
 "Skolelinux gebruikt, is dat van het Linux Terminal Server Project (LTSP)."
 
@@ -880,11 +880,6 @@ msgid "Administration"
 msgstr "Beheer"
 
 #. type: Content of: <article><section><section><para>
-#| 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 possible to log in to all machines via SSH, and thereby have full "
-#| "access to the machines."
 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 "
@@ -1102,9 +1097,6 @@ msgstr ""
 "hoofdstuk <link linkend=\"Architecture\">Architectuur van het netwerk</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The computers running Debian Edu / Skolelinux must have either i386 or "
-#| "amd64 processors."
 msgid ""
 "The computers running Debian Edu / Skolelinux must have either i386 (oldest "
 "supported processors: Intel Pentium/AMD K5) or amd64 processors."
@@ -1126,9 +1118,6 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 is verbonden met het hoofdnetwerk (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-#| "192.168.1.0/24)."
 msgid ""
 "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
 "192.168.1.0/24)."
@@ -1295,9 +1284,6 @@ msgstr ""
 "Er kunnen honderden werkstations aangesloten worden op het hoofdnetwerk."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "You can have a lot of LTSP servers on the main network; two different "
-#| "subnets are preconfigured in LDAP."
 msgid ""
 "You can have a lot of LTSP servers on the main network; two different "
 "subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
@@ -1470,9 +1456,6 @@ msgstr ""
 "amd64-machines. Het wordt beschikbaar gesteld via"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
-#| "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
@@ -1516,9 +1499,6 @@ msgstr ""
 "downloaden via FTP, HTTP of rsync:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
-#| "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
@@ -1613,13 +1593,6 @@ msgid "Installing Debian Edu"
 msgstr "Debian Edu installeren"
 
 #. type: Content of: <article><section><section><para>
-#| 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 the complexity of Debian during the installation and beyond. "
-#| "However, Debian Edu is Debian, and if you want there are more than 15,000 "
-#| "packages to choose from and a billion configuration options. For the "
-#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
@@ -2037,12 +2010,6 @@ msgid "<emphasis role=\"strong\">Roaming workstation</emphasis>"
 msgstr "<emphasis role=\"strong\">Mobiel werkstation</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Same as workstation but capable of authentication using cached "
-#| "credentials, meaning it can be used outside the school network. The "
-#| "users' files and profiles are stored on the local disk. Notebooks and "
-#| "laptops should select this profile and not 'Workstation' or 'Standalone' "
-#| "as suggested in earlier releases."
 msgid ""
 "Same as workstation but capable of authentication using cached credentials, "
 "meaning it can be used outside the school network. The users' files and "
@@ -2307,12 +2274,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=\"https://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 "
@@ -4242,11 +4203,6 @@ msgid "Backup Management"
 msgstr "Reservekopieën beheren"
 
 #. type: Content of: <article><section><section><para>
-#| 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."
 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, "
@@ -4840,12 +4796,6 @@ msgid "LDAP service needs to be reconfigured"
 msgstr "De dienst LDAP moet opnieuw geconfigureerd worden"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The LDAP setup has changed slightly from Wheezy to Jessie. 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."
 msgid ""
 "The LDAP setup has only scarcely changed from Wheezy to Jessie so chances "
 "are that LDAP hasn't to be rebuild from scratch. There's a script "
@@ -5324,10 +5274,6 @@ msgid "JXplorer, an LDAP GUI"
 msgstr "JXplorer, een grafische gebruikersinterface voor LDAP"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If you prefer a GUI to work with the LDAP database, check out the "
-#| "<computeroutput>jxplorer</computeroutput> package, wich is installed by "
-#| "default. To get write access connect like this:"
 msgid ""
 "If you prefer a GUI to work with the LDAP database, check out the "
 "<computeroutput>jxplorer</computeroutput> package, which is installed by "
@@ -6368,7 +6314,6 @@ msgstr ""
 "het even welk werkstation of om het even welke LTSP-client of LTSP-server."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Restricting pupils' network access"
 msgid "Restrict ssh login access"
 msgstr "De mogelijkheid inperken om zich via ssh aan te melden"
 
@@ -6379,7 +6324,6 @@ msgstr ""
 "Sommige ervan worden hier opgesomd."
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Sound with LTSP clients"
 msgid "Setup without LTSP clients"
 msgstr "Bij een opstelling zonder LTSP-clients"
 
@@ -6403,22 +6347,17 @@ msgid "Managing this case with GOsa is quite simple:"
 msgstr "Een dergelijke situatie beheren is heel eenvoudig met GOsa:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
 "Create a group <computeroutput>sshusers</computeroutput> on the root level "
-"(where already other system management related groups like"
+"(where already other system management related groups like "
+"<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
 "Maak een groep <computeroutput>sshgebruikers</computeroutput> aan in het "
 "basisniveau (waar zich al andere groepen bevinden die te maken hebben met "
 "systeembeheer, zoals"
 
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "'gosa-admins' show up)."
-msgstr "'gosa-admins')."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "This section explains how to use <computeroutput>apt-get upgrade</"
-#| "computeroutput>."
 msgid "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgstr ""
 "Gebruikers toevoegen aan de nieuwe groep <computeroutput>sshgebruikers</"
@@ -6433,12 +6372,10 @@ msgstr ""
 "het bestand /etc/ssh/sshd_config."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "run <computeroutput>apt-get update</computeroutput>"
 msgid "Execute <computeroutput>service ssh restart</computeroutput>."
 msgstr "Geef de opdracht <computeroutput>service ssh restart</computeroutput>."
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Sound with LTSP clients"
 msgid "Setup with LTSP clients"
 msgstr "Bij een opstelling met LTSP-clients"
 
@@ -6865,13 +6802,6 @@ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgstr "<emphasis role=\"strong\">De kernel van een LTSP-client</emphasis>"
 
 #. type: Content of: <article><section><section><para>
-#| 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."
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-586</computeroutput> is installed by default. If all LTSP client "
@@ -7254,11 +7184,6 @@ msgstr ""
 "worden om het subnet te wijzigen."
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
-#| "network.  Changing to this subnet will require manual editing of "
-#| "configuration files to remove duplicate entries."
 msgid ""
 "Note that changing to one of the subnets already used elsewhere in Debian "
 "Edu will not work. 192.168.0.0/24 and 192.168.1.0/24 are already set up as "
@@ -7518,14 +7443,6 @@ msgstr ""
 "opnieuw te starten."
 
 #. type: Content of: <article><section><section><section><section><para>
-#| 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 attached to the LTSP server's second network card. This is "
-#| "because when you use load-balancing, the clients need direct access to "
-#| "the server chosen by LDM. If you leave your clients on the 192.168.1.0 "
-#| "network, all of the clients' traffic will go through that server before "
-#| "it reaches the chosen LDM server."
 msgid ""
 "Now you have to move your clients from the 192.168.0.0 network to the "
 "10.0.0.0 network; attach them to the backbone network instead of the network "
@@ -9879,7 +9796,6 @@ msgid "the browsers Iceweasel 31 ESR and Chromium 38"
 msgstr "de webbrowsers Iceweasel 32 ESR en Chromium 38"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LibreOffice 4.3.2"
 msgid "LibreOffice 4.3.3"
 msgstr "LibreOffice 4.3.3"
 
@@ -9896,7 +9812,6 @@ msgid "GOsa 2.7.4"
 msgstr "GOsa 2.7.4"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LTSP 5.5.3"
 msgid "LTSP 5.5.4"
 msgstr "LTSP 5.5.4"
 
@@ -10254,7 +10169,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 "
@@ -12645,6 +12560,9 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "'gosa-admins' show up)."
+#~ msgstr "'gosa-admins')."
+
 #~ msgid ""
 #~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
 #~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"

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