[debian-edu-commits] debian-edu/ 02/02: Update Debian Edu Jessie manual from the wiki.

Holger Levsen holger at moszumanska.debian.org
Sun Apr 19 09:48:02 UTC 2015


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

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

commit f8023ecce3199cd1641e0ee948f5832c7203544f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Apr 19 11:47:53 2015 +0200

    Update Debian Edu Jessie manual from the wiki.
---
 .../debian-edu-jessie-manual.da.po                 |  549 +++---
 .../debian-edu-jessie-manual.de.po                 |   57 +-
 .../debian-edu-jessie-manual.es.po                 |   21 +-
 .../debian-edu-jessie-manual.fr.po                 |   57 +-
 .../debian-edu-jessie-manual.it.po                 |   57 +-
 .../debian-edu-jessie-manual.nb.po                 | 1838 +++++++-------------
 .../debian-edu-jessie-manual.nl.po                 |   58 +-
 .../debian-edu-jessie/debian-edu-jessie-manual.pot |   21 +-
 .../debian-edu-jessie/debian-edu-jessie-manual.xml |    9 -
 9 files changed, 1074 insertions(+), 1593 deletions(-)

diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index 374b185..04cad57 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2015-03-10 13:02+0000\n"
+"POT-Creation-Date: 2015-04-19 09:41+0000\n"
 "PO-Revision-Date: 2015-03-10 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -858,10 +858,11 @@ msgid ""
 "possible to log in to all machines via SSH (root not allowed by default), "
 "and thereby have full access to the machines."
 msgstr ""
-"Alle Linuxmaskinerne, som er installeret via Skolelinux-installationsprogrammet, "
-"vil kunne administreres fra en central computer, højst sandsynlig serveren. "
-"Det vil være muligt at logge ind på alle maskiner via SSH (root er ikke tilladt "
-"som standard), og dermed have fuld adgang til maskinerne."
+"Alle Linuxmaskinerne, som er installeret via Skolelinux-"
+"installationsprogrammet, vil kunne administreres fra en central computer, "
+"højst sandsynlig serveren. Det vil være muligt at logge ind på alle maskiner "
+"via SSH (root er ikke tilladt som standard), og dermed have fuld adgang til "
+"maskinerne."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1058,8 +1059,8 @@ msgid ""
 "and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
 msgstr ""
 "Computerne der kører Debian Edu / Skolelinux skal have enten 32-bit "
-"(Debianstruktur »i386«, ældste understøttede processorer er Intel Pentium "
-"og AMD K5) eller 64-bit (Debianarkitektur »amd64«) x86-processorer."
+"(Debianstruktur »i386«, ældste understøttede processorer er Intel Pentium og "
+"AMD K5) eller 64-bit (Debianarkitektur »amd64«) x86-processorer."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1086,8 +1087,8 @@ msgid ""
 msgstr ""
 "Swapping over netværket bliver automatisk aktiveret for LTSP-klienter; "
 "swapstørrelsen er 512 MiB, og hvis du skal bruge mere kan du tune denne "
-"indstilling ved at redigere <computeroutput>/etc/ltsp/nbdswapd.conf"
-"</computeroutput> på tjener ved at angive SIZE-variablen."
+"indstilling ved at redigere <computeroutput>/etc/ltsp/nbdswapd.conf</"
+"computeroutput> på tjener ved at angive SIZE-variablen."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -1103,9 +1104,9 @@ msgid ""
 "512 MiB RAM are the absolute minimum requirements. For running modern "
 "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgstr ""
-"For arbejdsstationer, diskløse arbejdsstationer og uafhængige systemer, er 800 "
-"MHz, 512 MiB RAM minimumskrav. For afvikling af moderne internetbrowsere og "
-"LibreOffice anbefales 1024 MiB RAM."
+"For arbejdsstationer, diskløse arbejdsstationer og uafhængige systemer, er "
+"800 MHz, 512 MiB RAM minimumskrav. For afvikling af moderne internetbrowsere "
+"og LibreOffice anbefales 1024 MiB RAM."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -1113,15 +1114,14 @@ msgid ""
 "hang if the swap space is also too small. If this happens frequently the "
 "spell checker can be disabled by system administrators."
 msgstr ""
-"På arbejdsstationer med en lille mængde RAM kan stavekontrollen få LibreOffice "
-"til at hænge hvis swapområdet også er for lille. Hvis dette sker ofte, så kan "
-"stavekontrollen deaktiveres af systemadministratorer."
+"På arbejdsstationer med en lille mængde RAM kan stavekontrollen få "
+"LibreOffice til at hænge hvis swapområdet også er for lille. Hvis dette sker "
+"ofte, så kan stavekontrollen deaktiveres af systemadministratorer."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "The minimum disk space requirements depend on the profile which is installed:"
-msgstr ""
-"Kravet for minimal diskplads afhænger af profilen som installeres:"
+msgstr "Kravet for minimal diskplads afhænger af profilen som installeres:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -1157,9 +1157,9 @@ msgid ""
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
-"eth1 bruges til betjening af LTSP-klienter (192.168.0.0/24 som standard, men <link "
-"linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">andre er "
-"mulige</link>."
+"eth1 bruges til betjening af LTSP-klienter (192.168.0.0/24 som standard, men "
+"<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">andre "
+"er mulige</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1386,9 +1386,15 @@ msgid "netinstall CD image for i386, amd64"
 msgstr "netinstallations-cd for i386, amd64"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The netinstall CD, which also can be used for installation from USB flash "
+#| "drives, is suited to install on i386 and amd64 machines. It's available "
+#| "via"
 msgid ""
 "The netinstall CD, which also can be used for installation from USB flash "
-"drives, is suited to install on i386 and amd64 machines. It's available via"
+"drives, is suitable to install i386 and amd64 machines. As the name implies, "
+"internet access is required for the installation. It's available via"
 msgstr ""
 "Cd'en for netinstallation, som også kan bruges for installation fra USB-"
 "drev, er egnet for installation på i386- og amd64-maskiner. Den er "
@@ -1423,11 +1429,17 @@ msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
 msgstr "USB-drev/blue-ray-disk ISO-aftryk for i386 og amd64"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. It behaves like the former DVD "
+#| "image which means it doesn't use internet access during installation. "
+#| "Like the others it can be downloaded over FTP, HTTP or rsync via:"
 msgid ""
 "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-"installation of amd64 and i386 machines. It behaves like the former DVD "
-"image which means it doesn't use internet access during installation. Like "
-"the others it can be downloaded over FTP, HTTP or rsync via:"
+"installation of amd64 and i386 machines. Please note that internet access "
+"during installation is needed. Like the others it can be downloaded over "
+"FTP, HTTP or rsync via:"
 msgstr ""
 "Dvd ISO-aftrykket for flere arkitekturer er på 5,2 GiB og kan bruges for "
 "installation på amd64- og i386-maskiner. Aftrykket fungerer på samme måde "
@@ -2784,10 +2796,10 @@ msgid ""
 "\"Upgrades\">Upgrades</link> chapter."
 msgstr ""
 "Der er tilgængelig information tilgængelig andre steder i denne manual: "
-"Kapitlet <link linkend=\"Features\">Nye funktioner i Jessie</link> kan "
-"læses af alle som er bekendt med tidligere udgivelser. Og for dem som "
-"opgraderer fra en tidligere udgivelse, så husk at læse kapitlet "
-"<link linkend=\"Upgrades\">Opgraderinger</link>."
+"Kapitlet <link linkend=\"Features\">Nye funktioner i Jessie</link> kan læses "
+"af alle som er bekendt med tidligere udgivelser. Og for dem som opgraderer "
+"fra en tidligere udgivelse, så husk at læse kapitlet <link linkend=\"Upgrades"
+"\">Opgraderinger</link>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3807,16 +3819,17 @@ msgid ""
 "member), <computeroutput>teachers</computeroutput> and "
 "<computeroutput>jradmins</computeroutput> (no members after installation)."
 msgstr ""
-"For printerhåndtering skal du pege din internetbrowser mod <ulink url=\"https://"
-"www:631\"/>. Dette er den normale CUPS-håndteringsgrænseflade, hvor du "
-"kan tilføje/slette/ændre dine printere og rydde op i printerkøen. Som "
-"standard er kun root tilladt, men dette kan ændres: Åbn etc/cups/cups-files.conf "
-"med et redigeringsprogram og tilføj en eller flere gyldige gruppenavne, der "
-"matcher din sidepolitik til linjen indeholdende <computeroutput>SystemGroup lpadmin</"
-"computeroutput>. Eksisterende GOsa²-grupper som kan bruges er "
-"<computeroutput>gosa-admins</computeroutput> (med den første bruger som "
-"medlem), <computeroutput>teachers</computeroutput> og "
-"<computeroutput>jradmins</computeroutput> (ingen medlemmer efter installation)."
+"For printerhåndtering skal du pege din internetbrowser mod <ulink url="
+"\"https://www:631\"/>. Dette er den normale CUPS-håndteringsgrænseflade, "
+"hvor du kan tilføje/slette/ændre dine printere og rydde op i printerkøen. "
+"Som standard er kun root tilladt, men dette kan ændres: Åbn etc/cups/cups-"
+"files.conf med et redigeringsprogram og tilføj en eller flere gyldige "
+"gruppenavne, der matcher din sidepolitik til linjen indeholdende "
+"<computeroutput>SystemGroup lpadmin</computeroutput>. Eksisterende GOsa²-"
+"grupper som kan bruges er <computeroutput>gosa-admins</computeroutput> (med "
+"den første bruger som medlem), <computeroutput>teachers</computeroutput> og "
+"<computeroutput>jradmins</computeroutput> (ingen medlemmer efter "
+"installation)."
 
 #. type: Content of: <article><section><title>
 msgid "Clock synchronisation"
@@ -4475,8 +4488,9 @@ msgid ""
 "Please read this chapter and the <link linkend=\"Features\">New features in "
 "Jessie</link> chapter of this manual completely before attempting to upgrade."
 msgstr ""
-"Læs venligst dette kapitel og kapitlet <link linkend=\"Features\">Nye funktioner i "
-"Jessie</link> i denne manual fuldstændig før du forsøger at opgradere."
+"Læs venligst dette kapitel og kapitlet <link linkend=\"Features\">Nye "
+"funktioner i Jessie</link> i denne manual fuldstændig før du forsøger at "
+"opgradere."
 
 #. type: Content of: <article><section><section><title>
 msgid "General notes on upgrading"
@@ -4572,7 +4586,8 @@ msgstr ""
 "Bemærk venligst at den følgende opskrift gælder for standardinstallationen "
 "af Debian Edus hovedserver (desktop=kde, profiler Main-Server, Workstation, "
 "Thin-Client-Server). (For et generelt overblik over wheezy til jessie-"
-"opgraderingen, se: <ulink url=\"https://www.debian.org/releases/jessie/releasenotes\"/>)"
+"opgraderingen, se: <ulink url=\"https://www.debian.org/releases/jessie/"
+"releasenotes\"/>)"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4582,9 +4597,9 @@ msgid ""
 "listchanges pager once you've read the information."
 msgstr ""
 "Brug ikke X, brug en virtuel konsol, log ind som root. Læs al debconf-"
-"information omhyggeligt, vælg »bevar den lokalt installeret version«; "
-"i de fleste tilfælde vil et tryk på retur være okay. Tryk »q« for at afslutte "
-"apt-listchanges-tekstsøgeren når du har læst informationen."
+"information omhyggeligt, vælg »bevar den lokalt installeret version«; i de "
+"fleste tilfælde vil et tryk på retur være okay. Tryk »q« for at afslutte apt-"
+"listchanges-tekstsøgeren når du har læst informationen."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Upgrade the server side"
@@ -4604,9 +4619,15 @@ msgstr ""
 "apt-get -y upgrade"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remove diversion; debian-edu-config's postinst seems to do it too late "
+#| "(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</"
+#| "ulink>)."
 msgid ""
-"Remove diversion; debian-edu-config's postinst seems to do it too late "
-"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Remove diversion; the postinst from <computeroutput>debian-edu-config</"
+"computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
 msgstr ""
 "Fjern diversion; debian-edu-configs postinst ser ud til at gøre det for sent "
 "(Debianfejl <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
@@ -4621,19 +4642,6 @@ msgstr ""
 "rm /usr/share/pam-configs/edu-krb5"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779642#\">779642</ulink>)."
-msgstr ""
-"Bevar en sikkerhedskopi af Kerberos' konfigurationsfil (Debianfejl <ulink url=\"https://"
-"bugs.debian.org/779642#\">779642</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
-msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Do the actual upgrade."
 msgstr "Udfør den faktiske opgradering."
 
@@ -4653,9 +4661,14 @@ msgstr ""
 "apt-get -y dist-upgrade"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If apt-get still finishes with an error, try to fix it and/or run the apt-"
+#| "get commands again, esp. apt-get -f install."
 msgid ""
-"If apt-get still finishes with an error, try to fix it and/or run the apt-"
-"get commands again, esp. apt-get -f install."
+"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
 msgstr ""
 "Hvis apt-get stadig afslutter med en fejl, så prøv at rette den og/eller "
 "køre apgt-get-kommandoerne igen, spcecielt apt-get -f install."
@@ -4665,8 +4678,8 @@ msgid ""
 "Install additional package to make PXE work (Debian bug <ulink url=\"https://"
 "bugs.debian.org/779644#\">779644</ulink>)."
 msgstr ""
-"Installer yderligere pakke for at få PXE til at fungere (Debianfejl <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
+"Installer yderligere pakke for at få PXE til at fungere (Debianfejl <ulink "
+"url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
 
 #. type: CDATA
 #, no-wrap
@@ -4675,12 +4688,17 @@ msgstr "apt-get -y install pxelinux"
 
 # engelsk fejl Jessie
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+#| "<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
 msgid ""
-"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"Install <computeroutput>squid3</computeroutput> as <computeroutput>squid</"
+"computeroutput> is deprecated and missing in jessie (Debian bug <ulink url="
+"\"https://bugs.debian.org/779649#\">779649</ulink>)."
 msgstr ""
-"Installer squid3 da squid er forældet og mangler i Jessie (Debianfejl "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"Installer squid3 da squid er forældet og mangler i Jessie (Debianfejl <ulink "
+"url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
 
 #. type: CDATA
 #, no-wrap
@@ -4692,38 +4710,26 @@ msgstr ""
 "service squid3 stop"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Apply debian-edu configuration (takes some time)."
-msgstr "Anvend debian-edu-konfiguration (tager lidt tid)."
+msgid ""
+"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779642#\">779642</ulink>)."
+msgstr ""
+"Bevar en sikkerhedskopi af Kerberos' konfigurationsfil (Debianfejl <ulink "
+"url=\"https://bugs.debian.org/779642#\">779642</ulink>)."
 
 #. type: CDATA
 #, no-wrap
-msgid "cfengine-debian-edu -D installation"
-msgstr "cfengine-debian-edu -D installation"
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Replace squid with squid3, keep the cache; a new swap file will be generated "
-"and the cache index be rebuilt upon first squid3 start."
-msgstr ""
-"Erstat squid med squid3, bevar mellemlageret, en ny swapfil vil blive oprettet "
-"og mellemlagerindekset bliver bygget om ved første squid3-start."
+msgid "Apply debian-edu configuration (takes some time)."
+msgstr "Anvend debian-edu-konfiguration (tager lidt tid)."
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-msgstr ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
+msgid "cfengine-debian-edu -D installation"
+msgstr "cfengine-debian-edu -D installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Replace Kerberos file (messed up by cfengine) with the right one."
@@ -4735,13 +4741,21 @@ msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
 msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
-msgstr "Genskab gosa.secrets så GOsa² fungerer med den nye php-version."
+msgid ""
+"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
+"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
+"in case it has been modified."
+msgstr ""
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "rm /etc/gosa/gosa.secrets\n"
+#| "cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+#| "gosa-encrypt-passwords"
 msgid ""
 "rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version\n"
 "cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
 "gosa-encrypt-passwords"
 msgstr ""
@@ -4769,10 +4783,10 @@ msgid ""
 "computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
 "debian.org/779648#\">779648</ulink>)."
 msgstr ""
-"Installer manglende pakker; pakkenavnene blev indhentet via "
-"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
-"computeroutput> efter trinet ovenfor (Debianfejl <ulink url=\"https://bugs."
-"debian.org/779648#\">779648</ulink>)."
+"Installer manglende pakker; pakkenavnene blev indhentet via <computeroutput>/"
+"usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</computeroutput> "
+"efter trinet ovenfor (Debianfejl <ulink url=\"https://bugs.debian.org/779648#"
+"\">779648</ulink>)."
 
 #. type: CDATA
 #, no-wrap
@@ -4797,10 +4811,10 @@ msgid ""
 "error."
 msgstr ""
 "Genstart og test om alt fungerer som før: Log ind som den første bruger og "
-"test om den grafiske brugerflade for GOsa² fungerer, om du kan forbinde "
-"LTSP-klienter og arbejdsstationer, om du kan tilføje/fjerne et netgruppe-"
-"medlemskab for et system, om du kan sende og modtage intern post, om du "
-"kan håndtere printere og måske andre sidespecifikke aktiviteter. Brug "
+"test om den grafiske brugerflade for GOsa² fungerer, om du kan forbinde LTSP-"
+"klienter og arbejdsstationer, om du kan tilføje/fjerne et netgruppe-"
+"medlemskab for et system, om du kan sende og modtage intern post, om du kan "
+"håndtere printere og måske andre sidespecifikke aktiviteter. Brug "
 "testprogrampakkens skripter hvis du finder en fejl."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4821,9 +4835,10 @@ msgid ""
 msgstr ""
 "Ryd op efter cfengine automatisk har afinstalleret pakker uden fuldstændig "
 "fjernelse. Dette vil fjerne konfigurationsfiler for afinstallerede pakker "
-"bør kun anvendes med omhu; se <computeroutput>dpkg -l|grep ^rc</computeroutput> "
-"først for at kontrollere det som fjernes, kør så <computeroutput>for i in "
-"$(dpkg -l|grep ^rc|cut -d' ' -f3);do dpkg -P $i;done</computeroutput>."
+"bør kun anvendes med omhu; se <computeroutput>dpkg -l|grep ^rc</"
+"computeroutput> først for at kontrollere det som fjernes, kør så "
+"<computeroutput>for i in $(dpkg -l|grep ^rc|cut -d' ' -f3);do dpkg -P $i;"
+"done</computeroutput>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Upgrade LTSP chroot (default arch i386)"
@@ -5040,11 +5055,17 @@ msgstr ""
 "konfigurationshistorik kan udtrækkes og gennemses."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To look at the history, the command <computeroutput>etckeeper vcs log</"
+#| "computeroutput> is used.  To check the differences between two points in "
+#| "time, a command like <computeroutput>etcinsvk vcs diff </computeroutput> "
+#| "can be used."
 msgid ""
 "To look at the history, the command <computeroutput>etckeeper vcs log</"
 "computeroutput> is used.  To check the differences between two points in "
-"time, a command like <computeroutput>etcinsvk vcs diff </computeroutput> can "
-"be used."
+"time, a command like <computeroutput>etckeeper vcs diff </computeroutput> "
+"can be used."
 msgstr ""
 "For at kige på historikken bruges kommandoen <computeroutput>etckeeper vcs "
 "log</computeroutput>. For at kontrollere forskellene mellem to punkter i et "
@@ -5662,10 +5683,23 @@ msgid "How to set up shutdown-at-night"
 msgstr "Sådan sættes shutdown-at-night (nedlukning om natten) op"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On clients that should turn off at night, touch <computeroutput>/etc/"
+#| "shutdown-at-night/shutdown-at-night</computeroutput>, or add the hostname "
+#| "(that is, the output from <computeroutput>'uname -n'</computeroutput> on "
+#| "the client) to the netgroup \"shutdown-at-night-hosts\". Adding hosts to "
+#| "the netgroup in LDAP can be done using the <computeroutput>GOsa²</"
+#| "computeroutput> web tool. The clients might need to have wake-on-lan "
+#| "configured in the BIOS. It is also important that the switches and "
+#| "routers used between the wake-on-lan server and the clients will pass the "
+#| "WOL packets to the clients even if the clients are turned off. Some "
+#| "switches fail to pass on packets to clients that are missing in the ARP "
+#| "table on the switch, and this blocks the WOL packets."
 msgid ""
 "On clients that should turn off at night, touch <computeroutput>/etc/"
 "shutdown-at-night/shutdown-at-night</computeroutput>, or add the hostname "
-"(that is, the output from <computeroutput>'uname -n'</computeroutput> on the "
+"(that is, the output from '<computeroutput>uname -n</computeroutput>' on the "
 "client) to the netgroup \"shutdown-at-night-hosts\". Adding hosts to the "
 "netgroup in LDAP can be done using the <computeroutput>GOsa²</"
 "computeroutput> web tool. The clients might need to have wake-on-lan "
@@ -5829,11 +5863,11 @@ msgid ""
 "(see the history of those pages to find them) if they are fine with moving "
 "the howto and putting it under the GPL.)"
 msgstr ""
-"RETMIG: Artiklerne fra <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> er "
-"enten bruger- eller udviklerspecifikke. Lad os flytte de brugerspecfikke "
-"artikler herover (og slette dem der)! (men spørg først forfatterne (se "
-"historikken for disse sider for at finde dem) om de er indforstået med "
-"flytningen af artiklen og udgivelse af den under GPL.)"
+"RETMIG: Artiklerne fra <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/"
+"\"/> er enten bruger- eller udviklerspecifikke. Lad os flytte de "
+"brugerspecfikke artikler herover (og slette dem der)! (men spørg først "
+"forfatterne (se historikken for disse sider for at finde dem) om de er "
+"indforstået med flytningen af artiklen og udgivelse af den under GPL.)"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
@@ -6335,8 +6369,8 @@ msgid ""
 "<computeroutput>sshusers</computeroutput> group will then be allowed to ssh "
 "into the machine from everywhere."
 msgstr ""
-"Hvis ingen LTSP-klienter bruges er en simpel løsning at oprette en ny "
-"gruppe (<computeroutput>sshusers</computeroutput>) og at tilføje linjen til "
+"Hvis ingen LTSP-klienter bruges er en simpel løsning at oprette en ny gruppe "
+"(<computeroutput>sshusers</computeroutput>) og at tilføje linjen til "
 "maskinens /etc/ssh/sshd_config-fil. Kun medlemmer af gruppen "
 "<computeroutput>sshusers</computeroutput> vil have tilladelse til at benytte "
 "ssh for at få adgang til maskinen."
@@ -6357,7 +6391,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Add users to the new group <computeroutput>sshusers</computeroutput>."
-msgstr "Tilføj brugere til den nye gruppe <computeroutput>sshusers</computeroutput>."
+msgstr ""
+"Tilføj brugere til den nye gruppe <computeroutput>sshusers</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6380,8 +6415,8 @@ msgid ""
 "The default LTSP client setup uses ssh connections to the LTSP server. So a "
 "different approach using PAM is needed."
 msgstr ""
-"Standardopsætningen for LTSP-klienten bruger ssh-forbindelser til LTSP-serveren. "
-"Så en anden fremgangsmåde ved brug af PAM er krævet."
+"Standardopsætningen for LTSP-klienten bruger ssh-forbindelser til LTSP-"
+"serveren. Så en anden fremgangsmåde ved brug af PAM er krævet."
 
 #. 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."
@@ -6417,10 +6452,10 @@ msgid ""
 "box into the dedicated LTSP client network(s) will gain ssh access to the "
 "LTSP server(s) as well."
 msgstr ""
-"Hvis kun dedikerede LTSP-servere anvendes, kan 10.0.0.0/8-netværket "
-"droppes for at deaktivere intern ssh-logindadgang. Bemærk: En person som "
-"tilslutter sin boks i de dedikerede LTSP-klientnetværk vil også få ssh-adgang "
-"til LTSP-serverne."
+"Hvis kun dedikerede LTSP-servere anvendes, kan 10.0.0.0/8-netværket droppes "
+"for at deaktivere intern ssh-logindadgang. Bemærk: En person som tilslutter "
+"sin boks i de dedikerede LTSP-klientnetværk vil også få ssh-adgang til LTSP-"
+"serverne."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "A note for more complex setups"
@@ -6434,11 +6469,11 @@ msgid ""
 "identifier together with apropriate PAM configuration would allow to disable "
 "internal ssh login."
 msgstr ""
-"Hvis LTSP-klienter blev tilføjet til backbone-netværket 10.0.0.0/8 (kombiserver "
-"eller LTSP-klyngeopsætning) er tingene endnu mere kompliceret og måske kan "
-"kun en sofistikeret DHCP-opsætning (i LDAP), der kontrollerer vendor-class-"
-"identifier sammen med passende PAM-konfiguration tillade en deaktivering af "
-"intern ssh-logind."
+"Hvis LTSP-klienter blev tilføjet til backbone-netværket 10.0.0.0/8 "
+"(kombiserver eller LTSP-klyngeopsætning) er tingene endnu mere kompliceret "
+"og måske kan kun en sofistikeret DHCP-opsætning (i LDAP), der kontrollerer "
+"vendor-class-identifier sammen med passende PAM-konfiguration tillade en "
+"deaktivering af intern ssh-logind."
 
 #. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
@@ -6514,8 +6549,8 @@ msgid ""
 "The usage of LXDE as default on thin clients can be forced; see <link "
 "linkend=\"NetworkClients\">networked clients</link> for details."
 msgstr ""
-"Brugen af LXDE som standard på tynde klienter kan fremtvinges; se "
-"<link linkend=\"NetworkClients\">netværksklienter</link> for detaljer."
+"Brugen af LXDE som standard på tynde klienter kan fremtvinges; se <link "
+"linkend=\"NetworkClients\">netværksklienter</link> for detaljer."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6524,10 +6559,10 @@ msgid ""
 "\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
 "MATE</link> directly."
 msgstr ""
-"Hvis du ikke ønsker at udføre installationer med standardskrivebordet "
-"KDE »Plasma«, så kan du også <link linkend=\"Installation--The_installation_process"
-"\">installere et af de fire alternative skriveborde, GNOME, LXDE, Xfce eller "
-"Mate</link> direkte."
+"Hvis du ikke ønsker at udføre installationer med standardskrivebordet KDE "
+"»Plasma«, så kan du også <link linkend=\"Installation--"
+"The_installation_process\">installere et af de fire alternative skriveborde, "
+"GNOME, LXDE, Xfce eller Mate</link> direkte."
 
 #. type: Content of: <article><section><section><title>
 msgid "Flash"
@@ -6541,10 +6576,9 @@ msgid ""
 "Please note that upgrading is special in this case."
 msgstr ""
 "Selvom den frie flashafspiller <computeroutput>gnash</computeroutput> "
-"<emphasis>ikke</emphasis> installeres som standard længere, da den er "
-"blevet fjernet fra Jessie, så er installation af en ikke-fri flashafspiller "
-"stadig en mulighed. Bemærk venligst at opgradering er speciel i dette "
-"tilfælde."
+"<emphasis>ikke</emphasis> installeres som standard længere, da den er blevet "
+"fjernet fra Jessie, så er installation af en ikke-fri flashafspiller stadig "
+"en mulighed. Bemærk venligst at opgradering er speciel i dette tilfælde."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6561,10 +6595,10 @@ msgstr ""
 "Flash Player, så installer Debianpakken <computeroutput>flashplugin-nonfree</"
 "computeroutput> fra <computeroutput>contrib</computeroutput>. Dette kræver "
 "at <computeroutput>contrib</computeroutput> er aktiveret i <computeroutput>/"
-"etc/apt/sources.list</computeroutput>. Brug <computeroutput>update-flashplugin-"
-"nonfree --status</computeroutput> for at kontrollere om der findes en nyere "
-"version og <computeroutput>update-flashplugin-nonfree --install</computeroutput> "
-"for at installere den."
+"etc/apt/sources.list</computeroutput>. Brug <computeroutput>update-"
+"flashplugin-nonfree --status</computeroutput> for at kontrollere om der "
+"findes en nyere version og <computeroutput>update-flashplugin-nonfree --"
+"install</computeroutput> for at installere den."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6578,12 +6612,11 @@ msgid ""
 msgstr ""
 "Løsningen for Chromium er på samme måde, at den kræver pakken "
 "<computeroutput>pepperflashplugin-nonfree</computeroutput> (også fra "
-"<computeroutput>contrib</computeroutput>) installeret, som vil "
-"installere den (ikke-frie) Adobe Flash Players netbrowserudvidelsesmodul. Brug "
+"<computeroutput>contrib</computeroutput>) installeret, som vil installere "
+"den (ikke-frie) Adobe Flash Players netbrowserudvidelsesmodul. Brug "
 "<computeroutput>update-pepperflashplugin-nonfree --status</computeroutput> "
-"for at kontrollere om der findes en nyere version og "
-"<computeroutput>update-pepperflashplugin-nonfree --install</computeroutput> "
-"for at installere den."
+"for at kontrollere om der findes en nyere version og <computeroutput>update-"
+"pepperflashplugin-nonfree --install</computeroutput> for at installere den."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6664,8 +6697,8 @@ msgid ""
 msgstr ""
 "Pakken <computeroutput>fonts-linex</computeroutput> (som installeres som "
 "standard) installerer skrifttypen »Abecedario« som er en pæn håndskrevet "
-"skrifttype for børn. Skrifttypen har flere varianter, som kan bruges af børn: "
-"prikket og med linjer."
+"skrifttype for børn. Skrifttypen har flere varianter, som kan bruges af "
+"børn: prikket og med linjer."
 
 #. type: Content of: <article><section><title>
 msgid "HowTos for networked clients"
@@ -7169,14 +7202,14 @@ msgid ""
 "the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
 "or any other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
-"192.168.0.0/24 er standardnetværk for LTSP-klienten hvis en maskine installeres "
-"via profilen for tynd klient-server. Hvis en masse LTSP-klienter bruges eller "
-"hvis forskellige LTSP-klienter skal betjene både i386- og amd64-chrootmiljøer "
-"kan det andet prækonfigurerede netværk 192.168.1.0/24 også anvendes. Rediger "
-"filen <computeroutput>/etc/network/interfaces</computeroutput> og juster "
-"eth1-indstillingerne. Brug <computeroutput>ldapvi</computeroutput> "
-"eller et andet LDAP-redigeringsprogram til at inspicere DNS- og DHCP-"
-"konfigurationen."
+"192.168.0.0/24 er standardnetværk for LTSP-klienten hvis en maskine "
+"installeres via profilen for tynd klient-server. Hvis en masse LTSP-klienter "
+"bruges eller hvis forskellige LTSP-klienter skal betjene både i386- og amd64-"
+"chrootmiljøer kan det andet prækonfigurerede netværk 192.168.1.0/24 også "
+"anvendes. Rediger filen <computeroutput>/etc/network/interfaces</"
+"computeroutput> og juster eth1-indstillingerne. Brug <computeroutput>ldapvi</"
+"computeroutput> eller et andet LDAP-redigeringsprogram til at inspicere DNS- "
+"og DHCP-konfigurationen."
 
 #. type: Content of: <article><section><section><title>
 msgid "Changing network settings"
@@ -7622,6 +7655,33 @@ msgstr ""
 "speciel opsætning for netværkslyd."
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Use printers attachted to LTSP clients"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Attach the printer to the LTSP client machine (both USB and parallel port "
+"are supported)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Configure this machine to run a printer in lts.conf (default location: "
+"<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>, see the LTSP "
+"manual <computeroutput>/usr/share/doc/ltsp/LTSPManual.html#printer</"
+"computeroutput> for details."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Configure the printer using the web interface <computeroutput>https://"
+"www:631</computeroutput> on tjener; choose network printer type "
+"<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
+"regardless of brand or model) and set <computeroutput>socket://<LTSP "
+"client ip>:9100</computeroutput> as connection URI."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Upgrading the LTSP environment"
 msgstr "Opgradering af LTSP-miljøet"
 
@@ -9288,10 +9348,10 @@ msgid ""
 "email address is <ulink url=\"mailto:jdoe at postoffice.intern"
 "\">jdoe at postoffice.intern</ulink>."
 msgstr ""
-"Hver bruger som ønsker at bruge KMail (eller Icedove, som ikke er installeret "
-"som standard) skal konfigurere programmet således. For en bruger med brugernavnet "
-"jdoe er den interne e-postadresse <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Hver bruger som ønsker at bruge KMail (eller Icedove, som ikke er "
+"installeret som standard) skal konfigurere programmet således. For en bruger "
+"med brugernavnet jdoe er den interne e-postadresse <ulink url=\"mailto:"
+"jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "KMail"
@@ -9323,7 +9383,8 @@ msgstr "indtast din e-postadresse"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
-msgstr "sikr dig at »postoffice.intern« er standarddomænet (faneblad avanceret)"
+msgstr ""
+"sikr dig at »postoffice.intern« er standarddomænet (faneblad avanceret)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "click OK"
@@ -9351,7 +9412,8 @@ msgstr "kontroller om brugernavnet er til stede"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "don't enter the password, as Kerberos single sign on will be used"
-msgstr "indtast ikke en adgangskode, da Kerberos' single sign on vil blive anvendt"
+msgstr ""
+"indtast ikke en adgangskode, da Kerberos' single sign on vil blive anvendt"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "click the tab Advanced"
@@ -9463,7 +9525,8 @@ msgstr "Klik »Færdig«"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr "En advarsel bliver vist, afkryds »Jeg forstår risikoen« og klik »Færdig«"
+msgstr ""
+"En advarsel bliver vist, afkryds »Jeg forstår risikoen« og klik »Færdig«"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9805,7 +9868,9 @@ msgid "Software updates"
 msgstr "Programopdateringer"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Jessie 8.0, eg:"
+#, fuzzy
+#| msgid "Everything which is new in Debian Jessie 8.0, eg:"
+msgid "Everything which is new in Debian 8 Jessie, eg:"
 msgstr "Alt som er nyt i Debian Jessie 8.0, f.eks.:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9814,14 +9879,18 @@ msgid ""
 "has been dropped; oldest supported ones: i586 (like Intel Pentium and AMD "
 "K5)."
 msgstr ""
-"Linuxkerne 3.16.x; for i386-arkitekturen er understøttelse for i486-processorer "
-"blevet droppet; ældste understøttede er: i586 (såsom Intel Pentium og AMD "
-"K5)."
+"Linuxkerne 3.16.x; for i386-arkitekturen er understøttelse for i486-"
+"processorer blevet droppet; ældste understøttede er: i586 (såsom Intel "
+"Pentium og AMD K5)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6"
 msgid ""
-"Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6"
+"Desktop environments KDE Plasma Workspace 4.11.13, GNOME 3.14, Xfce 4.10, "
+"LXDE 0.5.6"
 msgstr ""
 "Skrivebordsmiljøerne KDE »Plasma« 4.11.12, GNOME 3.14, Xfce 4.10, LXDE 0.5.6"
 
@@ -9830,15 +9899,21 @@ msgid "new optional desktop environment: MATE 1.8"
 msgstr "nyt valgfrit skrivebordsmiljø: MATE 1.8"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "KDE \"Plasma\" is installed by default; to choose one of the others see "
+#| "this manual."
 msgid ""
-"KDE \"Plasma\" is installed by default; to choose one of the others see this "
-"manual."
+"KDE Plasma Workspace is installed by default; to choose one of the others "
+"see this manual."
 msgstr ""
-"KDE »Plasma« installeres som standard; for at vælge en af de andre så se denne "
-"manual)."
+"KDE »Plasma« installeres som standard; for at vælge en af de andre så se "
+"denne manual)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "the browsers Iceweasel 31 ESR and Chromium 40"
+#, fuzzy
+#| msgid "the browsers Iceweasel 31 ESR and Chromium 40"
+msgid "the browsers Iceweasel 31 ESR and Chromium 41"
 msgstr "Internetbrowserne Iceweasel 31 ESR og Chromium 40"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9846,7 +9921,9 @@ msgid "LibreOffice 4.3.3"
 msgstr "LibreOffice 4.3.3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Educational toolbox GCompris 14.07"
+#, fuzzy
+#| msgid "Educational toolbox GCompris 14.07"
+msgid "Educational toolbox GCompris 14.12"
 msgstr "Undervisningsprogrampakken GCompris 14.07"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9868,10 +9945,10 @@ msgid ""
 "in the<ulink url=\"http://www.freedesktop.org/wiki/Software/systemd/"
 "\">systemd manual</ulink>."
 msgstr ""
-"ny opstartsramme: systemd. Mere information er tilgængelig i "
-"<ulink url=\"https://wiki.debian.org/systemd\">systemd-wikisiden</ulink> og "
-"i <ulink url=\"http://www.freedesktop.org/wiki/Software/systemd/"
-"\">systemd-manualen</ulink>."
+"ny opstartsramme: systemd. Mere information er tilgængelig i <ulink url="
+"\"https://wiki.debian.org/systemd\">systemd-wikisiden</ulink> og i <ulink "
+"url=\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd-manualen</"
+"ulink>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Debian Jessie includes about 42000 packages available for installation."
@@ -9880,8 +9957,14 @@ msgstr ""
 "installation."
 
 #. 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="
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Jessie 8.0 is provided in the <ulink url="
+#| "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</"
+#| "ulink> and the <ulink url=\"http://www.debian.org/releases/jessie/"
+#| "installmanual\">installation manual</ulink>."
+msgid ""
+"More information about Debian 8 Jessie is provided in the <ulink url="
 "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</ulink> "
 "and the <ulink url=\"http://www.debian.org/releases/jessie/installmanual"
 "\">installation manual</ulink>."
@@ -9906,8 +9989,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Two manual translations have been completed: Dutch and Norwegian Bokmål."
-msgstr ""
-"To manualoversættelser er blevet færdig: Hollandsk og norsk bokmål."
+msgstr "To manualoversættelser er blevet færdig: Hollandsk og norsk bokmål."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9943,11 +10025,11 @@ msgid ""
 "<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
 "<computeroutput>/etc/squid3/squid.conf</computeroutput>."
 msgstr ""
-"Nedlukning og genstart af hovedserveren tager lang tid på grund af en "
-"ny standardindstilling <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. "
-"Som et eksempel kan forsinkelsen blive sat til 10 sekunder ved at tilføje linjen "
-"<computeroutput>shutdown_lifetime 10 seconds</computeroutput> til "
-"<computeroutput>/etc/squid3/squid.conf</computeroutput>."
+"Nedlukning og genstart af hovedserveren tager lang tid på grund af en ny "
+"standardindstilling <computeroutput>shutdown_lifetime 30 seconds</"
+"computeroutput>. Som et eksempel kan forsinkelsen blive sat til 10 sekunder "
+"ved at tilføje linjen <computeroutput>shutdown_lifetime 10 seconds</"
+"computeroutput> til <computeroutput>/etc/squid3/squid.conf</computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "SSH"
@@ -9961,9 +10043,9 @@ msgid ""
 "computeroutput>, so ssh-keys will work."
 msgstr ""
 "Rootbrugeren kan ikke længere logge ind via SSH med adgangskode. Standarden "
-"<computeroutput>PermitRootLogin yes</computeroutput> er blevet erstattet "
-"med <computeroutput>PermitRootLogin without-password</"
-"computeroutput>, så ssh-keys vil fungere."
+"<computeroutput>PermitRootLogin yes</computeroutput> er blevet erstattet med "
+"<computeroutput>PermitRootLogin without-password</computeroutput>, så ssh-"
+"keys vil fungere."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Backup (slbackup-php)"
@@ -9975,9 +10057,9 @@ msgid ""
 "<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
 "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgstr ""
-"For at kunne se slbackup-php-siden (som bruger rootlogind via ssh), "
-"skal <computeroutput>PermitRootLogin yes</computeroutput> sættes "
-"midlertidigt i <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+"For at kunne se slbackup-php-siden (som bruger rootlogind via ssh), skal "
+"<computeroutput>PermitRootLogin yes</computeroutput> sættes midlertidigt i "
+"<computeroutput>/etc/ssh/sshd_config</computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "gnash (flash player)"
@@ -9990,8 +10072,8 @@ msgid ""
 "free flash player</link> from Adobe is still possible however."
 msgstr ""
 "Den frie flashafspiller <computeroutput>gnash</computeroutput> er ikke "
-"tilgængelig for Jessie. <link linkend=\"Desktop--Flash\">Installation af den ikke-"
-"frie flashafspiller</link> fra Adobe kan stadig udføres."
+"tilgængelig for Jessie. <link linkend=\"Desktop--Flash\">Installation af den "
+"ikke-frie flashafspiller</link> fra Adobe kan stadig udføres."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
@@ -10022,16 +10104,16 @@ msgid ""
 msgstr ""
 "Dette dokument er underlagt ophavsretten og skrevet af Holger Levsen (2007, "
 "2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, "
-"2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), Patrick "
-"Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
-"(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel "
-"Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim "
-"Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
-"(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
-"(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015) and "
-"Bernhard Hammes (2012). Dokumentet er udgivet under GPL2 eller enhver senere "
-"version. God fornøjelse!"
+"2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), "
+"Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), "
+"Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
+"2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+"(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, "
+"2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
+"Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), "
+"Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, "
+"2014, 2015) and Bernhard Hammes (2012). Dokumentet er udgivet under GPL2 "
+"eller enhver senere version. God fornøjelse!"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -10070,10 +10152,10 @@ msgid ""
 msgstr ""
 "Oversættelsen til bokmål er underlagt ophavsretten af Petter Reinholdtsen "
 "(2007, 2012, 2014, 2015), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), "
-"Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
-"(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
-"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) og Ragnar Wisløff "
-"(2014) og er udgivet under GPL version 2 eller enhver senere version."
+"Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), "
+"Ingrid Yrvin (2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin "
+"(2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) og Ragnar "
+"Wisløff (2014) og er udgivet under GPL version 2 eller enhver senere version."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -10145,9 +10227,10 @@ msgid ""
 "debian-edu-doc/\">online overview of all languages</ulink>."
 msgstr ""
 "Fuldt oversatte versioner af dette dokument på tysk, italiensk, fransk, "
-"dansk, hollandsk og norsk bokmål er tilgængelige. En ufuldstændig oversættelse "
-"findes for spansk. Dette er <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
-"doc/\">et overblik på nettet over alle sprog</ulink>."
+"dansk, hollandsk og norsk bokmål er tilgængelige. En ufuldstændig "
+"oversættelse findes for spansk. Dette er <ulink url=\"http://maintainer."
+"skolelinux.org/debian-edu-doc/\">et overblik på nettet over alle sprog</"
+"ulink>."
 
 #. type: Content of: <article><section><section><title>
 msgid "HowTo translate this document"
@@ -10955,8 +11038,8 @@ msgstr ""
 "<computeroutput>locale=ll_CC.UTF-8</computeroutput> som opstartsindstilling, "
 "hvor ll_CC.UTF-8 er sprognavnet du ønsker. For at aktivere et bestemt "
 "tastaturlayout, så brug indstillingen <computeroutput>keyb=KB</"
-"computeroutput> hvor KB er det ønskede tastaturlayout. Her er en liste "
-"over ofte brugte sprogkoder:"
+"computeroutput> hvor KB er det ønskede tastaturlayout. Her er en liste over "
+"ofte brugte sprogkoder:"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
@@ -11226,8 +11309,8 @@ msgid ""
 "and Danish. Partly translated versions exist for Norwegian Bokmål and "
 "Spanish."
 msgstr ""
-"Manualen for Debian Edu Wheezy er fuldt oversat til tysk, fransk, italiensk og "
-"dansk. Delvist oversatte versioner findes for norsk bokmål og spansk."
+"Manualen for Debian Edu Wheezy er fuldt oversat til tysk, fransk, italiensk "
+"og dansk. Delvist oversatte versioner findes for norsk bokmål og spansk."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -11757,8 +11840,9 @@ msgid ""
 "Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
 "and Spanish."
 msgstr ""
-"Manualen for Debian Edu Squeeze er fuldt oversat til tysk, fransk og italiensk. "
-"Delvist oversatte versioner findes for dansk (ny), norsk bokmål og spansk."
+"Manualen for Debian Edu Squeeze er fuldt oversat til tysk, fransk og "
+"italiensk. Delvist oversatte versioner findes for dansk (ny), norsk bokmål "
+"og spansk."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to many language tasks, especially French and Danish."
@@ -12589,6 +12673,31 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "Replace squid with squid3, keep the cache; a new swap file will be "
+#~ "generated and the cache index be rebuilt upon first squid3 start."
+#~ msgstr ""
+#~ "Erstat squid med squid3, bevar mellemlageret, en ny swapfil vil blive "
+#~ "oprettet og mellemlagerindekset bliver bygget om ved første squid3-start."
+
+#~ msgid ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+#~ msgstr ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+
+#~ msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+#~ msgstr "Genskab gosa.secrets så GOsa² fungerer med den nye php-version."
+
 #~| msgid ""
 #~| "The LDAP setup has changed slightly from Wheezy to Jessie. Nevertheless, "
 #~| "LDAP has to be rebuild from scratch. There's a script "
@@ -12710,5 +12819,3 @@ msgstr ""
 
 #~ msgid "new manual translation: Dutch"
 #~ msgstr "ny manualoversættelse: hollandsk"
-
-
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 780b725..3e4398e 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-16 12:44+0200\n"
+"POT-Creation-Date: 2015-04-19 09:41+0000\n"
 "PO-Revision-Date: 2015-03-24 11:04+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4838,35 +4838,6 @@ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
-"computeroutput>, keep the cache; a new swap file will be generated and the "
-"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
-"start."
-msgstr ""
-"Das Paket <computeroutput>squid</computeroutput> durch "
-"<computeroutput>squid3</computeroutput> ersetzen, den Cache weiterverwenden; "
-"beim ersten Start von Squid3 wird eine neue Swap-Datei erstellt und es wird "
-"der Cache-Index erneuert."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-msgstr ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
 "with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
 "in case it has been modified."
@@ -12975,3 +12946,29 @@ msgstr ""
 "Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
+
+#~ msgid ""
+#~ "Replace <computeroutput>squid</computeroutput> with "
+#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
+#~ "will be generated and the cache index be rebuilt upon first "
+#~ "<computeroutput>squid3</computeroutput> start."
+#~ msgstr ""
+#~ "Das Paket <computeroutput>squid</computeroutput> durch "
+#~ "<computeroutput>squid3</computeroutput> ersetzen, den Cache "
+#~ "weiterverwenden; beim ersten Start von Squid3 wird eine neue Swap-Datei "
+#~ "erstellt und es wird der Cache-Index erneuert."
+
+#~ msgid ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+#~ msgstr ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index f5c97fe..8b0054c 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-16 09:57+0000\n"
+"POT-Creation-Date: 2015-04-19 09:41+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -4423,25 +4423,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
-"computeroutput>, keep the cache; a new swap file will be generated and the "
-"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
-"start."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
 "with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
 "in case it has been modified."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index 4222b66..5db20a9 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-04-16 09:57+0000\n"
+"POT-Creation-Date: 2015-04-19 09:41+0000\n"
 "PO-Revision-Date: 2015-03-18 00:37+0100\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -4877,35 +4877,6 @@ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
-"computeroutput>, keep the cache; a new swap file will be generated and the "
-"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
-"start."
-msgstr ""
-"Remplacez <computeroutput>squid</computeroutput> par <computeroutput>squid3</"
-"computeroutput>, et gardez le cache. Un nouveau fichier d'échange sera créé "
-"et l'index du cache sera reconstruit au premier démarrage de "
-"<computeroutput>squid3</computeroutput>."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-msgstr ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
 "with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
 "in case it has been modified."
@@ -13072,6 +13043,32 @@ msgstr ""
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
 #~ msgid ""
+#~ "Replace <computeroutput>squid</computeroutput> with "
+#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
+#~ "will be generated and the cache index be rebuilt upon first "
+#~ "<computeroutput>squid3</computeroutput> start."
+#~ msgstr ""
+#~ "Remplacez <computeroutput>squid</computeroutput> par "
+#~ "<computeroutput>squid3</computeroutput>, et gardez le cache. Un nouveau "
+#~ "fichier d'échange sera créé et l'index du cache sera reconstruit au "
+#~ "premier démarrage de <computeroutput>squid3</computeroutput>."
+
+#~ msgid ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+#~ msgstr ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+
+#~ msgid ""
 #~ "FIXME: confirm this is really all what needs to be done for upgrades. "
 #~ "It's great if that's true! It could be..."
 #~ msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index ca417f2..46a51b8 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2015-04-16 09:57+0000\n"
+"POT-Creation-Date: 2015-04-19 09:41+0000\n"
 "PO-Revision-Date: 2015-03-16 19:55+0100\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -4789,35 +4789,6 @@ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
-"computeroutput>, keep the cache; a new swap file will be generated and the "
-"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
-"start."
-msgstr ""
-"Sostituire <computeroutput>squid</computeroutput> con "
-"<computeroutput>squid3</computeroutput>, lasciare la cache; un nuovo file di "
-"swap verrà generato e l'indice di cache ricostruito al primo avvio di "
-"<computeroutput>squid3</computeroutput>."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-msgstr ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
 "with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
 "in case it has been modified."
@@ -12806,6 +12777,32 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "Replace <computeroutput>squid</computeroutput> with "
+#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
+#~ "will be generated and the cache index be rebuilt upon first "
+#~ "<computeroutput>squid3</computeroutput> start."
+#~ msgstr ""
+#~ "Sostituire <computeroutput>squid</computeroutput> con "
+#~ "<computeroutput>squid3</computeroutput>, lasciare la cache; un nuovo file "
+#~ "di swap verrà generato e l'indice di cache ricostruito al primo avvio di "
+#~ "<computeroutput>squid3</computeroutput>."
+
+#~ msgid ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+#~ msgstr ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+
+#~ msgid ""
 #~ "FIXME: confirm this is really all what needs to be done for upgrades. "
 #~ "It's great if that's true! It could be..."
 #~ msgstr ""
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 f171c01..4ca8955 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-04-16 09:57+0000\n"
+"POT-Creation-Date: 2015-04-19 09:41+0000\n"
 "PO-Revision-Date: 2015-04-19 08:53+0000\n"
 "Last-Translator: Alexander Alemayhu <a at alemayhu.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -40,13 +40,11 @@ msgstr "Debian Edu / Skolelinux Jessie 8.0+edu0 utgivelseshåndbok"
 msgid "Manual for Debian Edu 8.0+edu0 Codename Jessie"
 msgstr "Utgivelseshåndbok for Debian Edu 8.0+edu0 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"
 
@@ -186,13 +184,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"
 
@@ -358,128 +354,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\">Vanlig navn</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\">Tjenestenavn i DNS</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"
 
@@ -487,123 +458,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"
@@ -611,8 +558,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"
 
@@ -1125,8 +1071,7 @@ msgstr ""
 "Tynne klienter med bare 64 MiB RAM og 133 MHz på 32 bit prosessorer er "
 "mulig, men 256 MiB RAM eller mer og raskere prosessorer anbefales."
 
-#. 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 for LTSP clients; the "
 "swap size is 512 MiB, and if you need more you can tune this by editing "
@@ -1137,8 +1082,7 @@ msgstr ""
 "størrelsen på mellomlageret er 512 MiB. Trenger du mer, kan du endre SIZE-"
 "variabelen herfra:  <computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput>."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><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."
@@ -1156,8 +1100,7 @@ msgstr ""
 "512 MiB RAM absolutte minimumskrav. For å kjøre moderne nettlesere og "
 "LibreOffice anbefales 1024 MiB RAM."
 
-#. 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 might cause LibreOffice to "
 "hang if the swap space is also too small. If this happens frequently the "
@@ -1173,8 +1116,7 @@ msgid ""
 msgstr ""
 "Minimumskravet til lagerplass avhenger av hvilken profil som er installert:"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "main server + thin client server: 60 GiB. As usual with disk space on a main "
 "server, \"the bigger the better\"."
@@ -1182,13 +1124,11 @@ msgstr ""
 "Hovedtjener + tynnklient: 60 GiB. Som vanlig med diskplass på en "
 "hovedtjener, «jo større jo bedre»."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "thin client server: 40 GiB."
 msgstr "Tynnklienttjener: 40 GiB."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "workstation or standalone: 30 GiB."
 msgstr "Arbeidsstasjon eller frittstående: 30 GiB."
 
@@ -1200,13 +1140,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, but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
@@ -1236,13 +1174,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 ":)"
 
@@ -1403,18 +1339,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 "/!\\"
 
@@ -1459,22 +1392,19 @@ msgstr ""
 "maskiner. Som navnet sier kreves Internett-tilgang for installasjonen. 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-CD."
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
 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://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD."
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
@@ -1498,8 +1428,7 @@ msgstr ""
 "under installasjon er nødvendig. I likhet med de andre kan bildet 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-USB."
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
@@ -1507,8 +1436,7 @@ msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
 "iso\">debian-edu-8.0+edu0-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-USB."
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
@@ -1516,8 +1444,7 @@ msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
 "iso\">debian-edu-8.0+edu0-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 -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
@@ -1533,8 +1460,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-"
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
@@ -1542,8 +1468,7 @@ msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso\">debian-edu-8.0+edu0-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-"
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
@@ -1551,8 +1476,7 @@ msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso\">debian-edu-8.0+edu0-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 -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
@@ -1606,18 +1530,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."
@@ -1625,8 +1546,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."
@@ -1634,8 +1554,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit install</emphasis> 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."
@@ -1643,8 +1562,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis> bruker en GTK-"
 "installasjon 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."
@@ -1652,8 +1570,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical install</emphasis> for å kjøre en "
 "64-bit GTK-installasjon 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"
@@ -1661,8 +1578,7 @@ msgstr ""
 "<emphasis role=\"strong\">Advanced options ></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"
@@ -1670,26 +1586,22 @@ msgstr ""
 "<emphasis role=\"strong\">Help</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 "Installer avanserte alternativer skjermbilde1"
 
-#. 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 ""
 "<emphasis role=\"strong\">Back..</emphasis> bringer deg tilbake til "
 "hovedmenyen."
 
-#. 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."
@@ -1697,8 +1609,7 @@ msgstr ""
 "<emphasis role=\"strong\">Expert install</emphasis> gir tilgang til alle "
 "tilgjengelige spørsmål i klartekst."
 
-#. 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."
@@ -1706,16 +1617,14 @@ msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> gjør dette "
 "installasjonsmediet til en redningsdisk for nødsituasjonsoppgaver."
 
-#. 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 ""
 "<emphasis role=\"strong\">Automated install</emphasis> trenger en «preseed»-"
 "fil (for automatisk installasjon)."
 
-#. 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."
@@ -1723,8 +1632,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit expert install</emphasis> gir tilgang til "
 "alle tilgjengelige spørsmål i klartekst tilknyttet AMD64. "
 
-#. 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."
@@ -1732,8 +1640,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit rescue mode</emphasis> gjør dette "
 "installasjonsmedium til en redningsdisk for beredskapsoppgaver på AMD64."
 
-#. 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."
@@ -1741,18 +1648,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> trenger en "
 "«preseed»-fil (for automatisk installasjon)."
 
-#. 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 "Avanserte installasjonsvalg på skjerm 2"
 
-#. 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."
@@ -1760,8 +1664,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gir tilgang "
 "til alle tilgjengelige spørsmål i grafisk modus."
 
-#. 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 "
@@ -1771,8 +1674,7 @@ msgstr ""
 "installasjonsmedium til en redningsdisk for beredskapsmessige oppgaver med "
 "et grafisk GTK-utseende."
 
-#. 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."
@@ -1780,8 +1682,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> trenger en "
 "«preseed»-fil (for automatisk installasjon)."
 
-#. 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."
@@ -1789,8 +1690,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gir "
 "tilgang til alle tilgjengelige spørsmål i grafisk modus for AMD64."
 
-#. 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 "
@@ -1800,8 +1700,7 @@ msgstr ""
 "installasjonsmedium til en redningsdisk for beredskapsoppgaver på AMD64 med "
 "et grafisk GTK-utseende."
 
-#. 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."
@@ -1809,18 +1708,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
 "trenger en «preseed»-fil."
 
-#. 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 "Installasjons-hjelpeskjerm"
 
-#. 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."
@@ -1840,8 +1736,7 @@ msgstr ""
 "På i386/AMD64, så kan oppstartsalternativer redigeres ved å trykke TAB-"
 "tasten i oppstartsmenyen."
 
-#. 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 "
@@ -1851,8 +1746,7 @@ msgstr ""
 "AMD64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 "
 "maskiner."
 
-#. 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>."
@@ -1860,8 +1754,7 @@ msgstr ""
 "Hvis du vil starte opp en AMD64 i tekstmodus med en fler-arkitekturtype, må "
 "du bruke <computeroutput>amd64-install</computeroutput>."
 
-#. 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."
@@ -1869,8 +1762,7 @@ msgstr ""
 "På samme måte kan du velge <computeroutput>amd64-expertgui</computeroutput> "
 "for å få GUI-versjonen på AMD64."
 
-#. 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> "
@@ -1880,8 +1772,7 @@ msgstr ""
 "maskin må du skrive <computeroutput>install</computeroutput> (tekstmodus) "
 "eller <computeroutput>expertgui</computeroutput> (grafisk modus). "
 
-#. 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/"
@@ -1893,8 +1784,7 @@ msgstr ""
 "<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> som "
 "en ekstra oppstartsparameter."
 
-#. 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 "
@@ -1904,8 +1794,7 @@ msgstr ""
 "skal videre installasjoner gjøres via PXE, da denne automatisk vil bruke "
 "mellomlageret i hovedtjeneren."
 
-#. 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 "
@@ -1916,8 +1805,7 @@ 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 "
@@ -1927,8 +1815,7 @@ msgstr ""
 "i stedet, legg til <computeroutput>desktop=lxde</computeroutput> i kjernens "
 "boot/oppstartsparametere. "
 
-#. 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 "
@@ -1938,8 +1825,7 @@ msgstr ""
 "i stedet, legg til <computeroutput>desktop=xfce</computeroutput> i kjernens "
 "boot/oppstartsparametere. "
 
-#. 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 "
@@ -1964,34 +1850,28 @@ msgstr ""
 "Requirements\">system requirements</ulink>, og pass på at du har minst to "
 "nettverkskort (NIC-er) hvis du planlegger å sette opp en tynnklientserver."
 
-#. 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 "Velg et sted som vanligvis er stedet du bor."
 
-#. 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 ""
 "Velg et tastaturoppsett (vanligvis er standardoppsettet for landet ditt bra)."
 
-#. 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 "<emphasis role=\"strong\">Hovedtjener</emphasis>"
 
-#. 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 "
@@ -2006,13 +1886,11 @@ msgstr ""
 "et grafisk brukergrensesnitt, velger du en arbeidsstasjon eller tynn-klient-"
 "server i tillegg til denne."
 
-#. 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 "<emphasis role=\"strong\">Arbeidsstasjon</emphasis>"
 
-#. 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 "
@@ -2024,13 +1902,11 @@ msgstr ""
 "brukeren logger inn og autentiseres av hovedtjeneren, der brukerens filer og "
 "skrivebordsoppsett er lagret."
 
-#. 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 "<emphasis role=\"strong\">Vandrende arbeidsstasjon</emphasis>"
 
-#. 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 "
@@ -2043,13 +1919,11 @@ msgstr ""
 "filer og profiler blir lagret på den lokale disken. Bærbare PC-er skal velge "
 "denne profilen."
 
-#. 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 "<emphasis role='strong'>Tynnklienttjener</emphasis>"
 
-#. 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 "
@@ -2068,13 +1942,11 @@ msgstr ""
 "arbeidsstasjonsprofilen, (selv om den ikke er valgt), og en tynnklienttjener "
 "kan alltid brukes som en arbeidsstasjon også."
 
-#. 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 "<emphasis role='strong'>Frittstående</emphasis>"
 
-#. 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."
@@ -2082,13 +1954,11 @@ msgstr ""
 "En vanlig maskin som kan fungere uten en hovedtjener. Dvs. den trenger ikke "
 "være inne på nettverket. Denne profilen passer bra for bærbare."
 
-#. 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 "<emphasis role='strong'>Minimal</emphasis>"
 
-#. 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 "
@@ -2100,8 +1970,7 @@ msgstr ""
 "applikasjoner. Den er nyttig som en plattform for enkle tjenester som man "
 "flytter manuelt ut fra hovedtjeneren."
 
-#. 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</"
@@ -2144,8 +2013,7 @@ msgstr ""
 "vanligvis ønske å erstatte eth0 med eth1 og eth1 med eth0. Omstart må til "
 "for å at endringene skal tre i kraft."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. 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 "
@@ -2156,8 +2024,7 @@ msgstr ""
 "Svarer du derimot nei, vil det kreve mer arbeid. I tillegg må man være "
 "sikker på at de nødvendige partisjoner både er laget, og at de har nok plass."
 
-#. 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 "
@@ -2169,8 +2036,7 @@ msgstr ""
 "pakker som er populære, og som bør beholdes i fremtidige utgivelser - dette "
 "er selvfølgelig frivillig. "
 
-#. 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 - "
@@ -2180,8 +2046,7 @@ msgstr ""
 "del tid mot slutten, og det står da «Fullfører installasjonen ...» på "
 "skjermen."
 
-#. 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 "
@@ -2192,8 +2057,7 @@ msgstr ""
 "«for ikke-administrative oppgaver». For Debian Edu er denne kontoen svært "
 "viktig: Denne skal du bruke til å administrere Skolelinux-nettverket."
 
-#. 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> - "
@@ -2205,8 +2069,7 @@ msgstr ""
 "vil ikke innlogging være mulig (selv om et kortere passord er godkjent av "
 "installereren)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Vær glad"
 
@@ -2402,13 +2265,11 @@ msgstr ""
 "Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong"
 "\">hovedtjener</emphasis> tilgjengelig: "
 
-#. 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 "./images/pxe-tjener.png"
 
-#. 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 "width=400"
 
@@ -2421,8 +2282,7 @@ msgstr ""
 "Slik ser PXE-menyen ut når man har  <emphasis role=\"strong\">hovedtjener</"
 "emphasis> og <emphasis role=\"strong\">tynnklienttjener</emphasis>profilene:"
 
-#. 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 "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
@@ -2596,303 +2456,243 @@ msgstr ""
 "første oppstart av tjener, en PXE-start både på arbeidsstasjonens og "
 "tynnklientens nettverk:"
 
-#. 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 "./images/03-select_your_location.png"
 
-#. 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 "03-select_your_location.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/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 "./images/06-Load_installer_components_from_CD.png"
 
-#. 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 "08-Choose_Debian_Edu_profile.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/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
-#. 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 "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#. 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 "10-Really_use_the_automatic_partitioning_tool-Yes.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/11-Participate_in_the_package_usage_survey.png"
 msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. 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 "11-Participate_in_the_package_usage_survey.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/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 "12c-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/12d-Setting-up-the-partitioner.png"
 msgstr "./images/12d-Setting-up-the-partitioner.png"
 
-#. 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 "12d-Setting-up-the-partitioner.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/12e-creating_ext4.png"
 msgstr "./images/12e-creating_ext4.png"
 
-#. 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 "12e-creating_ext4.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/13-Install+the+base+system.png"
 msgstr "./images/13-Install+the+base+system.png"
 
-#. 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 "13-Install the base system.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/14-Select_and_install_software.png"
 msgstr "./images/14-Select_and_install_software.png"
 
-#. 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 "14-Select_and_install_software.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/17-Select_and_install_software.png"
 msgstr "./images/17-Select_and_install_software.png"
 
-#. 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 "17-Select_and_install_software.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/18-Build+LTSP+chroot.png"
 msgstr "./images/18-Build+LTSP+chroot.png"
 
-#. 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 "18-Build LTSP chroot.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/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
-#. 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 "19-Install_the_GRUB_boot_loader_on_a_hard_disk.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/20-Finish_the_Installation.png"
 msgstr "./images/20-Finish_the_Installation.png"
 
-#. 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 "20-Finish_the_Installation.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/21-Finish_the_Installation-Installation_complete.png"
 msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#. 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 "21-Finish_the_Installation-Installation_complete.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/22-Tjener_GRUB_boot_menu.png"
 msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
-#. 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 "22-Tjener_GRUB_boot_menu.png"
 
-#. 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 "KDM-innlogging på tjener"
 
-#. 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 "./images/24-Tjener-KDE_Start.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE starting..."
 msgstr "KDE starter..."
 
-#. 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 "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. 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 "KDE og nettleser"
 
-#. 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 "./images/27-Tjener-KDE_Desktop.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE Desktop"
 msgstr "KDE Desktop"
 
-#. 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 "28-Diskless-WS-GRUB_Boot_menu-PXE.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/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. 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 "Diskløs Arbeidstasjoner Innlogging"
 
-#. 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 "./images/31-ThinClient-KDE_Desktop.png"
 
@@ -2992,8 +2792,7 @@ msgstr ""
 "hyppige stilte spørsmål.\n"
 " "
 
-#. 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 "Debian Edu KDE desktop"
 
@@ -3097,13 +2896,11 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "GOsa² Login pluss oversikt"
 
-#. 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 "./images/gosa2_overview.png"
 
-#. 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 "GOsa² oversiktsside etter innlogging, som den første brukeren"
 
@@ -3227,8 +3024,7 @@ msgstr ""
 "skjermen; velg «Opprett» («Create») her, og deretter «Bruker» («User»). Du "
 "blir veiledet av brukerveiviseren."
 
-#. 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)."
@@ -3236,8 +3032,7 @@ msgstr ""
 "Den viktigste tingen å legge til er malen (newstudent eller newteacher) det "
 "fulle navnet for din bruker (se bilde)."
 
-#. 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 "
@@ -3251,8 +3046,7 @@ msgstr ""
 "hele navnet, ikke er et problem. Merk at GOsa² kan generere ugyldige "
 "brukernavn hvis hele navnet inneholder ikke-ASCII-tegn."
 
-#. 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 "
@@ -3269,8 +3063,7 @@ msgstr ""
 "<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> som "
 "et ekstra alternativ til «location-definisjonen»)."
 
-#. 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."
@@ -3312,13 +3105,11 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Søk etter og slett brukere"
 
-#. 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 "./images/filterbox.png"
 
-#. 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 "Filterbox"
 
@@ -3361,13 +3152,11 @@ msgstr ""
 "bruker, endre passordet til brukeren, og endre listen over grupper som "
 "brukeren tilhører."
 
-#. 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 "./images/edit_user.png"
 
-#. 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 "Legge til brukere"
 
@@ -3404,35 +3193,30 @@ msgstr ""
 msgid "To administratively set a new password for a user"
 msgstr "For å gi en bruker et nytt passord"
 
-#. 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 ""
 "Søk etter brukeren, som skal modifiseres, som beskrevet ovenfor. Klikk på "
 "brukernavnet når brukeren er funnet."
 
-#. 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 ""
 "Klikk på nøkkelsymbolet ved slutten av linjen som brukernavn er vist i."
 
-#. 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 ""
 "På den påfølgende siden kan du sette et nytt passord som du selv velger."
 
-#. 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 "./images/change_password_administratively.png"
 
-#. 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"
 
@@ -3479,18 +3263,15 @@ msgstr ""
 "Dette er format for retningslinjene slik som CSV-fil (GOsa² er ganske "
 "intolerant når det gjelder disse):"
 
-#. 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 "Bruk \",\" som feltskille."
 
-#. 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 "Ikke bruk hermetegn."
 
-#. 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)"
@@ -3498,8 +3279,7 @@ msgstr ""
 "CSV-filen <emphasis role=\"strong\">må ikke</emphasis> inneholde en "
 "topptekstlinje (av den typen som vanligvis inneholder kolonnenavnene)."
 
-#. 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"
@@ -3511,18 +3291,15 @@ msgstr ""
 msgid "The mass import steps are:"
 msgstr "Masseimport trinnene er: "
 
-#. 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 "Klikk på «LDAP Manager»-lenken i navigasjonsmenyen til venstre."
 
-#. 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 "Klikk på «Import»-fanen i skjermen til høyre."
 
-#. 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"
@@ -3530,8 +3307,7 @@ msgstr ""
 "Bla gjennom lokal disk, og velg en CSV-fil med en liste over brukere som "
 "skal importeres."
 
-#. 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)"
@@ -3539,8 +3315,7 @@ msgstr ""
 "Velg en tilgjengelig brukermal som skal brukes under masseimport/"
 "overføringer (som NewTeacher eller NewStudent)."
 
-#. 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 "Klikk på «Import»-knappen i nederste høyre hjørne."
 
@@ -3556,18 +3331,15 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppeadministrasjon med GOsa²"
 
-#. 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 "lag gruppe"
 
-#. 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"
 
@@ -3752,43 +3524,35 @@ msgstr ""
 "Tilkobling til LDAP som cn=admin, ou=ldap-access, dc=skole, dc = skolelinux, dc=no\n"
 "oppgi passord:"
 
-#. 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 "Systemopplisting i "
 
-#. 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 "Maskindetaljer"
 
-#. 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 "Endre maskindetaljer"
 
-#. 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 "Legg til nettgruppe"
 
@@ -3855,53 +3619,43 @@ msgid ""
 "computeroutput>"
 msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>"
 
-#. 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 "printer-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "server-hosts"
 msgstr "server-hosts"
 
-#. 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 "shutdown-at-night-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "winstation-hosts"
 msgstr "winstation-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "workstation-hosts"
 msgstr "workstation-hosts"
 
@@ -3913,13 +3667,11 @@ msgstr ""
 "Se på koden i <computeroutput>/etc/init.d/kdm</computeroutput> for å få "
 "informasjon om hvordan disse variablene blir brukt."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "NFS."
 msgstr "NFS"
 
-#. 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 "
@@ -3940,8 +3692,7 @@ msgstr ""
 "maskinene riktig i LDAP-treet ved bruk av LWAT, og å konfigurere dem til å "
 "bruke statiske IP-adresser fra LDAP."
 
-#. 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 "
@@ -3953,13 +3704,11 @@ msgstr ""
 "arbeidsstasjoner og tynne klienter bruker ikke NFS så de trenger ikke å "
 "settes opp."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "fs-autoresize"
 msgstr "fs-autoresize"
 
-#. 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."
@@ -3967,13 +3716,11 @@ msgstr ""
 "Maskiner med Skolelinux/Debian Edu i denne gruppen vil automatisk justere "
 "størrelsen på LVM-partisjoner som får for liten plass.  "
 
-#. 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 "Nattestengning"
 
-#. 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."
@@ -3981,13 +3728,11 @@ msgstr ""
 "Maskiner med Skolelinux/Debian Edu i denne gruppen vil automatisk slå seg av "
 "om natten for å spare energi."
 
-#. 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 "CUPS (cups-queue-autoflush-hosts og cups-queue-autoreenable-hosts)"
 
-#. 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."
@@ -3995,8 +3740,7 @@ msgstr ""
 "Maskiner med Skolelinux/Debian Edu i denne gruppen vil automatisk slå seg av "
 "om natten for å spare energi."
 
-#. 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 "
@@ -4341,13 +4085,11 @@ msgstr ""
 "Hvis du ønsker å kvitte deg med eldre sikkerhetskopier, velg «Vedlikehold» 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"
 
@@ -4505,13 +4247,11 @@ msgstr ""
 "Her er instruksjoner om hvordan du skal håndtere de mest vanlige Nagios-"
 "advarsler."
 
-#. 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 "DISK-KRITISK - ledig plass: /usr 309 MB (5% inode=47%):"
 
-#. 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 "
@@ -4532,15 +4272,13 @@ msgstr ""
 "dette programmet automatisk hver time, kan verten det gjelder legges til "
 "nettgruppen <computeroutput> fsautoresize-hosts </computeroutput>."
 
-#. 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 ""
 "APT-KRITISK: 13 pakker tilgjengelig for oppgradering (13 kritiske "
 "oppdateringer)."
 
-#. 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-"
@@ -4556,8 +4294,7 @@ msgstr ""
 "med<computeroutput> ltsp-chroot apt-get update && ltsp-chroot apt-"
 "get upgrade </computeroutput>."
 
-#. 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-"
@@ -4570,8 +4307,7 @@ msgstr ""
 "automatisk oppgradere alle nye pakker hver natt. Dette vil ikke oppgradere "
 "LTSP-chroot-er."
 
-#. 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 "
@@ -4585,8 +4321,7 @@ msgstr ""
 "til LTSP-chroot. Det er en god idé å oppdatere chroot når man oppdaterer "
 "vertssystemet."
 
-#. 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"
@@ -4594,8 +4329,7 @@ msgstr ""
 "ADVARSEL: Restart nødvendig: Kjerne i bruk = 2.6.32-37.81.0, installert "
 "kjerne = 2.6.32-38.83.0"
 
-#. 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 "
@@ -4606,13 +4340,11 @@ msgstr ""
 "må til for å aktivere den nyest installerte kjernen. Dette vil normalt haste "
 "endel, fordi nye kjerner i Debian Edu bidrar til å løse sikkerhetsproblemer."
 
-#. 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 "ADVARSEL: CUPS køstørrelse - 61"
 
-#. 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 "
@@ -4818,8 +4550,7 @@ msgstr ""
 msgid "Upgrade the server side"
 msgstr "Oppgrader tjenersiden"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Make sure the current system is up-to-date."
 msgstr "Sørg for at gjeldende system er up-to-date."
 
@@ -4832,8 +4563,7 @@ msgstr ""
 "apt-get update\n"
 "apt-get -y upgrade"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Remove diversion; the postinst from <computeroutput>debian-edu-config</"
 "computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
@@ -4853,8 +4583,7 @@ msgstr ""
 "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
 "rm /usr/share/pam-configs/edu-krb5"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Do the actual upgrade."
 msgstr "Gjøre selve oppgraderingen."
 
@@ -4884,8 +4613,7 @@ msgstr ""
 "computeroutput> kommandoene igjen, spesielt <computeroutput>apt-get -f "
 "install</computeroutput>."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Install additional package to make PXE work (Debian bug <ulink url=\"https://"
 "bugs.debian.org/779644#\">779644</ulink>)."
@@ -4898,8 +4626,7 @@ msgstr ""
 msgid "apt-get -y install pxelinux"
 msgstr "apt-get -y install (installere) pxelinux"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Install <computeroutput>squid3</computeroutput> as <computeroutput>squid</"
 "computeroutput> is deprecated and missing in jessie (Debian bug <ulink url="
@@ -4918,8 +4645,7 @@ msgstr ""
 "apt-get -y install (installer) squid3\n"
 "service squid3 stop"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
 "bugs.debian.org/779642#\">779642</ulink>)."
@@ -4932,8 +4658,7 @@ msgstr ""
 msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
 msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Apply debian-edu configuration (takes some time)."
 msgstr "Bruk Debian Edu-oppsettet (tar litt tid)."
 
@@ -4942,8 +4667,7 @@ msgstr "Bruk Debian Edu-oppsettet (tar litt tid)."
 msgid "cfengine-debian-edu -D installation"
 msgstr "cfengine-debian-edu -D installation"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Replace Kerberos file (messed up by cfengine) with the right one."
 msgstr "Erstatt Kerberos-filen (rotet til av CFEngine) med den riktige."
 
@@ -4952,38 +4676,7 @@ msgstr "Erstatt Kerberos-filen (rotet til av CFEngine) med den riktige."
 msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
 msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
-"computeroutput>, keep the cache; a new swap file will be generated and the "
-"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
-"start."
-msgstr ""
-"Erstatte <computeroutput>squid</computeroutput> med <computeroutput>squid3</"
-"computeroutput>, behold hurtiglageret; en ny vekselminnefil genereres, og "
-"vekselminneindeksen bygges opp igjen ved første start av "
-"<computeroutput>squid3</computeroutput>."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-msgstr ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i «s#/var/spool/squid#/var/spool/squid3#»/etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
 "with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
@@ -5006,8 +4699,7 @@ msgstr ""
 "cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
 "gosa-encrypt-passwords"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Install newly split out cups package needed for networked printing (Debian "
 "bug <ulink url=\"https://bugs.debian.org/779645#\">779645</ulink>)."
@@ -5021,8 +4713,7 @@ msgstr ""
 msgid "apt-get -y install cups-browsed"
 msgstr "apt-get -y install (installer) cups-browsed"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Install missing packages; the package names were obtained using "
 "<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
@@ -5043,8 +4734,7 @@ msgstr ""
 "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
 "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Check if the upgraded system works."
 msgstr "Sjekk om det oppgraderte systemet virker. "
 
@@ -5064,8 +4754,7 @@ msgstr ""
 "skrivere og kanskje annet tilbehør. Bruk Testsuite-skriptet hvis du finner "
 "en feil."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
 "org/779646#\">779646</ulink>)."
@@ -5113,8 +4802,7 @@ msgstr ""
 "ltsp-chroot -m -a i386 apt-get -f install\n"
 "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
 "bugs.debian.org/779647#\">779647</ulink>)."
@@ -5131,8 +4819,7 @@ msgstr ""
 "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
 "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cleaning up."
 msgstr "Rydder opp."
 
@@ -5141,8 +4828,7 @@ msgstr "Rydder opp."
 msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
 msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove (fjerne automatisk)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Update LTSP support on the server side."
 msgstr "Oppdater LTSP-støtten på tjenersiden."
 
@@ -6137,8 +5823,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"
 
@@ -6150,8 +5835,7 @@ msgstr "mkdir /skole/tjener/home0/2014 "
 msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgstr "<emphasis role='strong'>rolle</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Department"
 msgstr "Avdeling"
 
@@ -6171,8 +5855,7 @@ msgstr ""
 "(should be «/Students»). Lagre ved å klikke «Ok». Nå vil det nye department "
 "(2014) vises nedenfor under /Students. Klikk på det."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Group"
 msgstr "Gruppe"
 
@@ -6186,8 +5869,7 @@ msgstr ""
 "«Base» stå som det er, det skal være /Students/2014), og kryss av i boksen "
 "til venstre for «Samba group» «Ok» for å lagre.  "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Template"
 msgstr "Mal"
 
@@ -6212,8 +5894,7 @@ msgstr ""
 "inn de ønskede verdier, først i Generic-fanen (legg til din nye 2014 groupe "
 "under Group Membership, også), legg derettet til POSIX og Samba-konto."
 
-#. 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"
 
@@ -6427,8 +6108,7 @@ msgstr ""
 "<link linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-"
 "\">Getting started</link> kapitlet i denne manualen."
 
-#. 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 "
@@ -6451,8 +6131,7 @@ msgstr ""
 "    /storage         10.0.0.0/8\n"
 "    root at tjener:~# "
 
-#. 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 "
@@ -6472,8 +6151,7 @@ msgstr ""
 "Legg til automont informasjon om «nas-server.intern» i LDAP for å tillate "
 "alle klienter å automatisk montere ny eksport på forespørsel."
 
-#. 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."
@@ -6482,8 +6160,7 @@ msgstr ""
 "Bruk isteden Ldapvi og tilføy de nødvendige LDAP-objekter ved å bruke en "
 "tekstbehandler."
 
-#. 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>"
@@ -6491,8 +6168,7 @@ msgstr ""
 "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
 "dc=skolelinux,dc=no</computeroutput> "
 
-#. 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 "
@@ -6545,8 +6221,7 @@ msgstr ""
 "Legg til relevante oppføringer i tjener.intern:/etc/fstab, fordi tjener."
 "intern ikke bruker automonter for å unngå monteringssløyfer:"
 
-#. 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</"
@@ -6597,8 +6272,7 @@ msgstr ""
 msgid "Managing this case with GOsa is quite simple:"
 msgstr "Håndtering av dette tilfellet er ganske enkelt med GOsa: "
 
-#. 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 "
@@ -6608,13 +6282,11 @@ msgstr ""
 "de andre systemadministrasjonsrelaterte grupper som <computeroutput>gosa-"
 "admins</computeroutput> allerede dukker opp)."
 
-#. 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 "<computeroutput>git pull</computeroutput>"
 
-#. 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."
@@ -6622,8 +6294,7 @@ msgstr ""
 "Legg <computeroutput>AllowGroups sshusers</computeroutput> til /etc/ssh/"
 "sshd_config."
 
-#. 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 "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>"
 
@@ -6639,13 +6310,11 @@ msgstr ""
 "Standard LTSP-oppsett for klienter bruker SSH-oppkobling til LTSP-tjener. "
 "Derfor trengs en annen bruk av PAM . "
 
-#. 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 "Skru på pam_access.so i LTSP-serverens fil /etc/pam.d/sshd ."
 
-#. 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 "
@@ -7344,8 +7013,7 @@ msgstr ""
 "For å la Ltspserver00 betjene diskløse arbeidsstasjoner på hovednettverket "
 "(10.0.0.0 /8), når tjener ikke er en kombinert server, gjør du følgende:"
 
-#. 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 "
@@ -7355,15 +7023,13 @@ msgstr ""
 "avmontere <computeroutput>/var/spool/squid</computeroutput>-partisjonen også "
 "for at dette skal fungere:"
 
-#. 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 "
@@ -7379,8 +7045,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 "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"
 
-#. 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/"
@@ -7867,16 +7532,14 @@ msgstr ""
 msgid "Use printers attachted to LTSP clients"
 msgstr "Bruk skrivere koblet til LTSP-klienter"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Attach the printer to the LTSP client machine (both USB and parallel port "
 "are supported)."
 msgstr ""
 "Koble skriveren til LTSP-klientmaskinen (både USB og parallellport fungerer)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Configure this machine to run a printer in lts.conf (default location: "
 "<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>, see the LTSP "
@@ -7888,8 +7551,7 @@ msgstr ""
 "LTSP-manualen <computeroutput>/usr/share/doc/ltsp/LTSPManual.html#printer</"
 "computeroutput> for detaljer."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
 "www:631</computeroutput> on tjener; choose network printer type "
@@ -8339,8 +8001,7 @@ msgstr ""
 "Du kan redigere retningslinjer for maskiner, og kopiere de til alle andre "
 "maskiner."
 
-#. 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>"
@@ -8348,8 +8009,7 @@ msgstr ""
 "Bruk en nyinstallert Windows-maskin, og kjør <computeroutput>gpedit.msc</"
 "computeroutput>"
 
-#. 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 "
@@ -8365,38 +8025,31 @@ msgstr ""
 "inn navnet på installasjonspråket slik de er i profilen. Eksempel på "
 "kataloger som kan ekskluderes er:"
 
-#. 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 "Lokale innstillinger"
 
-#. 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 Internett-filer"
 
-#. 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 "Lagre endringer, og forlat editoren."
 
-#. 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."
@@ -8404,8 +8057,7 @@ msgstr ""
 "Kopier <computeroutput>c:\\windows\\system32\\GroupPolicy</computeroutput> "
 "til alle andre maskiner."
 
-#. 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."
@@ -8499,13 +8151,11 @@ msgstr ""
 "Du kan redigere registeret på den lokale maskinen, og kopiere denne "
 "registernøkkelen til andre maskiner."
 
-#. 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>"
@@ -8513,18 +8163,15 @@ msgstr ""
 "Naviger til <computeroutput>HKEY_CURRENT_USER\\Software\\Microsoft\\Windows "
 "NT\\CurrentVersion\\Winlogon</computeroutput>."
 
-#. 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 "Bruk menyen «Endre meny» -> «Ny» -> «Verdi-streng»."
 
-#. 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)"
@@ -8532,8 +8179,7 @@ msgstr ""
 "Skriv inn en semikolonbasert liste med stier som skal ekskluderes (samme "
 "måte som maskinregler)."
 
-#. 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\"."
@@ -8542,8 +8188,7 @@ msgstr ""
 "utvalg, høyreklikk og velg «Eksporter». Lagre filen og du kan dobbelklikke "
 "på den, eller legge den til et skript for å spre den til andre maskiner."
 
-#. 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."
@@ -8555,8 +8200,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\"/>"
@@ -8564,8 +8208,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\"/>"
@@ -8573,13 +8216,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\"/>"
 
@@ -8630,15 +8271,13 @@ msgstr ""
 "katalogene automatisk bli lagt i listen over synkroniserte kataloger. Hvis "
 "du ikke vil dette, så må du i tillegg også slå av følgende"
 
-#. 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 "Brukeroppsett -> Administrative Maler -> Nettverk -> Frakoblete filer"
 
-#. 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\""
@@ -8764,8 +8403,7 @@ msgstr ""
 msgid "Available Remote Desktop clients"
 msgstr "Tilgjengelige klienter for skrivebordsomgivelse via nett"
 
-#. 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."
@@ -8773,8 +8411,7 @@ msgstr ""
 "<computeroutput>freerdp-x11</computeroutput> er installert som standard, og "
 "håndterer RDP og VNC."
 
-#. 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>."
@@ -8782,8 +8419,7 @@ msgstr ""
 "RDP - den enkleste måte å kople til Windows-terminaltjener. Det er bare å "
 "installere <computeroutput>rdesktop</computeroutput>-pakken."
 
-#. 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>."
@@ -8791,8 +8427,7 @@ msgstr ""
 "VNC-klienter (Virituell Nettverksmaskin) gir tilgang til Skolelinux utenfra. "
 "Bare installer pakken <computeroutput>xvncviewer</computeroutput>."
 
-#. 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 "
@@ -8803,8 +8438,7 @@ msgstr ""
 "Windows, Mac eller Linux. En kommune i Norge har tilbudt NX-støtte for alle "
 "sine elever siden 2005. De rapporterer at løsningen er stabil."
 
-#. 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."
@@ -8890,8 +8524,7 @@ msgstr ""
 "er SKOLELINUX. Bruk en Windows-maskin (eller et Linux system med smbclient) "
 "for å bla gjennom ditt Windows/Samba nettverkmiljø."
 
-#. 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."
 
@@ -8927,16 +8560,14 @@ msgstr ""
 "hjemmemapper med Windows-maskiner <emphasis role=\"strong\">not</emphasis>  "
 "som er sammenføyet med Windows SKOLELINUX-domain."
 
-#. 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 ""
 "Oppgi \\\\TJENER\\HOMES eller \\\\TJENER\\<brukernavn> og klikk på "
 "tilbaketasten (Return)."
 
-#. 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"
@@ -8944,8 +8575,7 @@ msgstr ""
 "Oppgi dine innloggingsreferanser (brukernavn, passord) i dialogvinduet som "
 "kommer opp der identiteten skal bekreftes. "
 
-#. 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."
@@ -9055,8 +8685,7 @@ msgstr ""
 "MERK: Windows XP Home støtter ikke domenemedlemskap; Windows XPProfesjonell "
 "er nødvendig her."
 
-#. 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)"
@@ -9064,8 +8693,7 @@ msgstr ""
 "Logge seg på Windows XP-maskin som Administrator (eller hvilken som helst "
 "annen konto med administratorrettigheter)."
 
-#. 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"
 "\""
@@ -9073,13 +8701,11 @@ msgstr ""
 "Klikk på «Start», og deretter høyreklikke på «Computer» og klikk på "
 "«Egenskaper»."
 
-#. 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 "Velg fanen «Datamaskinnavn», og klikk på «Endre ...»."
 
-#. 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\""
@@ -9087,8 +8713,7 @@ msgstr ""
 "Under «Medlem av» velger du alternativknappen ved siden av «Domain», skriv "
 "Skolelinux og klikk deretter på «OK»."
 
-#. 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 "
@@ -9098,8 +8723,7 @@ msgstr ""
 "rettigheter til å bli med i domenet. Skriv inn brukernavn SKOLELINUX"
 "\\Administrator og root-passordet, klikk på «OK»."
 
-#. 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 "
@@ -9141,8 +8765,7 @@ msgstr ""
 "installasjon av et register-patch på klienten i Windows Vista/7 klient. "
 "Denne patchen er gitt på dette stedet:"
 
-#. 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"
@@ -9169,8 +8792,7 @@ msgstr ""
 "Etter bruk av ovennevnte lapp og ny oppstart av klientsystemet, bør du være "
 "i stand til å bli med i Skolelinux-domenet:"
 
-#. 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\""
@@ -9181,8 +8803,7 @@ msgstr ""
 "Den grunnleggende systeminformasjonsside åpnes. Under «datamaskinnavn, "
 "domene, og arbeidsgruppeinnstillinger», klikk på «Endre innstillinger»."
 
-#. 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 "På siden Systemegenskaper, klikk på «Endre ...\""
 
@@ -9626,83 +9247,67 @@ msgstr ""
 msgid "KMail"
 msgstr "KMail"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Start KMail"
 msgstr "Start KMail"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Close the tip of the day"
 msgstr "Lukke dagens tips"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cancel the Account Assistant"
 msgstr "Annullere Account Assistenten"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Open Settings/Configure KMail"
 msgstr "Åpne innstillinger/sette opp KMail"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Modify the default identity"
 msgstr "Endre standardidentiteten "
 
-#. 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 "enter your email address"
 msgstr "legg inn din e-postadresse"
 
-#. 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 "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
 msgstr "sørg for at «postoffice.intern» er standarddomene (i  Avansert-fanen)"
 
-#. 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 "click OK"
 msgstr "klikk OK"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose Accounts out of the menu"
 msgstr "Velge Accounts (kontoer) fra menyen"
 
-#. 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 "click add"
 msgstr "klikk add"
 
-#. 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 "choose imap-server (get rid of KWallet each time it pops up)"
 msgstr "velg imap-server (kvitte seg med KWallet hver gang den dukker opp)"
 
-#. 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 "enter 'intern' as account name and 'postoffice.intern' as imap server"
 msgstr "velg «intern» som kontonavn og «postoffice.intern» som  imap-tjener"
 
-#. 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 "check if the username is present"
 msgstr "sjekk om brukernavnet er der "
 
-#. 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 "don't enter the password, as Kerberos single sign on will be used"
 msgstr "ikke bruk passordet, ettersom Kerberos single sign-on vil bli brukt"
 
-#. 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 "click the tab Advanced"
 msgstr "klikk på Advanced (avansert)"
 
-#. 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 ""
 "click 'Auto detect', then change Authentication manually from 'Login' to "
 "'GSSAPI'"
@@ -9710,74 +9315,60 @@ msgstr ""
 "klikk «Auto detect», slik at Authentication (autentisering) kan endres "
 "manuelt fra «Login» til «GSSAPI»"
 
-#. 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 "click ok"
 msgstr "klikk ok"
 
-#. 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 "accept the certificate (forever)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Open Settings/Configure KMail to configure Sending"
 msgstr "Åpne Settings/Configure KMail for å sette opp Sending"
 
-#. 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 "click Add"
 msgstr "klikk Add"
 
-#. 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 "enter 'intern' as name and set it as default, choose SMTP"
 msgstr "Sett «intern» som navn, og sett den som standard, velg SMTP"
 
-#. 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 "click 'Create and Configure'"
 msgstr "klikk «Create and Configure» (Lag og Konfigurer)"
 
-#. 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 "enter 'postoffice.intern' as outgoing server name"
 msgstr "oppgi «postoffice.intern» som navn for utgående server"
 
-#. 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 "check 'server requires authentication'"
 msgstr "sjekk «server requires authentication» (server krever godkjenning)"
 
-#. 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 "enter username; again, omit the password"
 msgstr "oppgi brukernavn; igjen, utelat passord"
 
-#. 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 "click on the just configured server entry, click 'Modify'"
 msgstr ""
 "klikk på den nettopp oppsatte adgangen til serveren, klikk «Modify» (endre)"
 
-#. 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 "click advanced configuration"
 msgstr "klikk på avansert oppsett"
 
-#. 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 "click detect automatically"
 msgstr "klikk oppdag automatisk"
 
-#. 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 "click two times OK"
 msgstr "klikk to ganger OK"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "You should now be able to read your welcome email (next message)."
 msgstr "Nå skal du være i stand til å lese din velkomst-e-post (neste melding)"
 
@@ -9785,60 +9376,49 @@ msgstr "Nå skal du være i stand til å lese din velkomst-e-post (neste melding
 msgid "Icedove"
 msgstr "Icedove"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Start Icedove"
 msgstr "Start Icedove"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
 msgstr ""
 "Klikk «Skip this and use my existing email» (hopp over dette, og bruk min "
 "eksisterende e-post)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Enter your email address"
 msgstr "Skriv inn din e-postadresse"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Uncheck 'Remember password'"
 msgstr "Deaktiver «Remember password»"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Don't enter your password as Kerberos single sign on will be used"
 msgstr "Skriv ikke inn passordet da Kerberos single sign-on blir  brukt"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Continue'"
 msgstr "Klikk «Continue»"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Manual config'"
 msgstr "Klikk «Manual config»"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
 msgstr "Under Authentication, bytt til «Kerberos/GSSAPI» også for SMTP"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Done'"
 msgstr "Klikk «Done»"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
 msgstr "En advarsel dukker opp, sjekk «I understand the risks» og klikk «Done»"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "First time accessing the inbox click 'Confirm Security Exception' to accept "
 "the certificate"
@@ -9894,13 +9474,11 @@ msgstr "Bidra"
 msgid "Let us know you exist"
 msgstr "La oss vite at du er der"
 
-#. 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 "./images/worldmap.png"
 
-#. 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"
@@ -10052,13 +9630,11 @@ msgstr "Frivillighetsbasert støtte"
 msgid "in English"
 msgstr "På engelsk"
 
-#. 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 "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
-#. 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"
@@ -10066,8 +9642,7 @@ msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/>  - e-postliste for support"
 
-#. 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"
@@ -10079,8 +9654,7 @@ msgstr ""
 msgid "in Norwegian"
 msgstr "På norsk"
 
-#. 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"
@@ -10088,8 +9662,7 @@ msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
 "> - e-postliste for support"
 
-#. 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 "
@@ -10099,8 +9672,7 @@ msgstr ""
 "linuxiskolen\"/> - e-postliste for medlemmer i utviklerorganisasjonen i "
 "Norge (FRISK)"
 
-#. 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 "#skolelinux på irc.oftc.net - IRC-kanal for support av norske brukere"
 
@@ -10108,8 +9680,7 @@ msgstr "#skolelinux på irc.oftc.net - IRC-kanal for support av norske brukere"
 msgid "in German"
 msgstr "På tysk"
 
-#. 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"
@@ -10117,16 +9688,14 @@ msgstr ""
 "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\">http://www."
 "skolelinux.de/mailman/listinfo/user</ulink> - e-postliste for support"
 
-#. 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 ""
 "<ulink url=\"http://wiki.skolelinux.de\">http://wiki.skolelinux.de</ulink> "
 "Wiki med mange veiledninger osv."
 
-#. 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 ""
 "#skolelinux.de på irc.oftc.net - IRC-kanal for support av tyske brukere"
@@ -10135,8 +9704,7 @@ msgstr ""
 msgid "in French"
 msgstr "På fransk"
 
-#. 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"
@@ -10148,8 +9716,7 @@ msgstr ""
 msgid "in Spanish"
 msgstr "På spansk"
 
-#. 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 "<ulink url=\"http://www.skolelinux.es\"/> - Spansk portal"
 
@@ -10178,8 +9745,7 @@ msgstr "Nye egenskaper i Debian Edu 8.0+edu0 kodenavn Jessie utgitt 2015-XX-YY"
 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> "
@@ -10193,13 +9759,13 @@ msgstr ""
 msgid "Software updates"
 msgstr "Programvareoppdateringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Jessie 8.0, eg:"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Everything which is new in Debian Jessie 8.0, eg:"
+msgid "Everything which is new in Debian 8 Jessie, 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 "
@@ -10208,60 +9774,60 @@ msgstr ""
 "Linux-kjernen 3.16.x; for i386 arkitekturen, er støtten til i486 prosessorer "
 "droppet. Eldste som støttes er: i586 (som Intel Pentium og AMD K5)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6"
 msgid ""
-"Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6"
+"Desktop environments KDE Plasma Workspace 4.11.13, GNOME 3.14, Xfce 4.10, "
+"LXDE 0.5.6"
 msgstr ""
 "Skrivebordsmiljøet KDE «Plasma» 4.11.12, GNOME 3.14, Xfce 4.10, LXDE 0.5.6"
 
-#. 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 "new optional desktop environment: MATE 1.8"
 msgstr "Nytt valgfritt skrivebordsmiljø: MATE 1.8"
 
-#. 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>
+#, fuzzy
+#| msgid ""
+#| "KDE \"Plasma\" is installed by default; to choose one of the others see "
+#| "this manual."
 msgid ""
-"KDE \"Plasma\" is installed by default; to choose one of the others see this "
-"manual."
+"KDE Plasma Workspace is installed by default; to choose one of the others "
+"see this manual."
 msgstr ""
 "KDE «Plasma» er installert som standard, for å velge et av de andre gjør du "
 "som beskrevet annet sted i denne håndboken"
 
-#. 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 41"
 msgstr "Nettleserne Iceweasel 31 ESR og Chromium 41"
 
-#. 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>
-msgid "Educational toolbox GCompris 14.07"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Educational toolbox GCompris 14.07"
+msgid "Educational toolbox GCompris 14.12"
 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 "
@@ -10273,16 +9839,20 @@ msgstr ""
 "url=\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</"
 "ulink>"
 
-#. 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>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Jessie 8.0 is provided in the <ulink url="
+#| "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</"
+#| "ulink> and the <ulink url=\"http://www.debian.org/releases/jessie/"
+#| "installmanual\">installation manual</ulink>."
 msgid ""
-"More information about Debian Jessie 8.0 is provided in the <ulink url="
+"More information about Debian 8 Jessie is provided in the <ulink url="
 "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</ulink> "
 "and the <ulink url=\"http://www.debian.org/releases/jessie/installmanual"
 "\">installation manual</ulink>."
@@ -10295,8 +9865,7 @@ 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."
@@ -10304,14 +9873,12 @@ msgstr ""
 "Oversettelsesoppdateringer for malene som brukes i installasjonsprogrammet. "
 "Disse malene er nå tilgjengelig på 29 språk."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Two manual translations have been completed: Dutch and Norwegian Bokmål."
 msgstr "To oversettelser av håndboken er gjort: nederlandsk og norsk bokmål."
 
-#. 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, Dutch and Norwegian Bokmål. A partly translated version exists for "
@@ -10325,8 +9892,7 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr "LDAP-relaterte endringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "TBD"
 msgstr "TBD"
 
@@ -10338,8 +9904,7 @@ msgstr "Andre endringer"
 msgid "Squid"
 msgstr "Squid"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Shutdown and reboot of the main server takes longer due to a new default "
 "setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
@@ -10357,8 +9922,7 @@ msgstr ""
 msgid "SSH"
 msgstr "SSH"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The root user is no longer allowed to login via SSH with password. The "
 "default <computeroutput>PermitRootLogin yes</computeroutput> has been "
@@ -10375,8 +9939,7 @@ msgstr ""
 msgid "Backup (slbackup-php)"
 msgstr "Sikkerhetskopering (slbackup-php)"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To be able to use the slbackup-php site (which uses root logins via ssh), "
 "<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
@@ -10391,8 +9954,7 @@ msgstr ""
 msgid "gnash (flash player)"
 msgstr "Gnash (Flash-avspiller)"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The free flash player <computeroutput>gnash</computeroutput> is not "
 "available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
@@ -10407,8 +9969,7 @@ msgstr ""
 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å."
 
@@ -10696,7 +10257,7 @@ msgstr ""
 "språk, hvis det ikke finnes allerede, og hvordan oppdatere oversettelser. "
 
 #.  <remark>
-#. status ignore</remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -11372,118 +10933,95 @@ msgstr ""
 "du ønsker angis oppstartsvalget <computeroutput>keyb=KB</computeroutput> der "
 "KB er det ønskede tastaturet. Her er en liste over vanlig brukte landkoder:"
 
-#. 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 "<emphasis role='strong'>Spåk (Region)</emphasis>"
 
-#. 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 "<emphasis role='strong'>Lokalkode</emphasis>"
 
-#. 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 "<emphasis role='strong'>Tastaturutforming</emphasis>"
 
-#. 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 "Norsk bokmål"
 
-#. 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 "nb_NO.UTF-8"
 
-#. 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 "no"
 
-#. 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 "Norsk nynorsk"
 
-#. 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 "nn_NO.UTF-8"
 
-#. 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 "Tysk"
 
-#. 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 "de_DE.UTF-8"
 
-#. 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 "de"
 
-#. 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 "Fransk (Frankrike)"
 
-#. 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 "fr_FR.UTF-8"
 
-#. 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 "fr"
 
-#. 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 "Gresk (Hellas)"
 
-#. 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 "el_GR.UTF-8"
 
-#. 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 "el"
 
-#. 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 "Japansk"
 
-#. 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 "ja_JP.UTF-8"
 
-#. 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 "jp"
 
-#. 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 "Nordsamisk (Norge)"
 
-#. 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 "se_NO"
 
-#. 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 "no(smi)"
 
@@ -11515,13 +11053,11 @@ msgstr "Kjente problemer med avtrykket"
 msgid "There are no jessie images yet"
 msgstr "Det er ingen jessie avtrykk ennå"
 
-#. 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 "./images/sad.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 ":("
 
@@ -11556,8 +11092,7 @@ msgstr ""
 msgid "User visible changes"
 msgstr "Endringer synlig for brukerne"
 
-#. 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."
@@ -11565,8 +11100,7 @@ msgstr ""
 "Oppdatert illustrasjonsmateriale og ny Debian Edu / Skolelinux-logo, som er  "
 "synlig under installasjon, i påloggingsskjermen og som skrivebordsbakgrunn."
 
-#. 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> "
@@ -11576,8 +11110,7 @@ msgstr ""
 "www.debian.org/releases/wheezy/installmanual\">installasjons-instruksjonene</"
 "ulink> for ytterligere detaljer."
 
-#. 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."
@@ -11586,18 +11119,15 @@ msgstr ""
 "ray plate, som oppfører seg som et DVD-avtrykk, men er for stort til å få "
 "plass på en DVD."
 
-#. 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 "Alt som er nytt i Debian Wheezy 7.1, 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.2.x"
 msgstr "Linux kjerneversjon 3.2.x"
 
-#. 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 "
@@ -11607,63 +11137,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 "Nettleser Iceweasel 17 ESR"
 
-#. 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 "Libreoffice 3.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 "LTSP 5.4.2"
 msgstr "LTSP 5.4.2"
 
-#. 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 "CUPS utskriftssystem 1.5.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 12.01"
 msgstr "Pedagogisk verktøykasse GCompris 12.01"
 
-#. 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 "Musikkskaperen Rosegarden 12.04"
 
-#. 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 "Bilderedigeringsprogrammet Gimp 2.8.2"
 
-#. 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 "Virtuelt univers Celestia 1.6.1"
 
-#. 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 "Virtuell stjernehimmel Stellarium 0.11.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 "Scratch visual programming environment 1.4.0.6"
 msgstr "Scratch visuelt programmeringsmiljø 1.4.0.6"
 
-#. 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 "Debian Wheezy omfatter ca 37 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 Wheezy 7.1 is provided in the <ulink url="
 "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
@@ -11675,8 +11193,7 @@ msgstr ""
 "\"http://www.debian.org/releases/wheezy/installmanual\">Installation Guide</"
 "ulink>."
 
-#. 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 Bokmål and "
@@ -11685,8 +11202,7 @@ msgstr ""
 "Debian Edu Wheezy Manual er oversatt til tysk, fransk, italiensk og dansk. "
 "Delvis oversatte versjoner finnes på norsk bokmål og spansk."
 
-#. 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, "
@@ -11697,18 +11213,15 @@ msgstr ""
 "arbeidsstasjon, skriver, terminal eller netdevice (Linux Programmerer "
 "Håndbok)."
 
-#. 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 "Ny Xfce desktop/skrivebord oppgave."
 
-#. 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 "LTSP diskløse arbeidsstasjoner kjører uten noen konfigurasjon."
 
-#. 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 "
@@ -11718,8 +11231,7 @@ msgstr ""
 "(standard192.168.0.0/24), kjører maskiner som standard som diskløse "
 "arbeidsstasjoner dersom de er kraftige nok."
 
-#. 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 "
@@ -11729,8 +11241,7 @@ msgstr ""
 "funksjonelle, nedtonet/grået ut (eller er ikke klikkbare). Noen kategorier "
 "er helt skjult for sluttbruker, noen også for GOsa admin."
 
-#. 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 "
@@ -11764,13 +11275,11 @@ msgstr ""
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr "sammendrag ble oppdatert fra 0.1.3 til 0.1.8"
 
-#. 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 "Gjør Nagios oppsett/konfigurasjon mer robust og effektiv"
 
-#. 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 "Sammenfaller med  3.X kernel"
 
@@ -11778,13 +11287,11 @@ msgstr "Sammenfaller med  3.X kernel"
 msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
 msgstr "debian-edu-doc fra 1.4~20120310~6.0.4+r0 til 1.4~20130228~6.0.7+r1"
 
-#. 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 "Mindre oppdateringer fra wiki"
 
-#. 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 "Dansk oversettelse er nå komplett "
 
@@ -11792,18 +11299,15 @@ msgstr "Dansk oversettelse er nå komplett "
 msgid "debian-edu-config from 1.453 to 1.455"
 msgstr "debian-edu-config fra 1.453 til 1.455"
 
-#. 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 "Fikse /etc/hosts for LTSP tynnklienter. Lukker: #699880"
 
-#. 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 "Gjør ltsp_local_mount script arbeid for flere enheter."
 
-#. 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"
@@ -11811,45 +11315,37 @@ msgstr ""
 "Riktig Kerberos brukerpolicy: utløper ikke passord etter to dager. lukker:"
 "#664596 "
 
-#. 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 ""
 "Behandle '#' tegn i roten eller første brukers passord. Lukker: # 664976"
 
-#. 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 "Fikser for GOsa-sync:"
 
-#. 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 "Ikke mislykkes hvis passord inneholder \""
 
-#. 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 "Ikke oppgi nytt passord-streng i syslog"
 
-#. 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 "Rettelser for GOsa-skaper:"
 
-#. 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 "Gjør libnss-mellomlager ugyldig før endriner anvendes"
 
-#. 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 "Flere feil i løpet av masseimport av brukere i "
 
-#. 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"
@@ -11857,15 +11353,13 @@ msgstr ""
 "innstikkmodul gosa-netgroups: ikke slett attributtoppføringer av type "
 "«memberNisNetgroup». Lukker: #687256"
 
-#. 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 ""
 "Første bruker har nå samme grunnleggende Kerberos-oppsett (policy) som alle "
 "andre brukere"
 
-#. 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 "Legg til dansk nettside"
 
@@ -11873,8 +11367,7 @@ msgstr "Legg til dansk nettside"
 msgid "debian-edu-install from 1.528 to 1.530"
 msgstr "debian-edu-install fra 1.528 til 1.530"
 
-#. 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 "Forbedre tidligere støtte og dokumentasjon"
 
@@ -11884,8 +11377,7 @@ msgid ""
 msgstr ""
 "Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Lenny - utgitt  08.02.2010"
 
-#. 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/"
@@ -11897,13 +11389,11 @@ msgstr ""
 "installasjon.</ulink> for å lære å installere med GNOME i stedet for KDE som "
 "skrivebordmiljø ."
 
-#. 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 "Det ligger en liste med oppdatert programvare lenger ned på siden"
 
-#. 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 "
@@ -11915,8 +11405,7 @@ msgstr ""
 "for profiler i nettverket. Sett  <ulink url=\"http://www.skolelinux.org/\"/> "
 "ved frittstående installering."
 
-#. 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 "
@@ -11925,18 +11414,15 @@ msgstr ""
 "Nytt LXDE skrivebordsalternativ, i tillegg til KDE (standard) og GNOME. "
 "GNOMEs og LXDEs skrivebordsalternativer støttes bare ved installasjon fra CD."
 
-#. 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 "Lyd med LTSP-klienter"
 
-#. 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 "Gir en KDE menyinngang for å endre passordet i GOsa²."
 
-#. 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."
@@ -11948,8 +11434,7 @@ msgstr ""
 "detaljert i kapittelet <link linkend=\"NetworkClients\">Veiledning/"
 "Nettverksklienter</link> i denne manualen."
 
-#. 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."
@@ -11957,8 +11442,7 @@ msgstr ""
 "Lagt til lenke til <ulink url=\"http://linuxsignpost.org/\"/> på startsiden "
 "som vises til nye brukere."
 
-#. 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 "
@@ -11968,8 +11452,7 @@ msgstr ""
 "DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service"
 "\">RPD-tjenere</ulink>."
 
-#. 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 "
@@ -11979,8 +11462,7 @@ msgstr ""
 "skrivebordsvarsel lenger når du setter nye medier, og gi en mulighet til å "
 "starte Dolphin når slike medier settes inn."
 
-#. 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> "
@@ -11989,8 +11471,7 @@ msgstr ""
 "Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
 "lenny/installmanual\"> manualen til Debian Installer</ulink>."
 
-#. 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² "
@@ -12004,8 +11485,7 @@ msgstr ""
 "Debian Edu menyendring er også aktivert ved også å legge brukeren til "
 "<computeroutput>teachers</computeroutput>-gruppen."
 
-#. 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> "
@@ -12015,13 +11495,11 @@ msgstr ""
 "computeroutput> som navneserver. Det er imidlertid mulig å forsette å bruke "
 "<computeroutput>bind9</computeroutput>."
 
-#. 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 "arbeidsstasjon"
 
-#. 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 "
@@ -12031,8 +11509,7 @@ msgstr ""
 "org/PolicyKit#\">PolicyKit</ulink>, og ekstra gruppemedlemskap er ikke "
 "nødvendig for å få tilgang til enheter."
 
-#. 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."
@@ -12040,8 +11517,7 @@ msgstr ""
 "Det kommer en advarsel når du installerer den valgte profilen på altfor små "
 "disker."
 
-#. 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."
@@ -12049,8 +11525,7 @@ msgstr ""
 "Å forenkle partisjoneringen til frittstående installasjoner kan skje bare "
 "ved å ha en separat /home/ men ikke egen /usr lenger."
 
-#. 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."
@@ -12058,8 +11533,7 @@ msgstr ""
 "Flere tester i testsamlingen, og korrigerte noen av testene som tidligere "
 "feilet."
 
-#. 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 "
@@ -12069,66 +11543,54 @@ msgstr ""
 "netinst-bildene uten en fungerende Internet-tilkobling, i stedet for å "
 "installere et ødelagt system uten å melde fra."
 
-#. 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 "Alt som er nytt i Debian Squeeze:"
 
-#. 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 ""
 "kompatibilitet med FHS v2.3 og programvare utviklet for versjon 3.2 av LSB."
 
-#. 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 "Linux kjerneversjon 2.6.18"
 
-#. 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 "Nettleser Iceweasel 3.5"
 
-#. 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 "OpenOffice.org 1.1."
 
-#. 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 "Pedagogisk verktøykasse GCompris 9.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 "Music creator Rosegarden 10.04.2"
 msgstr "Musikkskaperen Rosegarden 10.04.2"
 
-#. 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 "Bilderedigeringsprogrammet Gimp 2.6.10"
 
-#. 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 "Virtuelt univers Celestia 1.6.0"
 
-#. 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 "Virtuell stjernekikker Stellarium 0.10.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 ""
 "Debian Squeeze includes over 10,000 new packages available for installation, "
 "including the browser Chromium"
@@ -12136,8 +11598,7 @@ msgstr ""
 "Debian Squeeze inkluderer over 10 000 nye pakker tilgjengelig for "
 "installasjon, inkludert nettleseren Chromium"
 
-#. 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</"
@@ -12151,8 +11612,7 @@ msgstr ""
 msgid "Infrastructural changes"
 msgstr "Installasjon"
 
-#. 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."
@@ -12160,8 +11620,7 @@ msgstr ""
 "Nå brukes 10.0.0.0/8-nettet i stedet for 10.0.2.0/23, og forhåndsinnstillt "
 "gateway er 10.0.0.1/8, ikke 10.0.2.1/8 slik det var tidligere."
 
-#. 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."
@@ -12169,8 +11628,7 @@ msgstr ""
 "Det dynamiske DHCP-området var utvidet på stamnettet til omtrent 4k IP-"
 "adresser og omtrent 200 IP-adresser for tynnklientnettet."
 
-#. 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</"
@@ -12179,8 +11637,7 @@ msgstr ""
 "Endre <computeroutput>$allowPwSet = false ;</computeroutput> til "
 "<computeroutput>$allowPwSet = true ;</computeroutput>"
 
-#. 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...)"
@@ -12188,28 +11645,23 @@ msgstr ""
 "Det er ikke lenger noen forhåndsdefinerte oppføringer for klienter i DNS "
 "(staticXX, ..., dhcpYY ...)"
 
-#. 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 "MIT Kerberos5 brukt for brukerautentisering, aktivisert for:"
 
-#. 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 "PAM"
 
-#. 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 "IMAP"
 
-#. 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 "SMTP"
 
-#. 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</"
@@ -12219,13 +11671,11 @@ msgstr ""
 "Maskinene må fortsatt legges til i nettgruppen <computeroutput>workstation</"
 "computeroutput> for å kunne montere hjemmeområder."
 
-#. 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 "Samba støtter  NT4-dome for Windows XP/Vista/7 fullt ut"
 
-#. 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 "
@@ -12237,8 +11687,7 @@ msgstr ""
 "PXE. Et nytt skript pxe-addfirmware er laget for å støtte flere maskin-"
 "modeller som trenger fastvare.  "
 
-#. 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 "
@@ -12253,8 +11702,7 @@ msgstr ""
 "No_hardcoded_config_on_Debian_Edu_clients.html\">blogg-post med informasjon "
 "om endringer</ulink>."
 
-#. 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."
@@ -12262,8 +11710,7 @@ msgstr ""
 "Oversetteroppdateringer for malene som brukes av installasjonssystemet.  "
 "Disse malene er nå tilgjengelig i 28 språk."
 
-#. 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."
@@ -12272,8 +11719,7 @@ msgstr ""
 "forbedret.  En lingvist med engelsk som morsmål har korrekturlest og "
 "korrigert teksten."
 
-#. 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 Bokmål "
@@ -12282,19 +11728,16 @@ msgstr ""
 "Brukerhåndboka for Debian Edu Squeeze er oversatt til tysk, fransk og "
 "italiensk.  Delvis oversettelse finnes på dansk (ny), norsk bokmål og spansk."
 
-#. 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 ""
 "Forbedringer for mange språkspesifikke oppgaver, spesielt fransk og dansk."
 
-#. 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 "Forbedringer i velkomstsiden på nett som vises ved første pålogging. "
 
-#. 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."
@@ -12305,8 +11748,7 @@ msgstr ""
 msgid "Regressions"
 msgstr "Regresjoner"
 
-#. 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 "
@@ -12316,8 +11758,7 @@ msgstr ""
 "\">CD and DVD er forskjellige</ulink> - DVD-en er bare egnet til å "
 "installere KDE-omgivelsene. "
 
-#. 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 "
@@ -12328,8 +11769,7 @@ msgstr ""
 "<computeroutput>powerpc</computeroutput>, men installasjonen er mindre "
 "automatisk. "
 
-#. 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)."
@@ -12341,8 +11781,7 @@ msgstr ""
 msgid "New administration tool: GOsa²"
 msgstr "Brukeradministrasjon (lwat)"
 
-#. 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:"
@@ -12350,21 +11789,18 @@ msgstr ""
 "gosa (2.6.11-3+squeeze1~edu+1) fra den kommende 6.0.5 Debian point "
 "utgivelsen, med:"
 
-#. 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 "Reparert DHCP fjerning av vert. Stenger: #650258"
 
-#. 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 ""
 "Tilbakeført brukerskapt unicode-karakterer for transliteration. Stenger: "
 "#657086"
 
-#. 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."
@@ -12372,8 +11808,7 @@ msgstr ""
 "Tilpasset GOsa²-konfigurasjon for å passe bedre til nettverk-arkitekturen i "
 "Debian Edu. "
 
-#. 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 "
@@ -12383,8 +11818,7 @@ msgstr ""
 "oppdatert i LDAP, som gjør at diskløse arbeidsstasjoner virker rett etter de "
 "har lagt til i påkrevd netgroup. "
 
-#. 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 "
@@ -12398,16 +11832,14 @@ msgstr ""
 msgid "More software changes"
 msgstr "Flere endringer i programvaren"
 
-#. 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 ""
 "Legg til video-redigerer Kdenlive 0.7.7 og interaktivt geometri-verktøy "
 "Geogebra 3.2.42"
 
-#. 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."
@@ -12415,8 +11847,7 @@ msgstr ""
 "Endre standard pakke-håndterer fra adept til synaptic, for å unngå at man "
 "får to grafiske pakke-håndterere installert som standard. "
 
-#. 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."
@@ -12424,8 +11855,7 @@ msgstr ""
 "Installer openoffice.org-kde for å sikre at kontorpakken OOo bruker KDE "
 "fildialog ved bruk av KDE."
 
-#. 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)."
@@ -12433,8 +11863,7 @@ msgstr ""
 "Endre oppsett av video-spiller for å bruke andre spillere i KDE "
 "(dragonplayer), GNOME (totem) og LXDE (totem)."
 
-#. 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."
@@ -12442,8 +11871,7 @@ msgstr ""
 "Legg til KDE-verktøyene freespacenotifier, kinfocenter, update-notifier-kde "
 "til standard KDE-installasjon."
 
-#. 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"
@@ -12451,15 +11879,13 @@ msgstr ""
 "Erstatt network-manager-kde med plasma-widget-networkmanagement i "
 "frittstående KDE-profil. "
 
-#. 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 ""
 "Installer usb-modeswitch på bærbare for å håndtere såkalte «dual mode USB "
 "devices»."
 
-#. 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."
@@ -12467,8 +11893,7 @@ msgstr ""
 "Legg til cifs-utils i standard-installasjonen for å sikre at montering med "
 "SMB virker i alle profiler. "
 
-#. 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 "
@@ -12478,8 +11903,7 @@ msgstr ""
 "og valgrind fra standard-installasjonen og DVD'en for å gi plass til pakker "
 "med høyere prioritet. "
 
-#. 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."
@@ -12487,8 +11911,7 @@ msgstr ""
 "Dropp libnss-mdns fra stasjonære profiler. Da skal DNS være den eneste "
 "kilden til maskin-navn."
 
-#. 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 "
@@ -12501,8 +11924,7 @@ msgstr ""
 msgid "Other LDAP related changes"
 msgstr "Andre LDAP-relaterte endringer"
 
-#. 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."
@@ -12510,8 +11932,7 @@ msgstr ""
 "Få LDAP-tjenesten til å håndtere flere brukere ved å øke antallet "
 "tilgjengelige filer fra 1024 tl 32768."
 
-#. 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."
@@ -12520,8 +11941,7 @@ msgstr ""
 "hoved-tjeneren, samt tømme alle CUPS-køer hver natt. Begge funksjoner kan "
 "skrus av i LDAP."
 
-#. 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 "
@@ -12531,8 +11951,7 @@ msgstr ""
 "kontrollert via LDAP. I tillegg til å hindre nettverkstilgang må det gjøres "
 "endringer i Squid-oppsettet."
 
-#. 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."
@@ -12540,8 +11959,7 @@ msgstr ""
 "Sett opp autmatisk utvidelse når et filsystem går fullt på hoved-tjeneren "
 "som standard. Dette kan skrus av i LDAP."
 
-#. 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."
@@ -12549,16 +11967,14 @@ msgstr ""
 "Bytt navnet på SSL-sertifikatet som brukes av LDAP-tjenesten, og la "
 "klientene bruke det nye navnet når sertifikatene sjekkes på klientene."
 
-#. 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 ""
 "La PowerDNS bruke streng LDAP modus, dette forenkler DNS-oppsettet i LDAP."
 
-#. 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."
@@ -12567,16 +11983,14 @@ msgstr ""
 "katalog-partisjoner som er eksportert fra hoved-server uten noen "
 "forandringer."
 
-#. 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 ""
 "Lag sikkerhetskopisystemet mer robust i behandling av LDAP database utskrift/"
 "dump og omstart."
 
-#. 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#"
@@ -12587,8 +12001,7 @@ msgstr ""
 "installasjon.</ulink> for å lære å innstallere med GNOME i stedet for KDE "
 "som skrivebordmiljø ."
 
-#. 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."
@@ -12596,8 +12009,7 @@ msgstr ""
 "Klienter satt opp til å stenge om natten vil være oppe i minst en time hvis "
 "de er slått på manuelt 16:00 til 07:00."
 
-#. 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."
@@ -12605,8 +12017,7 @@ msgstr ""
 "I tillegg, bruk lokal NTP klokke på hovedtjeneren for å sikre at klienter og "
 "server har synkroniserte klokker også når de er koblet fra Internett."
 
-#. 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."
@@ -12617,13 +12028,11 @@ msgstr ""
 "org/20100704221022.GC30542 at login1.uio.no\"> ved hjelp av DHCP og WPAD </"
 "ulink>"
 
-#. 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 "home0 partisjon er montert med nosuid, for å øke sikkerhet"
 
-#. 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."
@@ -12631,8 +12040,7 @@ msgstr ""
 "Bytt KDE/Akonadi konfigurasjon for å redusere diskbruk for hver bruker fra "
 "144 til 24 MiB."
 
-#. 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."
@@ -12997,8 +12405,7 @@ msgstr "LSB 3.1-kompatibel"
 msgid "Linux kernel version 2.6.18"
 msgstr "Linux kjerneversjon 2.6.18"
 
-#. 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 "Støtte for SATA-kontrollere og harddisker"
 
@@ -13034,8 +12441,7 @@ msgstr "Automatisk versjonskontroll av oppsettsfiler i /etc/ ved hjelp av svk."
 msgid "File systems can be extended while the file system is mounted."
 msgstr "Filsystemer kan utvides mens filsystemet er montert."
 
-#. 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 ""
@@ -13152,3 +12558,29 @@ msgstr ""
 "Mer informasjon om de gamle utgavene kan du finne på <ulink url='http://"
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
+
+#~ msgid ""
+#~ "Replace <computeroutput>squid</computeroutput> with "
+#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
+#~ "will be generated and the cache index be rebuilt upon first "
+#~ "<computeroutput>squid3</computeroutput> start."
+#~ msgstr ""
+#~ "Erstatte <computeroutput>squid</computeroutput> med "
+#~ "<computeroutput>squid3</computeroutput>, behold hurtiglageret; en ny "
+#~ "vekselminnefil genereres, og vekselminneindeksen bygges opp igjen ved "
+#~ "første start av <computeroutput>squid3</computeroutput>."
+
+#~ msgid ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+#~ msgstr ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i «s#/var/spool/squid#/var/spool/squid3#»/etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
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 c4e5e03..2ccf70d 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: 2015-04-16 09:57+0000\n"
+"POT-Creation-Date: 2015-04-19 09:41+0000\n"
 "PO-Revision-Date: 2015-04-13 20:58+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -4932,35 +4932,6 @@ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
-"computeroutput>, keep the cache; a new swap file will be generated and the "
-"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
-"start."
-msgstr ""
-"Vervang <computeroutput>squid</computeroutput> door <computeroutput>squid3</"
-"computeroutput>, behoud de cache; er zal een nieuw wisselbestand aangemaakt "
-"worden en de cache-index zal opnieuw opgebouwd worden als "
-"<computeroutput>squid3</computeroutput> voor het eerst opstart."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-msgstr ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
 "with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
 "in case it has been modified."
@@ -13244,6 +13215,33 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "Replace <computeroutput>squid</computeroutput> with "
+#~ "<computeroutput>squid3</computeroutput>, keep the cache; a new swap file "
+#~ "will be generated and the cache index be rebuilt upon first "
+#~ "<computeroutput>squid3</computeroutput> start."
+#~ msgstr ""
+#~ "Vervang <computeroutput>squid</computeroutput> door "
+#~ "<computeroutput>squid3</computeroutput>, behoud de cache; er zal een "
+#~ "nieuw wisselbestand aangemaakt worden en de cache-index zal opnieuw "
+#~ "opgebouwd worden als <computeroutput>squid3</computeroutput> voor het "
+#~ "eerst opstart."
+
+#~ msgid ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+#~ msgstr ""
+#~ "service squid stop\n"
+#~ "umount /var/spool/squid\n"
+#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#~ "mount /var/spool/squid3\n"
+#~ "service squid3 start\n"
+#~ "apt-get -y purge squid squid-common"
+
+#~ msgid ""
 #~ "FIXME: confirm this is really all what needs to be done for upgrades. "
 #~ "It's great if that's true! It could be..."
 #~ msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index bfe0caa..0ec39cc 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-16 09:57+0000\n"
+"POT-Creation-Date: 2015-04-19 09:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -3537,25 +3537,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
-"computeroutput>, keep the cache; a new swap file will be generated and the "
-"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
-"start."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
 "with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
 "in case it has been modified."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index f3de66f..0a90f4a 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -1454,15 +1454,6 @@ service squid3 stop]]></screen>
 </para></listitem></itemizedlist><screen><![CDATA[cp /etc/krb5.conf.backup /etc/krb5.conf]]></screen>
 <itemizedlist>
 <listitem>
-<para>Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</computeroutput>, keep the cache; a new swap file will be generated and the cache index be rebuilt upon first <computeroutput>squid3</computeroutput> start. 
-</para></listitem></itemizedlist><screen><![CDATA[service squid stop
-umount /var/spool/squid
-sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab
-mount /var/spool/squid3
-service squid3 start
-apt-get -y purge squid squid-common]]></screen>
-<itemizedlist>
-<listitem>
 <para>Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work with new php version; backup <computeroutput>gosa.conf</computeroutput> just in case it has been modified. 
 </para></listitem></itemizedlist><screen><![CDATA[rm /etc/gosa/gosa.secrets
 cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version

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