[debian-edu-commits] debian-edu/ 01/01: jessie manual: updated from the wiki

Holger Levsen holger at moszumanska.debian.org
Sun Nov 30 11:47:31 UTC 2014


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 7861dd9bdc8df9eb88146cbd8658584af86138eb
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Nov 30 12:47:15 2014 +0100

    jessie manual: updated from the wiki
---
 .../debian-edu-jessie-manual.da.po                 |   19 +-
 .../debian-edu-jessie-manual.de.po                 |   31 +-
 .../debian-edu-jessie-manual.es.po                 |   11 +-
 .../debian-edu-jessie-manual.fr.po                 |   27 +-
 .../debian-edu-jessie-manual.it.po                 |   23 +-
 .../debian-edu-jessie-manual.nb.po                 | 4686 ++++++++++----------
 .../debian-edu-jessie-manual.nl.po                 |   25 +-
 .../debian-edu-jessie/debian-edu-jessie-manual.pot |   11 +-
 .../debian-edu-jessie/debian-edu-jessie-manual.xml |    4 +-
 9 files changed, 2392 insertions(+), 2445 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 2af75ef..1605640 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: 2014-11-29 16:49+0100\n"
+"POT-Creation-Date: 2014-11-30 12:45+0100\n"
 "PO-Revision-Date: 2014-10-21 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -9545,10 +9545,19 @@ msgstr ""
 "(2010, 2012, 2013). Udgivet under GPL version 2 eller enhver senere version."
 
 #. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
-"Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) and is released "
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
+#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
+#| "(2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) "
+#| "and is released under the GPL v2 or any later version."
+msgid ""
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
+"(2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), <ulink url="
+"\"https://wiki.debian.org/FourFire#\">FourFire</ulink> Le'bard (2014), "
+"Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released "
 "under the GPL v2 or any later version."
 msgstr ""
 "Oversættelsen til bokmål er underlagt ophavsretten af Petter Reinholdtsen "
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 1da6a63..2cabfdc 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: 2014-11-29 16:49+0100\n"
+"POT-Creation-Date: 2014-11-30 12:45+0100\n"
 "PO-Revision-Date: 2014-11-29 16:54+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -781,8 +781,8 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
-"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
+"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
 "Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
 "Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
 "Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -6273,10 +6273,10 @@ msgid ""
 "alice, jane, bob and john from everywhere and for all other users only from "
 "the internal networks by adding these lines:"
 msgstr ""
-"In der Datei /etc/security/access.conf den Zugang für die "
-"(Beispiel-)Benutzer  alice, jane, bob and john von überall her sowie für "
-"alle anderen Benutzer nur aus den internen Netzwerken ermöglichen durch "
-"Einfügen dieser Zeilen: :"
+"In der Datei /etc/security/access.conf den Zugang für die (Beispiel-)"
+"Benutzer  alice, jane, bob and john von überall her sowie für alle anderen "
+"Benutzer nur aus den internen Netzwerken ermöglichen durch Einfügen dieser "
+"Zeilen: :"
 
 #. type: CDATA
 #, no-wrap
@@ -9747,10 +9747,19 @@ msgstr ""
 "2013). Sie wurde unter der GPL v2 oder einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
-"Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) and is released "
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
+#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
+#| "(2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) "
+#| "and is released under the GPL v2 or any later version."
+msgid ""
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
+"(2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), <ulink url="
+"\"https://wiki.debian.org/FourFire#\">FourFire</ulink> Le'bard (2014), "
+"Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released "
 "under the GPL v2 or any later version."
 msgstr ""
 "Das Copyright der norwegischen Bokmål-Übersetzung liegt bei Petter "
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 b09c104..8997a93 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: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-29 16:49+0100\n"
+"POT-Creation-Date: 2014-11-30 12:45+0100\n"
 "PO-Revision-Date: 2013-12-02 00:31-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -8829,9 +8829,12 @@ msgstr ""
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
-"Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) and is released "
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
+"(2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), <ulink url="
+"\"https://wiki.debian.org/FourFire#\">FourFire</ulink> Le'bard (2014), "
+"Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released "
 "under the GPL v2 or any later version."
 msgstr ""
 "La traducción a noruego es copyright 2007 de Petter Reinholdtsen y está bajo "
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 5c183a8..43ed578 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: 2014-11-29 16:49+0100\n"
+"POT-Creation-Date: 2014-11-30 12:45+0100\n"
 "PO-Revision-Date: 2014-09-23 07:24+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -7227,10 +7227,10 @@ msgid ""
 "address or IP address like this: <computeroutput>[192.168.0.10]</"
 "computeroutput>."
 msgstr ""
-"Les valeurs par défaut sont définies dans la section "
-"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
-"indiquez son adresse MAC ou son adresse IP de cette manière : "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"Les valeurs par défaut sont définies dans la section <computeroutput>"
+"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
+"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9866,10 +9866,19 @@ msgstr ""
 "ultérieure."
 
 #. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
-"Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) and is released "
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
+#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
+#| "(2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) "
+#| "and is released under the GPL v2 or any later version."
+msgid ""
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
+"(2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), <ulink url="
+"\"https://wiki.debian.org/FourFire#\">FourFire</ulink> Le'bard (2014), "
+"Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released "
 "under the GPL v2 or any later version."
 msgstr ""
 "La traduction norvégienne Bokmål, dont les droits d'auteur appartiennent à "
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 950701b..2016b06 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: 2014-11-29 16:49+0100\n"
+"POT-Creation-Date: 2014-11-30 12:45+0100\n"
 "PO-Revision-Date: 2014-10-23 23:32+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -7070,8 +7070,8 @@ msgid ""
 msgstr ""
 "I valori predefiniti sono definiti in <computeroutput>[default]</"
 "computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
+"</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9650,10 +9650,19 @@ msgstr ""
 "2013) rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
-"Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) and is released "
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
+#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
+#| "(2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) "
+#| "and is released under the GPL v2 or any later version."
+msgid ""
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
+"(2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), <ulink url="
+"\"https://wiki.debian.org/FourFire#\">FourFire</ulink> Le'bard (2014), "
+"Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released "
 "under the GPL v2 or any later version."
 msgstr ""
 "La traduzione norvegese bokmål è protetta da copyright di Petter "
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 9da6028..0306da5 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -15,14 +15,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-11-29 16:49+0100\n"
+"POT-Creation-Date: 2014-11-30 12:45+0100\n"
 "PO-Revision-Date: 2014-11-30 11:29+0000\n"
 "Last-Translator: Hans Arthur Kielland Aanesen <hans at iti.as>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/debian-edu-doc/language/nb_NO/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
+"p/debian-edu-doc/language/nb_NO/)\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Attribute 'lang' of: <article>
@@ -37,34 +38,38 @@ msgstr "Debian Edu / Skolelinux Jessie 8.0+edu0~alpha0 utgivelsesmanual"
 msgid "Manual for Debian Edu 8.0+edu0~alpha0 Codename Jessie"
 msgstr "Utgivelsesmanual for Debian Edu 8.0+edu0~alpha0 kodenavn Jessie"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/23-Tjener-KDM_Login.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of:
-#. <article><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu login"
 msgstr "Skolelinux innlogging"
 
 #. type: Content of: <article><section><para>
 msgid "This is the manual for the Debian Edu Jessie 8.0+edu0~alpha0 release."
-msgstr "Dette er utgivelsesmanualen for Debian Edu Jessie versjon 8.0+edu0~alpha0."
+msgstr ""
+"Dette er utgivelsesmanualen for Debian Edu Jessie versjon 8.0+edu0~alpha0."
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The version at <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Jessie\"/> is a wiki "
-"and updated frequently."
-msgstr "Versjonen på <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Jessie\"/>er en wikiside og oppdateres ofte."
+"The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Jessie\"/> is a wiki and updated frequently."
+msgstr ""
+"Versjonen på <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Jessie\"/>er en wikiside og oppdateres ofte."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "<link linkend=\"Translations\">Translations</link> are part of the "
 "<computeroutput>debian-edu-doc</computeroutput> package which can be "
-"installed on a webserver, and is available <ulink "
-"url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">online</ulink>."
-msgstr "<link linkend=\"Translations\">Oversettelser</link> er en del av pakken <computeroutput>debian-edu-doc</computeroutput>, som kan installeres på en webtjener, og er tilgjengelig på <ulink url='http://maintainer.skolelinux.no/debian-edu-doc/'>online</ulink>."
+"installed on a webserver, and is available <ulink url=\"http://maintainer."
+"skolelinux.org/debian-edu-doc/\">online</ulink>."
+msgstr ""
+"<link linkend=\"Translations\">Oversettelser</link> er en del av pakken "
+"<computeroutput>debian-edu-doc</computeroutput>, som kan installeres på en "
+"webtjener, og er tilgjengelig på <ulink url='http://maintainer.skolelinux.no/"
+"debian-edu-doc/'>online</ulink>."
 
 #. type: Content of: <article><section><title>
 msgid "About Debian Edu and Skolelinux"
@@ -74,28 +79,45 @@ msgstr "Om Debian Edu og Skolelinux"
 msgid ""
 "Debian Edu aka Skolelinux is a Linux distribution based on Debian providing "
 "an out-of-the box environment of a completely configured school network."
-msgstr "Skolelinux er en versjon av Debian GNU/Linux og gir skolen din et IT-system ferdig oppsatt og tilpasset skoler."
+msgstr ""
+"Skolelinux er en versjon av Debian GNU/Linux og gir skolen din et IT-system "
+"ferdig oppsatt og tilpasset skoler."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "Immediatly after installation a school server running all services needed "
-"for a school network is set up (see the next chapter <link "
-"linkend=\"Architecture\">details of the architecture of this setup</link>), "
-"just waiting for users and machines being added via GOsa², a comfortable "
-"Web-UI, or any other LDAP editor. A netbooting environment is prepared using"
-" PXE, so after initial installation of the main server from CD, Blue-ray "
-"disc or USB flash drive all other machines can be installed via the network,"
-" this includes \"roaming workstations\" (ones that can be taken away from "
-"the school network, usually laptops or netbooks) as well as PXE booting for "
+"for a school network is set up (see the next chapter <link linkend="
+"\"Architecture\">details of the architecture of this setup</link>), just "
+"waiting for users and machines being added via GOsa², a comfortable Web-UI, "
+"or any other LDAP editor. A netbooting environment is prepared using PXE, so "
+"after initial installation of the main server from CD, Blue-ray disc or USB "
+"flash drive all other machines can be installed via the network, this "
+"includes \"roaming workstations\" (ones that can be taken away from the "
+"school network, usually laptops or netbooks) as well as PXE booting for "
 "diskless machines like traditional thin-clients."
-msgstr "Rett etter installasjonen vill skoletjeneren være satt opp til å kjøre alle tjenester som trengs i skolenettverket (se neste kapittel <link linkend=\"Architecture\"> for detaljer omkring arkitektur og oppsett</link>). Tjenereren vil vente på at brukere og maskiner blir lagt til via GOsa² og få et komfortabelt Web-brukergrensesnitt eller foreta andre LDAP redigeringer. Et nettoppstartmiljø er utarbeidet ved hjelp av PXE slik at etter første installasjon av hovedtjener fra en CD, B [...]
+msgstr ""
+"Rett etter installasjonen vill skoletjeneren være satt opp til å kjøre alle "
+"tjenester som trengs i skolenettverket (se neste kapittel <link linkend="
+"\"Architecture\"> for detaljer omkring arkitektur og oppsett</link>). "
+"Tjenereren vil vente på at brukere og maskiner blir lagt til via GOsa² og få "
+"et komfortabelt Web-brukergrensesnitt eller foreta andre LDAP redigeringer. "
+"Et nettoppstartmiljø er utarbeidet ved hjelp av PXE slik at etter første "
+"installasjon av hovedtjener fra en CD, Blue-ray-plate eller USB-minne, vil "
+"alle andre maskiner bli installert via nettverket.  Dette gjelder også  "
+"vandrende (mobile) arbeidsstasjoner som periodevis forlater det lokale "
+"skolenettverket. Dette kan være bærbare datamaskiner eller nettbrett, men "
+"også tradisjonelle tynne klienter som lagringsløse maskiner  med PXE "
+"oppstart."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "Several educational applications like celestia, drgeo, gcompris, kalzium, "
 "kgeography, solfege and scratch are included in the default desktop setup, "
 "which can be extended easily and almost endlessly via the Debian universe."
-msgstr "Flere pedagogiske programmer som celestia, drgeo, gcompris, kalzium, kgeography, solfege og scratch er inkludert i standardsoppsettet for skrivebordet, som enkelt kan utvides nesten uendelig fra Debian-utvalget."
+msgstr ""
+"Flere pedagogiske programmer som celestia, drgeo, gcompris, kalzium, "
+"kgeography, solfege og scratch er inkludert i standardsoppsettet for "
+"skrivebordet, som enkelt kan utvides nesten uendelig fra Debian-utvalget."
 
 #. type: Content of: <article><section><section><title>
 msgid "Some history and why two names"
@@ -104,18 +126,25 @@ msgstr "Litt historie og hvorfor to navn"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> is a Linux "
-"distribution created by the Debian Edu project. As a <ulink "
-"url=\"http://wiki.debian.org/DebianPureBlends\">Debian Pure Blends</ulink> "
-"distribution it is an official <ulink "
-"url=\"http://www.debian.org\">Debian</ulink> subproject."
-msgstr "<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> er en Linux distribusjon som er laget av prosjektet Debian Edu. Dette er en<ulink url=\"http://wiki.debian.org/DebianPureBlends\"> ren Debian tilpasset</ulink>distribusjon og et offisielt <ulink url='http://www.debian.org'>Debian</ulink> underprosjekt."
+"distribution created by the Debian Edu project. As a <ulink url=\"http://"
+"wiki.debian.org/DebianPureBlends\">Debian Pure Blends</ulink> distribution "
+"it is an official <ulink url=\"http://www.debian.org\">Debian</ulink> "
+"subproject."
+msgstr ""
+"<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> er en Linux "
+"distribusjon som er laget av prosjektet Debian Edu. Dette er en<ulink url="
+"\"http://wiki.debian.org/DebianPureBlends\"> ren Debian tilpasset</"
+"ulink>distribusjon og et offisielt <ulink url='http://www.debian."
+"org'>Debian</ulink> underprosjekt."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "What this means for your school is that Skolelinux is a version of Debian "
 "providing an out-of-the box environment of a completely configured school-"
 "network."
-msgstr "Skolelinux er en versjon av Debian GNU/Linux og gir skolen din et IT-system ferdig oppsatt og tilpasset skoler."
+msgstr ""
+"Skolelinux er en versjon av Debian GNU/Linux og gir skolen din et IT-system "
+"ferdig oppsatt og tilpasset skoler."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -123,14 +152,21 @@ msgid ""
 "same time Raphaël Hertzog started Debian-Edu in France. Since 2003 both "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
-msgstr "Skolelinux-prosjektet i Norge ble stiftet 2. juli 2001, omtrent på samme tid  som Raphaël Hertzog startet Debian-Edu i Frankrike. Fra 2003 er begge prosjekter samlet, og begge navn videreført. \"Skole\" og (Debian-)\"Education\" er to godt forståtte begreper i de berørte regionene."
+msgstr ""
+"Skolelinux-prosjektet i Norge ble stiftet 2. juli 2001, omtrent på samme "
+"tid  som Raphaël Hertzog startet Debian-Edu i Frankrike. Fra 2003 er begge "
+"prosjekter samlet, og begge navn videreført. \"Skole\" og "
+"(Debian-)\"Education\" er to godt forståtte begreper i de berørte regionene."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The main target group in Norway initially were schools serving the 6-16 "
 "years age bracket. Today the system is in use in several countries around "
 "the world, with most installations in Norway, Spain, Germany and France."
-msgstr "I Norge, hvor Skolelinux ble startet, er hovedmålgruppen skoler for elever i alderen 6-16 år. I dag er systemet i bruk i flere land rundt om i verden, men de fleste installasjonene er i Norge, Spania, Tyskland og Frankrike."
+msgstr ""
+"I Norge, hvor Skolelinux ble startet, er hovedmålgruppen skoler for elever i "
+"alderen 6-16 år. I dag er systemet i bruk i flere land rundt om i verden, "
+"men de fleste installasjonene er i Norge, Spania, Tyskland og Frankrike."
 
 #. type: Content of: <article><section><title>
 msgid "Architecture"
@@ -138,35 +174,44 @@ msgstr "Arkitektur"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"This section of the document describes the network architecture and services"
-" provided by a Skolelinux installation."
-msgstr "Denne delen av dokumentet beskriver nettverksarkitekturen og tjenester som skolelinuxinstallasjonen tilbyr."
+"This section of the document describes the network architecture and services "
+"provided by a Skolelinux installation."
+msgstr ""
+"Denne delen av dokumentet beskriver nettverksarkitekturen og tjenester som "
+"skolelinuxinstallasjonen tilbyr."
 
 #. type: Content of: <article><section><section><title>
 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"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The figure is a sketch of the assumed network topology. The default setup of"
-" a Skolelinux network assumes that there is one (and only one) main-server, "
+"The figure is a sketch of the assumed network topology. The default setup of "
+"a Skolelinux network assumes that there is one (and only one) main-server, "
 "while allowing the inclusion of both normal workstations and thin-client-"
 "servers (with associated thin-clients and/or diskless workstations). The "
 "number of workstations can be as large or small as you want (starting from "
 "none to a lot). The same goes for the thin-client servers, each of which is "
 "on a separate network so that the traffic between the clients and the thin-"
 "client server doesn't affect the rest of the network services."
-msgstr "Figuren er en skisse over det forventede nettverksoppsettet (topologien). Standardoppsettet til et skolelinuxnettverk forventer at det er en (og bare en) hovedtjener, men det er tillatt å legge til både normale arbeidsstasjoner og tynnklienttjenere (med tilhørende tynnklienter og/eller lagringsløse arbeidsstasjoner). Antallet arbeidsstasjoner kan være stort eller lite alt etter behovet (fra null til veldig mange). Det samme gjelder for tynnklienttjenere. Hver enkel tynnklienttjen [...]
+msgstr ""
+"Figuren er en skisse over det forventede nettverksoppsettet (topologien). "
+"Standardoppsettet til et skolelinuxnettverk forventer at det er en (og bare "
+"en) hovedtjener, men det er tillatt å legge til både normale "
+"arbeidsstasjoner og tynnklienttjenere (med tilhørende tynnklienter og/eller "
+"lagringsløse arbeidsstasjoner). Antallet arbeidsstasjoner kan være stort "
+"eller lite alt etter behovet (fra null til veldig mange). Det samme gjelder "
+"for tynnklienttjenere. Hver enkel tynnklienttjener er på et adskilt nettverk "
+"slik at nettverkstrafikken mellom tynnklienter og tynnklienttjenere ikke "
+"forstyrrer resten av nettverkstjenestene."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -174,18 +219,29 @@ msgid ""
 "that the main server provides DHCP, and there can be only one machine doing "
 "so in each network. It is possible to move services from the main server to "
 "other machines by setting up the service on another machine, and "
-"subsequently updating the DNS-configuration, pointing the DNS alias for that"
-" service to the right computer."
-msgstr "Grunnen til at det bare kan være en hovedtjener i hvert skolenettverk er at hovedtjeneren tilbyr DHCP, og det kan bare være en maskin som gjør det i et nettverk. Det er mulig å flytte tjenester fra hovedtjeneren til andre maskiner ved å sette opp tjenesten på en annen maskin, og så oppdatere DNS-oppsettet slik at DNS-aliaset for den tjenesten peker til rett maskin."
+"subsequently updating the DNS-configuration, pointing the DNS alias for that "
+"service to the right computer."
+msgstr ""
+"Grunnen til at det bare kan være en hovedtjener i hvert skolenettverk er at "
+"hovedtjeneren tilbyr DHCP, og det kan bare være en maskin som gjør det i et "
+"nettverk. Det er mulig å flytte tjenester fra hovedtjeneren til andre "
+"maskiner ved å sette opp tjenesten på en annen maskin, og så oppdatere DNS-"
+"oppsettet slik at DNS-aliaset for den tjenesten peker til rett maskin."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "In order to simplify the standard setup of Skolelinux, the Internet "
-"connection runs over a separate router. It is possible to set up Debian with"
-" both a modem and an ISDN connection; however, no attempt is made to make "
+"connection runs over a separate router. It is possible to set up Debian with "
+"both a modem and an ISDN connection; however, no attempt is made to make "
 "such a setup work out of the box for Skolelinux (the setup needed to adjust "
 "the default situation to this should be documented separately)."
-msgstr "For å forenkle standardoppsettet i Skolelinux, blir tilkoblingen til Internett kjørt over en egen ruter. Det er mulig å sette opp Debian til å koble til Internett både med modem og ISDN, men det er ikke gjort noe forsøk på å få et slikt oppsett til å fungere \"ut av boksen\" i Skolelinux (oppsettet som skal til for å tilpasse standardoppsettet til dette må dokumenteres separat)."
+msgstr ""
+"For å forenkle standardoppsettet i Skolelinux, blir tilkoblingen til "
+"Internett kjørt over en egen ruter. Det er mulig å sette opp Debian til å "
+"koble til Internett både med modem og ISDN, men det er ikke gjort noe forsøk "
+"på å få et slikt oppsett til å fungere \"ut av boksen\" i Skolelinux "
+"(oppsettet som skal til for å tilpasse standardoppsettet til dette må "
+"dokumenteres separat)."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "The default network setup"
@@ -193,11 +249,15 @@ msgstr "Standard nettverksoppsett"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"DHCPD on Tjener serves the 10.0.0.0/8 network, providing a syslinux menu via"
-" PXE-boot where you can choose whether to install a new server/workstation, "
+"DHCPD on Tjener serves the 10.0.0.0/8 network, providing a syslinux menu via "
+"PXE-boot where you can choose whether to install a new server/workstation, "
 "boot a thin client or a diskless workstation, run memtest, or boot from the "
 "local hard disk."
-msgstr "DHCPD på Tjener betjener 10.0.0.0/8 nettverket, som gir en syslinux meny via PXE-boot hvor du kan velge om du vil installere en ny server/arbeidsstasjon, sette opp en ny klient eller en arbeidsstasjon uten disk, kjøre memtest, eller velge oppstart fra den lokale harddisken."
+msgstr ""
+"DHCPD på Tjener betjener 10.0.0.0/8 nettverket, som gir en syslinux meny via "
+"PXE-boot hvor du kan velge om du vil installere en ny server/arbeidsstasjon, "
+"sette opp en ny klient eller en arbeidsstasjon uten disk, kjøre memtest, "
+"eller velge oppstart fra den lokale harddisken."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -205,14 +265,20 @@ msgid ""
 "syslinux point to one of the LTSP servers or change the DHCP next-server "
 "option (stored in LDAP) to have clients directly boot via PXE from the "
 "terminal server."
-msgstr "Denne er laget for å modifiseres - det vil si, du kan la NFS-root i syslinux peke til en av LTSP-serverne eller endre valg av neste DHCP server  (lagret i LDAP) til å la klienter starte opp direkte via PXE fra terminaltjeneren."
+msgstr ""
+"Denne er laget for å modifiseres - det vil si, du kan la NFS-root i syslinux "
+"peke til en av LTSP-serverne eller endre valg av neste DHCP server  (lagret "
+"i LDAP) til å la klienter starte opp direkte via PXE fra terminaltjeneren."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "DHCPD on the LTSP servers only serves a dedicated network on the second "
 "interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) and "
 "should seldom need to be changed."
-msgstr "DHCPD på LTSP servere håndterer bare et angitt nettverk med et annet brukergrensesnitt (192.168.0.0/24 og 192.168.1.0/24 er forhåndskonfigurerte valg) og trenger skjelden å bli endret."
+msgstr ""
+"DHCPD på LTSP servere håndterer bare et angitt nettverk med et annet "
+"brukergrensesnitt (192.168.0.0/24 og 192.168.1.0/24 er forhåndskonfigurerte "
+"valg) og trenger skjelden å bli endret."
 
 #. type: Content of: <article><section><section><section><para>
 msgid "The configuration of all subnets is stored in LDAP."
@@ -229,7 +295,12 @@ msgid ""
 "10.0.2.2 and is installed by selecting the main server profile. It's "
 "possible (but not required) to also select and install the thin-client-"
 "server and workstation profiles in addition to the main server profile."
-msgstr "Et Skolelinuxnett trenger en hovedtjener (også kalt tjener), som har som standard IP-adresse 10.0.2.2. Hovedltjeneren installeres ved å velge hovedtjener-profilen under installasjon. Det er mulig (men ikke nødvendig) å installere tynnklientserver- og arbeidsstasjonprofiler sammen med hovedtjener. "
+msgstr ""
+"Et Skolelinuxnett trenger en hovedtjener (også kalt tjener), som har som "
+"standard IP-adresse 10.0.2.2. Hovedltjeneren installeres ved å velge "
+"hovedtjener-profilen under installasjon. Det er mulig (men ikke nødvendig) å "
+"installere tynnklientserver- og arbeidsstasjonprofiler sammen med "
+"hovedtjener. "
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Services running on the main server"
@@ -247,14 +318,27 @@ msgid ""
 "stopping the service on the main-server, and changing the DNS configuration "
 "to point to the new location of the service (which should be set up on that "
 "machine first, of course)."
-msgstr "Med unntak av kontrollen med tynnklienter, er alle tjenester i utgangspunktet satt opp på en sentral maskin (hovedtjener). Av ytelsesgrunner bør tynnklienttjeneren være en egen maskin (selv om det er mulig å installere profilene for både hovedtjener og tynnklienttjener på en og samme maskin). Alle tjenester er gitt et eget DNS-navn og blir tilbydd over IPv4. Det tilknyttede DNS-navnet for tjenestene gjør det enkelt å flytte individuelle tjenester fra hovedtjener til andre maskine [...]
+msgstr ""
+"Med unntak av kontrollen med tynnklienter, er alle tjenester i "
+"utgangspunktet satt opp på en sentral maskin (hovedtjener). Av "
+"ytelsesgrunner bør tynnklienttjeneren være en egen maskin (selv om det er "
+"mulig å installere profilene for både hovedtjener og tynnklienttjener på en "
+"og samme maskin). Alle tjenester er gitt et eget DNS-navn og blir tilbydd "
+"over IPv4. Det tilknyttede DNS-navnet for tjenestene gjør det enkelt å "
+"flytte individuelle tjenester fra hovedtjener til andre maskiner. Dette ved "
+"å stoppe tjenesten på hovedtjener og endrer DNS-oppsettet slik at DNS-navnet "
+"peker til den ny plasseringen av tjenesten (som selvfølgelig må settes opp "
+"på denne maskin i forkant)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To ensure security all connections where passwords are transmitted over the "
 "network are encrypted, so no passwords are sent over the network as plain "
 "text."
-msgstr "For å ta vare på sikkerheten er alle tilkoplinger der passord blir overført over nettverket kryptert. Slik blir ingen passord i klartekst sendt over nettverket."
+msgstr ""
+"For å ta vare på sikkerheten er alle tilkoplinger der passord blir overført "
+"over nettverket kryptert. Slik blir ingen passord i klartekst sendt over "
+"nettverket."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -263,130 +347,110 @@ msgid ""
 "files will refer to the service by name (without the domain name) thus "
 "making it easy for schools to change either their domain (if they have an "
 "own DNS domain) or the IP addresses they use."
-msgstr "Under er en liste over tjenester som er satt opp som standard i et\nSkolelinuxnettverk og DNS-navnet for hver tjeneste.  Alle oppsettfiler\nvil, hvis der er mulig, referere til tjenesten ved hjelp av navnet (uten\ndomenenavnet). Dette gjør det enkelt for skoler å enten bytte domenet\n(hvis de har eget DNS-domene) eller IP-adressene de bruker."
+msgstr ""
+"Under er en liste over tjenester som er satt opp som standard i et\n"
+"Skolelinuxnettverk og DNS-navnet for hver tjeneste.  Alle oppsettfiler\n"
+"vil, hvis der er mulig, referere til tjenesten ved hjelp av navnet (uten\n"
+"domenenavnet). Dette gjør det enkelt for skoler å enten bytte domenet\n"
+"(hvis de har eget DNS-domene) eller IP-adressene de bruker."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\"> Table of services</emphasis>"
 msgstr "<emphasis role='strong'>Tabell over tjenester</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Service description</emphasis>"
 msgstr "<emphasis role='strong'>Tjenestebeskrivelse</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgstr "<emphasis role='strong'>vertsnavn</emphasis>:"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">DNS service name</emphasis>"
 msgstr "<emphasis role='strong'>vertsnavn</emphasis>:"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Centralised Logging"
 msgstr "Sentralisert logging"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "rsyslog"
 msgstr "rsyslog"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "syslog"
 msgstr "syslog"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Domain Name Service"
 msgstr "Domenenavntjeneste"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "DNS (BIND)"
 msgstr "DNS (BIND)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "domain"
 msgstr "domain"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Automatic Network Configuration of Machines"
 msgstr "Automatisk nettverksoppsett for maskiner"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "DHCP"
 msgstr "DHCP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "bootps"
 msgstr "bootps"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Clock Synchronisation"
 msgstr "Klokkesynkronisering"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "NTP"
 msgstr "NTP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ntp"
 msgstr "ntp"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Home Directories via Network File System"
 msgstr "Hjemmeområder på nettverksfilsystem (SMB/NFS) [homes]"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "SMB / NFS"
 msgstr "SMB / NFS"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "homes"
 msgstr "homes"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Electronic Post Office"
 msgstr "Elektronisk postkontor"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "IMAP (Dovecot)"
 msgstr "IMAP (Dovecot)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "postoffice"
 msgstr "Postkontor"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Directory Service"
 msgstr "Katalogtjeneste"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "OpenLDAP"
 msgstr "OpenLDAP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ldap"
 msgstr "ldap"
 
@@ -394,191 +458,197 @@ 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"
-msgstr "Maskin og tjenesteovervåkning med feilrapportering, pluss status og historie på web. Feilrapportering via e-post"
+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"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Personal files for each user are stored in their home directories, which are"
-" made available by the server. Home directories are accessible from all "
+"Personal files for each user are stored in their home directories, which are "
+"made available by the server. Home directories are accessible from all "
 "machines, giving users access to the same files regardless of which machine "
-"they are using. The server is operating system agnostic, offering access via"
-" NFS for Unix clients, SMB for Windows and Macintosh clients."
-msgstr "Hver bruker lagrer sine egne filer i sin egen hjemmemappe, som er gjort tilgjengelig fra tjeneren. Hjemmemapper er tilgjengelig fra alle maskiner, noe som gir brukerne tilgang til de samme filene uansett hvilken maskin de bruker. Tjeneren bryr seg ikke om hvilket operativsystem den tilbyr sine filer for, NFS for Unixklienter, SMB for Windows og Macintosh-klienter."
+"they are using. The server is operating system agnostic, offering access via "
+"NFS for Unix clients, SMB for Windows and Macintosh clients."
+msgstr ""
+"Hver bruker lagrer sine egne filer i sin egen hjemmemappe, som er gjort "
+"tilgjengelig fra tjeneren. Hjemmemapper er tilgjengelig fra alle maskiner, "
+"noe som gir brukerne tilgang til de samme filene uansett hvilken maskin de "
+"bruker. Tjeneren bryr seg ikke om hvilket operativsystem den tilbyr sine "
+"filer for, NFS for Unixklienter, SMB for Windows og Macintosh-klienter."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"By default email is set up for local delivery (i.e. within the school) only,"
-" though email delivery to the wider Internet may be set up if the school has"
-" a permanent Internet connection. Mailing lists are set up based on the user"
-" database, giving each class their own mailing list. Clients are set up to "
-"deliver mail to the server (using 'smarthost'), and users can <link "
-"linkend=\"Users--Using_email\">access their personal mail</link> through "
-"IMAP."
-msgstr "Som standard er e-post satt opp med bare lokal leveranse (f.eks. innen skolen). Men e-postlevering til resten av Internett kan settes opp dersom skolen har en permanent fast Internettilkopling. E-postlister er satt opp basert på brukerdatabasen, ved å gi hver enkel klasse sin egen e-postliste. Klienter er satt opp til å levere e-post til tjeneren (ved bruk av 'smarthost') og brukere kan <ulink url=\"Users--Using_email\">få tilgang til sin personlige e-post</ulink> gjennom IMAP."
+"By default email is set up for local delivery (i.e. within the school) only, "
+"though email delivery to the wider Internet may be set up if the school has "
+"a permanent Internet connection. Mailing lists are set up based on the user "
+"database, giving each class their own mailing list. Clients are set up to "
+"deliver mail to the server (using 'smarthost'), and users can <link linkend="
+"\"Users--Using_email\">access their personal mail</link> through IMAP."
+msgstr ""
+"Som standard er e-post satt opp med bare lokal leveranse (f.eks. innen "
+"skolen). Men e-postlevering til resten av Internett kan settes opp dersom "
+"skolen har en permanent fast Internettilkopling. E-postlister er satt opp "
+"basert på brukerdatabasen, ved å gi hver enkel klasse sin egen e-postliste. "
+"Klienter er satt opp til å levere e-post til tjeneren (ved bruk av "
+"'smarthost') og brukere kan <ulink url=\"Users--Using_email\">få tilgang til "
+"sin personlige e-post</ulink> gjennom IMAP."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "All services are accessible using the same username and password, thanks to "
 "the central user database for authentication and authorisation."
-msgstr "Alle tjenester er tilgjengelig ved bruk av samme brukernavn og passord, på grunn av den sentrale brukerdatabasen for autentisering og autorisering."
+msgstr ""
+"Alle tjenester er tilgjengelig ved bruk av samme brukernavn og passord, på "
+"grunn av den sentrale brukerdatabasen for autentisering og autorisering."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To increase performance on frequently accessed sites a web proxy that caches"
-" files locally (Squid) is used. In conjunction with blocking web-traffic in "
+"To increase performance on frequently accessed sites a web proxy that caches "
+"files locally (Squid) is used. In conjunction with blocking web-traffic in "
 "the router this also enables control of Internet access on individual "
 "machines."
-msgstr "For å øke ytelsen på sider som ofte blir besøkt blir det brukt en mellomtjener (proxy) som mellomlagrer filer lokalt (Squid). I tillegg til å kontrollere internettrafikk i ruteren gjør dette det også mulig å kontrollere internettilgang på individuelle maskiner."
+msgstr ""
+"For å øke ytelsen på sider som ofte blir besøkt blir det brukt en "
+"mellomtjener (proxy) som mellomlagrer filer lokalt (Squid). I tillegg til å "
+"kontrollere internettrafikk i ruteren gjør dette det også mulig å "
+"kontrollere internettilgang på individuelle maskiner."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via"
-" the separate subnet 192.168.0.0/24 (this is to ensure that the network "
+"while thin clients are connected to the corresponding thin-client-server via "
+"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
 "traffic of the thin clients doesn't interfere with the rest of the network "
 "services)."
-msgstr "Nettverksoppsett på klienter blir gjort automatisk ved hjelp av DHCP. Vanlige klienter blir gitt IP-adresser i det private undernettet 10.0.0.0/8, mens tynnklienter kopler til den tilhørende tynnklienttjeneren via et eget undernett 192.168.0.0/24 (dette er for å sikre at nettverkstrafikk til og fra tynnklienter ikke forstyrrer resten av nettverkstjenestene)."
+msgstr ""
+"Nettverksoppsett på klienter blir gjort automatisk ved hjelp av DHCP. "
+"Vanlige klienter blir gitt IP-adresser i det private undernettet 10.0.0.0/8, "
+"mens tynnklienter kopler til den tilhørende tynnklienttjeneren via et eget "
+"undernett 192.168.0.0/24 (dette er for å sikre at nettverkstrafikk til og "
+"fra tynnklienter ikke forstyrrer resten av nettverkstjenestene)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Centralised logging is set up so that all machines send their syslog "
-"messages to the server. The syslog service is set up so that it only accepts"
-" incoming messages from the local network."
-msgstr "Sentralisert logging er satt opp slik at alle maskiner sender sine syslog-meldinger til tjeneren. Syslogtjenesten er satt opp slik at den bare aksepterer innkommende meldinger fra det lokale nettverket."
+"messages to the server. The syslog service is set up so that it only accepts "
+"incoming messages from the local network."
+msgstr ""
+"Sentralisert logging er satt opp slik at alle maskiner sender sine syslog-"
+"meldinger til tjeneren. Syslogtjenesten er satt opp slik at den bare "
+"aksepterer innkommende meldinger fra det lokale nettverket."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"By default the DNS server is set up with a domain for internal use only "
-"(*.intern), until a real (\"external\") DNS domain can be set up. The DNS "
+"By default the DNS server is set up with a domain for internal use only (*."
+"intern), until a real (\"external\") DNS domain can be set up. The DNS "
 "server is set up as caching DNS server so that all machines on the network "
 "can use it as the main DNS Server."
-msgstr "Som standard er DNS-tjeneren satt opp med et domene bare for intern bruk (*.intern) fram til et ekte («eksternt») DNS-domene kan settes opp. DNS-tjeneren er satt opp som en mellomlagrende DNS-tjener slik at alle maskiner på nettverket kan bruke den som hoved DNS-tjener."
+msgstr ""
+"Som standard er DNS-tjeneren satt opp med et domene bare for intern bruk (*."
+"intern) fram til et ekte («eksternt») DNS-domene kan settes opp. DNS-"
+"tjeneren er satt opp som en mellomlagrende DNS-tjener slik at alle maskiner "
+"på nettverket kan bruke den som hoved DNS-tjener."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -587,19 +657,32 @@ msgid ""
 "individual pages and subdirectories to certain users and groups. Users will "
 "have the ability to create dynamic web pages, as the web server will be "
 "programmable on the server side."
-msgstr "Elever og lærere har mulighet til å publisere nettsider. Webtjeneren tilbyr mekanismer for autentisering av brukere, og for begrenset tilgang til individuelle sider og undermapper til visse brukere og grupper. Brukere vil ha mulighet til å lage dynamiske nettsider, siden webtjeneren vil være programmerbar på tjenersiden."
+msgstr ""
+"Elever og lærere har mulighet til å publisere nettsider. Webtjeneren tilbyr "
+"mekanismer for autentisering av brukere, og for begrenset tilgang til "
+"individuelle sider og undermapper til visse brukere og grupper. Brukere vil "
+"ha mulighet til å lage dynamiske nettsider, siden webtjeneren vil være "
+"programmerbar på tjenersiden."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Information on users and machines can be changed in one central location, "
 "and is made accessible to all computers on the network automatically. To "
 "achieve this a centralised directory server is set up. The directory will "
-"have information on users, user groups, machines, and groups of machines. To"
-" avoid user confusion there won't be any difference between file groups, "
+"have information on users, user groups, machines, and groups of machines. To "
+"avoid user confusion there won't be any difference between file groups, "
 "mailing lists, and network groups. This implies that groups of machines "
 "which are to form network groups will use the same namespace as user groups "
 "and mailing lists."
-msgstr "Informasjon om brukere og maskiner kan endres fra et sentralt sted, og det blir gjort tilgjengelig til alle maskinene på nettverket automatisk. For å oppnå dette er en sentralisert katalogtjener satt opp. Katalogen vil ha informasjon om brukere, brukergrupper, maskiner og grupper av maskiner. For å hindre brukerforvirring vil det ikke være noen forskjell mellom filgrupper, e-postlister og nettverksgrupper. Dette betyr at grupper av maskiner som må være nettverksgrupper, har det s [...]
+msgstr ""
+"Informasjon om brukere og maskiner kan endres fra et sentralt sted, og det "
+"blir gjort tilgjengelig til alle maskinene på nettverket automatisk. For å "
+"oppnå dette er en sentralisert katalogtjener satt opp. Katalogen vil ha "
+"informasjon om brukere, brukergrupper, maskiner og grupper av maskiner. For "
+"å hindre brukerforvirring vil det ikke være noen forskjell mellom "
+"filgrupper, e-postlister og nettverksgrupper. Dette betyr at grupper av "
+"maskiner som må være nettverksgrupper, har det samme navneområdet som "
+"brukergrupper og e-postlister."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -607,27 +690,43 @@ msgid ""
 "established standards, functioning well in the web browsers which are part "
 "of Skolelinux. The delegation of certain tasks to individual users or user "
 "groups will be made possible by the administration systems."
-msgstr "Administrasjon av tjenester vil i stor grad bli gjort via nettet og følge etablerte standarder. Det fungerer bra i nettlesere som følger med i Skolelinux. Delegering av ulike oppgaver til individuelle brukere eller brukergrupper er mulig i administrasjonssystemet."
+msgstr ""
+"Administrasjon av tjenester vil i stor grad bli gjort via nettet og følge "
+"etablerte standarder. Det fungerer bra i nettlesere som følger med i "
+"Skolelinux. Delegering av ulike oppgaver til individuelle brukere eller "
+"brukergrupper er mulig i administrasjonssystemet."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"In order to avoid certain problems with NFS, and to make it simpler to debug"
-" problems, the different machines need synchronised clocks. To achieve this "
+"In order to avoid certain problems with NFS, and to make it simpler to debug "
+"problems, the different machines need synchronised clocks. To achieve this "
 "the Skolelinux server is set up as a local Network Time Protocol (NTP) "
 "server, and all workstations and clients are set up to synchronise with the "
 "server. The server itself should synchronise its clock via NTP against "
 "machines on the Internet, thus ensuring the whole network has the correct "
 "time."
-msgstr "For å hindre visse problemer med NFS, og for å gjøre det enkelt å identifisere problemer, så må klokkene på maskinene synkroniseres. For å oppnå dette er skolelinuxtjeneren satt opp som lokal NTP-tjener (Network Time Protocol), og alle arbeidsstasjonene og klienter er satt opp til å synkronisere klokkene sine med tjeneren. Tjeneren selv bør synkronisere seg selv med NTP mot maskiner på internett, for dermed å sikre at hele nettverket har riktig tid."
+msgstr ""
+"For å hindre visse problemer med NFS, og for å gjøre det enkelt å "
+"identifisere problemer, så må klokkene på maskinene synkroniseres. For å "
+"oppnå dette er skolelinuxtjeneren satt opp som lokal NTP-tjener (Network "
+"Time Protocol), og alle arbeidsstasjonene og klienter er satt opp til å "
+"synkronisere klokkene sine med tjeneren. Tjeneren selv bør synkronisere seg "
+"selv med NTP mot maskiner på internett, for dermed å sikre at hele "
+"nettverket har riktig tid."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access"
-" to printers can be controlled for individual users according to the groups "
+"network, or connected to a server, workstation or thin-client-server. Access "
+"to printers can be controlled for individual users according to the groups "
 "they belong to; this will be achieved by using quota and access control for "
 "printers."
-msgstr "Skrivere tilkoples der det er ønskelig, enten direkte på nettverket eller koblet til en tjener, arbeidsstasjon eller tynnklienttjener. Tilgang til skrivere kan kontrolleres for individuelle brukere i henhold til gruppen de tilhører. Dette blir oppnådd ved hjelp av kvoter og tilgangskontroll til skrivere."
+msgstr ""
+"Skrivere tilkoples der det er ønskelig, enten direkte på nettverket eller "
+"koblet til en tjener, arbeidsstasjon eller tynnklienttjener. Tilgang til "
+"skrivere kan kontrolleres for individuelle brukere i henhold til gruppen de "
+"tilhører. Dette blir oppnådd ved hjelp av kvoter og tilgangskontroll til "
+"skrivere."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "LTSP server(s) (Thin client server(s))"
@@ -637,13 +736,17 @@ msgstr "LTSP tjenere (tynnklienttjener(e))"
 msgid ""
 "A Skolelinux network can have many LTSP servers (also called thin client "
 "servers), which are installed by selecting the Thin client server profile."
-msgstr "Et Skolelinuxnett kan ha mange LTSP-tjenere (tynnklienttjenere), som installeres ved å velge profilen for en  tynnklienttjener."
+msgstr ""
+"Et Skolelinuxnett kan ha mange LTSP-tjenere (tynnklienttjenere), som "
+"installeres ved å velge profilen for en  tynnklienttjener."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "The thin client servers are set up to receive syslog from the thin clients, "
 "and forward these messages to the central syslog recipient."
-msgstr "Tynnklienttjeneren er satt opp til å motta syslog fra de tynne klientene og videresende disse meldingene til den sentrale mottakeren for syslogmeldinger."
+msgstr ""
+"Tynnklienttjeneren er satt opp til å motta syslog fra de tynne klientene og "
+"videresende disse meldingene til den sentrale mottakeren for syslogmeldinger."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
@@ -655,7 +758,12 @@ msgid ""
 "means that the machine boots from a diskette or directly from the server "
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
-msgstr "Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som (X-)terminaler. Dette betyr at maskinen starter opp fra en diskett eller direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal harddisk i klienten. Tynnklientoppsettet som er brukt er Linux Terminal Server Project (LTSP)."
+msgstr ""
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som (X-)"
+"terminaler. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. Tynnklientoppsettet som er brukt er Linux Terminal "
+"Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -664,11 +772,20 @@ msgid ""
 "service uses DHCP and TFTP to connect to the network and boot from the "
 "network. Next, the file system is mounted via NFS from the LTSP server, and "
 "finally the X Window System is started. The display manager (LDM) connects "
-"to the LTSP server via SSH with X-forwarding. This way all data is encrypted"
-" on the network. For very old thin clients which are too slow for the "
-"encryption this can be set to the behavior from former versions, which is to"
-" use a direct X connection via XDMCP."
-msgstr "Tynnklienter er en bra måte å bruke gamle, trege datamaskiner siden de egentlig kjører alle programmene på LTSP-tjeneren. Dette fungere som følger: Tjenesten bruker DHCP og TFTP for å kople seg til nettverket og starte opp fra nettverket. Det neste er at filsystemet blir tilknyttet(mounted) via NFS fra LTSP-tjeneren. Til slutt startes X Windows systemet. Display administratoren (LDM) kopler seg til LTSP-tjeneren vha SSH med X-forwarding. På denne måte blir all data kryptert i net [...]
+"to the LTSP server via SSH with X-forwarding. This way all data is encrypted "
+"on the network. For very old thin clients which are too slow for the "
+"encryption this can be set to the behavior from former versions, which is to "
+"use a direct X connection via XDMCP."
+msgstr ""
+"Tynnklienter er en bra måte å bruke gamle, trege datamaskiner siden de "
+"egentlig kjører alle programmene på LTSP-tjeneren. Dette fungere som følger: "
+"Tjenesten bruker DHCP og TFTP for å kople seg til nettverket og starte opp "
+"fra nettverket. Det neste er at filsystemet blir tilknyttet(mounted) via NFS "
+"fra LTSP-tjeneren. Til slutt startes X Windows systemet. Display "
+"administratoren (LDM) kopler seg til LTSP-tjeneren vha SSH med X-forwarding. "
+"På denne måte blir all data kryptert i nettverket. Ved bruk av gammel "
+"maskinvare til tynnklienter, som er for svake til krypteringen, så kan man "
+"sette opp direkte X-forbindelse via XDMCP fra tidligere versjoner."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Diskless workstations"
@@ -679,7 +796,10 @@ msgid ""
 "For diskless workstations the terms \"stateless workstations\", \"lowfat "
 "clients\" or \"half-thick clients\" are also used. For the sake of clarity "
 "this manual sticks to the term \"diskless workstations\"."
-msgstr "Abeidstasjoner uten harddisk blir også omtalt som \"tilstandsløse arbeidsstasjoner\" eller \"halvtykke klienter\".  I denne manualen benyttes begrepet \"diskløse arbeidsstasjoenr\""
+msgstr ""
+"Abeidstasjoner uten harddisk blir også omtalt som \"tilstandsløse "
+"arbeidsstasjoner\" eller \"halvtykke klienter\".  I denne manualen benyttes "
+"begrepet \"diskløse arbeidsstasjoenr\""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -687,22 +807,31 @@ msgid ""
 "installed operating system. This means that client machines boot directly "
 "from the server's hard drive without running software installed on a local "
 "hard drive."
-msgstr "En arbeidstasjon uten harddisk kjører all programvaren på PCen uten noe lokalt installert operativsystem. Dette betyr at klientmaskinen starter opp direkte fra tjeneren sin harddisk uten å kjøre programvare som er installert lokalt på harddisken."
+msgstr ""
+"En arbeidstasjon uten harddisk kjører all programvaren på PCen uten noe "
+"lokalt installert operativsystem. Dette betyr at klientmaskinen starter opp "
+"direkte fra tjeneren sin harddisk uten å kjøre programvare som er installert "
+"lokalt på harddisken."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Diskless workstations are an excellent way of reusing newer hardware with "
-"the same low maintenance cost as with thin clients. Software is administered"
-" and maintained on the server with no need for local installed software on "
+"the same low maintenance cost as with thin clients. Software is administered "
+"and maintained on the server with no need for local installed software on "
 "the clients. Home directories and system settings are stored on the server "
 "too."
-msgstr "Arbeidstasjoner uten harddisk er en ypperlig måte å gjenbruke nyere maskinvare med det samme lave vedlikeholdsbehovet som for tynne klienter. Hjemmeområder og systeminnstillinger lagres også på serveren."
+msgstr ""
+"Arbeidstasjoner uten harddisk er en ypperlig måte å gjenbruke nyere "
+"maskinvare med det samme lave vedlikeholdsbehovet som for tynne klienter. "
+"Hjemmeområder og systeminnstillinger lagres også på serveren."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Diskless workstations were introduced as part of the Linux Terminal Server "
 "Project (LTSP) with version 5.0."
-msgstr "Arbeidstasjoner uten harddisk ble introdusert som en del av Linux Terminal Server Project (LTSP) med versjon 5.0."
+msgstr ""
+"Arbeidstasjoner uten harddisk ble introdusert som en del av Linux Terminal "
+"Server Project (LTSP) med versjon 5.0."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Networked clients"
@@ -713,7 +842,10 @@ msgid ""
 "The term \"networked clients\" is used in this manual to refer to both thin "
 "clients and diskless workstations, as well as computers running Mac OS or "
 "Windows."
-msgstr "Begrepet «nettverksklienter» blir brukt i denne manualen for å referere både til tynnklienter og arbeidstasjoner uten harddisk i tillegg til maskiner som kjører MacOS eller Windows."
+msgstr ""
+"Begrepet «nettverksklienter» blir brukt i denne manualen for å referere både "
+"til tynnklienter og arbeidstasjoner uten harddisk i tillegg til maskiner som "
+"kjører MacOS eller Windows."
 
 #. type: Content of: <article><section><section><title>
 msgid "Administration"
@@ -721,11 +853,16 @@ msgstr "Administrasjon"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"All the Linux machines that are installed with the Skolelinux installer will"
-" be administrable from a central computer, most likely the server. It will "
-"be possible to log in to all machines via SSH (root not allowed by default),"
-" and thereby have full access to the machines."
-msgstr "Alle linuxmaskinene som er installert ved hjelp av en Skolelinux-installer vil være satt opp til å administreres fra en sentral maskin, mest trolig tjeneren. Det vil være mulig å logge inn på alle maskiner ved hjelp av SSH ( som standard er \"root\" ikke tilgjenglig) og dermed ha full tilgang til maskinene."
+"All the Linux machines that are installed with the Skolelinux installer will "
+"be administrable from a central computer, most likely the server. It will be "
+"possible to log in to all machines via SSH (root not allowed by default), "
+"and thereby have full access to the machines."
+msgstr ""
+"Alle linuxmaskinene som er installert ved hjelp av en Skolelinux-installer "
+"vil være satt opp til å administreres fra en sentral maskin, mest trolig "
+"tjeneren. Det vil være mulig å logge inn på alle maskiner ved hjelp av SSH "
+"( som standard er \"root\" ikke tilgjenglig) og dermed ha full tilgang til "
+"maskinene."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -733,14 +870,20 @@ msgid ""
 "the server to the clients. In order to change the client configuration, it "
 "suffices to edit the server configuration and let the automation distribute "
 "the changes."
-msgstr "Vi bruker cfengine til å redigere oppsettfiler. Disse filene blir oppdatert fra tjeneren til klientene. For å endre oppsettet på klientene er det nok å endre tjeneroppsettet og så la automatikken fordele endringene."
+msgstr ""
+"Vi bruker cfengine til å redigere oppsettfiler. Disse filene blir oppdatert "
+"fra tjeneren til klientene. For å endre oppsettet på klientene er det nok å "
+"endre tjeneroppsettet og så la automatikken fordele endringene."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
-msgstr "All brukerinformasjon ligger i en LDAP-katalog. Oppdateringer av brukerinformasjon blir gjort mot denne databasen og blir brukt av klientene til autentisering."
+msgstr ""
+"All brukerinformasjon ligger i en LDAP-katalog. Oppdateringer av "
+"brukerinformasjon blir gjort mot denne databasen og blir brukt av klientene "
+"til autentisering."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation"
@@ -748,30 +891,43 @@ msgstr "Installasjon"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Currently there are two kinds of installation media images: netinstall (CD)"
-"  and multi-arch USB flash drive. Both images can also be booted from USB "
+"Currently there are two kinds of installation media images: netinstall (CD)  "
+"and multi-arch USB flash drive. Both images can also be booted from USB "
 "sticks."
-msgstr "Foreløpig er det to typer installasjonsmedier : nettInstall (CD) og multi-arch( USB-Flash-disk). Begge installasjonsmetoder kan også startes fra en USB minnepenn."
+msgstr ""
+"Foreløpig er det to typer installasjonsmedier : nettInstall (CD) og multi-"
+"arch( USB-Flash-disk). Begge installasjonsmetoder kan også startes fra en "
+"USB minnepenn."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "The aim is to be able to install a server from any type medium once, and "
 "install all other clients over the network by booting from the network."
-msgstr "Målet er å gjøre det mulig å installere en tjener fra ett type medium kun en gang, og så installere klienter over nettverket ved å starte opp alle andre maskiner fra nettverket."
+msgstr ""
+"Målet er å gjøre det mulig å installere en tjener fra ett type medium kun en "
+"gang, og så installere klienter over nettverket ved å starte opp alle andre "
+"maskiner fra nettverket."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Only the netinstall image needs access to the Internet during installation."
-msgstr "Bare nettinstallasjonsvarianten trenger Internett-tilgang under installasjonen."
+msgstr ""
+"Bare nettinstallasjonsvarianten trenger Internett-tilgang under "
+"installasjonen."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The installation should not ask any questions, with the exception of desired"
-" language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile "
-"(server, workstation, thin client server). All other configuration will be "
-"set up automatically with reasonable values, to be changed from a central "
-"location by the system administrator subsequent to the installation."
-msgstr "Installasjonen skal ikke komme med noen spørsmål, foruten det å velge foretrukket språk (f.eks. Norsk bokmål, Nynorsk, Samisk) og maskinprofil (tjener, arbeidsstasjon, tynnklienttjener). Alt annet oppsett vil bli satt opp automatisk med fornuftige verdier, som kan endres av systemadministratoren etter installasjonen."
+"The installation should not ask any questions, with the exception of desired "
+"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
+"workstation, thin client server). All other configuration will be set up "
+"automatically with reasonable values, to be changed from a central location "
+"by the system administrator subsequent to the installation."
+msgstr ""
+"Installasjonen skal ikke komme med noen spørsmål, foruten det å velge "
+"foretrukket språk (f.eks. Norsk bokmål, Nynorsk, Samisk) og maskinprofil "
+"(tjener, arbeidsstasjon, tynnklienttjener). Alt annet oppsett vil bli satt "
+"opp automatisk med fornuftige verdier, som kan endres av "
+"systemadministratoren etter installasjonen."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "File system access configuration"
@@ -779,36 +935,54 @@ msgstr "Oppsett av tilgang til filsystem"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Each Skolelinux user account is assigned a section of the file system on the"
-" file server. This section (home directory) contains the user's "
-"configuration files, documents, email and web pages. Some of the files "
-"should be set to have read access for other users on the system, some should"
-" be readable by everyone on the Internet, and some should not be accessible "
-"for reading by anyone but the user."
-msgstr "Hver brukerkonto i Skolelinux har tildelt et område på filsystemet til filtjeneren. Dette området (hjemmeområdet) inneholder brukerens oppsettfiler, dokumenter, e-post og nettsider. Noen av filene settes slik at andre brukere på systemet har lesetilgang, noen er slik at alle på internett har tilgang og noen settes slik at ingen andre enn brukeren kan lese dem."
+"Each Skolelinux user account is assigned a section of the file system on the "
+"file server. This section (home directory) contains the user's configuration "
+"files, documents, email and web pages. Some of the files should be set to "
+"have read access for other users on the system, some should be readable by "
+"everyone on the Internet, and some should not be accessible for reading by "
+"anyone but the user."
+msgstr ""
+"Hver brukerkonto i Skolelinux har tildelt et område på filsystemet til "
+"filtjeneren. Dette området (hjemmeområdet) inneholder brukerens "
+"oppsettfiler, dokumenter, e-post og nettsider. Noen av filene settes slik at "
+"andre brukere på systemet har lesetilgang, noen er slik at alle på internett "
+"har tilgang og noen settes slik at ingen andre enn brukeren kan lese dem."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To ensure that all disks that are used for user directories or shared "
 "directories can be uniquely named across all the computers in the "
-"installation, they can be mounted as "
-"<computeroutput>/skole/host/directory/</computeroutput>. Initially, one "
-"directory is created on the file server, "
-"<computeroutput>/skole/tjener/home0/</computeroutput>, in which all the user"
-" accounts are created. More directories may then be created when needed to "
+"installation, they can be mounted as <computeroutput>/skole/host/directory/</"
+"computeroutput>. Initially, one directory is created on the file server, "
+"<computeroutput>/skole/tjener/home0/</computeroutput>, in which all the user "
+"accounts are created. More directories may then be created when needed to "
 "accommodate particular user groups or particular patterns of usage."
-msgstr "For å sikre at alle disker som blir brukt for brukerområder eller delte områder kan gis unike navn over alle maskinene i installasjonen, så er de montert som <computeroutput>/skole/vert/katalog</computeroutput>. I utgangspunktet er en katalog opprettet på filtjeneren, <computeroutput>/skole/tjener/home0/</computeroutput>, der alle brukerkontoer opprettes. Flere kataloger kan så bli opprettet ved behov for å tilfredsstille visse brukergrupper eller visse bruksmåter."
+msgstr ""
+"For å sikre at alle disker som blir brukt for brukerområder eller delte "
+"områder kan gis unike navn over alle maskinene i installasjonen, så er de "
+"montert som <computeroutput>/skole/vert/katalog</computeroutput>. I "
+"utgangspunktet er en katalog opprettet på filtjeneren, <computeroutput>/"
+"skole/tjener/home0/</computeroutput>, der alle brukerkontoer opprettes. "
+"Flere kataloger kan så bli opprettet ved behov for å tilfredsstille visse "
+"brukergrupper eller visse bruksmåter."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To enable shared access to files under the normal UNIX permissions system, "
 "users need to be in supplementary shared groups (such as \"students\") as "
-"well as the personal primary group that they're in by default. If users have"
-" an appropriate umask to make newly created items group-accessible (002 or "
+"well as the personal primary group that they're in by default. If users have "
+"an appropriate umask to make newly created items group-accessible (002 or "
 "007), and if the directories they're working in are setgid to ensure the "
 "files inherit the correct group-ownership, the result is controlled file "
 "sharing between the members of a group."
-msgstr "For å aktivere delt tilgang til filene under vanlig tilgangskontrollsystem for UNIX, trenger brukerne å være i delte grupper (for eksempel \"studenter\") samt i den personlige primærgruppen som de er i som standard. Hvis brukere har en passende umask for å gjøre nyopprettede filer tilgjengelig for gruppens brukere (002 eller 007), og hvis de katalogene de jobber i er i setgid for å sikre at filene arver korrekt gruppe-eierskap, er resultatet en kontrollert fildeling mellom medlem [...]
+msgstr ""
+"For å aktivere delt tilgang til filene under vanlig tilgangskontrollsystem "
+"for UNIX, trenger brukerne å være i delte grupper (for eksempel \"studenter"
+"\") samt i den personlige primærgruppen som de er i som standard. Hvis "
+"brukere har en passende umask for å gjøre nyopprettede filer tilgjengelig "
+"for gruppens brukere (002 eller 007), og hvis de katalogene de jobber i er i "
+"setgid for å sikre at filene arver korrekt gruppe-eierskap, er resultatet en "
+"kontrollert fildeling mellom medlemmene i en gruppe."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -818,18 +992,18 @@ msgid ""
 "are created with read access for everybody, which can later be removed by "
 "explicit user action. This can alternatively be changed (by editing "
 "<computeroutput>/etc/pam.d/common-session</computeroutput>) to a umask of "
-"007 - meaning read access is initially blocked, necessitating user action to"
-" make them accessible.  The first approach encourages knowledge sharing, and"
-" makes the system more transparent, whereas the second method decreases the "
+"007 - meaning read access is initially blocked, necessitating user action to "
+"make them accessible.  The first approach encourages knowledge sharing, and "
+"makes the system more transparent, whereas the second method decreases the "
 "risk of unwanted spreading of sensitive information. The problem with the "
 "first solution is that it is not apparent to the users that the material "
-"they create will be accessible to all other users. They can only detect this"
-" by inspecting other users' directories and seeing that their files are "
-"readable. The problem with the second solution is that few people are likely"
-" to make their files accessible, even if they do not contain sensitive "
+"they create will be accessible to all other users. They can only detect this "
+"by inspecting other users' directories and seeing that their files are "
+"readable. The problem with the second solution is that few people are likely "
+"to make their files accessible, even if they do not contain sensitive "
 "information and the content would be helpful to inquisitive users who want "
-"to learn how others have solved particular problems (typically configuration"
-" issues)."
+"to learn how others have solved particular problems (typically configuration "
+"issues)."
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -842,7 +1016,12 @@ msgid ""
 "installed on just one standalone PC, or as a region-wide solution at many "
 "schools operated centrally. This flexibility makes a huge difference to the "
 "configuration of network components, servers and client machines."
-msgstr "Det er forskjellige måter å sette opp en skolelinuxløsning på. Det kan installeres på bare en selvstendig maskin eller på mange maskiner i en stor region med flere skoler og sentral drifting. Denne variasjonen i maskinpark og nettverkstopologi gjør en enorm forskjell på hvordan ting blir satt opp med tanke på nettverkskomponenter, tjenere og klientmaskiner."
+msgstr ""
+"Det er forskjellige måter å sette opp en skolelinuxløsning på. Det kan "
+"installeres på bare en selvstendig maskin eller på mange maskiner i en stor "
+"region med flere skoler og sentral drifting. Denne variasjonen i maskinpark "
+"og nettverkstopologi gjør en enorm forskjell på hvordan ting blir satt opp "
+"med tanke på nettverkskomponenter, tjenere og klientmaskiner."
 
 #. type: Content of: <article><section><section><title>
 msgid "Hardware requirements"
@@ -850,33 +1029,40 @@ msgstr "Maskinvarekrav"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The purpose of the different profiles is explained in the <link "
-"linkend=\"Architecture\">network architecture</link> chapter."
-msgstr "Egenskapene til de ulike profilene forklares i kapitlet <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy/Architecture#\">nettverksarkitektur</ulink>."
+"The purpose of the different profiles is explained in the <link linkend="
+"\"Architecture\">network architecture</link> chapter."
+msgstr ""
+"Egenskapene til de ulike profilene forklares i kapitlet <ulink url=\"http://"
+"wiki.debian.org/DebianEdu/Documentation/Wheezy/Architecture#"
+"\">nettverksarkitektur</ulink>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "The computers running Debian Edu / Skolelinux must have either i386 (oldest "
 "supported processors: Intel Pentium/AMD K5) or amd64 processors."
-msgstr "Maskiner som kjører Debian Edu / Skolelinux må ha enten i386 (den eldste støttede prosessor: Intel Pentium/AMD K5) eller amd64 prosessorer."
+msgstr ""
+"Maskiner som kjører Debian Edu / Skolelinux må ha enten i386 (den eldste "
+"støttede prosessor: Intel Pentium/AMD K5) eller amd64 prosessorer."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "Thin client servers need two network cards when using the default network "
 "architecture:"
-msgstr "Tynnklienttjenere trenger to nettverkskort ved bruk av standard nettverksarkitektur:"
+msgstr ""
+"Tynnklienttjenere trenger to nettverkskort ved bruk av standard "
+"nettverksarkitektur:"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 koblet til hovednettverket (10.0.2.0/23)"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
 "192.168.1.0/24)."
-msgstr "eth1 brukes til å betjene LTSP klienter (92.168.0.0/24 som standard eller 192.168.1.0/24)."
+msgstr ""
+"eth1 brukes til å betjene LTSP klienter (92.168.0.0/24 som standard eller "
+"192.168.1.0/24)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
@@ -884,64 +1070,87 @@ msgstr "Vurder å ha 2 GB RAM for 30 klienter og 4 GB RAM for 50-60 klienter."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Disk space requirements depend on profiles used, but any disk larger than 25"
-" GiB will be sufficient for a workstation or standalone installation, 30 Gib"
-" for a thin-client server and at least 40 GiB on the main server. As usual "
+"Disk space requirements depend on profiles used, but any disk larger than 25 "
+"GiB will be sufficient for a workstation or standalone installation, 30 Gib "
+"for a thin-client server and at least 40 GiB on the main server. As usual "
 "with disk space on a main-server, it's \"the bigger the better\"."
-msgstr "Krav til diskstørrelse avhenger av hvilken profil som blir brukt, men alle disker større enn 25 GiB vil være tilstrekkelig for en arbeidsstasjon eller en frittstående installasjon, 30 GiB for en tynnklientserver og minst 40 GiB på hovedserveren.  Som vanlig, jo større disk på hovedserveren jo bedre er det. "
+msgstr ""
+"Krav til diskstørrelse avhenger av hvilken profil som blir brukt, men alle "
+"disker større enn 25 GiB vil være tilstrekkelig for en arbeidsstasjon eller "
+"en frittstående installasjon, 30 GiB for en tynnklientserver og minst 40 GiB "
+"på hovedserveren.  Som vanlig, jo større disk på hovedserveren jo bedre er "
+"det. "
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "Thin clients can run on as low as 64 MiB RAM and 133 MHz processor, though "
 "128 MiB RAM and somewhat faster processors are recommended."
-msgstr "Tynnklienter kan kjøres på så lite som 64 MB RAM og en 133 MHz prosessor, men 128MB RAM og noe raskere prosessor anbefales."
+msgstr ""
+"Tynnklienter kan kjøres på så lite som 64 MB RAM og en 133 MHz prosessor, "
+"men 128MB RAM og noe raskere prosessor anbefales."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
 "requirement."
-msgstr "for å kjøre Iceweasel/Firefox og LibreOffice, så anbefales det minimum 128 MB RAM."
+msgstr ""
+"for å kjøre Iceweasel/Firefox og LibreOffice, så anbefales det minimum 128 "
+"MB RAM."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB"
-" RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
+"For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
+"RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
 "considerably better. Just a faster CPU will speed things up."
-msgstr "For arbeidsstasjoner, diskløse arbeidsstasjoner og frittstående PCer anbefales det minimum 320 MB RAM og 800MHz prosessor, men 512 eller 1024 MB RAM vil gi langt bedre ytelse. En raskere CPU vil også økte ytelsen."
+msgstr ""
+"For arbeidsstasjoner, diskløse arbeidsstasjoner og frittstående PCer "
+"anbefales det minimum 320 MB RAM og 800MHz prosessor, men 512 eller 1024 MB "
+"RAM vil gi langt bedre ytelse. En raskere CPU vil også økte ytelsen."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Swapping over the network is automatically enabled; the swap size is 512 "
-"MiB, and if you need more you can tune this by editing "
-"/etc/ltsp/nbdswapd.conf on tjener to set the SIZE variable. Please "
-"<emphasis>tune up the swap size</emphasis> either locally on the PC or on "
-"the server."
-msgstr "Vekselminne (swap) over nettverket er satt opp automatisk. Størrelsen på veksleminnet er satt til 512 MB. Hvis det er nødvenig, så kan denne størrelsen endres ved å redigere /etc/ltsp/ndbswapd.conf på tjener,  og endre SIZE-variabelen her. Vennligst <emphasis> juster vekselminnestørrelsen (swap)</emphasis> enten lokalt på PC eller på serveren. "
+"MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
+"conf on tjener to set the SIZE variable. Please <emphasis>tune up the swap "
+"size</emphasis> either locally on the PC or on the server."
+msgstr ""
+"Vekselminne (swap) over nettverket er satt opp automatisk. Størrelsen på "
+"veksleminnet er satt til 512 MB. Hvis det er nødvenig, så kan denne "
+"størrelsen endres ved å redigere /etc/ltsp/ndbswapd.conf på tjener,  og "
+"endre SIZE-variabelen her. Vennligst <emphasis> juster vekselminnestørrelsen "
+"(swap)</emphasis> enten lokalt på PC eller på serveren. "
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "If your diskless workstations have hard drives, it is recommended to use "
 "them for swap as it is a lot faster than network swapping."
-msgstr "Hvis din diskløse arbeidsstasjon har harddisker, er det anbefalt å bruke dem for lokal swap da dette er raskere enn nettverks-swap."
+msgstr ""
+"Hvis din diskløse arbeidsstasjon har harddisker, er det anbefalt å bruke dem "
+"for lokal swap da dette er raskere enn nettverks-swap."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "On workstations with little RAM the spell checker can cause LibreOffice to "
 "hang if the swap space is too small. Then the system administrator has to "
 "disable the spell checker on LibreOffice or students have to kill "
 "LibreOffice, resulting in loss of work. Enabling at least 512 MiB swap on a "
 "320 MiB RAM workstation solves this, and the spell checker runs smoothly."
-msgstr "På arbeidsstasjoner med lite minne (RAM), kan stavekontrollen i LibreOffice  føre til at klienten henger hvis vekselminnet (swap) er for lite. I slike tilfeller så må systemadministrator deaktivere stavekontrollen i LibreOffice, eller elevene må drepe LibreOffice-prosessen, noe som kan resultere i tap av arbeid. Å sette opp minimum 512 MB vekselminne på en arbeidsstasjom med 320 MB RAM løser problemet, og stavekontroll skal nå kjøre helt fint. "
+msgstr ""
+"På arbeidsstasjoner med lite minne (RAM), kan stavekontrollen i LibreOffice  "
+"føre til at klienten henger hvis vekselminnet (swap) er for lite. I slike "
+"tilfeller så må systemadministrator deaktivere stavekontrollen i "
+"LibreOffice, eller elevene må drepe LibreOffice-prosessen, noe som kan "
+"resultere i tap av arbeid. Å sette opp minimum 512 MB vekselminne på en "
+"arbeidsstasjom med 320 MB RAM løser problemet, og stavekontroll skal nå "
+"kjøre helt fint. "
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "Laptops have the same requirements as for workstations since they are just "
 "movable workstations."
-msgstr "Laptops har samme systemkrav som vanlige arbeidsstasjoner, bare at de er flyttbare arbeidsstasjoner."
+msgstr ""
+"Laptops har samme systemkrav som vanlige arbeidsstasjoner, bare at de er "
+"flyttbare arbeidsstasjoner."
 
 #. type: Content of: <article><section><section><title>
 msgid "Hardware known to work"
@@ -949,34 +1158,40 @@ msgstr "Maskinvare som er bekreftet å virke"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A list of tested hardware is provided at <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Hardware/\"/> . This list is not "
-"nearly complete"
-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. "
+"A list of tested hardware is provided at <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/Hardware/\"/> . This list is not nearly complete"
+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 ":)"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "<ulink url=\"http://wiki.debian.org/InstallingDebianOn\"/> is an effort to "
-"document how to install, configure and use Debian on some specific hardware,"
-" allowing potential buyers to know if that hardware is supported and "
-"existing owners to know how get the best out of that hardware."
-msgstr "<ulink url=\"http://wiki.debian.org/InstallingDebianOn\"/> er et forsøk på å dokumentere hvodan man installerer, konfigurerer og bruker Debian på enkelte spesielle typer maskinvare. Slik kan potensielle kjøpere av maskinvaren se om det er støtte for den, og eksisterende eiere få lære hvordan de får mest mulig ut av den aktuelle maskinvaren."
+"document how to install, configure and use Debian on some specific hardware, "
+"allowing potential buyers to know if that hardware is supported and existing "
+"owners to know how get the best out of that hardware."
+msgstr ""
+"<ulink url=\"http://wiki.debian.org/InstallingDebianOn\"/> er et forsøk på å "
+"dokumentere hvodan man installerer, konfigurerer og bruker Debian på enkelte "
+"spesielle typer maskinvare. Slik kan potensielle kjøpere av maskinvaren se "
+"om det er støtte for den, og eksisterende eiere få lære hvordan de får mest "
+"mulig ut av den aktuelle maskinvaren."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "An excellent database of hardware supported by Debian is online at <ulink "
 "url=\"http://kmuto.jp/debian/hcl/\"/>."
-msgstr "En god database med oversikt over maskinvare som er støttet i Debian, finner man på <ulink url=\"http://kmuto.jp/debian/hcl/\"/>."
+msgstr ""
+"En god database med oversikt over maskinvare som er støttet i Debian, finner "
+"man på <ulink url=\"http://kmuto.jp/debian/hcl/\"/>."
 
 #. type: Content of: <article><section><title>
 msgid "Requirements for network setup"
@@ -988,7 +1203,9 @@ msgstr "Standard oppsett"
 
 #. type: Content of: <article><section><section><para>
 msgid "When using the default network architecture, these rules apply:"
-msgstr "Når man bruker standard oppsett for nettverksarkitekturen, så brukes disse reglene:"
+msgstr ""
+"Når man bruker standard oppsett for nettverksarkitekturen, så brukes disse "
+"reglene:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "You need exactly one main server, the tjener."
@@ -1002,23 +1219,30 @@ msgstr "Man kan ha hundrevis av arbeidsstasoner på hovednettverket."
 msgid ""
 "You can have a lot of LTSP servers on the main network; two different "
 "subnets are preconfigured (DNS, DHCP) in LDAP, more could be added."
-msgstr "Man kan ha mange LTSP-tjenere på hovednettverket: to forskjellige undernett er konfigurert i forkant (DNS, DHCP) i LDAP, men flere kan legges til."
+msgstr ""
+"Man kan ha mange LTSP-tjenere på hovednettverket: to forskjellige undernett "
+"er konfigurert i forkant (DNS, DHCP) i LDAP, men flere kan legges til."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can have hundreds of thin clients and/or diskless workstations on each "
 "LTSP server network."
-msgstr "Man kan ka hundrevis av tynnklienter og/eller diskløse arbeidsstasjoner på hvert nettverk med en LTSP-server."
+msgstr ""
+"Man kan ka hundrevis av tynnklienter og/eller diskløse arbeidsstasjoner på "
+"hvert nettverk med en LTSP-server."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"You can have hundreds of other machines which will have dynamic IP addresses"
-" assigned."
-msgstr "Man kan ha hundrevis av andre maskiner som vil få tildelt dynamisk IP-adresse."
+"You can have hundreds of other machines which will have dynamic IP addresses "
+"assigned."
+msgstr ""
+"Man kan ha hundrevis av andre maskiner som vil få tildelt dynamisk IP-"
+"adresse."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "For access to the Internet you need a router/gateway (see below)."
-msgstr "For å få tilgang til internett så trenger man en ruter/gateway (se under)."
+msgstr ""
+"For å få tilgang til internett så trenger man en ruter/gateway (se under)."
 
 #. type: Content of: <article><section><section><title>
 msgid "Internet router"
@@ -1029,20 +1253,28 @@ msgid ""
 "A router/gateway, connected to the Internet on the external interface and "
 "running on the IP address 10.0.0.1 with netmask 255.0.0.0 on the internal "
 "interface, is needed to connect to the Internet."
-msgstr "En ruter/gateway tilkoplet Internett på det eksterne grensesnittet, og som kjører på IP-adressen 10.0.0.1 med netmaske 255.0.0.0 på det interne grensesnittet, er nødvendig for å få tilgang til Internett."
+msgstr ""
+"En ruter/gateway tilkoplet Internett på det eksterne grensesnittet, og som "
+"kjører på IP-adressen 10.0.0.1 med netmaske 255.0.0.0 på det interne "
+"grensesnittet, er nødvendig for å få tilgang til Internett."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
-msgstr "Ruteren skal ikke kjøre på en DHCP-tjener. Den kan kjøre på en DNS-tjener, selv om dette ikke er nødvendig, og den ikke brukes."
+msgstr ""
+"Ruteren skal ikke kjøre på en DHCP-tjener. Den kan kjøre på en DNS-tjener, "
+"selv om dette ikke er nødvendig, og den ikke brukes."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "If you are looking for a router firewall solution capable of running on an "
 "old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
 "<ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
-msgstr "Hvis du leter etter en ruter med brannvegg-løsning som kan kjøre på en gammel PC, vil vi anbefale<ulink url=\"http://www.ipcop.org\">IPCop</ulink> eller <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
+msgstr ""
+"Hvis du leter etter en ruter med brannvegg-løsning som kan kjøre på en "
+"gammel PC, vil vi anbefale<ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
+"eller <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1050,19 +1282,31 @@ msgid ""
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "you can also use the original firmware. Using the original firmware is "
 "easier; using OpenWRT gives you more choices and control. Check the OpenWRT "
-"webpages for a list of <ulink "
-"url=\"http://wiki.openwrt.org/TableOfHardware\">supported hardware</ulink>."
-msgstr "Hvis du trenger en innebygd ruter eller tilgangsspunkt, anbefaler vi å bruke<ulink url=\"http://openwrt.org\">OpenWRT</ulink>, selv om du selvsagt kan bruke standard firmware. Bruk av standard firmware er enklere, mens bruk av OpenWRT gir deg flere valgmuligheter og bedre kontroll. Sjekk OpenWRTs nettsider for en oversikt over <ulink url=\"http://wiki.openwrt.org/TableOfHardware\">støttet maskinvare</ulink>."
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/TableOfHardware"
+"\">supported hardware</ulink>."
+msgstr ""
+"Hvis du trenger en innebygd ruter eller tilgangsspunkt, anbefaler vi å "
+"bruke<ulink url=\"http://openwrt.org\">OpenWRT</ulink>, selv om du selvsagt "
+"kan bruke standard firmware. Bruk av standard firmware er enklere, mens bruk "
+"av OpenWRT gir deg flere valgmuligheter og bedre kontroll. Sjekk OpenWRTs "
+"nettsider for en oversikt over <ulink url=\"http://wiki.openwrt.org/"
+"TableOfHardware\">støttet maskinvare</ulink>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"It is possible to use a different network setup (there is a <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented "
+"It is possible to use a different network setup (there is a <ulink url="
+"\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">documented "
 "procedure</ulink> to do this), but if you are not forced to do this by an "
-"existing network infrastructure, we recommend against doing so and recommend"
-" you stay with the default <link linkend=\"Architecture\">network "
+"existing network infrastructure, we recommend against doing so and recommend "
+"you stay with the default <link linkend=\"Architecture\">network "
 "architecture</link>."
-msgstr "Det er mulig å bruke et annet nettverksoppsett. Dette er den <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">dokumenterte fremgangsmåten</ulink> for å gjøre dette. Hvis du ikke er tvunget til å gjøre dette på grunn av en eksisterende infrastruktur for nettverket, så anbefaler vi å ikke gjøre det og heller bruke standard <link linkend=\"Architecture\">nettverksarkitektur</link>."
+msgstr ""
+"Det er mulig å bruke et annet nettverksoppsett. Dette er den <ulink url="
+"\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\">dokumenterte "
+"fremgangsmåten</ulink> for å gjøre dette. Hvis du ikke er tvunget til å "
+"gjøre dette på grunn av en eksisterende infrastruktur for nettverket, så "
+"anbefaler vi å ikke gjøre det og heller bruke standard <link linkend="
+"\"Architecture\">nettverksarkitektur</link>."
 
 #. type: Content of: <article><section><title>
 msgid "Installation and download options"
@@ -1074,24 +1318,26 @@ msgstr "Hvor finner man mer informasjon"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We recommend that you read or at least take a look at the <ulink "
-"url=\"http://www.debian.org/releases/jessie/releasenotes\">release notes for"
-" Debian Jessie</ulink> before you start installing a system for production "
+"We recommend that you read or at least take a look at the <ulink url="
+"\"http://www.debian.org/releases/jessie/releasenotes\">release notes for "
+"Debian Jessie</ulink> before you start installing a system for production "
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
-msgstr "Vi anbefaler å lese, eller i det minste, ta en kikk på <ulink url=\"http://www.debian.org/releases/jessie/releasenotes\">utgivelsesnotatene for Debian Jessie</ulink> før du starter å installere et system for bruk i produksjon. Hvis du bare vil prøve Debian Edu/Skolelinux, så trenger du ikke det. Det skal bare fungere. "
+msgstr ""
+"Vi anbefaler å lese, eller i det minste, ta en kikk på <ulink url=\"http://"
+"www.debian.org/releases/jessie/releasenotes\">utgivelsesnotatene for Debian "
+"Jessie</ulink> før du starter å installere et system for bruk i produksjon. "
+"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 "/!\\"
 
@@ -1100,21 +1346,28 @@ msgid ""
 "Be sure to read the <link linkend=\"GettingStarted\">getting started</link> "
 "chapter of this manual, though, as it explains how to log in for the first "
 "time."
-msgstr "Forsikre deg om å lese <link linkend=\"GettingStarted\">getting started</link> kapittelet i denne manual, da spesielt om hvorledes man logger inn for første gang."
+msgstr ""
+"Forsikre deg om å lese <link linkend=\"GettingStarted\">getting started</"
+"link> kapittelet i denne manual, da spesielt om hvorledes man logger inn for "
+"første gang."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Even more information about the Debian Jessie release is available in its "
-"<ulink "
-"url=\"http://www.debian.org/releases/jessie/installmanual\">installation "
-"manual</ulink>."
-msgstr "Mer informasjon om \"Debian Jessie\" utgivelsen er tilgjenglig i dennes <ulink url=\"http://www.debian.org/releases/jessie/installmanual\">innstallasjonsmanual</ulink>."
+"<ulink url=\"http://www.debian.org/releases/jessie/installmanual"
+"\">installation manual</ulink>."
+msgstr ""
+"Mer informasjon om \"Debian Jessie\" utgivelsen er tilgjenglig i dennes "
+"<ulink url=\"http://www.debian.org/releases/jessie/installmanual"
+"\">innstallasjonsmanual</ulink>."
 
 #. type: Content of: <article><section><section><title>
 msgid ""
 "Download the installation media for Debian Edu 8.0+edu0~alpha0 Codename "
 "\"Jessie\""
-msgstr "Last ned et installasjonsmedium for Debian Edu 8.0+edu0~alpha0 kodenavn «Jessie»"
+msgstr ""
+"Last ned et installasjonsmedium for Debian Edu 8.0+edu0~alpha0 kodenavn "
+"«Jessie»"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "netinstall CD image for i386, amd64"
@@ -1124,29 +1377,35 @@ msgstr "netinstall (CD) installasjon for i386, amd64"
 msgid ""
 "The netinstall CD, which also can be used for installation from USB flash "
 "drives, is suited to install on i386 and amd64 machines. It's available via"
-msgstr "nettinstall (CD), som kan brukes til installasjon fra USB flash-disker, er egnet for installasjon på  i386-, amd64-maskiner.  Den er tilgjengelig via"
+msgstr ""
+"nettinstall (CD), som kan brukes til installasjon fra USB flash-disker, er "
+"egnet for installasjon på  i386-, amd64-maskiner.  Den er tilgjengelig via"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
-msgstr "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+msgstr ""
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
-msgstr "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
+msgstr ""
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+"edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~alpha0-CD.iso debian-edu-8.0+edu0~alpha0-CD.iso "
-"</computeroutput>"
-msgstr "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0~alpha0-CD.iso debian-edu-8.0+edu0~alpha0-CD.iso </computeroutput>"
+"edu-8.0+edu0~alpha0-CD.iso debian-edu-8.0+edu0~alpha0-CD.iso </"
+"computeroutput>"
+msgstr ""
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0~alpha0-CD.iso debian-edu-8.0+edu0~alpha0-CD.iso </"
+"computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
@@ -1158,29 +1417,38 @@ msgid ""
 "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:"
-msgstr "ISO-varianten for flere-arkitektur installasjon er på 5.2 GB, og kan brukes til innstallasjon på amd64- og i386-maskiner.  Den fungerer som den tidligere DVD-varianten, hvilket betyr at den ikke trenger Internet-tilgang under installasjonen. Som de andre kan den lastes ned via FTP, HTTP eller rsync via:"
+msgstr ""
+"ISO-varianten for flere-arkitektur installasjon er på 5.2 GB, og kan brukes "
+"til innstallasjon på amd64- og i386-maskiner.  Den fungerer som den "
+"tidligere DVD-varianten, hvilket betyr at den ikke trenger Internet-tilgang "
+"under installasjonen. Som de andre kan den lastes ned via FTP, HTTP eller "
+"rsync via:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
-msgstr "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+msgstr ""
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
-msgstr "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
+msgstr ""
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+"edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~alpha0-USB.iso debian-edu-8.0+edu0~alpha0-USB.iso "
-"</computeroutput>"
-msgstr "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0~alpha0-USB.iso debian-edu-8.0+edu0~alpha0-USB.iso </computeroutput>"
+"edu-8.0+edu0~alpha0-USB.iso debian-edu-8.0+edu0~alpha0-USB.iso </"
+"computeroutput>"
+msgstr ""
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0~alpha0-USB.iso debian-edu-8.0+edu0~alpha0-USB.iso </"
+"computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source image"
@@ -1190,29 +1458,35 @@ msgstr "Kildebilde"
 msgid "The source image is available via"
 msgstr "Kildekodebildet er tilgjengelig via"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
-"edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-"
-"USB.iso</ulink>"
-msgstr "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB.iso</ulink>"
+"edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
+"iso</ulink>"
+msgstr ""
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+"edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
+"iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
-"edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-"
-"USB.iso</ulink>"
-msgstr "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB.iso</ulink>"
+"edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
+"iso</ulink>"
+msgstr ""
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+"edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
+"iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-8.0+edu0~alpha0-source-USB.iso debian-edu-8.0+edu0~alpha0-source-"
-"USB.iso</computeroutput>"
-msgstr "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0~alpha0-source-USB.iso debian-edu-8.0+edu0~alpha0-source-USB.iso</computeroutput>"
+"edu-8.0+edu0~alpha0-source-USB.iso debian-edu-8.0+edu0~alpha0-source-USB."
+"iso</computeroutput>"
+msgstr ""
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0~alpha0-source-USB.iso debian-edu-8.0+edu0~alpha0-source-USB."
+"iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD / DVD by mail"
@@ -1221,16 +1495,22 @@ msgstr "Be om en CD/DVD i posten"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
-"for the cost of the CD or DVD and shipping. Just send an email to <ulink "
-"url=\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss"
-" the payment details (for shipping and media)"
-msgstr "For dem uten en rask internettilkopling tilbyr vi å sende deg en CD eller DVD for kostnaden av CDen eller DVDen + porto. Det er bare å sende en e-post til <ulink url='mailto:cd at skolelinux.no'>cd at skolelinux.no</ulink> og vi vil diskutere hvordan du får betalt for lagringsmedium og porto"
+"for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
+"\"mailto:cd at skolelinux.no\">cd at skolelinux.no</ulink> and we will discuss the "
+"payment details (for shipping and media)"
+msgstr ""
+"For dem uten en rask internettilkopling tilbyr vi å sende deg en CD eller "
+"DVD for kostnaden av CDen eller DVDen + porto. Det er bare å sende en e-post "
+"til <ulink url='mailto:cd at skolelinux.no'>cd at skolelinux.no</ulink> og vi vil "
+"diskutere hvordan du får betalt for lagringsmedium og porto"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Remember to include the address you want the CD or DVD to be sent to in the "
 "email."
-msgstr "Husk å inkludere adressen du vil at CDen eller DVDen skal sendes til i e-posten."
+msgstr ""
+"Husk å inkludere adressen du vil at CDen eller DVDen skal sendes til i e-"
+"posten."
 
 #. type: Content of: <article><section><section><title>
 msgid "Installing Debian Edu"
@@ -1240,194 +1520,207 @@ msgstr "Installasjon av DebianEdu"
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
-"the complexity of Debian during the installation and beyond. However, Debian"
-" Edu is Debian, and if you want there are more than 42,000 packages to "
-"choose from and a billion configuration options. For the majority of our "
-"users, our defaults should be fine."
-msgstr "Når du gjør en installasjon av en Debian Edu, har du noen få valg du må gjøre. Men vær ikke redd; det er ikke mange. Vi har gjort en god jobb med å gjemme kompleksiteten til Debian under installasjonen og videre. Likevel, Debian Edu er Debian, og hvis du vil så er det mer enn 42.000 pakker å velge mellom, og millioner av oppsettsmuligheter. Men for de fleste brukere så skal standardoppsettet være greit."
+"the complexity of Debian during the installation and beyond. However, Debian "
+"Edu is Debian, and if you want there are more than 42,000 packages to choose "
+"from and a billion configuration options. For the majority of our users, our "
+"defaults should be fine."
+msgstr ""
+"Når du gjør en installasjon av en Debian Edu, har du noen få valg du må "
+"gjøre. Men vær ikke redd; det er ikke mange. Vi har gjort en god jobb med å "
+"gjemme kompleksiteten til Debian under installasjonen og videre. Likevel, "
+"Debian Edu er Debian, og hvis du vil så er det mer enn 42.000 pakker å velge "
+"mellom, og millioner av oppsettsmuligheter. Men for de fleste brukere så "
+"skal standardoppsettet være greit."
 
 #. type: Content of: <article><section><section><section><title>
 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."
-msgstr "<emphasis role=\"strong\">Install</emphasis>  er den standardiserte tekstmodus-innstallasjonen for i386- og amd64-maskiner."
+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."
-msgstr "<computeroutput>64-bit install</computeroutput> kjører en amd64 installasjon i tekstmodus. "
+msgstr ""
+"<computeroutput>64-bit install</computeroutput> kjører en amd64 installasjon "
+"i tekstmodus. "
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
-msgstr "<emphasis role=\"strong\">Grafisk installasjon</emphasis> bruker en GTK innstallasjon hvor du kan bruke musen."
+msgstr ""
+"<emphasis role=\"strong\">Grafisk installasjon</emphasis> bruker en GTK "
+"innstallasjon hvor du kan bruke musen."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64"
-" GTK installer where you can use the mouse."
-msgstr "<emphasis role=\"strong\">64-bit grafisk installasjon</emphasis> for å kjøre en 64-bit GTK-innstallasjon hvor du kan bruke en mus."
+"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
+"GTK installer where you can use the mouse."
+msgstr ""
+"<emphasis role=\"strong\">64-bit grafisk installasjon</emphasis> for å kjøre "
+"en 64-bit GTK-innstallasjon hvor du kan bruke en mus."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose"
-msgstr "<emphasis role=\"strong\">Avanserte opsjoner ></emphasis> viser en undermeny med flere detaljerte valg å velge mellom"
+msgstr ""
+"<emphasis role=\"strong\">Avanserte opsjoner ></emphasis> viser en "
+"undermeny med flere detaljerte valg å velge mellom"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer"
-msgstr "<emphasis role=\"strong\">Hjelp</emphasis> gir noen hint i bruk av installasjonsprosessen"
+msgstr ""
+"<emphasis role=\"strong\">Hjelp</emphasis> gir noen hint i bruk av "
+"installasjonsprosessen"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/Installer_advanced_options_a.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer advanced options screen 1"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-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>
+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."
-msgstr "<emphasis role=\"strong\">Eksperet innstallasjon</emphasis> gir tilgang til alle tilgjenglige spørsmål i klartekst."
+msgstr ""
+"<emphasis role=\"strong\">Eksperet innstallasjon</emphasis> gir tilgang til "
+"alle tilgjenglige 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."
-msgstr "<emphasis role=\"strong\">Rescue mode</emphasis> gjør dette installasjonsmediet til et redningsdisk for nødsituasjonsoppgaver."
+msgstr ""
+"<emphasis role=\"strong\">Rescue mode</emphasis> gjør dette "
+"installasjonsmediet til et 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)."
+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."
-msgstr "<emphasis role=\"strong\">64 bit expert install</emphasis> gir tilgang til alle tilgjenglige spørsmål i klartekst tilknyttet amd64. "
+msgstr ""
+"<emphasis role=\"strong\">64 bit expert install</emphasis> gir tilgang til "
+"alle tilgjenglige 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."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
 "preseed file."
-msgstr "<emphasis role=\"strong\">64 bit automated install</emphasis> trenger en «preseed»-fil (for automatisk installasjon)."
+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."
-msgstr "<emphasis role=\"strong\">Graphical expert install</emphasis> gir tilgang til alle tilgjenglige spørsmål i grafisk modus."
+msgstr ""
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gir tilgang "
+"til alle tilgjenglige 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"
-" look."
+"install medium become a rescue disk for emergency tasks with a graphical GTK "
+"look."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
-msgstr "<emphasis role=\"strong\">Graphical automated install</emphasis> trenger en «preseed»-fil (for automatisk installasjon)."
+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."
-msgstr "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gir tilgang til alle tilgjenglige spørsmål i grafisk modus for amd64."
+msgstr ""
+"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gir "
+"tilgang til alle tilgjenglige 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 "
+"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks on amd64 with a "
 "graphical GTK look."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
 "needs a preseed file."
-msgstr "<emphasis role='strong'>64-bit automatisert grafisk installasjon</emphasis> trenger en «preseed»-fil (for automatisk installasjon)."
+msgstr ""
+"<emphasis role='strong'>64-bit automatisert grafisk installasjon</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_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."
-msgstr "Denne hjelpeskjermen er selvforklarende og gjør <F>-tastene på tastaturet i stand til å gi mer detaljert hjelp om de aktuelle emnene. "
+msgstr ""
+"Denne hjelpeskjermen er selvforklarende og gjør <F>-tastene på "
+"tastaturet i stand til å gi mer detaljert hjelp om de aktuelle emnene. "
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Additional boot parameters for installations"
@@ -1437,82 +1730,80 @@ msgstr "Flere oppstartsparametre for installasjoner"
 msgid ""
 "On i386/amd64, boot options can be edited by pressing the TAB key in the "
 "boot menu."
-msgstr "På i386/amd64, så kan oppstartsalternativer redigeres ved å trykke TAB-tasten i oppstartsmenyen."
+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 "
 "machines."
-msgstr "USB Fler-arkitektur flash-disk/Blue-ray disk-typer er standard for bruk av amd64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 maskiner."
+msgstr ""
+"USB Fler-arkitektur flash-disk/Blue-ray disk-typer er standard for bruk av "
+"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>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
 "get the GUI version on amd64."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput>"
-" (text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
+"machine you need to manually select <computeroutput>install</computeroutput> "
+"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
-"installation of the main server profile from CD. Add "
-"<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> as "
-"an additional boot parameter."
+"installation of the main server profile from CD. Add <computeroutput>mirror/"
+"http/proxy=http://10.0.2.2:3128/</computeroutput> as an additional boot "
+"parameter."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you have already installed the main server profile on a machine, further "
 "installations should be done via PXE, as this will automatically use the "
 "proxy of the main server."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of"
-" the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-"parameters."
-msgstr "For å installere skrivebordsmiljøet <emphasis role=\"strong\">GNOME</emphasis> i stedet for <emphasis role=\"strong\">KDE «Plasma»</emphasis>, legg til <computeroutput>desktop=gnome</computeroutput> i kjernens oppstartparametere. "
+"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
+"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
+"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+msgstr ""
+"For å installere skrivebordsmiljøet <emphasis role=\"strong\">GNOME</"
+"emphasis> i stedet for <emphasis role=\"strong\">KDE «Plasma»</emphasis>, "
+"legg til <computeroutput>desktop=gnome</computeroutput> i kjernens "
+"oppstartparametere. "
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
 "parameters."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
 "parameters."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
 "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
@@ -1525,132 +1816,112 @@ msgstr "Innstallasjonsprosessen"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Remember the <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Jessie/Requirements\">system"
-" requirements</ulink> and make sure you have at least two network cards "
-"(NICs) if you plan on setting up a thin client server."
+"Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Jessie/Requirements\">system requirements</ulink> and make sure you have at "
+"least two network cards (NICs) if you plan on setting up a thin client "
+"server."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. 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>
-msgid ""
-"Choose a location which normally should be the location where you live."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Choose a location which normally should be the location where you live."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a keyboard keymap (the country's default is usually fine)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose profile(s) from the following list:"
 msgstr "Velg profil(er) fra denne listen:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
-"configured to work out of the box. You must only install one main server per"
-" school! This profile does not include a graphical user interface. If you "
+"configured to work out of the box. You must only install one main server per "
+"school! This profile does not include a graphical user interface. If you "
 "want a graphical user interface, then select Workstation or Thin-Client-"
 "Server in addition to this one."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Workstation</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "A computer booting from its local hard drive, and running all software and "
 "devices locally like an ordinary computer, except that user logins are "
-"authenticated by the main server, where the users' files and desktop profile"
-" are stored."
+"authenticated by the main server, where the users' files and desktop profile "
+"are stored."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Roaming workstation</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Same as workstation but capable of authentication using cached credentials, "
 "meaning it can be used outside the school network. The users' files and "
-"profiles are stored on the local disk. For single user notebooks and laptops"
-" this profile should be selected and not 'Workstation' or 'Standalone' as "
+"profiles are stored on the local disk. For single user notebooks and laptops "
+"this profile should be selected and not 'Workstation' or 'Standalone' as "
 "suggested in earlier releases."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "A thin client (and diskless workstation) server, also called a LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
-"computer needs two network cards, a lot of memory, and ideally more than one"
-" processor or core. See the chapter about <link "
-"linkend=\"NetworkClients\">networked clients</link> for more information on "
-"this subject. Choosing this profile also enables the workstation profile "
-"(even if it is not selected) - a thin client server can always be used as a "
-"workstation, too."
+"computer needs two network cards, a lot of memory, and ideally more than one "
+"processor or core. See the chapter about <link linkend=\"NetworkClients"
+"\">networked clients</link> for more information on this subject. Choosing "
+"this profile also enables the workstation profile (even if it is not "
+"selected) - a thin client server can always be used as a workstation, too."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Standalone</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "An ordinary computer that can function without a main server (that is, it "
 "doesn't need to be on the network). Includes laptops."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Minimal</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This profile will install the base packages and configure the machine to "
 "integrate into the Debian Edu network, but without any services and "
-"applications.  It is useful as a platform for single services manually moved"
-" out from the main-server."
+"applications.  It is useful as a platform for single services manually moved "
+"out from the main-server."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis "
-"role=\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
-"Client Server</emphasis> profiles are preselected. These profiles can be "
-"installed on one machine together if you want to install a so called "
-"<emphasis>combined main server</emphasis>. This means the main server will "
-"be a thin client server and also be used as a workstation. This is the "
-"default choice, since we assume most people will install <link "
-"linkend=\"Installation--"
+"The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
+"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"emphasis> profiles are preselected. These profiles can be installed on one "
+"machine together if you want to install a so called <emphasis>combined main "
+"server</emphasis>. This means the main server will be a thin client server "
+"and also be used as a workstation. This is the default choice, since we "
+"assume most people will install <link linkend=\"Installation--"
 "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
 "PXE</link> afterwards. Please note that you must have 2 network cards "
 "installed in a machine which is going to be installed as a combined main "
@@ -1660,41 +1931,37 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing"
-" <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>:"
-" Usually <emphasis>if this happens</emphasis>, you will want to replace eth0"
-" with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
+"ordering during installation. The wanted ordering can be achieved by editing "
+"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
+"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
+"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
 "effect."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying "
-"\"yes\" will destroy all data on the hard drives! Saying \"no\" on the other"
-" hand will require more work - you will need to make sure that the required "
+"Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
+"\" will destroy all data on the hard drives! Saying \"no\" on the other hand "
+"will require more work - you will need to make sure that the required "
 "partitions are created and are big enough."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. 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 should be kept for future releases.  Although you don't have"
-" to, it is a simple way for you to help."
+"Please say \"yes\" to submitting information to <ulink url=\"http://popcon."
+"skolelinux.org/\"/> to allow us to know which packages are popular and "
+"should be kept for future releases.  Although you don't have to, it is a "
+"simple way for you to help."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. 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 - "
+"Wait. If the selected profiles include Thin-client-server then the installer "
+"will spend quite some time at the end, \"Finishing the installation - "
 "Running debian-edu-profile-udeb...\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "After giving the root password, you will be asked to create a normal user "
 "account \"for non-administrative tasks\". For Debian Edu this account is "
@@ -1702,17 +1969,15 @@ msgid ""
 "network."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The password for this user <emphasis role=\"strong\">must</emphasis> have a "
 "length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
-"otherwise login will not be possible (even though a shorter password will be"
-" accepted by the installer)."
+"otherwise login will not be possible (even though a shorter password will be "
+"accepted by the installer)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Vær glad"
 
@@ -1739,8 +2004,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image,"
-" <computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
+"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
@@ -1775,26 +2040,26 @@ msgstr "En kommentar om installasjon av tynnklienttjenere"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently"
-" this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink "
-"url=\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
-"change the name of the profile into a better suited one."
+"First of all, this profile name is confusing for historic reasons. Currently "
+"this profile actually installs an LTSP server environment for thin-clients "
+"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
+"org/588510#\">588510</ulink> has been filed to change the name of the "
+"profile into a better suited one."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
 "client</computeroutput> makes it possible to skip the step which converts "
-"the LTSP chroot from a thin-client chroot into a combined thin-"
-"client/diskless workstation chroot."
+"the LTSP chroot from a thin-client chroot into a combined thin-client/"
+"diskless workstation chroot."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"This is useful in certain situations, such as if you want a pure thin client"
-" chroot or if there is already a diskless chroot on another server, which "
-"can be rsynced. For these situations skipping this step will cut down the "
+"This is useful in certain situations, such as if you want a pure thin client "
+"chroot or if there is already a diskless chroot on another server, which can "
+"be rsynced. For these situations skipping this step will cut down the "
 "installation time considerably."
 msgstr ""
 
@@ -1836,12 +2101,12 @@ msgstr ""
 msgid ""
 "For this installation method it is required that you have a running main "
 "server. When clients boot via the main network, a new PXE menu with "
-"installer and boot selection options is displayed. If PXE installation fails"
-" with an error message claiming a XXX.bin file is missing, then most "
-"probably the client's network card requires nonfree firmware. In this case "
-"the Debian Installer's initrd must be modified. This can be achieved by "
-"executing the command: <computeroutput>/usr/share/debian-edu-config/tools"
-"/pxe-addfirmware </computeroutput> on the server."
+"installer and boot selection options is displayed. If PXE installation fails "
+"with an error message claiming a XXX.bin file is missing, then most probably "
+"the client's network card requires nonfree firmware. In this case the Debian "
+"Installer's initrd must be modified. This can be achieved by executing the "
+"command: <computeroutput>/usr/share/debian-edu-config/tools/pxe-addfirmware "
+"</computeroutput> on the server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1850,25 +2115,22 @@ msgid ""
 "Server</emphasis> profile only:"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/pxe-tjener.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "width=400"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-"
-"Server</emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+"emphasis> profiles:"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
@@ -1876,14 +2138,14 @@ msgstr ""
 msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
-"to be added to LDAP with GOsa², but can be, for example if you want to force"
-" the hostname."
+"to be added to LDAP with GOsa², but can be, for example if you want to force "
+"the hostname."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"More information about network clients can be found in the <link "
-"linkend=\"NetworkClients\">Network clients HowTo</link> chapter."
+"More information about network clients can be found in the <link linkend="
+"\"NetworkClients\">Network clients HowTo</link> chapter."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -1898,8 +2160,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"A line like the following needs to be added to <computeroutput>tjener:/etc"
-"/debian-edu/www/debian-edu-install.dat</computeroutput>"
+"A line like the following needs to be added to <computeroutput>tjener:/etc/"
+"debian-edu/www/debian-edu-install.dat</computeroutput>"
 msgstr ""
 
 #. type: CDATA
@@ -1909,45 +2171,43 @@ msgstr "d-i  pkgsel/include string my-extra-package(s)"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"The PXE installation uses <computeroutput>/var/lib/tftpboot/debian-"
-"edu/install.cfg</computeroutput> and the preseeding file in "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput>."
-" These files can be changed to adjust the preseeding used during "
-"installation, to avoid more questions when installing over the net. Another "
-"way to achieve this is to provide extra settings in <computeroutput>/etc"
-"/debian-edu/pxeinstall.conf</computeroutput> and <computeroutput>/etc"
-"/debian-edu/www/debian-edu-install.dat.local</computeroutput> and to run "
-"<computeroutput>/usr/sbin/debian-edu-pxeinstall</computeroutput> to update "
-"the generated files."
+"The PXE installation uses <computeroutput>/var/lib/tftpboot/debian-edu/"
+"install.cfg</computeroutput> and the preseeding file in <computeroutput>/etc/"
+"debian-edu/www/debian-edu-install.dat</computeroutput>. These files can be "
+"changed to adjust the preseeding used during installation, to avoid more "
+"questions when installing over the net. Another way to achieve this is to "
+"provide extra settings in <computeroutput>/etc/debian-edu/pxeinstall.conf</"
+"computeroutput> and <computeroutput>/etc/debian-edu/www/debian-edu-install."
+"dat.local</computeroutput> and to run <computeroutput>/usr/sbin/debian-edu-"
+"pxeinstall</computeroutput> to update the generated files."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"Further information can be found in the <ulink "
-"url=\"http://www.debian.org/releases/jessie/installmanual\">manual of the "
-"Debian Installer</ulink>."
+"Further information can be found in the <ulink url=\"http://www.debian.org/"
+"releases/jessie/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"To disable or change the use of the proxy when installing via PXE, the lines"
-" containing <computeroutput>mirror/http/proxy</computeroutput>, "
+"To disable or change the use of the proxy when installing via PXE, the lines "
+"containing <computeroutput>mirror/http/proxy</computeroutput>, "
 "<computeroutput>mirror/ftp/proxy</computeroutput> and "
 "<computeroutput>preseed/early_command</computeroutput> in "
-"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat "
-"</computeroutput> need to be changed.  To disable the use of a proxy when "
+"<computeroutput>tjener:/etc/debian-edu/www/debian-edu-install.dat </"
+"computeroutput> need to be changed.  To disable the use of a proxy when "
 "installing, put '#' in front of the first two lines, and remove the "
-"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; "
-"</computeroutput>\" part from the last one."
+"\"<computeroutput>export http_proxy=\"http://webcache:3128\"; </"
+"computeroutput>\" part from the last one."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Some settings can not be preseeded because they are needed before the "
 "preseeding file is downloaded.  These are configured in the PXElinux-based "
-"boot arguments available from <computeroutput>/var/lib/tftproot/debian-"
-"edu/install.cfg</computeroutput>.  Language, keyboard layout and desktop are"
-" examples of such settings."
+"boot arguments available from <computeroutput>/var/lib/tftproot/debian-edu/"
+"install.cfg</computeroutput>.  Language, keyboard layout and desktop are "
+"examples of such settings."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1957,19 +2217,18 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
-"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
-"installer</ulink>, which has a modular design and other nice features. "
-"<ulink "
-"url=\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> "
-"allows you to define answers to the questions normally asked."
+"the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
+"ulink>, which has a modular design and other nice features. <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
+"you to define answers to the questions normally asked."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"So all you need to do is to create a preseeding file with your answers (this"
-" is described in the appendix of the debian installer manual) and <ulink "
-"url=\"http://wiki.debian.org/DebianInstaller/Modify/CD\">remaster the "
-"CD/DVD</ulink>."
+"So all you need to do is to create a preseeding file with your answers (this "
+"is described in the appendix of the debian installer manual) and <ulink url="
+"\"http://wiki.debian.org/DebianInstaller/Modify/CD\">remaster the CD/DVD</"
+"ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -1987,308 +2246,248 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"So here is a screenshot tour through a graphical Main-Server + Workstation +"
-" Thin Client Server installation and how it looks at the first boot of the "
+"So here is a screenshot tour through a graphical Main-Server + Workstation + "
+"Thin Client Server installation and how it looks at the first boot of the "
 "tjener, a PXE boot on the workstation network and on the thinclient network:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "01-Installer_boot_menu.png"
 msgstr "01-Installer_boot_menu.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
 msgstr "./images/02-select_a_language.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "02-select_a_language.png"
 msgstr "02-select_a_language.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/03-select_your_location.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "03-select_your_location.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/04-Configure_the_keyboard.png"
 msgstr "./images/04-Configure_the_keyboard.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "04-Configure_the_keyboard.png"
 msgstr "04-Configure_the_keyboard.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr "05-Detect_and_mount_CD-ROM.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "06-Load_installer_components_from_CD.png"
 msgstr "06-Load_installer_components_from_CD.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/07-Detect_network_hardware.png"
 msgstr "./images/07-Detect_network_hardware.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "07-Detect_network_hardware.png"
 msgstr "07-Detect_network_hardware.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "./images/12-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12-Set_up_users_and_passwords.png"
 msgstr "12-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "12a-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "./images/12b-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "12b-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "./images/12c-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12c-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12e-creating_ext4.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12e-creating_ext4.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/13-Install+the+base+system.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "13-Install the base system.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/14-Select_and_install_software.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "14-Select_and_install_software.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/17-Select_and_install_software.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "17-Select_and_install_software.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/18-Build+LTSP+chroot.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "18-Build LTSP chroot.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/20-Finish_the_Installation.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "20-Finish_the_Installation.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "tjener KDM Login"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/24-Tjener-KDE_Start.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE starting..."
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE and Browser"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE Desktop"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Diskless Workstation Login"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr ""
 
@@ -2305,9 +2504,9 @@ msgid ""
 "During installation of the main server a first user account was created. In "
 "the following text this account will be referenced as \"first user\". This "
 "account is special, as there's no Samba account (can be added via GOsa²), "
-"the home directory permission is set to 700 (so <computeroutput>chmod o+x "
-"~</computeroutput> is needed to make personal web pages accessible), and the"
-" first user can use <computeroutput>sudo</computeroutput> to become root."
+"the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</"
+"computeroutput> is needed to make personal web pages accessible), and the "
+"first user can use <computeroutput>sudo</computeroutput> to become root."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2340,20 +2539,18 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "If generic DNS traffic is blocked out of your network and you need to use "
-"some specific DNS server to look up internet hosts, you need to tell the DNS"
-" server to use this server as its \"forwarder\".  Update "
-"/etc/bind/named.conf.options and specify the IP address of the DNS server to"
-" use."
+"some specific DNS server to look up internet hosts, you need to tell the DNS "
+"server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
+"options and specify the IP address of the DNS server to use."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks"
-" and some frequently asked questions."
+"The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
+"and some frequently asked questions."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu KDE desktop"
 msgstr ""
 
@@ -2398,8 +2595,8 @@ msgstr "DHCP Administrasjon"
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server +"
-" workstation). If all of the mentioned before is not available, see: <link "
+"installed as a so called combined server (main server + thin client server + "
+"workstation). If all of the mentioned before is not available, see: <link "
 "linkend=\"Administration--Installing_a_graphical_environment_on_the_main-"
 "server_to_use_GOsa.2BALI-\">Installing a graphical environment on the main-"
 "server to use GOsa²</link>."
@@ -2426,21 +2623,19 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"For general information on GOsa² have a look at: <ulink "
-"url=\"https://oss.gonicus.de/labs/gosa/wiki/documentation\"/>."
+"For general information on GOsa² have a look at: <ulink url=\"https://oss."
+"gonicus.de/labs/gosa/wiki/documentation\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "GOsa² Login plus Overview"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² overview page after login as the first user"
 msgstr ""
 
@@ -2460,8 +2655,8 @@ msgstr ""
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on"
-" the network. With LDAP, account information about students, pupils, "
+"(diskless) workstations, the thin client servers and the Windows machines on "
+"the network. With LDAP, account information about students, pupils, "
 "teachers, etc. only needs to be entered once. After information has been "
 "provided in LDAP, the information will be available to all systems on the "
 "whole Skolelinux network."
@@ -2472,9 +2667,9 @@ msgid ""
 "GOsa² is an administration tool that uses LDAP to store its information and "
 "provide a hierarchical department structure. To each \"department\" you can "
 "add user accounts, groups, systems, netgroups, etc. Depending on the "
-"structure of your institution, you can use the department structure in "
-"GOsa²/LDAP to transfer your organisational structure into the LDAP data tree"
-" of the Debian Edu main server."
+"structure of your institution, you can use the department structure in GOsa²/"
+"LDAP to transfer your organisational structure into the LDAP data tree of "
+"the Debian Edu main server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2485,16 +2680,17 @@ msgid ""
 "department, teachers to the \"Teachers\" department; systems (servers, "
 "Skolelinux workstations, Windows machines, printers etc.) are currently "
 "added to the base level. Find your own scheme for customising this "
-"structure. (You can find an example how to create users in year groups, with"
-" common home directories for each group in the <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Jessie//HowTo/AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/AdvancedAdministration</ulink>"
-" chapter of this manual.)"
+"structure. (You can find an example how to create users in year groups, with "
+"common home directories for each group in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Jessie//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Depending on the task that you want to work on (manage users, manage groups,"
-" manage systems, etc.) GOsa² presents you with a different view on the "
+"Depending on the task that you want to work on (manage users, manage groups, "
+"manage systems, etc.) GOsa² presents you with a different view on the "
 "selected department (or the base level)."
 msgstr ""
 
@@ -2504,14 +2700,13 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"First, click on \"Users\" in the left navigation menu. The right side of the"
-" screen will change to show a table with department folders for \"Students\""
-" and \"Teachers\" and the account of the GOsa² Super-Administrator (the "
-"first created user). Above this table you can see a field called "
-"<emphasis>Base</emphasis> that allows you to navigate through your tree "
-"structure (move your mouse over that area and a drop-down menu will appear) "
-"and to select a base folder for your intended operations (e.g. adding a new "
-"user)."
+"First, click on \"Users\" in the left navigation menu. The right side of the "
+"screen will change to show a table with department folders for \"Students\" "
+"and \"Teachers\" and the account of the GOsa² Super-Administrator (the first "
+"created user). Above this table you can see a field called <emphasis>Base</"
+"emphasis> that allows you to navigate through your tree structure (move your "
+"mouse over that area and a drop-down menu will appear) and to select a base "
+"folder for your intended operations (e.g. adding a new user)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -2521,19 +2716,17 @@ msgstr "Legge til brukere"
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Next to that tree navigation item you can see the \"Actions\" menu. Move "
-"your mouse over this item and a submenu appears on screen; choose \"Create\""
-" here, and then \"User\". You will be guided by the user creation wizard."
+"your mouse over this item and a submenu appears on screen; choose \"Create\" "
+"here, and then \"User\". You will be guided by the user creation wizard."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The most important thing to add is the template (newstudent or newteacher) "
 "and the full name of your user (see image)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "As you follow the wizard, you will see that GOsa² generates a username "
 "automatically based on the real name. It automatically chooses a username "
@@ -2542,19 +2735,17 @@ msgid ""
 "contains non-ASCII characters."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
 "wizard. (If you want to be able to edit the proposed username, open "
 "<computeroutput>/etc/gosa/gosa.conf</computeroutput> with an editor and add "
-"<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> as an"
-" additional option to the \"location definition\".)"
+"<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> as an "
+"additional option to the \"location definition\".)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "When the wizard has finished, you are presented with the GOsa² screen for "
 "your new user object. Use the tabs at the top to check the completed fields."
@@ -2587,13 +2778,11 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/filterbox.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Filterbox"
 msgstr ""
 
@@ -2608,27 +2797,25 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"When using the \"Filter\" box, results will immediately appear in the middle"
-" of the text in the table list view. Every line represents a user account "
-"and the items farthest to the right on each line are little icons that "
-"provide actions for you: cut entry, copy entry, edit user, lock account, set"
-" password, take snapshot (not usable) and remove user."
+"When using the \"Filter\" box, results will immediately appear in the middle "
+"of the text in the table list view. Every line represents a user account and "
+"the items farthest to the right on each line are little icons that provide "
+"actions for you: cut entry, copy entry, edit user, lock account, set "
+"password, take snapshot (not usable) and remove user."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "A new page will show up where you can directly modify information about the "
-"user, change the password of the user and modify the list of groups the user"
-" belongs to."
+"user, change the password of the user and modify the list of groups the user "
+"belongs to."
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/edit_user.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Editing user data"
 msgstr ""
 
@@ -2638,12 +2825,11 @@ msgstr "Sett passord"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The students can change their own passwords by logging into GOsa² with their"
-" own usernames. To ease the access of GOsa², an entry called Gosa is "
-"provided in the desktop's System (or System settings) menu. A logged-in "
-"student will be presented with a very minimal version of GOsa² that only "
-"allows access to the student's own account data sheet and to the set-"
-"password dialog."
+"The students can change their own passwords by logging into GOsa² with their "
+"own usernames. To ease the access of GOsa², an entry called Gosa is provided "
+"in the desktop's System (or System settings) menu. A logged-in student will "
+"be presented with a very minimal version of GOsa² that only allows access to "
+"the student's own account data sheet and to the set-password dialog."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2657,31 +2843,26 @@ msgstr ""
 msgid "To administratively set a new password for a user"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "search for the user to be modified, as explained above"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "click on the key symbol at the end of the line that the username is shown in"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "on the page subsequently presented you can set a new password chosen by "
 "yourself"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/change_password_administratively.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Set user password"
 msgstr "Sett brukerpassord"
 
@@ -2704,8 +2885,8 @@ msgid ""
 "(givenName) and password. Make sure that there are no duplicate entries in "
 "the uid field. Please note that the check for duplicates must include "
 "already existing uid entries in LDAP (which could be obtained by executing "
-"<computeroutput>getent passwd | grep tjener/home | cut -d\":\" "
-"-f1</computeroutput> on the command line)."
+"<computeroutput>getent passwd | grep tjener/home | cut -d\":\" -f1</"
+"computeroutput> on the command line)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2714,25 +2895,21 @@ msgid ""
 "intolerant about them):"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Use \",\" as field separator"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Do not use quotes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The CSV file <emphasis role=\"strong\">must not</emphasis> contain a header "
 "line (of the sort that normally contains the column names)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The order of the fields is not relevant, and can be defined in GOsa² during "
 "the mass import"
@@ -2742,32 +2919,27 @@ msgstr ""
 msgid "The mass import steps are:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "click the \"LDAP Manager\" link in the navigation menu on the left"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "click the \"Import\" tab in the screen on the right"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "browse your local disk and select a CSV file with the list of users to be "
 "imported"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "choose an available user template that should be applied during mass import "
 "(such as NewTeacher or NewStudent)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "click the \"Import\" button in the bottom-right corner"
 msgstr ""
 
@@ -2781,18 +2953,15 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/create_group.png"
 msgstr "./images/create_group.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "create group"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/list_groups.png"
 msgstr "./images/list_groups.png"
 
@@ -2809,15 +2978,15 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "By default, the appropriate Samba group isn't created. If you forgot to "
-"check the Samba group option during group creation, you can modify the group"
-" later on."
+"check the Samba group option during group creation, you can modify the group "
+"later on."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Adding users to a newly created group takes you back to the user list, where"
-" you most probably would like to use the filter box to find users. Check the"
-" LDAP tree level, too."
+"Adding users to a newly created group takes you back to the user list, where "
+"you most probably would like to use the filter box to find users. Check the "
+"LDAP tree level, too."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2844,8 +3013,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "This is explained in more detail in the <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration\">HowTo/NetworkClients</link>"
-" chapter of this manual."
+"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+"\">HowTo/NetworkClients</link> chapter of this manual."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -2864,10 +3033,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Diskless workstations and thin-clients work out-of-the-box when connected to"
-" the main network. Only workstations with disks <emphasis "
-"role=\"strong\">have</emphasis> to be added with GOsa², but all <emphasis "
-"role=\"strong\">can</emphasis>."
+"Diskless workstations and thin-clients work out-of-the-box when connected to "
+"the main network. Only workstations with disks <emphasis role=\"strong"
+"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">can</emphasis>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2884,8 +3053,8 @@ msgstr ""
 msgid ""
 "To assign a host with the MAC address 52:54:00:12:34:10 a static IP address "
 "in GOsa² you have to enter the MAC address, the hostname and the IP; "
-"alternatively you might click the <computeroutput>Propose "
-"ip</computeroutput> button which will show the first free fixed address in "
+"alternatively you might click the <computeroutput>Propose ip</"
+"computeroutput> button which will show the first free fixed address in "
 "10.0.0.0/8, most probably something like 10.0.0.2 if you add the first "
 "machine this way. It may be better to first think about your network: for "
 "example you could use 10.0.0.x with x>10 and x<50 for servers, and "
@@ -2899,14 +3068,13 @@ msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
 "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to "
-"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp "
-"-h</computeroutput> shows usage information. Please note, that the IP "
-"addresses shown after usage of "
-"<computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the dynamic "
-"IP range. These systems can then be modified though to suit your network: "
-"rename each new system, activate DHCP and DNS, add it to netgroups, if "
-"needed; reboot the system afterwards.  The following screenshots show how "
-"this looks in practice:"
+"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -"
+"h</computeroutput> shows usage information. Please note, that the IP "
+"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+"computeroutput> belong to the dynamic IP range. These systems can then be "
+"modified though to suit your network: rename each new system, activate DHCP "
+"and DNS, add it to netgroups, if needed; reboot the system afterwards.  The "
+"following screenshots show how this looks in practice:"
 msgstr ""
 
 #. type: CDATA
@@ -2921,50 +3089,42 @@ msgid ""
 "enter password:"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² systems listing"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Host details"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Modify host"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Add netgroup"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A cronjob updating DNS runs every hour; <computeroutput>su -c "
-"ldap2bind</computeroutput> can be used to trigger the update manually."
+"A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
+"computeroutput> can be used to trigger the update manually."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -2997,65 +3157,55 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"For example, adding a machine to a <computeroutput>NetGroup</computeroutput>"
-" does not modify the file access or command execution permissions for that "
+"For example, adding a machine to a <computeroutput>NetGroup</computeroutput> "
+"does not modify the file access or command execution permissions for that "
 "machine or the users logged in to that machine; instead it restricts the "
 "services that machine can use on your main-server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The default installation provides the "
-"<computeroutput>NetGroups</computeroutput>"
+"The default installation provides the <computeroutput>NetGroups</"
+"computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "cups-queue-autoflush-hosts"
 msgstr "cups-queue-autoflush-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "cups-queue-autoreenable-hosts"
 msgstr "cups-queue-autoreenable-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "fsautoresize-hosts"
 msgstr "fsautoresize-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "ltsp-server-hosts"
 msgstr "ltsp-server-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "netblock-hosts"
 msgstr "netblock-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "printer-hosts"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "server-hosts"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "shutdown-at-night-hosts"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "winstation-hosts"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "workstation-hosts"
 msgstr ""
 
@@ -3065,13 +3215,11 @@ msgid ""
 "used for"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "NFS."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "The home directories are exported by the main-server to be mounted by the "
 "workstations and the LTSP servers. For security reasons, only hosts within "
@@ -3082,8 +3230,7 @@ msgid ""
 "static IP addresses from LDAP."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Remember to configure workstations and ltsp-servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -3091,44 +3238,37 @@ msgid ""
 "configured."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "fs-autoresize"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Debian Edu machines in this group will automatically resize LVM partitions "
 "that run out of space."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "shutdown at night"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Debian Edu machines in this group will automatically shut down at night to "
 "save energy."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "CUPS (cups-queue-autoflush-hosts and cups-queue-autoreenable-hosts)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Debian Edu machines in these groups will automatically flush all print "
 "queues every night, and re-enable any disabled print queue every hour."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Debian Edu machines in this group will only be allowed to connect to "
 "machines on the local network.  Combined with web proxy restrictions this "
@@ -3137,14 +3277,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Another important part of machine configuration is the 'Samba host' flag (in"
-" the 'Host information' area). If you plan to add existing Windows systems "
-"to the Skolelinux Samba domain, you need to add the Windows host to the LDAP"
-" tree and set this flag to be able to join the Windows host to the domain. "
+"Another important part of machine configuration is the 'Samba host' flag (in "
+"the 'Host information' area). If you plan to add existing Windows systems to "
+"the Skolelinux Samba domain, you need to add the Windows host to the LDAP "
+"tree and set this flag to be able to join the Windows host to the domain. "
 "For more information about adding Windows hosts to the Skolelinux network "
 "see the <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration\">HowTo/NetworkClients</link>"
-" chapter of this manual."
+"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+"\">HowTo/NetworkClients</link> chapter of this manual."
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -3153,15 +3293,15 @@ msgstr "Skriverhåndtering"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"For Printer Management point your web browser to <ulink "
-"url=\"https://www:631\"/> This is the normal CUPS management interface where"
-" you can add/delete/modify your printers and can clean up the printing "
-"queue. By default only root is allowed but this can be changed: Open "
-"/etc/cups/cups-files.conf with an editor and add one or more valid group "
-"names matching your site policy to the line containing "
-"<computeroutput>SystemGroup lpadmin</computeroutput>. Existing GOsa² groups "
-"that might be used are <computeroutput>gosa-admins</computeroutput> (with "
-"the first user as member), <computeroutput>teachers</computeroutput> and "
+"For Printer Management point your web browser to <ulink url=\"https://"
+"www:631\"/> This is the normal CUPS management interface where you can add/"
+"delete/modify your printers and can clean up the printing queue. By default "
+"only root is allowed but this can be changed: Open /etc/cups/cups-files.conf "
+"with an editor and add one or more valid group names matching your site "
+"policy to the line containing <computeroutput>SystemGroup lpadmin</"
+"computeroutput>. Existing GOsa² groups that might be used are "
+"<computeroutput>gosa-admins</computeroutput> (with the first user as "
+"member), <computeroutput>teachers</computeroutput> and "
 "<computeroutput>jradmins</computeroutput> (no members after installation)."
 msgstr ""
 
@@ -3172,8 +3312,8 @@ msgstr "Klokkesynkronisering"
 #. type: Content of: <article><section><para>
 msgid ""
 "The default configuration in Debian Edu is to keep the clocks on all "
-"machines synchronous but not necessarily correct.  NTP is used to update the"
-" time. The clocks will be synchronised with an external source by default.  "
+"machines synchronous but not necessarily correct.  NTP is used to update the "
+"time. The clocks will be synchronised with an external source by default.  "
 "This can cause machines to keep the external Internet connection open if it "
 "is created when used."
 msgstr ""
@@ -3186,13 +3326,13 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"To disable synchronisation with an external clock, the file /etc/ntp.conf on"
-" the main-server and all clients and LTSP chroots need to be modified.  Add "
-"comment (\"#\") marks in front of the "
-"<computeroutput>server</computeroutput> entries.  After this, the NTP server"
-" needs to be restarted by running <computeroutput>/etc/init.d/ntp "
-"restart</computeroutput> as root.  To test if a machine is using the "
-"external clock sources, run <computeroutput>ntpq -c lpeer</computeroutput>."
+"To disable synchronisation with an external clock, the file /etc/ntp.conf on "
+"the main-server and all clients and LTSP chroots need to be modified.  Add "
+"comment (\"#\") marks in front of the <computeroutput>server</"
+"computeroutput> entries.  After this, the NTP server needs to be restarted "
+"by running <computeroutput>/etc/init.d/ntp restart</computeroutput> as "
+"root.  To test if a machine is using the external clock sources, run "
+"<computeroutput>ntpq -c lpeer</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -3201,8 +3341,8 @@ msgstr "Utvide hele partisjoner"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Because of a possible bug with automatic partitioning, some partitions might"
-" be too full after installation.  To extend these partitions, run "
+"Because of a possible bug with automatic partitioning, some partitions might "
+"be too full after installation.  To extend these partitions, run "
 "<computeroutput>debian-edu-fsautoresize -n</computeroutput> as root.  See "
 "the \"Resizing Partitions\" HowTo in the <link linkend=\"Administration--"
 "Resizing_Partitions\">administration HowTo chapter</link> for more "
@@ -3219,14 +3359,14 @@ msgstr "Oppdatere programvaren"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"This section explains how to use <computeroutput>apt-get "
-"upgrade</computeroutput>."
+"This section explains how to use <computeroutput>apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Using <computeroutput>apt-get</computeroutput> is really simply. To update a"
-" system you need to execute two commands on the command line as root: "
+"Using <computeroutput>apt-get</computeroutput> is really simply. To update a "
+"system you need to execute two commands on the command line as root: "
 "<computeroutput>apt-get update</computeroutput> (which updates the lists of "
 "available packages) and <computeroutput>apt-get upgrade</computeroutput> "
 "(which upgrades the packages for which an upgrade is available)."
@@ -3270,16 +3410,16 @@ msgid ""
 "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
 "email about any packages that can be upgraded. It does not install these "
 "upgrades, but does download them (usually in the night), so you don't have "
-"to wait for the download when you do <computeroutput>apt-get "
-"upgrade</computeroutput>."
+"to wait for the download when you do <computeroutput>apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
-"needs the <computeroutput>unattended-upgrades</computeroutput> package to be"
-" installed and configured as described on <ulink "
-"url=\"https://wiki.debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
+"needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
+"installed and configured as described on <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3312,8 +3452,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"For backup management point your browser to <ulink url=\"https://www"
-"/slbackup-php\"/>. Please note that you need to access this site via SSL, "
+"For backup management point your browser to <ulink url=\"https://www/"
+"slbackup-php\"/>. Please note that you need to access this site via SSL, "
 "since you have to enter the root password there. If you try to access this "
 "site without using SSL it will fail. Note: the site will only work if you "
 "temporarily allow ssh root login on the backup server (tjener by default)."
@@ -3321,12 +3461,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"By default tjener will back up "
-"<computeroutput>/skole/tjener/home0</computeroutput>, "
-"<computeroutput>/etc/</computeroutput>, "
-"<computeroutput>/root/.svk</computeroutput> and LDAP to /skole/backup which "
-"is under the LVM. If you only want to have spare copies of things (in case "
-"you delete them) this setup should be fine for you."
+"By default tjener will back up <computeroutput>/skole/tjener/home0</"
+"computeroutput>, <computeroutput>/etc/</computeroutput>, <computeroutput>/"
+"root/.svk</computeroutput> and LDAP to /skole/backup which is under the LVM. "
+"If you only want to have spare copies of things (in case you delete them) "
+"this setup should be fine for you."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3339,13 +3478,17 @@ msgstr ""
 msgid ""
 "If you want to back up your data to an external server, a tape device or "
 "another hard drive you'll have to modify the existing configuration a bit."
-msgstr "Hvis du vil sikkerhetskopiere dine data til en ekstern tjener, en tape-stasjon eller en annen harddisk, så må du endre oppsettet litt."
+msgstr ""
+"Hvis du vil sikkerhetskopiere dine data til en ekstern tjener, en tape-"
+"stasjon eller en annen harddisk, så må du endre oppsettet litt."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "If you want to restore a complete folder, your best option is to use the "
 "command-line:"
-msgstr "Hvis du ønsker å gjenopprette en komplett folder anbefales det å bruke kommandolinja:"
+msgstr ""
+"Hvis du ønsker å gjenopprette en komplett folder anbefales det å bruke "
+"kommandolinja:"
 
 #. type: CDATA
 #, no-wrap
@@ -3353,35 +3496,44 @@ msgid ""
 "$ sudo rdiff-backup -r <date>  \\\n"
 "   /skole/backup/tjener/skole/tjener/home0/user \\\n"
 "   /skole/tjener/home0/user_<date>"
-msgstr "$ sudo rdiff-backup -r <date>  \\\n   /skole/backup/tjener/skole/tjener/home0/user \\\n   /skole/tjener/home0/user_<date>"
+msgstr ""
+"$ sudo rdiff-backup -r <date>  \\\n"
+"   /skole/backup/tjener/skole/tjener/home0/user \\\n"
+"   /skole/tjener/home0/user_<date>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"This will leave the content from "
-"<computeroutput>/skole/tjener/home0/user</computeroutput> for "
-"<computeroutput><date></computeroutput> in the folder "
-"<computeroutput>/skole/tjener/home0/user_<date></computeroutput>"
-msgstr "Dette vil legge innholdet fra <computeroutput>/skole/tjener/home0/user</computeroutput> fra <computeroutput><dato></computeroutput> i mappa <computeroutput>/skole/tjener/home0/user_<dato></computeroutput> "
+"This will leave the content from <computeroutput>/skole/tjener/home0/user</"
+"computeroutput> for <computeroutput><date></computeroutput> in the "
+"folder <computeroutput>/skole/tjener/home0/user_<date></computeroutput>"
+msgstr ""
+"Dette vil legge innholdet fra <computeroutput>/skole/tjener/home0/user</"
+"computeroutput> fra <computeroutput><dato></computeroutput> i mappa "
+"<computeroutput>/skole/tjener/home0/user_<dato></computeroutput> "
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "If you want to restore a single file, then you should be able to select the "
 "file (and the version) from the web interface, and download only that file."
-msgstr "Hvis du ønsker å gjenopprette en enkelt fil skal dette kunne gjøres ved å velge fila (og versjon) fra webgrensesnittet, for så å laste ned bare den fila."
+msgstr ""
+"Hvis du ønsker å gjenopprette en enkelt fil skal dette kunne gjøres ved å "
+"velge fila (og versjon) fra webgrensesnittet, for så å laste ned bare den "
+"fila."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "If you want to get rid of older backups, choose \"Maintenance\" in the menu "
 "on the backup page and select the oldest snapshot to keep:"
-msgstr "Hvis du ønsker å kvitte deg med eldre sikkerhetskopier, velg \"Vedlikehold\" i menyen på sikkerhetskopi-siden og velg å beholde det eldste øyeblikksbildet:"
+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"
 
@@ -3395,38 +3547,41 @@ msgstr "Munin"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The Munin trend reporting system is available from <ulink "
-"url=\"https://www/munin/\"/>.  It provides system status measurement graphs "
-"on a daily, weekly, monthly and yearly basis, and provides the system "
-"administrator with help when looking for bottlenecks and the source of "
-"system problems."
-msgstr "Trendrapportsystemet Munin er tilgjengelig fra <ulink url=\"https://www/munin/\"/>. Det viser grafer for systemstatus på en daglig, ukentlig, månedlig og årlig basis. Dette gir systemadministrator hjelp til å se etter flaskehalser og kilde for systemproblemer."
+"The Munin trend reporting system is available from <ulink url=\"https://www/"
+"munin/\"/>.  It provides system status measurement graphs on a daily, "
+"weekly, monthly and yearly basis, and provides the system administrator with "
+"help when looking for bottlenecks and the source of system problems."
+msgstr ""
+"Trendrapportsystemet Munin er tilgjengelig fra <ulink url=\"https://www/"
+"munin/\"/>. Det viser grafer for systemstatus på en daglig, ukentlig, "
+"månedlig og årlig basis. Dette gir systemadministrator hjelp til å se etter "
+"flaskehalser og kilde for systemproblemer."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The list of machines being monitored using Munin is generated automatically,"
-" based on the list of hosts reporting to sitesummary.  All hosts with the "
+"The list of machines being monitored using Munin is generated automatically, "
+"based on the list of hosts reporting to sitesummary.  All hosts with the "
 "package munin-node installed are registered for Munin monitoring.  It will "
 "normally take one day from a machine being installed until Munin monitoring "
 "starts, because of the order the cron jobs are executed.  To speed up the "
 "process, run <computeroutput>sitesummary-update-munin</computeroutput> as "
-"root on the sitesummary server (normally the main-server).  This will update"
-" the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
+"root on the sitesummary server (normally the main-server).  This will update "
+"the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from "
-"<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks the "
-"relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
+"program, which probes the plugins available from <computeroutput>/usr/share/"
+"munin/plugins/</computeroutput> and symlinks the relevant ones to "
+"<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Information about Munin is available from <ulink "
-"url=\"http://munin.projects.linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin.projects."
+"linpro.no/\"/> ."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -3435,20 +3590,20 @@ msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Nagios system and service monitoring is available from <ulink "
-"url=\"https://www/nagios3/\"/>. The set of machines and services being "
-"monitored is automatically generated using information collected by the "
-"sitesummary system. The machines with the profile Main-server and Thin-"
-"client-server receive full monitoring, while workstations and thin clients "
-"receive simple monitoring. To enable full monitoring on a workstation, "
-"install the <computeroutput>nagios-nrpe-server</computeroutput> package on "
-"the workstation."
+"Nagios system and service monitoring is available from <ulink url=\"https://"
+"www/nagios3/\"/>. The set of machines and services being monitored is "
+"automatically generated using information collected by the sitesummary "
+"system. The machines with the profile Main-server and Thin-client-server "
+"receive full monitoring, while workstations and thin clients receive simple "
+"monitoring. To enable full monitoring on a workstation, install the "
+"<computeroutput>nagios-nrpe-server</computeroutput> package on the "
+"workstation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The username is <computeroutput>nagiosadmin</computeroutput> and the default"
-" password is <computeroutput>skolelinux</computeroutput>. For security "
+"The username is <computeroutput>nagiosadmin</computeroutput> and the default "
+"password is <computeroutput>skolelinux</computeroutput>. For security "
 "reasons, avoid using the same password as root. To change the password you "
 "can run the following command as root:"
 msgstr ""
@@ -3461,34 +3616,31 @@ msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "By default Nagios does not send email. This can be changed by replacing "
-"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput"
-">host-notify-by-email</computeroutput> and <computeroutput>notify-by-"
-"email</computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
+"<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
+"notify-by-email</computeroutput> and <computeroutput>notify-by-email</"
+"computeroutput> in the file <computeroutput>/etc/nagios3/sitesummary-"
 "template-contacts.cfg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The Nagios configuration file used is "
-"<computeroutput>/etc/nagios3/sitesummary.cfg</computeroutput>.  The "
-"sitesummary cron job generates <computeroutput>/var/lib/sitesummary/nagios-"
-"generated.cfg</computeroutput> with the list of hosts and services to "
-"monitor."
+"The Nagios configuration file used is <computeroutput>/etc/nagios3/"
+"sitesummary.cfg</computeroutput>.  The sitesummary cron job generates "
+"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</computeroutput> "
+"with the list of hosts and services to monitor."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Extra Nagios checks can be put in the file "
-"<computeroutput>/var/lib/sitesummary/nagios-"
-"generated.cfg.post</computeroutput> to get them included in the generated "
-"file."
+"Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
+"sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
+"in the generated file."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Information about Nagios is available from <ulink "
-"url=\"http://www.nagios.org/\"/> or in the "
-"<computeroutput>nagios3-doc</computeroutput> package."
+"Information about Nagios is available from <ulink url=\"http://www.nagios."
+"org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -3496,17 +3648,14 @@ msgid "Common Nagios warnings and how to handle them"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"Here are instructions on how to handle the most common Nagios warnings."
+msgid "Here are instructions on how to handle the most common Nagios warnings."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid "DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "The partition (/usr/ in the example) is too full.  There are in general two "
 "ways to handle this: (1) remove some files or (2) increase the size of the "
@@ -3515,17 +3664,15 @@ msgid ""
 "there is more room available in the LVM volume group, running the program "
 "<computeroutput>debian-edu-fsautoresize</computeroutput> to extend the "
 "partitions might help.  To run this program automatically every hour, the "
-"host in question can be added to the <computeroutput>fsautoresize-"
-"hosts</computeroutput> netgroup."
+"host in question can be added to the <computeroutput>fsautoresize-hosts</"
+"computeroutput> netgroup."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
@@ -3535,8 +3682,7 @@ msgid ""
 "upgrade</computeroutput>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "If you do not want to manually upgrade packages and trust Debian to do a "
 "good job with new versions, you can install the <computeroutput>unattended-"
@@ -3544,48 +3690,43 @@ msgid ""
 "all new packages every night.  This will not upgrade the LTSP chroots."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "To upgrade the LTSP chroot, one can use <computeroutput>ltsp-chroot apt-get "
 "update && ltsp-chroot apt-get upgrade</computeroutput>.  On 64-bit "
-"servers, one will have to add <computeroutput>-a i386</computeroutput> as an"
-" argument to ltsp-chroot.  It is a good idea to update the chroot when "
+"servers, one will have to add <computeroutput>-a i386</computeroutput> as an "
+"argument to ltsp-chroot.  It is a good idea to update the chroot when "
 "updating the host system."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid ""
 "WARNING - Reboot required : running kernel = 2.6.32-37.81.0, installed "
 "kernel = 2.6.32-38.83.0"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "The running kernel is older than the newest installed kernel, and a reboot "
 "is required to activate the newest installed kernel.  This is normally "
-"fairly urgent, as new kernels normally show up in Debian Edu to fix security"
-" issues."
+"fairly urgent, as new kernels normally show up in Debian Edu to fix security "
+"issues."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid "WARNING: CUPS queue size - 61"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "The printer queues in CUPS have a lot of jobs pending.  This is most likely "
 "because of a unavailable printer.  Disabled print queues are enabled every "
-"hour on hosts that are member of the <computeroutput>cups-queue-"
-"autoreenable-hosts</computeroutput> netgroup, so for such hosts no manual "
-"action should be required.  The print queues are emptied every night on "
-"hosts that are member of the <computeroutput>cups-queue-autoflush-"
-"hosts</computeroutput> netgroup.  If a host have a lot of jobs in their "
-"queue, consider adding this host to one or both of these netgroups."
+"hour on hosts that are member of the <computeroutput>cups-queue-autoreenable-"
+"hosts</computeroutput> netgroup, so for such hosts no manual action should "
+"be required.  The print queues are emptied every night on hosts that are "
+"member of the <computeroutput>cups-queue-autoflush-hosts</computeroutput> "
+"netgroup.  If a host have a lot of jobs in their queue, consider adding this "
+"host to one or both of these netgroups."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -3609,8 +3750,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Some documentation on sitesummary is available from <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+"Some documentation on sitesummary is available from <ulink url=\"http://wiki."
+"debian.org/DebianEdu/HowTo/SiteSummary\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -3620,10 +3761,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "More information about Debian Edu customisations useful for system "
-"administrators can be found in the <link "
-"linkend=\"Administration\">Administration Howto chapter</link> and in the "
-"<link linkend=\"AdvancedAdministration\">Advanced administration Howto "
-"chapter</link>"
+"administrators can be found in the <link linkend=\"Administration"
+"\">Administration Howto chapter</link> and in the <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -3633,9 +3773,9 @@ msgstr "Oppgraderinger"
 #. type: Content of: <article><section><para>
 msgid ""
 "Before reading this upgrade guide, please note that live updates to your "
-"production servers are carried out at your own risk. <emphasis "
-"role=\"strong\">Debian Edu/Skolelinux comes with ABSOLUTELY NO WARRANTY, to "
-"the extent permitted by applicable law.</emphasis>"
+"production servers are carried out at your own risk. <emphasis role=\"strong"
+"\">Debian Edu/Skolelinux comes with ABSOLUTELY NO WARRANTY, to the extent "
+"permitted by applicable law.</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -3648,11 +3788,11 @@ msgstr "Generelle betraktninger om oppgradering"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Upgrading Debian from one distribution to the next is generally rather easy."
-" For Debian Edu this is unfortunately not yet true as we modify "
-"configuration files in ways we shouldn't. (See Debian bug <ulink "
-"url=\"https://bugs.debian.org/311188#\">311188</ulink> for more "
-"information.) Upgrading is still possible but may require some work."
+"Upgrading Debian from one distribution to the next is generally rather easy. "
+"For Debian Edu this is unfortunately not yet true as we modify configuration "
+"files in ways we shouldn't. (See Debian bug <ulink url=\"https://bugs.debian."
+"org/311188#\">311188</ulink> for more information.) Upgrading is still "
+"possible but may require some work."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3668,22 +3808,21 @@ msgstr ""
 msgid ""
 "If you want to be sure that after the upgrade everything works as before, "
 "you should test the upgrade on a test system or systems configured the same "
-"way as your production machines. There you can test the upgrade without risk"
-" and see if everything works as it should."
+"way as your production machines. There you can test the upgrade without risk "
+"and see if everything works as it should."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Make sure to also read the information about the current Debian Stable "
-"release in its <ulink "
-"url=\"http://www.debian.org/releases/stable/installmanual\">installation "
-"manual</ulink>."
+"release in its <ulink url=\"http://www.debian.org/releases/stable/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"It may also be wise to wait a bit and keep running Oldstable for a few weeks"
-" longer, so that others can test the upgrade and document any problems they "
+"It may also be wise to wait a bit and keep running Oldstable for a few weeks "
+"longer, so that others can test the upgrade and document any problems they "
 "experience. The Oldstable release of Debian Edu will receive continued "
 "support for some time after the next Stable release, but when Debian <ulink "
 "url=\"http://www.debian.org/security/faq#lifespan\">ceases support for "
@@ -3710,25 +3849,21 @@ msgstr ""
 msgid "The basic upgrade operation"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Edit <computeroutput>/etc/apt/sources.list</computeroutput> and replace all "
 "occurrences of \"wheezy\" with \"jessie\"."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get update</computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get upgrade</computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "run <computeroutput>apt-get dist-upgrade</computeroutput>"
 msgstr ""
 
@@ -3757,15 +3892,15 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Remove <computeroutput>/opt/ltsp/i386</computeroutput> (or "
-"<computeroutput>/opt/ltsp/amd64</computeroutput>, depending on your setup). "
-"If you have enough diskspace, consider backing it up."
+"Remove <computeroutput>/opt/ltsp/i386</computeroutput> (or <computeroutput>/"
+"opt/ltsp/amd64</computeroutput>, depending on your setup). If you have "
+"enough diskspace, consider backing it up."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Recreate the chroot by running <computeroutput>debian-edu-"
-"ltsp</computeroutput> as root."
+"Recreate the chroot by running <computeroutput>debian-edu-ltsp</"
+"computeroutput> as root."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3781,12 +3916,11 @@ msgstr ""
 msgid ""
 "To upgrade from any older release, you will need to upgrade to the Wheezy "
 "based Debian Edu release first, before you can follow the instructions "
-"provided above. Instructions are given in the <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Wheezy#\">Manual for "
-"Debian Edu Wheezy</ulink> about how to upgrade to Wheezy from the previous "
-"release, Squeeze, and the Squeeze manual covers the one before that! (Lenny "
-"was it's name and before that there was even another one, based on what was "
-"called Etch.)"
+"provided above. Instructions are given in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu Wheezy</"
+"ulink> about how to upgrade to Wheezy from the previous release, Squeeze, "
+"and the Squeeze manual covers the one before that! (Lenny was it's name and "
+"before that there was even another one, based on what was called Etch.)"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -3794,13 +3928,14 @@ msgid "HowTo"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
-msgid "HowTos for <link linkend=\"Administration\">general administration</link>"
+msgid ""
+"HowTos for <link linkend=\"Administration\">general administration</link>"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 msgid ""
-"HowTos for <link linkend=\"AdvancedAdministration\">advanced "
-"administration</link>"
+"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
+"link>"
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
@@ -3831,8 +3966,8 @@ msgstr ""
 msgid ""
 "The <link linkend=\"GettingStarted\">Getting Started</link> and <link "
 "linkend=\"Maintenance\">Maintenance</link> chapters describe how to get "
-"started with Debian Edu and how to do the basic maintenance work. The howtos"
-" in this chapter have some more \"advanced\" tips and tricks."
+"started with Debian Edu and how to do the basic maintenance work. The howtos "
+"in this chapter have some more \"advanced\" tips and tricks."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -3843,10 +3978,10 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "With the introduction of <computeroutput>etckeeper</computeroutput> in "
-"Debian Edu Squeeze (previous versions used "
-"<computeroutput>etcinsvk</computeroutput> which was removed from Debian), "
-"all files in <computeroutput>/etc/</computeroutput> are tracked using <ulink"
-" url=\"http://www.git-scm.com/\">git</ulink> as a version control system."
+"Debian Edu Squeeze (previous versions used <computeroutput>etcinsvk</"
+"computeroutput> which was removed from Debian), all files in "
+"<computeroutput>/etc/</computeroutput> are tracked using <ulink url=\"http://"
+"www.git-scm.com/\">git</ulink> as a version control system."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3864,10 +3999,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To look at the history, the command <computeroutput>etckeeper vcs "
-"log</computeroutput> is used.  To check the differences between two points "
-"in time, a command like <computeroutput>etcinsvk vcs diff </computeroutput> "
-"can be used."
+"To look at the history, the command <computeroutput>etckeeper vcs log</"
+"computeroutput> is used.  To check the differences between two points in "
+"time, a command like <computeroutput>etcinsvk vcs diff </computeroutput> can "
+"be used."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3907,8 +4042,7 @@ msgid "etckeeper vcs log"
 msgstr "etckeeper vcs log"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"See which files are currently not tracked and which are not up-to-date:"
+msgid "See which files are currently not tracked and which are not up-to-date:"
 msgstr ""
 
 #. type: CDATA
@@ -3932,33 +4066,32 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"In Debian Edu, all partitions other than the "
-"<computeroutput>/boot/</computeroutput> partition are on logical LVM "
-"volumes. With Linux kernels since version 2.6.10, it is possible to extend "
-"partitions while they are mounted. Shrinking partitions still needs to "
-"happen while the partition is unmounted."
+"In Debian Edu, all partitions other than the <computeroutput>/boot/</"
+"computeroutput> partition are on logical LVM volumes. With Linux kernels "
+"since version 2.6.10, it is possible to extend partitions while they are "
+"mounted. Shrinking partitions still needs to happen while the partition is "
+"unmounted."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "It is a good idea to avoid creating very large partitions (over, say, "
-"20GiB), because of the time it takes to run "
-"<computeroutput>fsck</computeroutput> on them or to restore them from backup"
-" if the need arises.  It is better, if possible, to create several smaller "
-"partitions than one very large one."
+"20GiB), because of the time it takes to run <computeroutput>fsck</"
+"computeroutput> on them or to restore them from backup if the need arises.  "
+"It is better, if possible, to create several smaller partitions than one "
+"very large one."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The helper script <computeroutput>debian-edu-fsautoresize</computeroutput> "
 "is provided to make it easier to extend full partitions.  When invoked, it "
-"reads the configuration from <computeroutput>/usr/share/debian-edu-"
-"config/fsautoresizetab</computeroutput>, "
-"<computeroutput>/site/etc/fsautoresizetab</computeroutput> and "
-"<computeroutput>/etc/fsautoresizetab</computeroutput>.  It then proposes to "
-"extend partitions with too little free space, according to the rules "
-"provided in these files.  If run with no arguments, it will only show the "
-"commands needed to extend the file system. The argument "
+"reads the configuration from <computeroutput>/usr/share/debian-edu-config/"
+"fsautoresizetab</computeroutput>, <computeroutput>/site/etc/fsautoresizetab</"
+"computeroutput> and <computeroutput>/etc/fsautoresizetab</computeroutput>.  "
+"It then proposes to extend partitions with too little free space, according "
+"to the rules provided in these files.  If run with no arguments, it will "
+"only show the commands needed to extend the file system. The argument "
 "<computeroutput>-n</computeroutput> is needed to actually execute these "
 "commands to extend the file systems."
 msgstr ""
@@ -3975,9 +4108,9 @@ msgid ""
 "size in <computeroutput>etc/squid/squid.conf</computeroutput> needs to be "
 "updated as well.  The helper script <computeroutput>/usr/share/debian-edu-"
 "config/tools/squid-update-cachedir</computeroutput> is provided to do this "
-"automatically, checking the current partition size of "
-"<computeroutput>/var/spool/squid/</computeroutput> and configuring Squid to "
-"use 80% of this as its cache size."
+"automatically, checking the current partition size of <computeroutput>/var/"
+"spool/squid/</computeroutput> and configuring Squid to use 80% of this as "
+"its cache size."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -3987,16 +4120,15 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Logical Volume Management (LVM) enables resizing the partitions while they "
-"are mounted and in use. You can learn more about LVM from the <ulink "
-"url=\"http://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo</ulink>."
+"are mounted and in use. You can learn more about LVM from the <ulink url="
+"\"http://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To extend a logical volume manually you simply tell the "
 "<computeroutput>lvextend</computeroutput> command how large you want it to "
-"grow to. For example, to extend home0 to 30GB you use the following "
-"commands:"
+"grow to. For example, to extend home0 to 30GB you use the following commands:"
 msgstr ""
 
 #. type: CDATA
@@ -4017,9 +4149,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "If you (probably accidentally) installed a pure main-server profile and "
-"don't have a client with a web-browser handy, it's easy to install a minimal"
-" desktop on the main server using this command sequence in a (non-graphical)"
-" shell as the user you created during the main server's installation (first "
+"don't have a client with a web-browser handy, it's easy to install a minimal "
+"desktop on the main server using this command sequence in a (non-graphical) "
+"shell as the user you created during the main server's installation (first "
 "user):"
 msgstr ""
 
@@ -4054,9 +4186,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Note: <computeroutput>ldapvi</computeroutput> will use whatever is the "
-"default editor. By executing <computeroutput>export "
-"EDITOR=vim</computeroutput> in the shell prompt one can configure the "
-"environment to get a vi clone as editor."
+"default editor. By executing <computeroutput>export EDITOR=vim</"
+"computeroutput> in the shell prompt one can configure the environment to get "
+"a vi clone as editor."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4067,8 +4199,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be"
-" careful and don't mess up the LDAP database, same warning applies for "
+"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
+"careful and don't mess up the LDAP database, same warning applies for "
 "JXplorer."
 msgstr ""
 
@@ -4101,8 +4233,8 @@ msgstr "ldap-createuser-krb, et kommandolinjeverktøy"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>ldap-createuser-krb</computeroutput> is a small command line"
-" tool to create LDAP users and set their passwords in Kerberos. It's mostly "
+"<computeroutput>ldap-createuser-krb</computeroutput> is a small command line "
+"tool to create LDAP users and set their passwords in Kerberos. It's mostly "
 "useful for testing, though."
 msgstr ""
 
@@ -4113,14 +4245,14 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Since the Squeeze release, Debian has included packages formerly maintained "
-"in volatile.debian.org in the 2011 created <ulink "
-"url=\"http://wiki.debian.org/StableUpdates\">stable-updates suite</ulink>."
+"in volatile.debian.org in the 2011 created <ulink url=\"http://wiki.debian."
+"org/StableUpdates\">stable-updates suite</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"While you can use stable-updates directly, you don't have to: stable-updates"
-" are pushed into the stable suite regularily when stable point releases are "
+"While you can use stable-updates directly, you don't have to: stable-updates "
+"are pushed into the stable suite regularily when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 
@@ -4131,8 +4263,8 @@ msgstr "Å bruke backports.org til å installere nyere programvare"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "You are running Debian Edu because you prefer the stability of Debian Edu. "
-"It runs great; there is just one problem: sometimes software is a little bit"
-" more outdated than you like. This is where backports.debian.org steps in."
+"It runs great; there is just one problem: sometimes software is a little bit "
+"more outdated than you like. This is where backports.debian.org steps in."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4169,16 +4301,16 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Backports are automatically updated (if available) just like other packages."
-" (Previously, extra configuration was needed to achieve this, but since 2011"
-" this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
+"Backports are automatically updated (if available) just like other packages. "
+"(Previously, extra configuration was needed to achieve this, but since 2011 "
+"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
 "backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Like the normal archive, backports has three sections: main, contrib and "
-"non-free."
+"Like the normal archive, backports has three sections: main, contrib and non-"
+"free."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4240,8 +4372,8 @@ msgstr "Automatisk opprydding av prosesser som er til overs"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of"
-" background jobs. Background jobs are defined as processes that belong to "
+"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"background jobs. Background jobs are defined as processes that belong to "
 "users who are not currently logged into the machine. It's run by cron job "
 "once an hour."
 msgstr ""
@@ -4286,10 +4418,10 @@ msgstr "Autmatisk nedstenging av maskiner for natten"
 msgid ""
 "It is possible to save energy and money by automatically turning client "
 "machines off at night and back on in the morning. The package will try to "
-"turn off the machine every hour on the hour from 16:00 in the afternoon, but"
-" will not turn it off if it seems to have users.  It will try to tell the "
-"BIOS to turn on the machine around 07:00 in the morning, and the main-server"
-" will try to turn on machines from 06:30 by sending wake-on-lan packets. "
+"turn off the machine every hour on the hour from 16:00 in the afternoon, but "
+"will not turn it off if it seems to have users.  It will try to tell the "
+"BIOS to turn on the machine around 07:00 in the morning, and the main-server "
+"will try to turn on machines from 06:30 by sending wake-on-lan packets. "
 "These times can be changed in the crontabs of individual machines."
 msgstr ""
 
@@ -4314,11 +4446,10 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "There are two different methods available to wake up clients.  One uses a "
-"BIOS feature and requires a working and correct hardware clock, as well as a"
-" motherboard and BIOS version supported by <computeroutput>nvram-"
-"wakeup</computeroutput>; the other requires clients to have support for "
-"wake-on-lan, and the server to know about all the clients that need to be "
-"woken up."
+"BIOS feature and requires a working and correct hardware clock, as well as a "
+"motherboard and BIOS version supported by <computeroutput>nvram-wakeup</"
+"computeroutput>; the other requires clients to have support for wake-on-lan, "
+"and the server to know about all the clients that need to be woken up."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -4327,23 +4458,23 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"On clients that should turn off at night, touch <computeroutput>/etc"
-"/shutdown-at-night/shutdown-at-night</computeroutput>, or add the hostname "
-"(that is, the output from <computeroutput>'uname -n'</computeroutput> on the"
-" client) to the netgroup \"shutdown-at-night-hosts\". Adding hosts to the "
-"netgroup in LDAP can be done using the "
-"<computeroutput>GOsa²</computeroutput> web tool. The clients might need to "
-"have wake-on-lan configured in the BIOS. It is also important that the "
-"switches and routers used between the wake-on-lan server and the clients "
-"will pass the WOL packets to the clients even if the clients are turned off."
-" Some switches fail to pass on packets to clients that are missing in the "
-"ARP table on the switch, and this blocks the WOL packets."
+"On clients that should turn off at night, touch <computeroutput>/etc/"
+"shutdown-at-night/shutdown-at-night</computeroutput>, or add the hostname "
+"(that is, the output from <computeroutput>'uname -n'</computeroutput> on the "
+"client) to the netgroup \"shutdown-at-night-hosts\". Adding hosts to the "
+"netgroup in LDAP can be done using the <computeroutput>GOsa²</"
+"computeroutput> web tool. The clients might need to have wake-on-lan "
+"configured in the BIOS. It is also important that the switches and routers "
+"used between the wake-on-lan server and the clients will pass the WOL "
+"packets to the clients even if the clients are turned off. Some switches "
+"fail to pass on packets to clients that are missing in the ARP table on the "
+"switch, and this blocks the WOL packets."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To enable wake-on-lan on the server, add the clients to <computeroutput>/etc"
-"/shutdown-at-night/clients</computeroutput>, with one line per client, IP "
+"To enable wake-on-lan on the server, add the clients to <computeroutput>/etc/"
+"shutdown-at-night/clients</computeroutput>, with one line per client, IP "
 "address first, followed by MAC address (ethernet address), separated by a "
 "space; or create a script <computeroutput>/etc/shutdown-at-night/clients-"
 "generator</computeroutput> to generate the list of clients on the fly."
@@ -4351,8 +4482,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Here is an example <computeroutput>/etc/shutdown-at-night/clients-"
-"generator</computeroutput> for use with sitesummary:"
+"Here is an example <computeroutput>/etc/shutdown-at-night/clients-generator</"
+"computeroutput> for use with sitesummary:"
 msgstr ""
 
 #. type: CDATA
@@ -4387,9 +4518,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "To access machines behind a firewall from the Internet, consider installing "
-"the package <computeroutput>autossh</computeroutput>.  It can be used to set"
-" up an SSH tunnel to a machine on the Internet that you have access to. From"
-" that machine, you can access the server behind the firewall via the SSH "
+"the package <computeroutput>autossh</computeroutput>.  It can be used to set "
+"up an SSH tunnel to a machine on the Internet that you have access to. From "
+"that machine, you can access the server behind the firewall via the SSH "
 "tunnel."
 msgstr ""
 
@@ -4403,8 +4534,8 @@ msgstr ""
 msgid ""
 "In the default installation, all services are running on the main-server, "
 "tjener. To simplify moving some to another machine, there is a "
-"<emphasis>minimal</emphasis> installation profile available. Installing with"
-" this profile will lead to a machine, which is part of the Debian Edu "
+"<emphasis>minimal</emphasis> installation profile available. Installing with "
+"this profile will lead to a machine, which is part of the Debian Edu "
 "network, but which doesn't have any services running (yet)."
 msgstr ""
 
@@ -4441,9 +4572,9 @@ msgstr "Veiledninger fra wiki.debian.org"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are"
-" either user- or developer-specific. Let's move the user-specific HowTos "
-"over here (and delete them over there)! (But first ask the authors (see the "
+"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
+"either user- or developer-specific. Let's move the user-specific HowTos over "
+"here (and delete them over there)! (But first ask the authors (see the "
 "history of those pages to find them) if they are fine with moving the howto "
 "and putting it under the GPL.)"
 msgstr ""
@@ -4466,8 +4597,8 @@ msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink "
-"url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication\"/>"
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
+"\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -4497,8 +4628,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"
 
@@ -4510,8 +4640,7 @@ msgstr ""
 msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Department"
 msgstr ""
 
@@ -4519,44 +4648,41 @@ msgstr ""
 msgid ""
 "Main menu: goto 'Directory structure', click the 'Students' department. The "
 "'Base' field should show '/Students'. From the drop box 'Actions' choose "
-"'Create'/'Department'. Fill in values for Name (2014) and Description fields"
-" (students graduating in 2014), leave the Base field as is (should be "
-"'/Students'). Save it clicking 'Ok'. Now the new department (2014) should "
-"show up below /Students. Click it."
+"'Create'/'Department'. Fill in values for Name (2014) and Description fields "
+"(students graduating in 2014), leave the Base field as is (should be '/"
+"Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
+"up below /Students. Click it."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Group"
 msgstr "Gruppe"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name"
-" (leave 'Base' as is, should be /Students/2014) and click the check box left"
-" of 'Samba group'. 'Ok' to save it."
+"Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name "
+"(leave 'Base' as is, should be /Students/2014) and click the check box left "
+"of 'Samba group'. 'Ok' to save it."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Template"
 msgstr "Mal"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Choose 'users' from the main menu. Change to 'Students' in the Base field. "
-"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click"
-" it. This is the 'students' template, not a real user. As you'll have to "
+"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"it. This is the 'students' template, not a real user. As you'll have to "
 "create such a template (to be able to use csv import for your structure) "
 "based on this one, notice all entries showing up in the Generic, POSIX and "
-"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base"
-" field; choose Create/Template and start to fill in your desired values, "
-"first the Generic tab (add your new 2014 group under Group Membership, too),"
-" then add POSIX and Samba account."
+"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base "
+"field; choose Create/Template and start to fill in your desired values, "
+"first the Generic tab (add your new 2014 group under Group Membership, too), "
+"then add POSIX and Samba account."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Importer brukere"
 
@@ -4627,8 +4753,8 @@ msgstr ""
 msgid ""
 "When users insert a USB drive or a DVD / CDROM into a thin client there is "
 "only a notify-window showing up for a few seconds. The media is "
-"automatically mounted and it is possible to access it browsing to the "
-"/media/$user folder. This is quite difficult for many non experienced users."
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4643,11 +4769,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"In addition the following script could be used to create the symlink "
-"\"media\" for all users in their home folder for easy access to USB drives, "
-"CDROM / DVD or whatever media is connected to the thin client. This might "
-"come in handy if users want to edit files directly on their plugged in "
-"media."
+"In addition the following script could be used to create the symlink \"media"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
+"DVD or whatever media is connected to the thin client. This might come in "
+"handy if users want to edit files directly on their plugged in media."
 msgstr ""
 
 #. type: CDATA
@@ -4687,8 +4812,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"This is being tracked as <ulink "
-"url=\"http://bugs.skolelinux.org/1376\">Debian Edu bug #1376</ulink>."
+"This is being tracked as <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian Edu bug #1376</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4703,17 +4828,16 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add a new system of type server using GOsa² as outlined in the <link "
-"linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
-"started</link> chapter of this manual."
+"Add a new system of type server using GOsa² as outlined in the <link linkend="
+"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
+"link> chapter of this manual."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. 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 server are exported to the relevant subnets or machines:"
+"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 "
+"server are exported to the relevant subnets or machines:"
 msgstr ""
 
 #. type: CDATA
@@ -4725,8 +4849,7 @@ msgid ""
 "    root at tjener:~#"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Here everything on the backbone network is granted access to the /storage "
 "export. (This could be restricted to netgroup membership or single IP "
@@ -4740,22 +4863,19 @@ msgid ""
 "clients to automatically mount the new export on request."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This can't be done using GOsa², because a module for automount is missing. "
 "Instead, use ldapvi and add the required LDAP objects using an editor."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b "
-"ou=automount,dc=skole,dc=skolelinux,dc=no</computeroutput>"
+"<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
+"dc=skolelinux,dc=no</computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "When the editor shows up, add the following LDAP objects at the bottom of "
 "the document. (The \"/&\" part in the last LDAP object is a wild card "
@@ -4788,18 +4908,17 @@ msgid ""
 "does not use automount to avoid mounting loops:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Create the mount directories using <computeroutput>mkdir</computeroutput>, "
-"edit '/etc/fstab' as adequate and run <computeroutput>mount "
-"-a</computeroutput> to mount the new resources."
+"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
+"computeroutput> to mount the new resources."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Now users should be able to access the files on 'nas-server.intern' directly"
-" by just visiting the '/tjener/nas-server/storage/' directory using any "
+"Now users should be able to access the files on 'nas-server.intern' directly "
+"by just visiting the '/tjener/nas-server/storage/' directory using any "
 "application on any workstation, LTSP client or LTSP server."
 msgstr ""
 
@@ -4828,28 +4947,24 @@ msgstr ""
 msgid "Managing this case with GOsa is quite simple:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Create a group <computeroutput>sshusers</computeroutput> on the root level "
-"(where already other system management related groups like <computeroutput"
-">gosa-admins</computeroutput> show up)."
+"(where already other system management related groups like "
+"<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add <computeroutput>AllowGroups sshusers</computeroutput> to "
-"/etc/ssh/sshd_config."
+"Add <computeroutput>AllowGroups sshusers</computeroutput> to /etc/ssh/"
+"sshd_config."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Execute <computeroutput>service ssh restart</computeroutput>."
 msgstr ""
 
@@ -4863,13 +4978,11 @@ msgid ""
 "different approach using PAM is needed."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Enable pam_access.so in the LTSP server's /etc/pam.d/sshd file."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Configure /etc/security/access.conf to allow connections for (sample) users "
 "alice, jane, bob and john from everywhere and for all other users only from "
@@ -4902,8 +5015,8 @@ msgid ""
 "If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
 "server or LTSP cluster setup) things would be even more complicated and "
 "maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable"
-" internal ssh login."
+"identifier together with apropriate PAM configuration would allow to disable "
+"internal ssh login."
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -4917,14 +5030,14 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Customisations to the KDM login screen are made by adding a file in "
-"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to"
-" override the default."
+"<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
+"override the default."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Here is one example used to activate the theme in the <computeroutput"
-">desktop-base</computeroutput> package:"
+"Here is one example used to activate the theme in the "
+"<computeroutput>desktop-base</computeroutput> package:"
 msgstr ""
 
 #. type: CDATA
@@ -4946,15 +5059,14 @@ msgstr "Bruk av KDE «Plasma», GNOME og LXDE sammen"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link"
-" linkend=\"Installation--The_installation_process\">installation "
+"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
+"linkend=\"Installation--The_installation_process\">installation "
 "instructions</link>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To install other desktop environments after installation, simply use apt-"
-"get:"
+"To install other desktop environments after installation, simply use apt-get:"
 msgstr ""
 
 #. type: CDATA
@@ -4966,8 +5078,8 @@ msgstr ""
 msgid ""
 "Users will then be able to choose the desktop environment via the login "
 "manager before logging in. The usage of LXDE as default on thin clients can "
-"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for"
-" details."
+"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for "
+"details."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4981,8 +5093,8 @@ msgid ""
 "the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
-"<computeroutput>contrib</computeroutput> enabled in "
-"<computeroutput>/etc/apt/sources.list</computeroutput>."
+"<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
+"sources.list</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4991,10 +5103,10 @@ msgstr "Avspilling av DVD"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"libdvdcss is needed for playing most commercial DVDs. For legal reasons it's"
-" not included in Debian (Edu).  If you are legally allowed to use it, you "
-"can use the packages from deb-multimedia.org. Add the multimedia repository "
-"(as described in the following section) and install the required libraries:"
+"libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
+"not included in Debian (Edu).  If you are legally allowed to use it, you can "
+"use the packages from deb-multimedia.org. Add the multimedia repository (as "
+"described in the following section) and install the required libraries:"
 msgstr ""
 
 #. type: CDATA
@@ -5048,8 +5160,8 @@ msgstr "Introduksjon til Tynneklienter og Diskløse arbeidstasjoner"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "One generic term for both thin clients and diskless workstations is "
-"<emphasis>LTSP client</emphasis>. <ulink url=\"http://ltsp.org\">LTSP is the"
-" Linux Terminal Server Project</ulink>."
+"<emphasis>LTSP client</emphasis>. <ulink url=\"http://ltsp.org\">LTSP is the "
+"Linux Terminal Server Project</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5114,9 +5226,9 @@ msgstr ""
 msgid ""
 "LTSP client boot will fail if the client's network card requires a non-free "
 "firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing "
-"XXX.bin file then non-free firmware has to be added to the initrd used by "
-"LTSP clients."
+"netbooting a machine; if the Debian Installer complains about a missing XXX."
+"bin file then non-free firmware has to be added to the initrd used by LTSP "
+"clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5186,8 +5298,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be"
-" started as diskless workstation or thin client. By default clients in the "
+"Using the default PXE menu on the main subnet 10.0.0.0/8, a machine could be "
+"started as diskless workstation or thin client. By default clients in the "
 "separate subnet 192.168.0.0/24 will run as diskless workstations if the "
 "amount of RAM is sufficient.  If all clients in this LTSP client subnet "
 "should run as thin clients, the following has to be done."
@@ -5212,8 +5324,8 @@ msgstr "Konfigurering av PXE-menyen"
 msgid ""
 "The PXE configuration is generated using the script <computeroutput>debian-"
 "edu-pxeinstall</computeroutput>.  It allows some settings to be overridden "
-"by adding a file <computeroutput>/etc/debian-"
-"edu/pxeinstall.conf</computeroutput> with replacement values."
+"by adding a file <computeroutput>/etc/debian-edu/pxeinstall.conf</"
+"computeroutput> with replacement values."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5245,24 +5357,23 @@ msgid ""
 "settings from the settings used when installing the main-server, and the "
 "other questions will be asked during installation (profile, popcon "
 "participation, partitioning and root password). To avoid these questions, "
-"the file <computeroutput>/etc/debian-edu/www/debian-edu-"
-"install.dat</computeroutput> can be modified to provide preselected answers "
-"to debconf values. Some examples of available debconf values are already "
-"commented in <computeroutput>/etc/debian-edu/www/debian-edu-"
-"install.dat</computeroutput>. Your changes will be lost as soon as "
-"<computeroutput>debian-edu-pxeinstall</computeroutput> is used to recreate "
-"the PXE-installation environment. To append debconf values to "
-"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput> "
-"during recreation with <computeroutput>debian-edu-"
-"pxeinstall</computeroutput>, add the file <computeroutput>/etc/debian-"
+"the file <computeroutput>/etc/debian-edu/www/debian-edu-install.dat</"
+"computeroutput> can be modified to provide preselected answers to debconf "
+"values. Some examples of available debconf values are already commented in "
+"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</computeroutput>. "
+"Your changes will be lost as soon as <computeroutput>debian-edu-pxeinstall</"
+"computeroutput> is used to recreate the PXE-installation environment. To "
+"append debconf values to <computeroutput>/etc/debian-edu/www/debian-edu-"
+"install.dat</computeroutput> during recreation with <computeroutput>debian-"
+"edu-pxeinstall</computeroutput>, add the file <computeroutput>/etc/debian-"
 "edu/www/debian-edu-install.dat.local</computeroutput> with your additional "
 "debconf values."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"More information about modifying PXE installations can be found in the <link"
-" linkend=\"Installation--Modifying_PXE_installations\">Installation</link> "
+"More information about modifying PXE installations can be found in the <link "
+"linkend=\"Installation--Modifying_PXE_installations\">Installation</link> "
 "chapter."
 msgstr ""
 
@@ -5272,9 +5383,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"For adding a custom repository add something like this to "
-"<computeroutput>/etc/debian-edu/www/debian-edu-"
-"install.dat.local</computeroutput>:"
+"For adding a custom repository add something like this to <computeroutput>/"
+"etc/debian-edu/www/debian-edu-install.dat.local</computeroutput>:"
 msgstr ""
 
 #. type: CDATA
@@ -5289,8 +5399,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"and then run <computeroutput>/usr/sbin/debian-edu-"
-"pxeinstall</computeroutput> once."
+"and then run <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
+"computeroutput> once."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5299,12 +5409,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The PXE menu allows network booting of LTSP clients, the installer and other"
-" alternatives.  The file "
-"<computeroutput>/var/lib/tftpboot/pxelinux.cfg/default</computeroutput> is "
-"used by default if no other file in that directory matches the client, and "
-"out of the box it is set to link to <computeroutput>/var/lib/tftpboot"
-"/debian-edu/default-menu.cfg</computeroutput>."
+"The PXE menu allows network booting of LTSP clients, the installer and other "
+"alternatives.  The file <computeroutput>/var/lib/tftpboot/pxelinux.cfg/"
+"default</computeroutput> is used by default if no other file in that "
+"directory matches the client, and out of the box it is set to link to "
+"<computeroutput>/var/lib/tftpboot/debian-edu/default-menu.cfg</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5315,9 +5425,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5328,15 +5436,13 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"See also the PXELINUX documentation at <ulink "
-"url=\"http://syslinux.zytor.com/wiki/index.php/PXELINUX\"/> ."
+"See also the PXELINUX documentation at <ulink url=\"http://syslinux.zytor."
+"com/wiki/index.php/PXELINUX\"/> ."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5355,45 +5461,36 @@ msgid ""
 "network, when tjener is not a combined server, follow these steps:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
 "same directory on tjener."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"copy <computeroutput>/var/lib/tftpboot/debian-edu/default-"
-"diskless.cfg</computeroutput> to the same directory on tjener."
+"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 uses 10.0.2.10 for the IP address of ltspserver00 on the "
-"main network:"
+"edit <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+"computeroutput> to use the IP address of ltspserver00; the following example "
+"uses 10.0.2.10 for the IP address of ltspserver00 on the main network:"
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img "
-"nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet "
-"ipappend 2"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. 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/debian-edu/default-"
-"diskless.cfg</computeroutput>."
+"set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+"debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5412,10 +5509,10 @@ msgid ""
 "using the Thin-Client-Server profile. If loads of LTSP clients are used or "
 "if different LTSP servers should serve both i386 and amd64 chroot "
 "environments the second preconfigured network 192.168.1.0/24 could be used "
-"as well. Edit the file "
-"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1"
-" settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
-"other LDAP editor to inspect DNS and DHCP configuration."
+"as well. Edit the file <computeroutput>/etc/network/interfaces</"
+"computeroutput> and adjust the eth1 settings accordingly. Use "
+"<computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect "
+"DNS and DHCP configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5425,11 +5522,10 @@ msgstr "Endre nettverksoppsett"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The debian-edu-config package comes with a tool which helps in changing the "
-"network from 10.0.0.0/8 to something else. Have a look at "
-"<computeroutput>/usr/share/debian-edu-config/tools/subnet-"
-"change</computeroutput>.  It is intended for use just after installation on "
-"the main server, to update LDAP and other files that need to be edited to "
-"change the subnet."
+"network from 10.0.0.0/8 to something else. Have a look at <computeroutput>/"
+"usr/share/debian-edu-config/tools/subnet-change</computeroutput>.  It is "
+"intended for use just after installation on the main server, to update LDAP "
+"and other files that need to be edited to change the subnet."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5461,42 +5557,42 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To configure specific thin clients with particular features, you can add "
-"settings in LDAP or edit the file "
-"<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>."
+"settings in LDAP or edit the file <computeroutput>/opt/ltsp/i386/etc/lts."
+"conf</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"We recommend to configure clients in LDAP (and not edit "
-"<computeroutput>lts.conf</computeroutput> directly--however, configuration "
-"webforms for LTSP are currently not available in GOsa², you have to use a "
-"plain LDAP browser/explorer or <computeroutput>ldapvi</computeroutput>), as "
-"this makes it possible to add and/or replace LTSP servers without loosing "
-"(or having to redo) configuration."
+"We recommend to configure clients in LDAP (and not edit <computeroutput>lts."
+"conf</computeroutput> directly--however, configuration webforms for LTSP are "
+"currently not available in GOsa², you have to use a plain LDAP browser/"
+"explorer or <computeroutput>ldapvi</computeroutput>), as this makes it "
+"possible to add and/or replace LTSP servers without loosing (or having to "
+"redo) configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "The default values in LDAP are defined in the "
-"<computeroutput>cn=ltspConfigDefault,ou=ltsp,dc=skole,dc=skolelinux,dc=no</computeroutput>"
-" LDAP object using the <computeroutput>ltspConfig</computeroutput> "
-"attribute.  One can also add host specific entries in LDAP."
+"<computeroutput>cn=ltspConfigDefault,ou=ltsp,dc=skole,dc=skolelinux,dc=no</"
+"computeroutput> LDAP object using the <computeroutput>ltspConfig</"
+"computeroutput> attribute.  One can also add host specific entries in LDAP."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man"
-" lts.conf\" to have a look at available configuration options (see "
+"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
+"lts.conf\" to have a look at available configuration options (see "
 "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
 "detailed information about LTSP)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The default values are defined under "
-"<computeroutput>[default]</computeroutput>; to configure one client, specify"
-" it in terms of its MAC address or IP address like this: "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"The default values are defined under <computeroutput>[default]</"
+"computeroutput>; to configure one client, specify it in terms of its MAC "
+"address or IP address like this: <computeroutput>[192.168.0.10]</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5529,7 +5625,9 @@ msgstr ""
 msgid ""
 "[192.168.0.11]\n"
 "XSERVER = nvidia"
-msgstr "[192.168.0.11]\nXSERVER = nvidia"
+msgstr ""
+"[192.168.0.11]\n"
+"XSERVER = nvidia"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5539,10 +5637,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"To use IP addresses in <computeroutput>lts.conf</computeroutput> you need to"
-" add the client MAC address to your DHCP server. Otherwise you should use "
-"the client MAC address directly in your "
-"<computeroutput>lts.conf</computeroutput> file."
+"To use IP addresses in <computeroutput>lts.conf</computeroutput> you need to "
+"add the client MAC address to your DHCP server. Otherwise you should use the "
+"client MAC address directly in your <computeroutput>lts.conf</"
+"computeroutput> file."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5577,11 +5675,10 @@ msgstr "Del 1"
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "It is possible to set up the clients to connect to one of several LTSP "
-"servers for load-balancing. This is done by providing "
-"<computeroutput>/opt/ltsp/i386/usr/share/ltsp/get_hosts</computeroutput> as "
-"a script printing one or more servers for LDM to connect to. In addition to "
-"this, each LTSP chroot needs to include the SSH host key for each of the "
-"servers."
+"servers for load-balancing. This is done by providing <computeroutput>/opt/"
+"ltsp/i386/usr/share/ltsp/get_hosts</computeroutput> as a script printing one "
+"or more servers for LDM to connect to. In addition to this, each LTSP chroot "
+"needs to include the SSH host key for each of the servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -5597,10 +5694,10 @@ msgstr ""
 msgid ""
 "The load-balancing server must be announced to the clients as the \"next-"
 "server\" via DHCP. As DHCP configuration is in LDAP, modifications have to "
-"be done there. Use <computeroutput>ldapvi --ldap-conf -ZD "
-"'(cn=admin)'</computeroutput> to edit the appropriate entry in LDAP. (Enter "
-"the main server's root password at the prompt; if VISUAL isn't set, the "
-"default editor will be nano.) Search for a line reading "
+"be done there. Use <computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)'</"
+"computeroutput> to edit the appropriate entry in LDAP. (Enter the main "
+"server's root password at the prompt; if VISUAL isn't set, the default "
+"editor will be nano.) Search for a line reading "
 "<computeroutput>dhcpStatements: next-server tjener</computeroutput> Next-"
 "server should be the IP address or hostname of the server you chose to be "
 "the load-balancing server. If you use hostname you must have a working DNS. "
@@ -5610,9 +5707,9 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Now you have to move your clients from the 192.168.0.0 network to the "
-"10.0.0.0 network; attach them to the backbone network instead of the network"
-" attached to the LTSP server's second network card. This is because when you"
-" use load-balancing, the clients need direct access to the server chosen by "
+"10.0.0.0 network; attach them to the backbone network instead of the network "
+"attached to the LTSP server's second network card. This is because when you "
+"use load-balancing, the clients need direct access to the server chosen by "
 "LDM. If you leave your clients on the 192.168.0.0 network, all of the "
 "clients' traffic will go through that server before it reaches the chosen "
 "LDM server."
@@ -5626,8 +5723,8 @@ msgstr "Del 2"
 msgid ""
 "Now you have to make a \"get_hosts\" script that prints a server for LDM to "
 "connect to. The parameter LDM_SERVER overrides this script. In consequence, "
-"this parameter must not be defined if the get_hosts is going to be used. The"
-" get_hosts script writes on the standard output each server IP address or "
+"this parameter must not be defined if the get_hosts is going to be used. The "
+"get_hosts script writes on the standard output each server IP address or "
 "host name, in random order."
 msgstr ""
 
@@ -5643,9 +5740,9 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Replace xxxx with either the IP addresses or hostnames of the servers as a "
-"space-separated list. Then, put the following script in "
-"<computeroutput>/opt/ltsp/i386/usr/lib/ltsp/get_hosts</computeroutput> on "
-"the server you chose to be the load-balancing server."
+"space-separated list. Then, put the following script in <computeroutput>/opt/"
+"ltsp/i386/usr/lib/ltsp/get_hosts</computeroutput> on the server you chose to "
+"be the load-balancing server."
 msgstr ""
 
 #. type: CDATA
@@ -5675,21 +5772,20 @@ msgstr "Del 3"
 msgid ""
 "Now that you've made the \"get_hosts\" script, it's time to make the SSH "
 "host key for the LTSP chroots. This can be done by making a file containing "
-"the content of "
-"<computeroutput>/opt/ltsp/i386/etc/ssh/ssh_known_hosts</computeroutput> from"
-" all the LTSP servers that will be load-balanced. Save this file as "
-"<computeroutput>/etc/ltsp/ssh_known_hosts.extra</computeroutput> on all "
-"load-balanced servers. The last step is very important because ltsp-update-"
-"sshkeys runs every time a server is booted, and "
-"<computeroutput>/etc/ltsp/ssh_known_hosts.extra</computeroutput> is included"
-" if it exists."
+"the content of <computeroutput>/opt/ltsp/i386/etc/ssh/ssh_known_hosts</"
+"computeroutput> from all the LTSP servers that will be load-balanced. Save "
+"this file as <computeroutput>/etc/ltsp/ssh_known_hosts.extra</"
+"computeroutput> on all load-balanced servers. The last step is very "
+"important because ltsp-update-sshkeys runs every time a server is booted, "
+"and <computeroutput>/etc/ltsp/ssh_known_hosts.extra</computeroutput> is "
+"included if it exists."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"If you save your new host file as "
-"<computeroutput>/opt/ltsp/i386/etc/ssh/ssh_known_hosts</computeroutput>, it "
-"will be erased when you reboot the server."
+"If you save your new host file as <computeroutput>/opt/ltsp/i386/etc/ssh/"
+"ssh_known_hosts</computeroutput>, it will be erased when you reboot the "
+"server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -5715,16 +5811,16 @@ msgid ""
 "ESD, PulseAudio and ALSA.  ESD and PulseAudio support networked audio and "
 "are used to pass audio from the server to the clients.  ALSA is configured "
 "to redirect its sound via PulseAudio.  For selected applications only "
-"supporting the OSS audio system, a wrapper is created by "
-"<computeroutput>/usr/sbin/debian-edu-ltsp-audiodivert</computeroutput> to "
-"redirect their sound to PulseAudio.  Run this script without arguments to "
-"get a list of applications with such redirection enabled."
+"supporting the OSS audio system, a wrapper is created by <computeroutput>/"
+"usr/sbin/debian-edu-ltsp-audiodivert</computeroutput> to redirect their "
+"sound to PulseAudio.  Run this script without arguments to get a list of "
+"applications with such redirection enabled."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"LTSP diskless workstations handle audio locally and have none of the special"
-" setup needed for networked audio."
+"LTSP diskless workstations handle audio locally and have none of the special "
+"setup needed for networked audio."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5733,8 +5829,8 @@ msgstr "Oppgradere LTSP-miljøet"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"It is useful to upgrade the LTSP environment with new packages fairly often,"
-" to make sure security fixes and improvements are made available.  To "
+"It is useful to upgrade the LTSP environment with new packages fairly often, "
+"to make sure security fixes and improvements are made available.  To "
 "upgrade, run these commands as user root on each LTSP server:"
 msgstr ""
 
@@ -5779,11 +5875,10 @@ msgid ""
 "preventing unauthorised superuser access, password sniffing, and other "
 "tricks which may be used on a local network. One such security measure is "
 "secure login using SSH, which is the default with LDM. This can slow down "
-"some client machines which are more than about ten years old, with as little"
-" as a 160 MHz processor and 32 MB RAM. Although it's not recommended, you "
-"can add the value \"True\" in the "
-"<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput> file on the "
-"server:"
+"some client machines which are more than about ten years old, with as little "
+"as a 160 MHz processor and 32 MB RAM. Although it's not recommended, you can "
+"add the value \"True\" in the <computeroutput>/opt/ltsp/i386/etc/lts.conf</"
+"computeroutput> file on the server:"
 msgstr ""
 
 #. type: CDATA
@@ -5822,8 +5917,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption."
-" Passwords will travel in cleartext over the network, as well as anything "
+"<emphasis role=\"strong\">Warning</emphasis>: XDMCP does not use encryption. "
+"Passwords will travel in cleartext over the network, as well as anything "
 "else."
 msgstr ""
 
@@ -5903,8 +5998,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener,"
-" enables Windows clients to store profiles and user data, and also "
+"joined. A special service called Samba, installed on the main-server tjener, "
+"enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
 
@@ -5917,8 +6012,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
-"logout. Depending on how much data is stored in the profile, this could take"
-" some time. To minimise the time needed, deactivate things like local cache "
+"logout. Depending on how much data is stored in the profile, this could take "
+"some time. To minimise the time needed, deactivate things like local cache "
 "in browsers (you can use the Squid proxy cache installed on tjener instead) "
 "and save files into the H: volume rather than under \"My Documents\"."
 msgstr ""
@@ -5947,8 +6042,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"FIXME: It would be even better to first/also explain user groups for Windows"
-" with GOsa² (and then show an example for the command line)"
+"FIXME: It would be even better to first/also explain user groups for Windows "
+"with GOsa² (and then show an example for the command line)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -5986,8 +6081,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Since the profile is copied from the server to the machine during logon, and"
-" copied back to the server during logout, a large profile can make Windows "
+"Since the profile is copied from the server to the machine during logon, and "
+"copied back to the server during logout, a large profile can make Windows "
 "login/logout painfully slow. There can be many reasons for a large profile, "
 "but the most common problem is that users save their files on the Windows "
 "desktop or in the \"My Documents\" folder instead of in their home "
@@ -6006,11 +6101,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis>Tweaking the profile</emphasis>: a different approach to dealing "
-"with the problem is to remove parts of the profile, and redirect other parts"
-" to regular file storage. This moves the workload from the users to the "
+"with the problem is to remove parts of the profile, and redirect other parts "
+"to regular file storage. This moves the workload from the users to the "
 "administrator, while adding complexity to the installation. There are at "
-"least three ways to edit the parts that are removed from the roaming "
-"profile."
+"least three ways to edit the parts that are removed from the roaming profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -6025,20 +6119,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">Note</emphasis> The examples are outdated since in"
-" wheezy kerberos was configured for samba too!"
+"<emphasis role=\"strong\">Note</emphasis> The examples are outdated since in "
+"wheezy kerberos was configured for samba too!"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "You should hopefully find an example smb.conf in your preferred language "
-"delivered by the installation on tjener under <computeroutput>/usr/share"
-"/debian-edu-config/examples/</computeroutput>. The source file is in English"
-" and is called <computeroutput>smb-roaming-profiles-"
-"en.conf</computeroutput>; look for a file with the appropriate code in the "
-"filename (the German translation, for example, will be named <computeroutput"
-">smb-roaming-profiles-de.conf</computeroutput>). Inside the config file are "
-"a lot of explanations which you should have a look at."
+"delivered by the installation on tjener under <computeroutput>/usr/share/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
+"translation, for example, will be named <computeroutput>smb-roaming-profiles-"
+"de.conf</computeroutput>). Inside the config file are a lot of explanations "
+"which you should have a look at."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -6049,63 +6143,53 @@ msgstr ""
 msgid "Machine policies can be edited and copied to all the other computers."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
-"Pick a freshly installed Windows computer, and run "
-"<computeroutput>gpedit.msc</computeroutput>"
+"Pick a freshly installed Windows computer, and run <computeroutput>gpedit."
+"msc</computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
-"Under the selection \"User Configuration\" -> \"Administrative "
-"Templates\" -> \"System\" -> \"User Profiles\" -> \"Exclude "
-"directories in roaming profile\", you can enter a semicolon-separated list "
-"of directories to exclude from the profile.  The directories are "
-"internationalised and must be written in your own language the way they are "
-"in the profile. Examples of directories to exclude are:"
+"Under the selection \"User Configuration\" -> \"Administrative Templates"
+"\" -> \"System\" -> \"User Profiles\" -> \"Exclude directories in "
+"roaming profile\", you can enter a semicolon-separated list of directories "
+"to exclude from the profile.  The directories are internationalised and must "
+"be written in your own language the way they are in the profile. Examples of "
+"directories to exclude are:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "log"
 msgstr "logg"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Locale settings"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Temporary Internet Files"
 msgstr "Midlertidige Internettfiler"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "My Documents"
 msgstr "Mine Dokumenter"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Application Data"
 msgstr "Applikasjonsdata"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Save your changes, and exit the editor."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Copy <computeroutput>c:\\windows\\system32\\GroupPolicy</computeroutput> to "
 "all other Windows machines."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "It's a good idea to copy it to your Windows OS deployment system to have it "
 "included at install time."
@@ -6117,10 +6201,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"By using the legacy Windows policy editor "
-"(<computeroutput>poledit.exe</computeroutput>), you can can create a Policy "
-"file (NTConfig.pol) and put it in your netlogon share on tjener. This has "
-"the advantage of working almost instantly on all Windows machines."
+"By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
+"computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
+"in your netlogon share on tjener. This has the advantage of working almost "
+"instantly on all Windows machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -6131,11 +6215,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"With <computeroutput>poledit.exe</computeroutput> you can create .pol files."
-" If you put such a file on tjener as "
-"<computeroutput>/etc/samba/netlogon/NTLOGON.POL</computeroutput> it will "
-"automatically be read by Windows machines and temporarily overwrite the "
-"registry, thus applying the changes."
+"With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
+"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
+"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
+"machines and temporarily overwrite the registry, thus applying the changes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -6148,16 +6231,16 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"Be aware that the new group policy tools, "
-"<computeroutput>gpedit.msc</computeroutput> and "
-"<computeroutput>gpmc.msc</computeroutput>, cannot create .pol files; they "
-"either only work for the local machine or need an Active Directory server."
+"Be aware that the new group policy tools, <computeroutput>gpedit.msc</"
+"computeroutput> and <computeroutput>gpmc.msc</computeroutput>, cannot "
+"create .pol files; they either only work for the local machine or need an "
+"Active Directory server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"If you understand German, <ulink url=\"http://gruppenrichtlinien.de\"/> is a"
-" very good web site on this topic."
+"If you understand German, <ulink url=\"http://gruppenrichtlinien.de\"/> is a "
+"very good web site on this topic."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -6170,44 +6253,37 @@ msgid ""
 "to other computers"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Start the Registry Editor."
 msgstr "Start registereditoren"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Navigate to <computeroutput>HKEY_CURRENT_USER\\Software\\Microsoft\\Windows "
 "NT\\CurrentVersion\\Winlogon</computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Use the menu \"Edit menu\" -> \"New\" -> \"String Value\"."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Call it <computeroutput>ExcludeProfileDirs</computeroutput>"
 msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
-"Enter a semicolon-separated list of paths to exclude (in the same way as for"
-" a machine policy)"
+"Enter a semicolon-separated list of paths to exclude (in the same way as for "
+"a machine policy)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Now you can choose to export this registry key as a .reg file. Mark a "
 "selection, right-click, and select \"Export\"."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Save the file and you can double click it, or add it to a script to spread "
 "it to other machines."
@@ -6217,27 +6293,27 @@ 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\"/>"
-msgstr "<ulink url=\"http://technet2.microsoft.com/windowsserver/en/technologies/featured/gp/default.mspx\"/>"
+"<ulink url=\"http://technet2.microsoft.com/windowsserver/en/technologies/"
+"featured/gp/default.mspx\"/>"
+msgstr ""
+"<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\"/>"
-msgstr "<ulink url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/PolicyMgmt.html\"/>"
+"<ulink url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/"
+"PolicyMgmt.html\"/>"
+msgstr ""
+"<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\"/>"
 
@@ -6260,8 +6336,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"All the instructions given above about machine policies apply here too.  You"
-" can use <computeroutput>gpedit.msc</computeroutput> to edit the policy and "
+"All the instructions given above about machine policies apply here too.  You "
+"can use <computeroutput>gpedit.msc</computeroutput> to edit the policy and "
 "copy it to all machines. The redirection should be available under \"User "
 "Configuration\" -> \"Windows Settings\" -> \"Folder Redirection\". "
 "Directories that it can be useful to redirect include \"Desktop\" and \"My "
@@ -6275,18 +6351,16 @@ msgid ""
 "not want this, you should disable it via one of the following routes:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"\"User Configuration\" -> \"Administrative Templates\" -> \"Network\" "
-"-> \"Offline Files\""
+"\"User Configuration\" -> \"Administrative Templates\" -> \"Network\" -"
+"> \"Offline Files\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"\"Computer Configuration\" -> \"Administrative Templates\" -> "
-"\"Network\" -> \"Offline Files\""
+"\"Computer Configuration\" -> \"Administrative Templates\" -> \"Network"
+"\" -> \"Offline Files\""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -6295,8 +6369,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"FIXME: explain how to use profiles from global policies for Windows machines"
-" in the skolelinux network"
+"FIXME: explain how to use profiles from global policies for Windows machines "
+"in the skolelinux network"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -6374,38 +6448,33 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Some municipalities provide a remote desktop solution so that students and "
-"teachers can access Skolelinux from their home computer running Windows, Mac"
-" or Linux."
+"teachers can access Skolelinux from their home computer running Windows, Mac "
+"or Linux."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Available Remote Desktop clients"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default and is "
 "captable of RDP and VNC."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "RDP - the easiest way to access Windows terminal server. An alternative "
 "client package is <computeroutput>rdesktop</computeroutput>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "VNC client (Virtual Network Computer) gives access to Skolelinux remotely.  "
-"An alternative client package is "
-"<computeroutput>xvncviewer</computeroutput>."
+"An alternative client package is <computeroutput>xvncviewer</computeroutput>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "NX graphical client gives students and teachers access to Skolelinux "
 "remotely on Windows, Mac or Linux PC. One municipality in Norway has "
@@ -6413,22 +6482,25 @@ msgid ""
 "solution is stable."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/CitrixApps\">Citrix ICA "
 "client HowTo</ulink> to access Windows terminal server from Skolelinux."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs\"/>"
+msgid ""
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs\"/>"
+msgstr ""
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs\"/>"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink "
-"url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation\"/>"
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation"
+"\"/>"
+msgstr ""
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LtspDisklessWorkstation"
+"\"/>"
 
 #. type: Content of: <article><section><title>
 msgid "Samba in Debian Edu"
@@ -6464,8 +6536,7 @@ msgid ""
 "smbclient) to browse your Windows/Samba network environment."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "START -> Run command"
 msgstr "START -> Kjør kommando"
 
@@ -6475,9 +6546,9 @@ msgstr "skriv \\\\TJENER og trykk retur"
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 msgid ""
-"-> a Windows Explorer window should open and show the netlogon share on "
-"\\\\TJENER, and maybe printers you already have configured for printing "
-"under Unix/Linux (CUPS queues)."
+"-> a Windows Explorer window should open and show the netlogon share on \\"
+"\\TJENER, and maybe printers you already have configured for printing under "
+"Unix/Linux (CUPS queues)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -6486,27 +6557,25 @@ msgstr "Tilgang til filer via Samba"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Student and teacher user accounts that have been configured via GOsa² should"
-" be able to authenticate against \\\\TJENER\\HOMES or "
-"\\\\TJENER\\<username> and access their home directories with Windows "
-"machines <emphasis role=\"strong\">not</emphasis> joined to the Windows "
-"SKOLELINUX domain."
+"Student and teacher user accounts that have been configured via GOsa² should "
+"be able to authenticate against \\\\TJENER\\HOMES or \\\\TJENER\\<"
+"username> and access their home directories with Windows machines "
+"<emphasis role=\"strong\">not</emphasis> joined to the Windows SKOLELINUX "
+"domain."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
-msgid "enter \\\\TJENER\\HOMES or \\\\TJENER\\<username> and press return"
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"enter \\\\TJENER\\HOMES or \\\\TJENER\\<username> and press return"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "enter your login credentials (username, password) in the authentication "
 "dialog window that appears"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "-> a Windows Explorer window should open and show files and folders in "
 "your Debian Edu home directory."
@@ -6515,9 +6584,9 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "By default only the [homes] and the [netlogon] shares are exported; further "
-"share examples for students and teachers can be found in "
-"<computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on your "
-"Debian Edu main server."
+"share examples for students and teachers can be found in <computeroutput>/"
+"etc/samba/smb-debian-edu.conf</computeroutput> on your Debian Edu main "
+"server."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6534,9 +6603,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The first thing you have to do is to enable the SKOLELINUX\\Administrator "
-"account. This account is not intended for day-to-day usage; its current main"
-" purpose is to add Windows machines to the SKOLELINUX domain. To enable this"
-" account log on to TJENER as the first user (created during main server "
+"account. This account is not intended for day-to-day usage; its current main "
+"purpose is to add Windows machines to the SKOLELINUX domain. To enable this "
+"account log on to TJENER as the first user (created during main server "
 "installation) and run this command:"
 msgstr ""
 
@@ -6589,40 +6658,36 @@ msgid ""
 "Professional is required here."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
-"log on to the Windows XP machine as Administrator (or any other account with"
-" Administrator privileges)"
+"log on to the Windows XP machine as Administrator (or any other account with "
+"Administrator privileges)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
-msgid "click on \"Start\" then right-click on \"Computer\" and click on \"Properties\""
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"click on \"Start\" then right-click on \"Computer\" and click on \"Properties"
+"\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "select tab \"Computer Name\" and click on \"Change...\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "under \"Member of\", select the radio button beside \"Domain:\", type "
 "SKOLELINUX and then click \"OK\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "a pop up box will request to enter credentials of an account with rights to "
 "join the domain. Type username SKOLELINUX\\Administrator and the root "
 "password, click \"OK\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "a confirmation pop up box will welcome you to the SKOLELINUX domain. "
 "Clicking on \"OK\", will result in having another message informing that a "
@@ -6631,9 +6696,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"After the reboot, when you login the first time, click on the \"Options "
-">>\" button and select the domain SKOLELINUX instead of the local "
-"domain (\"this computer\")"
+"After the reboot, when you login the first time, click on the \"Options >"
+">\" button and select the domain SKOLELINUX instead of the local domain "
+"(\"this computer\")"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6653,33 +6718,32 @@ msgid ""
 "is provided at this location:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
-msgid "\\\\tjener\\netlogon\\win7+samba_domain-membership\\Win7_Samba3DomainMember.reg"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"\\\\tjener\\netlogon\\win7+samba_domain-membership\\Win7_Samba3DomainMember."
+"reg"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "For further information please consult the included README_Win7-Domain-"
-"Membership.txt in the same folder. Make sure you apply this patch as a local"
-" Administrator of the Windows system."
+"Membership.txt in the same folder. Make sure you apply this patch as a local "
+"Administrator of the Windows system."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"After applying the above patch and rebooting the client system you should be"
-" able to join the SKOLELINUX domain:"
+"After applying the above patch and rebooting the client system you should be "
+"able to join the SKOLELINUX domain:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "the basic system information page will open. Under \"Computer name, domain, "
 "and workgroup settings\", click on \"Change Settings\""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "on the System Properties page, click on \"Change...\""
 msgstr ""
 
@@ -6712,7 +6776,9 @@ msgstr "sette opp Web-Proxy, og begynne side i IE"
 msgid ""
 "add a MyHome icon to the Desktop that points to drive H: and opens Windows "
 "Explorer on double-click"
-msgstr "legge til et MyHome ikon på skrivebordet som peker til lagringsenhet H: og åpner Windows Explorer ved å dobbeltklikke "
+msgstr ""
+"legge til et MyHome ikon på skrivebordet som peker til lagringsenhet H: og "
+"åpner Windows Explorer ved å dobbeltklikke "
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6739,8 +6805,8 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "<ulink url=\"https://packages.debian.org/stable/moodle#\">Moodle</ulink> is "
-"a free, Open Source course management system - software designed using sound"
-" pedagogical principles to help educators create effective online learning "
+"a free, Open Source course management system - software designed using sound "
+"pedagogical principles to help educators create effective online learning "
 "communities. You can download and use it on any computer (including "
 "webhosts), yet it can scale from a single-teacher site to a University with "
 "200,000 students. Some schools in France use Moodle to keep track of "
@@ -6752,10 +6818,10 @@ msgid ""
 "There are <ulink url=\"http://moodle.org/sites/\">moodle sites</ulink> all "
 "over the world, mostly concentrated in Europe and North America. Check the "
 "site of an <ulink url=\"http://moodle.org/sites/\">institution</ulink> near "
-"you to get an idea about it. More information is available at the <ulink "
-"url=\"http://moodle.org\">moodle project page,</ulink> including <ulink "
-"url=\"http://docs.moodle.org/en/Main_Page\">documentation</ulink> and <ulink"
-" url=\"http://moodle.org/support/\">support</ulink>."
+"you to get an idea about it. More information is available at the <ulink url="
+"\"http://moodle.org\">moodle project page,</ulink> including <ulink url="
+"\"http://docs.moodle.org/en/Main_Page\">documentation</ulink> and <ulink url="
+"\"http://moodle.org/support/\">support</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6764,9 +6830,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-"
-"Prolog</ulink> is an open source implementation of the programming language "
-"Prolog, commonly used for teaching and semantic web applications."
+"<ulink url=\"https://packages.debian.org/stable/swi-prolog#\">SWI-Prolog</"
+"ulink> is an open source implementation of the programming language Prolog, "
+"commonly used for teaching and semantic web applications."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6775,13 +6841,12 @@ msgstr "Overvåkning av elever"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use control tools like <ulink "
-"url=\"https://packages.debian.org/stable/controlaula#\">Controlaula</ulink> "
-"or <ulink url=\"https://packages.debian.org/stable/italc-"
-"master#\">iTALC</ulink> to supervise their students.  See also the <ulink "
-"url=\"http://sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page\">iTALC"
-" Wiki</ulink> (and the documentation in bug <ulink "
-"url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"Some schools use control tools like <ulink url=\"https://packages.debian.org/"
+"stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
+"debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
+"students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
+"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6797,11 +6862,9 @@ msgstr "Begrense nettadgang for elever"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use <ulink "
-"url=\"https://packages.debian.org/stable/squidguard#\">Squidguard</ulink> or"
-" <ulink "
-"url=\"https://packages.debian.org/stable/dansguardian#\">Dansguardian</ulink>"
-" to restrict Internet access."
+"Some schools use <ulink url=\"https://packages.debian.org/stable/squidguard#"
+"\">Squidguard</ulink> or <ulink url=\"https://packages.debian.org/stable/"
+"dansguardian#\">Dansguardian</ulink> to restrict Internet access."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6810,13 +6873,13 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Some schools use the products of <ulink "
-"url=\"http://smarttech.com\">Smarttech</ulink> for their teaching. You need "
-"a workstation with drivers and software for this, Smarttech has published "
-"some working non-free Software in a Debian Repository as a download. A local"
-" copy of this repository needs to be put inside the school network, so that "
-"the smartboard software could be installed on our machines. So teachers and "
-"pupils can prepare for class on every computer:"
+"Some schools use the products of <ulink url=\"http://smarttech.com"
+"\">Smarttech</ulink> for their teaching. You need a workstation with drivers "
+"and software for this, Smarttech has published some working non-free "
+"Software in a Debian Repository as a download. A local copy of this "
+"repository needs to be put inside the school network, so that the smartboard "
+"software could be installed on our machines. So teachers and pupils can "
+"prepare for class on every computer:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -6825,8 +6888,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Download the repository as a tar.gz file from <ulink "
-"url=\"http://smarttech.com/us/Support/Browse+Support/Download+Software/Software/SMART+Notebook+collaborative+learning+software/Previous+versions/SMART+Notebook+10_2+for+Linux\"/>."
+"Download the repository as a tar.gz file from <ulink url=\"http://smarttech."
+"com/us/Support/Browse+Support/Download+Software/Software/SMART+Notebook"
+"+collaborative+learning+software/Previous+versions/SMART+Notebook+10_2+for"
+"+Linux\"/>."
 msgstr ""
 
 #. type: CDATA
@@ -6859,7 +6924,11 @@ msgid ""
 "d-i apt-setup/local1/comment string SMART Repo\n"
 "d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
 "d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
-msgstr "d-i apt-setup/local1/repository string http://www/debian/ stable non-free\nd-i apt-setup/local1/comment string SMART Repo\nd-i apt-setup/local1/key string http://www/debian/swbuild.asc\nd-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+msgstr ""
+"d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
+"d-i apt-setup/local1/comment string SMART Repo\n"
+"d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Update the preseed file:"
@@ -6872,9 +6941,8 @@ msgstr "/usr/sbin/debian-edu-pxeinstall"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"After this, new installations via PXE will have the <ulink "
-"url=\"https://wiki.debian.org/SmartBoard#\">SmartBoard</ulink> software "
-"installed."
+"After this, new installations via PXE will have the <ulink url=\"https://"
+"wiki.debian.org/SmartBoard#\">SmartBoard</ulink> software installed."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -6887,8 +6955,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Using an editor add the following lines to "
-"<computeroutput>/etc/apt/sources.list</computeroutput> in the chroot:"
+"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"list</computeroutput> in the chroot:"
 msgstr ""
 
 #. type: CDATA
@@ -6924,10 +6992,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are"
-" either user- or developer-specific. Let's move the user-specific HowTos "
-"over here (and delete them over there)! (But first ask the authors if they "
-"are happy with moving them and putting them under the GPL - see the page "
+"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
+"either user- or developer-specific. Let's move the user-specific HowTos over "
+"here (and delete them over there)! (But first ask the authors if they are "
+"happy with moving them and putting them under the GPL - see the page "
 "histories to find them.)"
 msgstr ""
 
@@ -6961,9 +7029,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-"but this will only update the Kerberos password, and not the Samba and GOsa²"
-" (LDAP) password. So after you changed your password at the login prompt, "
-"you really should also change it using GOsa²."
+"but this will only update the Kerberos password, and not the Samba and GOsa² "
+"(LDAP) password. So after you changed your password at the login prompt, you "
+"really should also change it using GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6999,8 +7067,8 @@ msgid ""
 "All users can send and receive mails within the internal network. To allow "
 "mail outside the internal network, the adminstrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
-"situation, starting with <computeroutput>dpkg-reconfigure "
-"exim4-config</computeroutput>."
+"situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7010,12 +7078,11 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Start KMail, click \"Next\" in the Account Wizard, select "
-"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter"
-" real name and e-mail address "
-"<computeroutput>username at postoffice.intern</computeroutput>, click \"Next\"."
-" Check if the username is correct, don't enter the password, click \"Next\"."
-" (Kerberos provides single sign on concerning SMTP and IMAP, so you don't "
-"have to enter your password.) Enter "
+"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
+"real name and e-mail address <computeroutput>username at postoffice.intern</"
+"computeroutput>, click \"Next\". Check if the username is correct, don't "
+"enter the password, click \"Next\". (Kerberos provides single sign on "
+"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
 "<computeroutput>postoffice.intern</computeroutput> twice as server name, "
 "click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
 "menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
@@ -7025,8 +7092,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Now send a test email to yourself. (This will create the IMAP folders on the"
-" server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
+"Now send a test email to yourself. (This will create the IMAP folders on the "
+"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
 "There should be your recently sent email in the inbox below of \"intern\"."
 msgstr ""
 
@@ -7048,15 +7115,15 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
-"<computeroutput>alsamixer</computeroutput> (but not "
-"<computeroutput>kmix</computeroutput>) can be used to change audio volume."
+"<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+"computeroutput>) can be used to change audio volume."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "On other machines (workstations, LTSP servers, and diskless workstations), "
-"<computeroutput>kmix</computeroutput> or "
-"<computeroutput>alsamixer</computeroutput> can be used."
+"<computeroutput>kmix</computeroutput> or <computeroutput>alsamixer</"
+"computeroutput> can be used."
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -7067,22 +7134,21 @@ msgstr ""
 msgid "Let us know you exist"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/worldmap.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid ""
-"http://www.skolelinux.no/slschools/worldmap.php?lang=en&image=worldmap.png"
+"http://www.skolelinux.no/slschools/worldmap.php?lang=en&image=worldmap."
+"png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "There are Debian Edu users all over the world. A very easy form of "
-"contribution is to let us know you exist and use Debian Edu - this motivates"
-" us very much and therefore is already a valuable contribution."
+"contribution is to let us know you exist and use Debian Edu - this motivates "
+"us very much and therefore is already a valuable contribution."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7091,8 +7157,8 @@ msgid ""
 "system to help the users find each other, and also to have an idea about "
 "where the users of the distribution are located.  Please let us know about "
 "your installation, by registering in this database.  To register your "
-"school, <ulink url=\"http://wiki.debian.org/DebianEdu/ReferenceSchools\">use"
-" this web form</ulink>."
+"school, <ulink url=\"http://wiki.debian.org/DebianEdu/ReferenceSchools\">use "
+"this web form</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -7102,8 +7168,8 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Currently there are local teams in Norway, Germany, the region of "
-"Extremadura in Spain, Taiwan and France. \"Isolated\" contributors and users"
-" exist in Greece, the Netherlands, Japan and elsewhere."
+"Extremadura in Spain, Taiwan and France. \"Isolated\" contributors and users "
+"exist in Greece, the Netherlands, Japan and elsewhere."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7119,28 +7185,26 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Internationally we are organised into various <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Teams/\">teams</ulink> working on "
-"different subjects."
+"Internationally we are organised into various <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Teams/\">teams</ulink> working on different subjects."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Most of the time, the <ulink url=\"http://lists.debian.org/debian-"
-"edu\">developer mailing list</ulink> is our main medium for communication, "
+"Most of the time, the <ulink url=\"http://lists.debian.org/debian-edu"
+"\">developer mailing list</ulink> is our main medium for communication, "
 "though we have monthly IRC meetings on #debian-edu on irc.debian.org and "
 "even, less frequently, real gatherings, where we meet each other in person. "
 "<ulink url=\"http://wiki.debian.org/DebianEdu/NewContributor\">New "
-"contributors</ulink> should read our <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/ArchivePolicy\"/>."
+"contributors</ulink> should read our <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/ArchivePolicy\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A good way to learn what is happening in the development of Debian Edu is to"
-" subscribe to the <ulink "
-"url=\"http://lists.alioth.debian.org/mailman/listinfo/debian-edu-"
-"commits\">commit mailinglist</ulink>."
+"A good way to learn what is happening in the development of Debian Edu is to "
+"subscribe to the <ulink url=\"http://lists.alioth.debian.org/mailman/"
+"listinfo/debian-edu-commits\">commit mailinglist</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -7157,21 +7221,20 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The source of the text is a wiki and can be edited with a simple webbrowser."
-" Just go to <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Jessie/\"/> and you can"
-" contribute easily. Note: a user account is needed to edit the pages; you "
-"need to <ulink url=\"http://wiki.debian.org/UserPreferences\">create a wiki "
-"user</ulink> first."
+"The source of the text is a wiki and can be edited with a simple webbrowser. "
+"Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Jessie/\"/> and you can contribute easily. Note: a user account is needed to "
+"edit the pages; you need to <ulink url=\"http://wiki.debian.org/"
+"UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Another very good way to contribute and to help users is by translating "
 "software and documentation. Information on how to translate this document "
-"can be found in the <link linkend=\"Translations\">translations "
-"chapter</link> of this book. Please consider helping the translation effort "
-"of this book!"
+"can be found in the <link linkend=\"Translations\">translations chapter</"
+"link> of this book. Please consider helping the translation effort of this "
+"book!"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -7186,20 +7249,17 @@ msgstr ""
 msgid "in English"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/> - support mailing list"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "#debian-edu on irc.debian.org - IRC channel, mostly development related; do "
 "not expect real time support even though it frequently happens"
@@ -7209,24 +7269,20 @@ msgstr ""
 msgid "in Norwegian"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink "
-"url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/> - "
-"support mailing list"
+"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
+"> - support mailing list"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink "
-"url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/linuxiskolen\"/>"
-" - mailing list for the development member organisation in Norway (FRISK)"
+"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+"linuxiskolen\"/> - mailing list for the development member organisation in "
+"Norway (FRISK)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "#skolelinux on irc.debian.org - IRC channel to support Norwegian users"
 msgstr ""
 
@@ -7234,20 +7290,18 @@ msgstr ""
 msgid "in German"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\"/> - support "
 "mailing list"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.skolelinux.de\"/> - wiki with lots of HowTos etc."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"<ulink url=\"http://wiki.skolelinux.de\"/> - wiki with lots of HowTos etc."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "#skolelinux.de on irc.debian.org - IRC channel to support German users"
 msgstr ""
 
@@ -7255,19 +7309,17 @@ msgstr ""
 msgid "in French"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - support mailing"
-" list"
+"<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - support mailing "
+"list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "in Spanish"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
 msgstr ""
 
@@ -7287,26 +7339,23 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 msgid ""
-"New features for Debian Edu 8.0+edu0~alpha0 Codename Jessie released 2015"
-"-XX-YY"
+"New features for Debian Edu 8.0+edu0~alpha0 Codename Jessie released 2015-XX-"
+"YY"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "User visible changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "new optional desktop environment: MATE"
 msgstr "nytt valgfritt skrivebordsmiljø: MATE"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "new manual translation: Dutch"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "TBD"
 msgstr ""
 
@@ -7314,112 +7363,98 @@ msgstr ""
 msgid "Installation changes"
 msgstr "Installasjonsendringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New version of debian-installer from Debian Jessie, see <ulink "
-"url=\"http://www.debian.org/releases/jessie/installmanual\">installation "
-"manual</ulink> for more details."
-msgstr "Ny versjon av debian-installer fra Debian Jessie, se <ulink url=\"http://www.debian.org/releases/jessie/installmanual\">installasjonshåndboken</ulink>for flere detaljer."
+"New version of debian-installer from Debian Jessie, see <ulink url=\"http://"
+"www.debian.org/releases/jessie/installmanual\">installation manual</ulink> "
+"for more details."
+msgstr ""
+"Ny versjon av debian-installer fra Debian Jessie, se <ulink url=\"http://www."
+"debian.org/releases/jessie/installmanual\">installasjonshåndboken</ulink>for "
+"flere detaljer."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "Programvareoppdateringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian Jessie 8.0, eg:"
 msgstr "Alt som er nytt i Debian Jessie 8.0, for eksempel:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Linux kernel 3.16.x; for the i386 architecture, support for i486 processors "
 "has been dropped; oldest supported ones: i586 (like Intel Pentium and AMD "
 "K5)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of"
-" the others see this manual.)"
+"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
+"the others see this manual.)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "the browsers Iceweasel 31 ESR and Chromium 38"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LibreOffice 4.3.3"
 msgstr "LibreOffice 4.3.3"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Educational toolbox GCompris 14.07"
 msgstr "Pedagogisk verktøykasse GCompris 14.07"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Music creator Rosegarden 14.02"
 msgstr "Musikkskaperen Rosegarden 14.02"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "GOsa 2.7.4"
 msgstr "GOsa 2.7.4"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LTSP 5.5.4"
 msgstr "LTSP 5.5.4"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "new boot framework: systemd. More information is available in the Debian "
-"<ulink url=\"https://wiki.debian.org/systemd\">systemd wiki page</ulink> and"
-" in the<ulink "
-"url=\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd "
-"manual</ulink>."
+"<ulink url=\"https://wiki.debian.org/systemd\">systemd wiki page</ulink> and "
+"in the<ulink url=\"http://www.freedesktop.org/wiki/Software/systemd/"
+"\">systemd manual</ulink>."
 msgstr ""
 
-#. 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>
+msgid "Debian Jessie includes about 42000 packages available for installation."
+msgstr ""
+"Debian Jessie omfatter omtrent 42 000 pakker tilgjengelig for installasjon."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"More information about Debian Jessie 8.0 is provided in the <ulink "
-"url=\"http://www.debian.org/releases/jessie/releasenotes\">release "
-"notes</ulink> and the <ulink "
-"url=\"http://www.debian.org/releases/jessie/installmanual\">installation "
-"manual</ulink>."
+"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>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 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."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 29 languages."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The Debian Edu Jessie Manual is fully translated to German, French, Italian,"
-" Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and"
-" Spanish."
+"The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
+"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
+"Spanish."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -7434,8 +7469,7 @@ msgstr "Andre endringer"
 msgid "Known issues"
 msgstr "Kjente problemer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "None yet."
 msgstr "Ingen kjente ennå."
 
@@ -7445,25 +7479,25 @@ msgstr "Opphavsrett og forfattere"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009,"
-" 2010, 2011, 2012, 2013, 2014), Petter Reinholdtsen (2001, 2002, 2003, 2004,"
-" 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), Patrick Winnertz "
+"This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
+"2010, 2011, 2012, 2013, 2014), 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), "
+"(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) and Bernhard Hammes"
-" (2012) and is released under the GPL2 or any later version. Enjoy!"
+"David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014) and Bernhard Hammes "
+"(2012) and is released under the GPL2 or any later version. Enjoy!"
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"If you add content to it, <emphasis role=\"strong\">please only do so if you"
-" are the author. You need to release it under the same "
-"conditions</emphasis>! Then add your name here and release it under the "
-"\"GPL v2 or any later version\" licence."
+"If you add content to it, <emphasis role=\"strong\">please only do so if you "
+"are the author. You need to release it under the same conditions</emphasis>! "
+"Then add your name here and release it under the \"GPL v2 or any later "
+"version\" licence."
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -7478,19 +7512,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan"
-" Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) and is released"
-" under the GPL v2 or any later version."
-msgstr "Opphavsretten til den norske bokmålsoversettelsen tilhører Petter Reinholdtsen (2007), Håvard Korsvoll (2007, 2008),  Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) og utgitt under GPL2 eller senere versjoner."
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
+#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
+#| "(2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) "
+#| "and is released under the GPL v2 or any later version."
+msgid ""
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
+"(2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), <ulink url="
+"\"https://wiki.debian.org/FourFire#\">FourFire</ulink> Le'bard (2014), "
+"Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released "
+"under the GPL v2 or any later version."
+msgstr ""
+"Opphavsretten til den norske bokmålsoversettelsen tilhører Petter "
+"Reinholdtsen (2007), Håvard Korsvoll (2007, 2008),  Tore Skogly (2008), Ole-"
+"Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid "
+"Yrvin (2014) og utgitt under GPL2 eller senere versjoner."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The German translation is copyrighted by Holger Levsen (2007), Patrick "
-"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007,"
-" 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008,"
-" 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
+"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
+"2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, "
+"2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), "
 "Philipp Hübner (2009), Andreas Mundt (2009, 2010) and Wolfgang Schweer "
 "(2012, 2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
@@ -7514,7 +7561,9 @@ msgstr ""
 msgid ""
 "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
 "released under the GPL v2 or any later version."
-msgstr "Opphavsretten for den danske oversettelsen tilhører Joe Hansen (2012, 2013), og er utgitt under GPL v2 eller en senere versjon."
+msgstr ""
+"Opphavsretten for den danske oversettelsen tilhører Joe Hansen (2012, 2013), "
+"og er utgitt under GPL v2 eller en senere versjon."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -7529,9 +7578,9 @@ msgstr "Oversettelser av dette dokumentet"
 #. type: Content of: <article><section><para>
 msgid ""
 "Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and"
-" Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-"
-"edu-doc/\">online overview of all languages</ulink>."
+"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
+"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
+"doc/\">online overview of all languages</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -7540,22 +7589,21 @@ msgstr "Hvordan oversette dette dokumentet"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"As in many free software projects, translations of this document are kept in"
-" PO files. More information about the process can be found in "
+"As in many free software projects, translations of this document are kept in "
+"PO files. More information about the process can be found in "
 "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-jessie-"
 "manual-translations</computeroutput>. The Git repository (see below) "
-"contains this file too. Take a look there and at the <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language"
-" specific conventions</ulink> if you want to help translating this document."
+"contains this file too. Take a look there and at the <ulink url=\"https://"
+"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
+"specific conventions</ulink> if you want to help translating this document."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "To commit your translations you need to be a member of the Alioth project "
-"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs"
-" from your local one, create or edit "
-"<computeroutput>~/.ssh/config</computeroutput>. There should be an entry "
-"like:"
+"<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
+"from your local one, create or edit <computeroutput>~/.ssh/config</"
+"computeroutput>. There should be an entry like:"
 msgstr ""
 
 #. type: CDATA
@@ -7563,13 +7611,15 @@ msgstr ""
 msgid ""
 "Host git.debian.org\n"
 "User <your-alioth-username>"
-msgstr "Host git.debian.org\nUser <ditt-alioth-brukernavn>"
+msgstr ""
+"Host git.debian.org\n"
+"User <ditt-alioth-brukernavn>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git"
-"/debian-edu/debian-edu-doc.git</computeroutput>"
+"using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
+"debian-edu/debian-edu-doc.git</computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7584,16 +7634,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"You can check out the <computeroutput>debian-edu-doc</computeroutput> source"
-" anonymously with the following command (you need to have the "
+"You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
+"anonymously with the following command (you need to have the "
 "<computeroutput>git</computeroutput> package installed for this to work):"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
-"doc.git</computeroutput>"
-msgstr "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc.git</computeroutput>"
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
+msgstr ""
+"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"git</computeroutput>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7611,8 +7663,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To update your local copy of the repository use the following command inside"
-" the <computeroutput>debian-edu-doc</computeroutput> directory:"
+"To update your local copy of the repository use the following command inside "
+"the <computeroutput>debian-edu-doc</computeroutput> directory:"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -7627,28 +7679,29 @@ msgid ""
 msgstr ""
 
 #.  <remark>
-#. status ignore</remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
 "translate any string which contains \" FIXME\"."
-msgstr "Vær spesielt oppmerksom på at denne håndboken fortsatt er under utvikling, så ikke oversett noen tekst (tekststreng) som inneholder «FIXME»."
+msgstr ""
+"Vær spesielt oppmerksom på at denne håndboken fortsatt er under utvikling, "
+"så ikke oversett noen tekst (tekststreng) som inneholder «FIXME»."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Basic information about Alioth (the host where our Git repository is "
-"located) and Git is available at <ulink "
-"url=\"http://wiki.debian.org/Alioth/Git\"/>."
+"located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
+"Git\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you are new to Git, look at the <ulink url=\"http://git-"
-"scm.com/book\">Pro Git</ulink> book; it has a chapter on the <ulink "
-"url=\"http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-"
-"Repository\">recording changes to the repository</ulink>. Also you might "
-"want to look at the <computeroutput>gitk</computeroutput> package that "
-"provides a GUI for Git."
+"If you are new to Git, look at the <ulink url=\"http://git-scm.com/book"
+"\">Pro Git</ulink> book; it has a chapter on the <ulink url=\"http://git-scm."
+"com/book/en/Git-Basics-Recording-Changes-to-the-Repository\">recording "
+"changes to the repository</ulink>. Also you might want to look at the "
+"<computeroutput>gitk</computeroutput> package that provides a GUI for Git."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7661,8 +7714,7 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid ""
-"Note to translators: there is no need to translate the GPL license text."
+msgid "Note to translators: there is no need to translate the GPL license text."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -7675,7 +7727,11 @@ msgid ""
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
-msgstr "Opphavsrett © 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-acht.org\">holger at layer-acht.org</ulink> > og andre, se <link linkend=\"CopyRight\">opphavsrettskapittelet</link> for den fulle lista av personer med  opphavsrett."
+msgstr ""
+"Opphavsrett © 2007-2014 Holger Levsen < <ulink url=\"mailto:holger at layer-"
+"acht.org\">holger at layer-acht.org</ulink> > og andre, se <link linkend="
+"\"CopyRight\">opphavsrettskapittelet</link> for den fulle lista av personer "
+"med  opphavsrett."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7695,10 +7751,13 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"You should have received a copy of the GNU General Public License along with"
-" this program; if not, write to the Free Software Foundation, Inc., 51 "
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-msgstr "Du skal ha mottatt en kopi av GNU General Public License sammen med dette programmet; hvis ikke, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Du skal ha mottatt en kopi av GNU General Public License sammen med dette "
+"programmet; hvis ikke, skriv til Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
 #. type: Content of: <article><section><section><title>
 msgid "GNU GENERAL PUBLIC LICENSE"
@@ -7727,29 +7786,29 @@ msgid ""
 "it may be distributed under the terms of this General Public License.  The "
 "\"Program\", below, refers to any such program or work, and a \"work based "
 "on the Program\" means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of"
-" it, either verbatim or with modifications and/or translated into another "
+"copyright law: that is to say, a work containing the Program or a portion of "
+"it, either verbatim or with modifications and/or translated into another "
 "language.  (Hereinafter, translation is included without limitation in the "
 "term \"modification\".)  Each licensee is addressed as \"you\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Activities other than copying, distribution and modification are not covered"
-" by this License; they are outside its scope.  The act of running the "
-"Program is not restricted, and the output from the Program is covered only "
-"if its contents constitute a work based on the Program (independent of "
-"having been made by running the Program). Whether that is true depends on "
-"what the Program does."
+"Activities other than copying, distribution and modification are not covered "
+"by this License; they are outside its scope.  The act of running the Program "
+"is not restricted, and the output from the Program is covered only if its "
+"contents constitute a work based on the Program (independent of having been "
+"made by running the Program). Whether that is true depends on what the "
+"Program does."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim"
-" copies of the Program's source code as you receive it, in any medium, "
+"<emphasis role=\"strong\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
 "provided that you conspicuously and appropriately publish on each copy an "
-"appropriate copyright notice and disclaimer of warranty; keep intact all the"
-" notices that refer to this License and to the absence of any warranty; and "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
 "give any other recipients of the Program a copy of this License along with "
 "the Program."
 msgstr ""
@@ -7770,8 +7829,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to"
-" carry prominent notices stating that you changed the files and the date of "
+"<emphasis role=\"strong\">a)</emphasis> You must cause the modified files to "
+"carry prominent notices stating that you changed the files and the date of "
 "any change."
 msgstr ""
 
@@ -7792,8 +7851,8 @@ msgid ""
 "notice that there is no warranty (or else, saying that you provide a "
 "warranty) and that users may redistribute the program under these "
 "conditions, and telling the user how to view a copy of this License.  "
-"(Exception: if the Program itself is interactive but does not normally print"
-" such an announcement, your work based on the Program is not required to "
+"(Exception: if the Program itself is interactive but does not normally print "
+"such an announcement, your work based on the Program is not required to "
 "print an announcement.)"
 msgstr ""
 
@@ -7806,8 +7865,8 @@ msgid ""
 "distribute them as separate works.  But when you distribute the same "
 "sections as part of a whole which is a work based on the Program, the "
 "distribution of the whole must be on the terms of this License, whose "
-"permissions for other licensees extend to the entire whole, and thus to each"
-" and every part regardless of who wrote it."
+"permissions for other licensees extend to the entire whole, and thus to each "
+"and every part regardless of who wrote it."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7822,8 +7881,8 @@ msgstr ""
 msgid ""
 "In addition, mere aggregation of another work not based on the Program with "
 "the Program (or with a work based on the Program) on a volume of a storage "
-"or distribution medium does not bring the other work under the scope of this"
-" License."
+"or distribution medium does not bring the other work under the scope of this "
+"License."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7846,8 +7905,8 @@ msgstr ""
 msgid ""
 "<emphasis role=\"strong\">b)</emphasis> Accompany it with a written offer, "
 "valid for at least three years, to give any third party, for a charge no "
-"more than your cost of physically performing source distribution, a complete"
-" machine-readable copy of the corresponding source code, to be distributed "
+"more than your cost of physically performing source distribution, a complete "
+"machine-readable copy of the corresponding source code, to be distributed "
 "under the terms of Sections 1 and 2 above on a medium customarily used for "
 "software interchange; or,"
 msgstr ""
@@ -7855,8 +7914,8 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "<emphasis role=\"strong\">c)</emphasis> Accompany it with the information "
-"you received as to the offer to distribute corresponding source code.  (This"
-" alternative is allowed only for noncommercial distribution and only if you "
+"you received as to the offer to distribute corresponding source code.  (This "
+"alternative is allowed only for noncommercial distribution and only if you "
 "received the program in object code or executable form with such an offer, "
 "in accord with Subsection b above.)"
 msgstr ""
@@ -7864,14 +7923,14 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "The source code for a work means the preferred form of the work for making "
-"modifications to it.  For an executable work, complete source code means all"
-" the source code for all modules it contains, plus any associated interface "
+"modifications to it.  For an executable work, complete source code means all "
+"the source code for all modules it contains, plus any associated interface "
 "definition files, plus the scripts used to control compilation and "
-"installation of the executable.  However, as a special exception, the source"
-" code distributed need not include anything that is normally distributed (in"
-" either source or binary form) with the major components (compiler, kernel, "
-"and so on) of the operating system on which the executable runs, unless that"
-" component itself accompanies the executable."
+"installation of the executable.  However, as a special exception, the source "
+"code distributed need not include anything that is normally distributed (in "
+"either source or binary form) with the major components (compiler, kernel, "
+"and so on) of the operating system on which the executable runs, unless that "
+"component itself accompanies the executable."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7888,8 +7947,8 @@ msgid ""
 "<emphasis role=\"strong\">4.</emphasis> You may not copy, modify, "
 "sublicense, or distribute the Program except as expressly provided under "
 "this License.  Any attempt otherwise to copy, modify, sublicense or "
-"distribute the Program is void, and will automatically terminate your rights"
-" under this License. However, parties who have received copies, or rights, "
+"distribute the Program is void, and will automatically terminate your rights "
+"under this License. However, parties who have received copies, or rights, "
 "from you under this License will not have their licenses terminated so long "
 "as such parties remain in full compliance."
 msgstr ""
@@ -7901,9 +7960,9 @@ msgid ""
 "permission to modify or distribute the Program or its derivative works.  "
 "These actions are prohibited by law if you do not accept this License.  "
 "Therefore, by modifying or distributing the Program (or any work based on "
-"the Program), you indicate your acceptance of this License to do so, and all"
-" its terms and conditions for copying, distributing or modifying the Program"
-" or works based on it."
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7913,8 +7972,8 @@ msgid ""
 "receives a license from the original licensor to copy, distribute or modify "
 "the Program subject to these terms and conditions.  You may not impose any "
 "further restrictions on the recipients' exercise of the rights granted "
-"herein. You are not responsible for enforcing compliance by third parties to"
-" this License."
+"herein. You are not responsible for enforcing compliance by third parties to "
+"this License."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7923,12 +7982,12 @@ msgid ""
 "judgment or allegation of patent infringement or for any other reason (not "
 "limited to patent issues), conditions are imposed on you (whether by court "
 "order, agreement or otherwise) that contradict the conditions of this "
-"License, they do not excuse you from the conditions of this License.  If you"
-" cannot distribute so as to satisfy simultaneously your obligations under "
+"License, they do not excuse you from the conditions of this License.  If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
 "this License and any other pertinent obligations, then as a consequence you "
 "may not distribute the Program at all.  For example, if a patent license "
-"would not permit royalty-free redistribution of the Program by all those who"
-" receive copies directly or indirectly through you, then the only way you "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
 "could satisfy both it and this License would be to refrain entirely from "
 "distribution of the Program."
 msgstr ""
@@ -7936,8 +7995,8 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "If any portion of this section is held invalid or unenforceable under any "
-"particular circumstance, the balance of the section is intended to apply and"
-" the section as a whole is intended to apply in other circumstances."
+"particular circumstance, the balance of the section is intended to apply and "
+"the section as a whole is intended to apply in other circumstances."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7963,9 +8022,9 @@ msgstr ""
 msgid ""
 "<emphasis role=\"strong\">8.</emphasis> If the distribution and/or use of "
 "the Program is restricted in certain countries either by patents or by "
-"copyrighted interfaces, the original copyright holder who places the Program"
-" under this License may add an explicit geographical distribution limitation"
-" excluding those countries, so that distribution is permitted only in or "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
 "among countries not thus excluded.  In such case, this License incorporates "
 "the limitation as if written in the body of this License."
 msgstr ""
@@ -7985,16 +8044,16 @@ msgid ""
 "later version\", you have the option of following the terms and conditions "
 "either of that version or of any later version published by the Free "
 "Software Foundation.  If the Program does not specify a version number of "
-"this License, you may choose any version ever published by the Free Software"
-" Foundation."
+"this License, you may choose any version ever published by the Free Software "
+"Foundation."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of"
-" the Program into other free programs whose distribution conditions are "
-"different, write to the author to ask for permission.  For software which is"
-" copyrighted by the Free Software Foundation, write to the Free Software "
+"<emphasis role=\"strong\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission.  For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
 "Foundation; we sometimes make exceptions for this.  Our decision will be "
 "guided by the two goals of preserving the free status of all derivatives of "
 "our free software and of promoting the sharing and reuse of software "
@@ -8010,12 +8069,12 @@ msgid ""
 "<emphasis role=\"strong\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED "
 "FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT "
 "PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE "
-"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT"
-" WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
+"COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT "
+"WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT "
 "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
 "PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF "
-"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE"
-" COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
+"THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE "
+"COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -8026,8 +8085,8 @@ msgid ""
 "ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
 "INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
 "USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
-"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE"
-" OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
 "OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
 
@@ -8065,138 +8124,113 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To activate a specific translation, boot using "
-"<computeroutput>locale=ll_CC.UTF-8</computeroutput> as a boot option, where "
-"ll_CC.UTF-8 is the locale name you want.  To activate a given keyboard "
-"layout, use the <computeroutput>keyb=KB</computeroutput> option where KB is "
-"the desired keyboard layout.  More information on this feature <ulink "
-"url=\"http://wiki.debian.org/DebianLive/l10n\">is available from the live CD"
-" build script documentation</ulink>.  Here is a list of commonly used locale"
-" codes:"
+"To activate a specific translation, boot using <computeroutput>locale=ll_CC."
+"UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
+"name you want.  To activate a given keyboard layout, use the "
+"<computeroutput>keyb=KB</computeroutput> option where KB is the desired "
+"keyboard layout.  More information on this feature <ulink url=\"http://wiki."
+"debian.org/DebianLive/l10n\">is available from the live CD build script "
+"documentation</ulink>.  Here is a list of commonly used locale codes:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Norwegian Bokmål"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "nb_NO.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "no"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "nn_NO.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "German"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "de_DE.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "de"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "French (France)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "fr_FR.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "fr"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Greek (Greece)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "el_GR.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "el"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Japanese"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ja_JP.UTF-8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "jp"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Northern Sami (Norway)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "se_NO"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "no(smi)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"A complete list of locale codes is available in "
-"<computeroutput>/usr/share/i18n/SUPPORTED</computeroutput>, but only the "
-"UTF-8 locales are supported by the live images. Not all locales have "
-"translations installed, though.  The keyboard layout names can be found in "
-"/usr/share/keymaps/i386/."
+"A complete list of locale codes is available in <computeroutput>/usr/share/"
+"i18n/SUPPORTED</computeroutput>, but only the UTF-8 locales are supported by "
+"the live images. Not all locales have translations installed, though.  The "
+"keyboard layout names can be found in /usr/share/keymaps/i386/."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -8215,13 +8249,11 @@ msgstr ""
 msgid "There are no jessie images yet"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/sad.png"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid ":("
 msgstr ""
 
@@ -8231,11 +8263,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The image is 1.2 GiB and would be (but currently isn't) available via <ulink"
-" url=\"ftp://ftp.skolelinux.org/cd-jessie-live/\">FTP</ulink>, <ulink "
-"url=\"http://ftp.skolelinux.org/cd-jessie-live/\">HTTP</ulink> or rsync from"
-" <computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput"
-">cd-jessie-live/</computeroutput>."
+"The image is 1.2 GiB and would be (but currently isn't) available via <ulink "
+"url=\"ftp://ftp.skolelinux.org/cd-jessie-live/\">FTP</ulink>, <ulink url="
+"\"http://ftp.skolelinux.org/cd-jessie-live/\">HTTP</ulink> or rsync from "
+"<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
+"jessie-live/</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -8243,171 +8275,151 @@ msgid "Appendix C - Features in older releases"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid ""
-"New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
+msgid "New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
 "installation, in the login screen and as desktop wallpaper."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"New version of debian-installer from Debian Wheezy, see <ulink "
-"url=\"http://www.debian.org/releases/wheezy/installmanual\">installation "
-"manual</ulink> for more details."
+"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
+"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a "
-"DVD."
+"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian Wheezy 7.1, eg:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Linux kernel 3.2.x"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
 "0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
 "LXDE: see manual.)"
-msgstr "Skrivebordsmiljøene KDE «Plasma» 4.8.4, GNOME 3.4, Xfce 4.8.6, og LXDE0.5.5 (KDE «Plasma» er installert som standard, for å velge GNOME, Xfce eller LXDE, se håndbok)"
+msgstr ""
+"Skrivebordsmiljøene KDE «Plasma» 4.8.4, GNOME 3.4, Xfce 4.8.6, og LXDE0.5.5 "
+"(KDE «Plasma» er installert som standard, for å velge GNOME, Xfce eller "
+"LXDE, se håndbok)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Web browser Iceweasel 17 ESR"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LibreOffice 3.5.4"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LTSP 5.4.2"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "CUPS print system 1.5.3"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Educational toolbox GCompris 12.01"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Music creator Rosegarden 12.04"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Image editor Gimp 2.8.2"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual universe Celestia 1.6.1"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual stargazer Stellarium 0.11.3"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Scratch visual programming environment 1.4.0.6"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Wheezy includes about 37000 packages available for installation."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Debian Wheezy includes about 37000 packages available for installation."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"More information about Debian Wheezy 7.1 is provided in the <ulink "
-"url=\"http://www.debian.org/releases/wheezy/releasenotes\">release "
-"notes</ulink> and the <ulink "
-"url=\"http://www.debian.org/releases/wheezy/installmanual\">installation "
-"manual</ulink>."
+"More information about Debian Wheezy 7.1 is provided in the <ulink url="
+"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
+"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
+"\">installation manual</ulink>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
 "and Danish. Partly translated versions exist for Norwegian Bokmal and "
 "Spanish."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
-"when adding systems in GOsa. Now systems can be of type server, workstation,"
-" printer, terminal or netdevice."
+"when adding systems in GOsa. Now systems can be of type server, workstation, "
+"printer, terminal or netdevice."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "LTSP diskless workstations run without any configuration."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "On the dedicated client network of thin client servers (default "
 "192.168.0.0/24), machines run by default as diskless workstations if they "
 "are powerful enough."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
 "hidden to the end user, others even to the GOsa admin."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Using KDE \"Plasma\" on standalone and roaming workstations, at least "
 "Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
-"machines are used outside the backbone network, proxy use is required to use"
-" the other network but no wpad.dat information is found. Workaround: Use "
+"machines are used outside the backbone network, proxy use is required to use "
+"the other network but no wpad.dat information is found. Workaround: Use "
 "Iceweasel or configure the proxy manually."
-msgstr "Ved bruk av KDE «Plasma» på frittstående og vandrende arbeidsstasjoner, feiler i hvert fall Konqueror, Chromium og Step noen ganger ut-av-boksen når maskiner brukes utenfor stamnettet.  En  proxy er påkrevd for å bruke et annet nettverk, men ingen wpad.dat-informasjon blir funnet. Løsning: Bruk Iceweasel eller konfigurere proxy manuelt."
+msgstr ""
+"Ved bruk av KDE «Plasma» på frittstående og vandrende arbeidsstasjoner, "
+"feiler i hvert fall Konqueror, Chromium og Step noen ganger ut-av-boksen når "
+"maskiner brukes utenfor stamnettet.  En  proxy er påkrevd for å bruke et "
+"annet nettverk, men ingen wpad.dat-informasjon blir funnet. Løsning: Bruk "
+"Iceweasel eller konfigurere proxy manuelt."
 
 #. type: Content of: <article><section><section><title>
-msgid "Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
+msgid ""
+"Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -8421,13 +8433,11 @@ msgstr ""
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Make Nagios configuration more robust and efficient"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Comply with 3.X kernel"
 msgstr ""
 
@@ -8435,13 +8445,11 @@ msgstr ""
 msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Minor updates from the wiki"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Danish translation now complete"
 msgstr ""
 
@@ -8449,73 +8457,60 @@ msgstr ""
 msgid "debian-edu-config from 1.453 to 1.455"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Make ltsp_local_mount script work for multiple devices."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Correct Kerberos user policy: don't expire password after 2 days. Closes: "
 "#664596"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fixes for gosa-sync:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Don't fail if password contains \""
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Don't disclose new password string in syslog"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fixes for gosa-create:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Invalidate libnss cache before applying changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Multiple failures during mass user import into GOsa²"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "gosa-netgroups plugin: don't erase entries of attribute type "
 "\"memberNisNetgroup\". Closes: #687256"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "First user now uses the same Kerberos policy as all other users"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Add Danish web page"
 msgstr ""
 
@@ -8523,8 +8518,7 @@ msgstr ""
 msgid "debian-edu-install from 1.528 to 1.530"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Improve preseeding support and documentation"
 msgstr ""
 
@@ -8533,22 +8527,19 @@ msgid ""
 "New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released 2012-03-11"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Replace LWAT with GOsa² as the LDAP administration interface. See below and "
-"the <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#\">Getting"
-" started chapter</ulink> of the manual for more information on GOsa²."
+"the <ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
+"GettingStarted#\">Getting started chapter</ulink> of the manual for more "
+"information on GOsa²."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "See below for a list of updated software."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Show welcome page to users when they first log in. This default start page "
 "for Iceweasel is fetched from LDAP at installation and boot time for "
@@ -8556,66 +8547,57 @@ msgid ""
 "Standalone installations."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
 "GNOME option, the LXDE desktop option is only supported by the CD "
 "installation method."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Speed up LTSP client boot."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Provide a KDE menu entry for changing the password in GOsa²."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"For more information on how to change passwords (including expired passwords"
-" at the KDM/GDM login prompt), please see the <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos"
-" for users</ulink> chapter of the manual."
+"For more information on how to change passwords (including expired passwords "
+"at the KDM/GDM login prompt), please see the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Squeeze/HowTo/Users#\">HowTos for users</"
+"ulink> chapter of the manual."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
 "shown to new users."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"All LTSP servers are also <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP"
-" servers</ulink> by default."
+"All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
+"Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
+"servers</ulink> by default."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Improve handing of removable media on thin clients. Show desktop "
 "notification longer when inserting new media and provide an option to start "
 "dolphin when such media is inserted."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New version of debian-installer from Debian Squeeze, see <ulink "
-"url=\"http://www.debian.org/releases/squeeze/installmanual\">installation "
-"manual</ulink> for more details."
+"New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
+"www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
+"for more details."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
 "is set up during installation of the Main Server. This user is up as GOsa² "
@@ -8624,199 +8606,166 @@ msgid ""
 "<computeroutput>teachers</computeroutput> group."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The <computeroutput>.iso</computeroutput> images can directly be copied onto"
-" USB flash drives, for example by using <computeroutput>dd</computeroutput> "
+"The <computeroutput>.iso</computeroutput> images can directly be copied onto "
+"USB flash drives, for example by using <computeroutput>dd</computeroutput> "
 "or even <computeroutput>cat</computeroutput>.."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New roaming workstation profile for laptops."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Device access for all users is handled by <ulink "
-"url=\"https://wiki.debian.org/PolicyKit#\">PolicyKit</ulink>, and no extra "
-"group memberships are needed to get access to devices."
+"Device access for all users is handled by <ulink url=\"https://wiki.debian."
+"org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
+"needed to get access to devices."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"A warning will be issued when installing on too small disks for the selected"
-" profile."
+"A warning will be issued when installing on too small disks for the selected "
+"profile."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Simplify partitioning for Standalone installs to only have a separate /home/"
-" but no seperate /usr anymore."
+"Simplify partitioning for Standalone installs to only have a separate /home/ "
+"but no seperate /usr anymore."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "More tests in the test suite, and correct some of the tests that failed "
 "earlier."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make sure to report an error and abort the installation when trying to use "
 "the netinst images without a working Internet connection, instead of "
 "silently installing a broken system."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian Squeeze:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "compatibility with the FHS v2.3 and software developed for version 3.2 of "
 "the LSB."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Linux kernel 2.6.32"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgstr "Skrivebordsomgivelser KDE «Plasma» 4.4 and GNOME 2.30"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Web browser Iceweasel 3.5"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "OpenOffice.org 3.2.1"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Educational toolbox GCompris 9.3"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Music creator Rosegarden 10.04.2"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Image editor Gimp 2.6.10"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual universe Celestia 1.6.0"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual stargazer Stellarium 0.10.4"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Debian Squeeze includes over 10,000 new packages available for installation,"
-" including the browser Chromium"
+"Debian Squeeze includes over 10,000 new packages available for installation, "
+"including the browser Chromium"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"More information about Debian Squeeze 6.0 is provided in the <ulink "
-"url=\"http://www.debian.org/releases/squeeze/releasenotes\">release "
-"notes</ulink> and the <ulink "
-"url=\"http://www.debian.org/releases/squeeze/installmanual\">installation "
-"manual</ulink>."
+"More information about Debian Squeeze 6.0 is provided in the <ulink url="
+"\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
+"ulink> and the <ulink url=\"http://www.debian.org/releases/squeeze/"
+"installmanual\">installation manual</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Infrastructural changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
 "gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "The dynamic DHCP range was extended on the backbone network to around 4k IP "
 "addresses, and around 200 IP addresses for the thin client network."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "The DHCP network for 10.0.0.0/8 has been renamed from "
-"<computeroutput>barebone</computeroutput> to "
-"<computeroutput>intern</computeroutput>"
+"<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
+"computeroutput>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "There are no pre-defined host entries for client systems in DNS anymore "
 "(staticXX, ..., dhcpYY...)"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "MIT Kerberos5 used for user authentication, enabled for:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "PAM"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "IMAP"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "SMTP"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
-"machines still have to be added to the "
-"<computeroutput>workstation</computeroutput> netgroup to be able to mount "
-"the home directories"
+"machines still have to be added to the <computeroutput>workstation</"
+"computeroutput> netgroup to be able to mount the home directories"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "A complete PXE boot environment is setup when installing from the DVD, so "
 "that further installations can be done using PXE network installs only. A "
@@ -8824,50 +8773,43 @@ msgid ""
 "needing firmware."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Remove all hard coded settings on workstations, and configure workstations "
 "and roaming workstations using settings detected from the environment using "
-"DNS, DHCP and LDAP.  See this <ulink "
-"url=\"http://people.skolelinux.org/pere/blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog"
-" post with more information on the changes</ulink>."
+"DNS, DHCP and LDAP.  See this <ulink url=\"http://people.skolelinux.org/pere/"
+"blog/No_hardcoded_config_on_Debian_Edu_clients.html\">blog post with more "
+"information on the changes</ulink>."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. 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."
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
 "proof-read with corrections was done by a native English linguist."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal"
-" and Spanish."
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"and Spanish."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to many language tasks, especially French and Danish."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to the welcome web page shown at first logins."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Add new Japanese, Portuguese and Catalan translations of the welcome web "
 "page."
@@ -8877,26 +8819,21 @@ msgstr ""
 msgid "Regressions"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink "
-"url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no\">CD and "
-"DVD installs are different</ulink> - the DVD is only suitable for installing"
-" a KDE environemnt."
+"<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
+"\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
+"installing a KDE environemnt."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop support for <computeroutput>powerpc</computeroutput> architecture from "
 "netinst installation CDs. It is still possible to run Debian Edu on "
-"<computeroutput>powerpc</computeroutput>, but installation is less "
-"automated."
+"<computeroutput>powerpc</computeroutput>, but installation is less automated."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop gtick in the default installation, because it doesn't work on thin "
 "clients (BTS #566335)."
@@ -8906,41 +8843,35 @@ msgstr ""
 msgid "New administration tool: GOsa²"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release,"
-" with:"
+"gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
+"with:"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fix DHCP host removal. Closes: #650258"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Backport user generator unicode character transliteration. Closes: #657086"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Customized GOsa² configuration to better suit the Debian Edu network "
 "architecture."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "GOsa² updates DNS and NFS exports immediately when a system is updated in "
 "LDAP, making diskless workstations work right after they are added to the "
 "required netgroup."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
 "objects using information gathered by sitesummary, to make it easier to add "
@@ -8951,77 +8882,65 @@ msgstr ""
 msgid "More software changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra "
-"3.2.42"
+"Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change default package manager from adept to synaptic, to avoid getting two "
 "graphical package managers installed by default."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
 "KDE."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change video player setup to install different players in KDE "
 "(dragonplayer), GNOME (totem) and LXDE (totem)."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
 "default KDE installation."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Replace network-manager-kde with plasma-widget-networkmanagement in the "
 "standalone KDE profile"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add cifs-utils to the default installation to ensure SMB mounting can work "
 "in any profile."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
 "and valgrind from the default installation and the DVD to make room for "
 "higher priority packages."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop libnss-mdns from stationary profiles, to make sure DNS is the "
 "authoritive source of host names."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
 "and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
@@ -9032,107 +8951,91 @@ msgstr ""
 msgid "Other LDAP related changes"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make the LDAP server handle more clients after increasing the server's file "
 "descriptor limit from 1024 to 32768."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Add code to re-enable stopped CUPS queues every hour on the Main Server, and"
-" flush all CUPS queues every night. Both can be disabled in LDAP."
+"Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
+"flush all CUPS queues every night. Both can be disabled in LDAP."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Provide network blocking / exam mode by default, controlled by LDAP. In "
 "addition to network blocking, changes to the Squid proxy configuration is "
 "needed."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Enable automatic extending of full file systems on the Main Server by "
 "default. This can be disabled in LDAP."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change SSL certificate name used by the LDAP server and adjust clients to "
 "use the new name to be able to enable certificate checking on clients."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
 "setup used for DNS."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Simplify autofs LDAP rules to make sure they work with extra home directory "
 "partitions exported from the main-server without any changes."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make backup system more robust in handling LDAP database dump and restart."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Root logins are denied for both KDM and GDM - see above and <ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#\">Getting"
-" started</ulink> for details."
+"Root logins are denied for both KDM and GDM - see above and <ulink url="
+"\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
+"\">Getting started</ulink> for details."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Clients set up to shut down at night will stay up for at least an hour if "
 "they are turned on manually between 16:00 and 07:00."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Additionally use local NTP clock on the main-server to ensure clients and "
 "server sync clocks also when disconnected from the Internet."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Access to Debian repositories is always done via a proxy on the main server "
-"- read more about the implementation details <ulink "
-"url=\"http://lists.debian.org/20100704221022.GC30542@login1.uio.no\">using "
-"DHCP and WPAD</ulink>"
+"- read more about the implementation details <ulink url=\"http://lists."
+"debian.org/20100704221022.GC30542 at login1.uio.no\">using DHCP and WPAD</ulink>"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "The home0 partition is mounted nosuid, to increase security."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change KDE/Akonadi configuration to reduce the disk footprint of every user "
 "from 144 to 24 MiB."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
 "users on a machine.  Useful for thin client servers."
@@ -9144,11 +9047,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Everything that is new in Debian <ulink "
-"url=\"http://www.debian.org/News/2010/20100626\">5.0.5</ulink> and <ulink "
-"url=\"http://www.debian.org/News/2010/20100904\">5.0.6</ulink>, which "
-"includes support for some new hardware. 5.0.5 and 5.0.6 are maintenance "
-"releases and generally don't add new features"
+"Everything that is new in Debian <ulink url=\"http://www.debian.org/"
+"News/2010/20100626\">5.0.5</ulink> and <ulink url=\"http://www.debian.org/"
+"News/2010/20100904\">5.0.6</ulink>, which includes support for some new "
+"hardware. 5.0.5 and 5.0.6 are maintenance releases and generally don't add "
+"new features"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9162,13 +9065,13 @@ msgstr ""
 msgid ""
 "Merge new web pages from Squeeze - the text is the same, but it provides a "
 "new translation for <computeroutput>zh</computeroutput>, compete "
-"translations for all included languages "
-"(<computeroutput>de</computeroutput>, <computeroutput>es</computeroutput>, "
-"<computeroutput>fr</computeroutput>, <computeroutput>it</computeroutput>, "
-"<computeroutput>nb</computeroutput>, <computeroutput>nl</computeroutput>, "
-"<computeroutput>ru</computeroutput>, <computeroutput>zh</computeroutput>), "
-"and a rename of the <computeroutput>.no</computeroutput> page to "
-"<computeroutput>.nb</computeroutput> to reflect the language used"
+"translations for all included languages (<computeroutput>de</"
+"computeroutput>, <computeroutput>es</computeroutput>, <computeroutput>fr</"
+"computeroutput>, <computeroutput>it</computeroutput>, <computeroutput>nb</"
+"computeroutput>, <computeroutput>nl</computeroutput>, <computeroutput>ru</"
+"computeroutput>, <computeroutput>zh</computeroutput>), and a rename of the "
+"<computeroutput>.no</computeroutput> page to <computeroutput>.nb</"
+"computeroutput> to reflect the language used"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9203,18 +9106,17 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "Everything that is new in Debian 5.0.4; see the <link linkend=\"AppendixC--"
-"New_features_in_Debian_5.0.4_upon_which_Debian_Edu_5.0.4.2B-"
-"edu0_is_based\">following paragraph</link> for details."
+"New_features_in_Debian_5.0.4_upon_which_Debian_Edu_5.0.4.2B-edu0_is_based"
+"\">following paragraph</link> for details."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "More than 80 applications relevant for education are included based on user "
-"feedback and user statistics (through <ulink "
-"url=\"http://popcon.skolelinux.org/\">Debian Edu popularity "
-"contest</ulink>).  The full list of packages is given in the <ulink "
-"url=\"http://blends.alioth.debian.org/edu/tasks/\">task overview "
-"page</ulink>."
+"feedback and user statistics (through <ulink url=\"http://popcon.skolelinux."
+"org/\">Debian Edu popularity contest</ulink>).  The full list of packages is "
+"given in the <ulink url=\"http://blends.alioth.debian.org/edu/tasks/\">task "
+"overview page</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9225,15 +9127,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Dynamic desktop icons and menu options that adjust based on user group."
+msgid "Dynamic desktop icons and menu options that adjust based on user group."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"GNOME added as a supported desktop; see the <link "
-"linkend=\"Installation\">Installation chapter</link> to learn how to install"
-" with GNOME instead of KDE as desktop."
+"GNOME added as a supported desktop; see the <link linkend=\"Installation"
+"\">Installation chapter</link> to learn how to install with GNOME instead of "
+"KDE as desktop."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9268,10 +9169,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"The configuration for DNS and DHCP is stored in LDAP and can be edited using"
-" <computeroutput>lwat</computeroutput>. The DNS server has been switched "
-"from <computeroutput>bind9</computeroutput> to "
-"<computeroutput>powerdns</computeroutput>."
+"The configuration for DNS and DHCP is stored in LDAP and can be edited using "
+"<computeroutput>lwat</computeroutput>. The DNS server has been switched from "
+"<computeroutput>bind9</computeroutput> to <computeroutput>powerdns</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9297,8 +9198,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"PulseAudio is provided in addition to ALSA and OSS for sound on workstations"
-" and diskless workstation machines."
+"PulseAudio is provided in addition to ALSA and OSS for sound on workstations "
+"and diskless workstation machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9313,14 +9214,13 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"The per-user file <computeroutput>~/.xsession-errors</computeroutput> is now"
-" truncated automatically when the user logs in to avoid filling up the home "
+"The per-user file <computeroutput>~/.xsession-errors</computeroutput> is now "
+"truncated automatically when the user logs in to avoid filling up the home "
 "directory partition with a log that grows indefinitely.  The user can "
-"disable this by creating <computeroutput>~/.xsession-errors-"
-"enable</computeroutput>.  The system administrator can configure the system "
-"to redirect the file to /dev/null by editing "
-"<computeroutput>/etc/X11/Xsession.d/05debian-edu-truncate-"
-"xerrorlog</computeroutput>."
+"disable this by creating <computeroutput>~/.xsession-errors-enable</"
+"computeroutput>.  The system administrator can configure the system to "
+"redirect the file to /dev/null by editing <computeroutput>/etc/X11/Xsession."
+"d/05debian-edu-truncate-xerrorlog</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9346,9 +9246,9 @@ msgid ""
 "environments KDE 3.5.10 and GNOME 2.22. Updates of other desktop "
 "applications include Iceweasel (version 3.0.6, which is the unbranded "
 "Firefox web browser) and Icedove (version 2.0.0.19, which is the unbranded "
-"Thunderbird mail client) as well as upgrades to Evolution 2.22.3, <ulink "
-"url=\"https://wiki.debian.org/OpenOffice#\">OpenOffice</ulink>.org 2.4.1, "
-"and Pidgin 2.4.3 (formerly known as Gaim). SWI-prolog is back."
+"Thunderbird mail client) as well as upgrades to Evolution 2.22.3, <ulink url="
+"\"https://wiki.debian.org/OpenOffice#\">OpenOffice</ulink>.org 2.4.1, and "
+"Pidgin 2.4.3 (formerly known as Gaim). SWI-prolog is back."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9361,9 +9261,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"For more information see the page <ulink "
-"url=\"http://wiki.debian.org/NewInLenny\">New in Lenny</ulink> on "
-"wiki.debian.org"
+"For more information see the page <ulink url=\"http://wiki.debian.org/"
+"NewInLenny\">New in Lenny</ulink> on wiki.debian.org"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -9378,8 +9277,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Includes more than 40 bug fixes, improvements and security updates that came"
-" to our attention after the 3.0r0 release"
+"Includes more than 40 bug fixes, improvements and security updates that came "
+"to our attention after the 3.0r0 release"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -9406,8 +9305,7 @@ msgstr ""
 msgid "Linux kernel version 2.6.18"
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Support for SATA controllers and hard disks"
 msgstr ""
 
@@ -9443,8 +9341,7 @@ msgstr ""
 msgid "File systems can be extended while the file system is mounted."
 msgstr ""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Support for automatically extending file systems based on predefined rules."
 msgstr ""
@@ -9475,18 +9372,17 @@ msgid ""
 "Regression: <computeroutput>webmin</computeroutput> is now removed from "
 "Debian because of problems supporting it. We've added a new web based user "
 "administration tool named <computeroutput>lwat</computeroutput>, which "
-"doesn't has the same functionality as <computeroutput>wlus</computeroutput>,"
-" the old user administration tool. But <computeroutput>wlus</computeroutput>"
-" requires <computeroutput>webmin</computeroutput>."
+"doesn't has the same functionality as <computeroutput>wlus</computeroutput>, "
+"the old user administration tool. But <computeroutput>wlus</computeroutput> "
+"requires <computeroutput>webmin</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "Regression: swi-prolog is not part of Etch, but was part of Sarge. The "
-"<ulink "
-"url=\"https://wiki.debian.org/DebianEdu/Documentation/Etch/HowTo/TeachAndLearn#\">HowTo"
-" teach and learn</ulink> Chapter describes how to install swi-prolog on "
-"Etch."
+"<ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/Etch/HowTo/"
+"TeachAndLearn#\">HowTo teach and learn</ulink> Chapter describes how to "
+"install swi-prolog on Etch."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -9539,6 +9435,6 @@ msgstr "Mer informasjon om eldre utgivelser"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"More information on even older releases can be found at <ulink "
-"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+"More information on even older releases can be found at <ulink url=\"http://"
+"developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 44ea8fa..4199ab7 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-11-29 16:49+0100\n"
+"POT-Creation-Date: 2014-11-30 12:45+0100\n"
 "PO-Revision-Date: 2014-11-29 21:05+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -781,9 +781,9 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Een thin-clientopstelling laat toe om eenvoudige PC's te gebruiken als "
-"(X-)terminals. Dit houdt in dat de machine wordt opgestart met een diskette "
-"of rechtstreeks vanaf de server met behulp van netwerk-PROM (of PXE) zonder "
+"Een thin-clientopstelling laat toe om eenvoudige PC's te gebruiken als (X-)"
+"terminals. Dit houdt in dat de machine wordt opgestart met een diskette of "
+"rechtstreeks vanaf de server met behulp van netwerk-PROM (of PXE) zonder "
 "gebruik te maken van de lokale harde schijf. Het thin-clientsysteem dat "
 "Skolelinux gebruikt, is dat van het Linux Terminal Server Project (LTSP)."
 
@@ -9943,10 +9943,19 @@ msgstr ""
 "enige latere versie."
 
 #. type: Content of: <article><section><para>
-msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
-"Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) and is released "
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), "
+#| "Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen "
+#| "(2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) "
+#| "and is released under the GPL v2 or any later version."
+msgid ""
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
+"(2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), <ulink url="
+"\"https://wiki.debian.org/FourFire#\">FourFire</ulink> Le'bard (2014), "
+"Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released "
 "under the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de vertaling naar het Bokmål berusten bij Petter "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 8efc63a..34f0799 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: 2014-11-29 16:49+0100\n"
+"POT-Creation-Date: 2014-11-30 12:45+0100\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"
@@ -7056,9 +7056,12 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard "
-"Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
-"Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) and is released "
+"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
+"(2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), <ulink url="
+"\"https://wiki.debian.org/FourFire#\">FourFire</ulink> Le'bard (2014), "
+"Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released "
 "under the GPL v2 or any later version."
 msgstr ""
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 66e8bff..ac89d86 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -1928,7 +1928,7 @@ apt-get upgrade]]></screen>
 </title>
 <para>If no LTSP clients are used a simple solution is to create a new group (say <computeroutput>sshusers</computeroutput>) and to add a line to the machine's /etc/ssh/sshd_config file. Only members of the <computeroutput>sshusers</computeroutput> group will then be allowed to ssh into the machine from everywhere. 
 </para>
-<para>Managing this case with GOsa is quite simple:  
+<para>Managing this case with GOsa is quite simple: 
 </para>
 <itemizedlist>
 <listitem>
@@ -3237,7 +3237,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </title>
 <para>The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, 2012, 2013) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Bokmål translation is copyrighted by Petter Reinholdtsen (2007), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) and is released under the GPL v2 or any later version. 
+<para>The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, 2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin (2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), <ulink url="https://wiki.debian.org/FourFire#">FourFire</ulink> Le'bard (2014),  Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released under the GPL v2 or any later version. 
 </para>
 <para>The German translation is copyrighted by Holger Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp Hübner (2009),  Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013, 2014) and is released under the GPL v2 or any later version. 
 </para>

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