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

Sat Feb 7 15:56:38 UTC 2015

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

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

commit 07aabf4eb6e2ef2bca16174dc91a0d307e8d0b37
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Feb 7 15:50:20 2015 +0000

    updated from the wiki
---
 debian/copyright                                   |   10 +-
 .../debian-edu-jessie-manual.da.po                 |  261 ++-
 .../debian-edu-jessie-manual.de.po                 |  284 ++-
 .../debian-edu-jessie-manual.es.po                 |  255 ++-
 .../debian-edu-jessie-manual.fr.po                 |  286 ++-
 .../debian-edu-jessie-manual.it.po                 |  274 ++-
 .../debian-edu-jessie-manual.nb.po                 | 1866 ++++++++------------
 .../debian-edu-jessie-manual.nl.po                 |  297 ++--
 .../debian-edu-jessie/debian-edu-jessie-manual.pot |  117 +-
 .../debian-edu-jessie/debian-edu-jessie-manual.xml |   60 +-
 .../debian-edu-jessie/images/de/worldmap.png       |  Bin 387007 -> 387002 bytes
 .../debian-edu-jessie/images/es/worldmap.png       |  Bin 387111 -> 387106 bytes
 .../debian-edu-jessie/images/fr/worldmap.png       |  Bin 387046 -> 387040 bytes
 .../debian-edu-jessie/images/worldmap.png          |  Bin 387039 -> 387034 bytes
 14 files changed, 1936 insertions(+), 1774 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 04ec1b7..46f1820 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -106,7 +106,7 @@ Copyright: 2007 José L. Redrejo Rodríguez
 License: GPL-2+
 
 Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
-Copyright: 2007, 2012, 2014 Petter Reinholdtsen
+Copyright: 2007, 2012, 2014, 2015 Petter Reinholdtsen
   2007-2009 Håvard Korsvoll
   2008 Tore Skogly
   2010 Ole-Anders Andreassen
@@ -131,7 +131,7 @@ Copyright: 2007 Holger Levsen
   2009 Franziska Teichert
   2009 Philipp Hübner
   2009, 2010  Andreas Mundt
-  2012, 2013, 2014 Wolfgang Schweer
+  2012, 2013, 2014, 2015 Wolfgang Schweer
 License: GPL-2+
 
 Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -142,7 +142,7 @@ License: GPL-2+
 Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
 Copyright: 2008 Christophe Masson
   2010 Olivier Vitrat
-  2012, 2013 Cédric Boutillier
+  2012, 2013,2014,2015 Cédric Boutillier
   2012 Jean-Paul Guilloneau
   2012 David Prévot
   2012 Thomas Vincent
@@ -150,11 +150,11 @@ Copyright: 2008 Christophe Masson
 License: GPL-2+
 
 Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
-Copyright: 2012, 2013 Joe Hansen
+Copyright: 2012, 2013, 2014 Joe Hansen
 License: GPL-2+
 
 Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
-Copyright: 2014 Frans Spiesschaert
+Copyright: 2014, 2015 Frans Spiesschaert
 License: GPL-2+
 
 Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
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 d05cbe0..0260df7 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2015-01-25 19:07+0000\n"
+"POT-Creation-Date: 2015-02-07 15:48+0000\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"
@@ -1071,117 +1071,132 @@ msgstr ""
 #| "The computers running Debian Edu / Skolelinux must have either i386 or "
 #| "amd64 processors."
 msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
-"supported processors: Intel Pentium/AMD K5) or amd64 processors."
+"The computers running Debian Edu / Skolelinux must have either 32 bit "
+"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
+"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
 msgstr ""
 "Computerne der kører Debian Edu / Skolelinux skal have enten i386- eller "
 "amd64-processorer."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
-"architecture:"
+"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+"recommended for the main and thin client server profiles."
 msgstr ""
-"Servere for tynde klienter skal have to netværkskort når netværkets "
-"standardarkitektur bruges:"
 
-#. 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 er forbundet til hovednetværket (10.0.0.0/8),"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
+msgid ""
+"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+"possible, though 256 MiB RAM or more and faster processors are recommended."
+msgstr ""
+"Tynde klienter kan køre på så lidt som 64 MiB RAM og 133 MHz processor, dog "
+"anbefales 128 MiB RAM og lidt hurtigere processorer."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-#| "192.168.1.0/24)."
+#| "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."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"Swapping over the network is automatically enabled for LTSP clients; the "
+"swap size is 512 MiB, and if you need more you can tune this by editing "
+"<computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> on tjener to set "
+"the SIZE variable."
 msgstr ""
-"eth1 bruges for betjening af tynde klienter (192.168.0.0/24 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."
-msgstr "Regn med 2 GB RAM for 30 klienter og 4 GB RAM for 50-60 klienter."
+"Swapping over netværket bliver automatisk aktiveret; swapstørrelsen er 512 "
+"MiB, og hvis du skal bruge mere kan du tune denne indstilling ved at "
+"redigere /etc/ltsp/nbdswapd.conf på tjener med variablen SIZE. <emphasis>øg "
+"swapstørrelsen</emphasis> enten lokalt på pc'en eller på serveren."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><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 "
-"with disk space on a main-server, it's \"the bigger the better\"."
+"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 ""
-"Diskpladskrav afhænger af de brugte profiler, men enhver disk større end 25 "
-"GiB vil være tilstrækkelig for en arbejdsstation eller uafhængig "
-"installation, 30 Gib for en server for tynde klitner og mindst 40 GiB på "
-"hovedserveren. Som sædvanligt for diskplads på en hovedserver er »jo større "
-"jo bedre«."
+"Hvis dine diskløse arbejdsstationer har harddiske, så anbefales det at bruge "
+"dem for swap, da det er langt hurtigere end netværksswapping."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "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."
 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."
+"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"512 MiB RAM are the absolute minimum requirements. For running modern "
+"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgstr ""
-"Tynde klienter kan køre på så lidt som 64 MiB RAM og 133 MHz processor, dog "
-"anbefales 128 MiB RAM og lidt hurtigere processorer."
+"For arbejdsstationer, diskløse arbejdsstationer og uafhængige pc'er, er 800 "
+"MHz, 320 MiB RAM minimumskrav, dog vil 512 eller 1024 MiB RAM have langt "
+"bedre ydelse. Ligesom en hurtigere CPU vil få tingene til at løbe hurtigere."
 
 #. 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."
+"On workstations with little RAM the spell checker might cause LibreOffice to "
+"hang if the swap space is also too small. If this happens frequently the "
+"spell checker can be disabled by system administrators."
 msgstr ""
-"For kørsel af Iceweasel/Firefox og LibreOffice, er 128 MiB RAM et minimum."
 
 #. 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 "
-"considerably better. Just a faster CPU will speed things up."
+"The minimum disk space requirements depend on the profile which is installed:"
 msgstr ""
-"For arbejdsstationer, diskløse arbejdsstationer og uafhængige pc'er, er 800 "
-"MHz, 320 MiB RAM minimumskrav, dog vil 512 eller 1024 MiB RAM have langt "
-"bedre ydelse. Ligesom en hurtigere CPU vil få tingene til at løbe hurtigere."
 
 #. 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."
+"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"server, \"the bigger the better\"."
 msgstr ""
-"Swapping over netværket bliver automatisk aktiveret; swapstørrelsen er 512 "
-"MiB, og hvis du skal bruge mere kan du tune denne indstilling ved at "
-"redigere /etc/ltsp/nbdswapd.conf på tjener med variablen SIZE. <emphasis>øg "
-"swapstørrelsen</emphasis> enten lokalt på pc'en 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><para>
+#, fuzzy
+#| msgid "Thin Client Server/s"
+msgid "thin client server: 40 GiB."
+msgstr "Servere for tynde klienter"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "workstation or standalone: 30 GiB."
+msgstr ""
+
+#. type: Content of: <article><section><section><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."
+"Thin client servers need two network cards when using the default network "
+"architecture:"
 msgstr ""
-"Hvis dine diskløse arbejdsstationer har harddiske, så anbefales det at bruge "
-"dem for swap, da det er langt hurtigere end netværksswapping."
+"Servere for tynde klienter skal have to netværkskort når netværkets "
+"standardarkitektur bruges:"
 
 #. 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 er forbundet til hovednetværket (10.0.0.0/8),"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#| "192.168.1.0/24)."
 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."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
 msgstr ""
-"På arbejdsstationer med begrænset RAM kan stavekontrollen få LibreOffice til "
-"at hænge hvis swapområdet er for lille. Systemadministratoren må så "
-"deaktivere stavekontrollen for LibreOffice eller studenterne må dræbe "
-"LibreOffice, hvilket kan resultere i tabt arbejde. Aktivering af mindst 512 "
-"MiB swap på en 320 MiB RAM arbejdsstation løser denne problemstilling, og "
-"stavekontrollen kører så fint."
+"eth1 bruges for betjening af tynde klienter (192.168.0.0/24 eller "
+"192.168.1.0/24)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Laptops have the same requirements as for workstations since they are "
+#| "just movable workstations."
 msgid ""
-"Laptops have the same requirements as for workstations since they are just "
-"movable workstations."
+"Laptops are movable workstations, so they have the same requirements as "
+"workstations."
 msgstr ""
 "Bærbare har de samme krav som arbejdsstationer da de bare er flytbare "
 "arbejdsstationer."
@@ -1432,9 +1447,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
@@ -1473,9 +1492,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
@@ -1505,9 +1528,15 @@ msgstr ""
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-source-USB.iso debian-edu-8.0+edu0-source-USB.iso</"
+#| "computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
@@ -9487,7 +9516,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "the browsers Iceweasel 31 ESR and Chromium 38"
-msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+msgid "the browsers Iceweasel 31 ESR and Chromium 40"
 msgstr "Internetbrowserne Iceweasel 31 ESR ig Chromium 38"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9710,7 +9739,7 @@ msgstr ""
 #| "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 "
+"2014, 2015), 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), FourFire "
 "Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) "
@@ -9722,13 +9751,23 @@ msgstr ""
 "Yrvin (2014) og er udgivet under GPL version 2 eller enhver senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), 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."
 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), "
 "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."
+"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Den tyske oversættelse er underlagt ophavsretten af Holger Levsen (2007), "
 "Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
@@ -9749,11 +9788,19 @@ msgstr ""
 "version 2 eller en senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
+#| "French l10n team (2009, 2010, 2012) and is released under the GPL v2 or "
+#| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL v2 or any later version."
+"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
+"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Den franske oversættelse er underlagt ophavsretten af Christophe Masson "
 "(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
@@ -9762,17 +9809,25 @@ msgstr ""
 "senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013, "
 "2014) og er udgivet under GPL version 2 eller enhver senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
-"released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "Den hollandske oversættelse er underlagt ophavsretten af Frans Spiesschaert "
 "(2014) og er udgivet under GPL version 2 eller enhver senere version."
@@ -12290,6 +12345,42 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
+#~ msgstr "Regn med 2 GB RAM for 30 klienter og 4 GB RAM for 50-60 klienter."
+
+#~ 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 with disk space on a main-server, it's \"the bigger the better\"."
+#~ msgstr ""
+#~ "Diskpladskrav afhænger af de brugte profiler, men enhver disk større end "
+#~ "25 GiB vil være tilstrækkelig for en arbejdsstation eller uafhængig "
+#~ "installation, 30 Gib for en server for tynde klitner og mindst 40 GiB på "
+#~ "hovedserveren. Som sædvanligt for diskplads på en hovedserver er »jo "
+#~ "større jo bedre«."
+
+#~ msgid ""
+#~ "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
+#~ "requirement."
+#~ msgstr ""
+#~ "For kørsel af Iceweasel/Firefox og LibreOffice, er 128 MiB RAM et minimum."
+
+#~ 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å arbejdsstationer med begrænset RAM kan stavekontrollen få LibreOffice "
+#~ "til at hænge hvis swapområdet er for lille. Systemadministratoren må så "
+#~ "deaktivere stavekontrollen for LibreOffice eller studenterne må dræbe "
+#~ "LibreOffice, hvilket kan resultere i tabt arbejde. Aktivering af mindst "
+#~ "512 MiB swap på en 320 MiB RAM arbejdsstation løser denne "
+#~ "problemstilling, og stavekontrollen kører så fint."
+
 #~ msgid "The KDE desktop profile for students/pupils."
 #~ msgstr "KDE-skrivebordsprofilen for studenter/elever."
 
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 37e08ed..7d5fe73 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-25 19:07+0000\n"
+"POT-Creation-Date: 2015-02-07 15:48+0000\n"
 "PO-Revision-Date: 2015-01-26 10:20+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1084,9 +1084,14 @@ msgstr ""
 "\"Architecture\">Netzwerk-Architektur</link> erläutert."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 "
+#| "(oldest supported processors: Intel Pentium/AMD K5) or amd64 processors."
 msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
-"supported processors: Intel Pentium/AMD K5) or amd64 processors."
+"The computers running Debian Edu / Skolelinux must have either 32 bit "
+"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
+"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
 msgstr ""
 "Rechner, auf denen Debian Edu / Skolelinux installiert werden soll, müssen "
 "eine i386- oder amd64-Prozessor-Architektur haben. (i386-Prozessoren ab "
@@ -1094,111 +1099,122 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
-"architecture:"
+"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+"recommended for the main and thin client server profiles."
 msgstr ""
-"Terminal-Server (LTSP) benötigen zwei Netzwerkkarten, wenn sie die Standard-"
-"Netzwerkarchitektur nutzen sollen:"
-
-#. 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 ist verbunden mit dem Hauptnetzwerk (10.0.0.0/8),"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+"possible, though 256 MiB RAM or more and faster processors are recommended."
 msgstr ""
-"eth1 bedient LTSP Clients (192.168.0.0/24 per Voreinstellung oder "
-"192.168.1.0/24)."
+"Thin Clients laufen mit 64 MiB RAM und einem 133 MHz Prozessor. "
+"Empfehlenswert sind jedoch 128 MiB RAM und ein schnellerer Prozessor."
 
-#. 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."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
+msgid ""
+"Swapping over the network is automatically enabled for LTSP clients; the "
+"swap size is 512 MiB, and if you need more you can tune this by editing "
+"<computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> on tjener to set "
+"the SIZE variable."
 msgstr ""
-"Rechnen Sie mit ca. 2 GB RAM für 30 Clients oder 4 GB RAM für 50-60 Clients."
+"Speicherauslagerung über das Netzwerk ist automatisch voreingestellt. Die "
+"Größe des Auslagerungsspeichers beträgt 512 MiB. Wenn Sie mehr benötigen, "
+"können Sie das durch Editieren der Datei /etc/ltsp/nbdswapd.conf auf "
+"»Tjener« oder dem PC ändern, indem Sie die SIZE-Variable entsprechend "
+"erhöhen. "
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><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 "
-"with disk space on a main-server, it's \"the bigger the better\"."
+"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 ""
-"Die benötigte Festplattenkapazität hängt von den verwendeten Profilen ab: "
-"Für Arbeitsplatz- oder Einzelplatzrechner gelten ca. 25 GiB als ausreichend. "
-"Ein »Terminal-Server« sollte mindestens 30 GiB haben, der Hauptserver "
-"mindestens 40 GiB. Auf dem Hauptserver gilt im Zweifelsfall: Je mehr "
-"Speicherplatz, desto besser."
+"Wenn Ihre Diskless Workstations eine Festplatte besitzen, sollten Sie diese "
+"als Swap (Auslagerungsspeicher) verwenden. Dies ist viel schneller als die "
+"Auslagerung über das Netzwerk."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "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."
 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."
+"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"512 MiB RAM are the absolute minimum requirements. For running modern "
+"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgstr ""
-"Thin Clients laufen mit 64 MiB RAM und einem 133 MHz Prozessor. "
-"Empfehlenswert sind jedoch 128 MiB RAM und ein schnellerer Prozessor."
+"Für Arbeitsplatzrechner, Diskless Workstations und Einzelplatzrechner werden "
+"mindestens 320 MiB RAM bei 800 MHz Taktfrequenz empfohlen, wobei 512 oder "
+"1024 MiB RAM deutliche Vorteile bringen. Schon ein schnellerer Prozessor "
+"wird die Arbeit deutlich beschleunigen."
 
 #. 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."
+"On workstations with little RAM the spell checker might cause LibreOffice to "
+"hang if the swap space is also too small. If this happens frequently the "
+"spell checker can be disabled by system administrators."
 msgstr ""
-"Bei Verwendung von Iceweasel/Firefox und LibreOffice müssen mindestens 128 "
-"MiB RAM zur Verfügung stehen."
 
 #. 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 "
-"considerably better. Just a faster CPU will speed things up."
+"The minimum disk space requirements depend on the profile which is installed:"
 msgstr ""
-"Für Arbeitsplatzrechner, Diskless Workstations und Einzelplatzrechner werden "
-"mindestens 320 MiB RAM bei 800 MHz Taktfrequenz empfohlen, wobei 512 oder "
-"1024 MiB RAM deutliche Vorteile bringen. Schon ein schnellerer Prozessor "
-"wird die Arbeit deutlich beschleunigen."
 
 #. 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."
+"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"server, \"the bigger the better\"."
 msgstr ""
-"Speicherauslagerung über das Netzwerk ist automatisch voreingestellt. Die "
-"Größe des Auslagerungsspeichers beträgt 512 MiB. Wenn Sie mehr benötigen, "
-"können Sie das durch Editieren der Datei /etc/ltsp/nbdswapd.conf auf "
-"»Tjener« oder dem PC ändern, indem Sie die SIZE-Variable entsprechend "
-"erhöhen. "
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Thin Client Server/s"
+msgid "thin client server: 40 GiB."
+msgstr "Terminal-Server"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "workstation or standalone: 30 GiB."
+msgstr ""
+
+#. type: Content of: <article><section><section><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."
+"Thin client servers need two network cards when using the default network "
+"architecture:"
 msgstr ""
-"Wenn Ihre Diskless Workstations eine Festplatte besitzen, sollten Sie diese "
-"als Swap (Auslagerungsspeicher) verwenden. Dies ist viel schneller als die "
-"Auslagerung über das Netzwerk."
+"Terminal-Server (LTSP) benötigen zwei Netzwerkkarten, wenn sie die Standard-"
+"Netzwerkarchitektur nutzen sollen:"
+
+#. 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 ist verbunden mit dem Hauptnetzwerk (10.0.0.0/8),"
 
 #. 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."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
 msgstr ""
-"Auf Workstations mit wenig RAM kann die Rechtschreibkontrolle von "
-"LibreOffice hängen bleiben, wenn der Swap-Speicher zu klein ist. Dann muss "
-"der System-Administrator die Rechtschreibkontrolle ausschalten oder "
-"betroffene Schüler müssen den LibreOffice-Prozess beenden (kill) und "
-"verlieren dabei ihre Arbeit. Wenn mindestens 512 MiB Swap-Speicher auf einer "
-"Diskless Workstation mit 320 MiB RAM zur Verfügung gestellt werden, läuft "
-"die Rechtschreibkontrolle ohne Probleme."
+"eth1 bedient LTSP Clients (192.168.0.0/24 per Voreinstellung oder "
+"192.168.1.0/24)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Laptops have the same requirements as for workstations since they are "
+#| "just movable workstations."
 msgid ""
-"Laptops have the same requirements as for workstations since they are just "
-"movable workstations."
+"Laptops are movable workstations, so they have the same requirements as "
+"workstations."
 msgstr ""
 "An Laptops sind dieselben Anforderungen wie an Arbeitsplatzrechner zu "
 "stellen, sie können einfach als mobile Arbeitsplatzrechner betrachtet werden."
@@ -1454,9 +1470,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
@@ -1494,9 +1514,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
@@ -1526,9 +1550,15 @@ msgstr ""
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-source-USB.iso debian-edu-8.0+edu0-source-USB.iso</"
+#| "computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
@@ -9651,7 +9681,9 @@ msgstr ""
 "eine der anderen zu installieren."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+#, fuzzy
+#| msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+msgid "the browsers Iceweasel 31 ESR and Chromium 40"
 msgstr "Webbrowser Iceweasel 31 ESR und Chromium 39"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9874,9 +9906,17 @@ msgstr ""
 "2013). Sie wurde unter der GPL v2 oder einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), "
+#| "FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar "
+#| "Wisløff (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 "
+"2014, 2015), 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), FourFire "
 "Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) "
@@ -9891,13 +9931,23 @@ msgstr ""
 "lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), 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."
 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), "
 "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."
+"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Die deutsche Übersetzung wurde erstellt und ist Copyright von Holger Levsen "
 "(2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
@@ -9919,11 +9969,19 @@ msgstr ""
 "lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
+#| "French l10n team (2009, 2010, 2012) and is released under the GPL v2 or "
+#| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL v2 or any later version."
+"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
+"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Die französische Übersetzung wurde von Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
@@ -9932,17 +9990,25 @@ msgstr ""
 "Version lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "Die dänische Übersetzung wurde verfasst von Joe Hansen (2012, 2013) und ist "
 "unter der GPL v2 oder einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
-"released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "Die niederländische Übersetzung wurde verfasst von Frans Spiesschaert (2014) "
 "und ist unter der GPL v2 oder einer späteren Version lizenziert."
@@ -12450,6 +12516,46 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
+#~ msgstr ""
+#~ "Rechnen Sie mit ca. 2 GB RAM für 30 Clients oder 4 GB RAM für 50-60 "
+#~ "Clients."
+
+#~ 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 with disk space on a main-server, it's \"the bigger the better\"."
+#~ msgstr ""
+#~ "Die benötigte Festplattenkapazität hängt von den verwendeten Profilen ab: "
+#~ "Für Arbeitsplatz- oder Einzelplatzrechner gelten ca. 25 GiB als "
+#~ "ausreichend. Ein »Terminal-Server« sollte mindestens 30 GiB haben, der "
+#~ "Hauptserver mindestens 40 GiB. Auf dem Hauptserver gilt im Zweifelsfall: "
+#~ "Je mehr Speicherplatz, desto besser."
+
+#~ msgid ""
+#~ "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
+#~ "requirement."
+#~ msgstr ""
+#~ "Bei Verwendung von Iceweasel/Firefox und LibreOffice müssen mindestens "
+#~ "128 MiB RAM zur Verfügung stehen."
+
+#~ 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 ""
+#~ "Auf Workstations mit wenig RAM kann die Rechtschreibkontrolle von "
+#~ "LibreOffice hängen bleiben, wenn der Swap-Speicher zu klein ist. Dann "
+#~ "muss der System-Administrator die Rechtschreibkontrolle ausschalten oder "
+#~ "betroffene Schüler müssen den LibreOffice-Prozess beenden (kill) und "
+#~ "verlieren dabei ihre Arbeit. Wenn mindestens 512 MiB Swap-Speicher auf "
+#~ "einer Diskless Workstation mit 320 MiB RAM zur Verfügung gestellt werden, "
+#~ "läuft die Rechtschreibkontrolle ohne Probleme."
+
 #~ msgid "The KDE desktop profile for students/pupils."
 #~ msgstr "Das KDE-Arbeitsflächenprofil für Studenten/Schüler"
 
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 1d8173c..f672307 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: 2015-01-25 19:07+0000\n"
+"POT-Creation-Date: 2015-02-07 15:48+0000\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"
@@ -1087,126 +1087,136 @@ msgstr ""
 #| "The computers running Debian Edu / Skolelinux must have either i386 or "
 #| "amd64 processors."
 msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
-"supported processors: Intel Pentium/AMD K5) or amd64 processors."
+"The computers running Debian Edu / Skolelinux must have either 32 bit "
+"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
+"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
 msgstr ""
 "Las computadoras corriendo Debian Edu / Skolelinux deben tener procesadores "
 "i386, amd64 o powerpc."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
-"architecture:"
+"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+"recommended for the main and thin client server profiles."
 msgstr ""
-"Los servidores para clientes ligeros necesitan dos tarjetas de red cuando la "
-"arquitectura de red por defecto es usada."
 
-#. 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 conectada a la red principal (10.0.0.0/8),"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
-#| "192.168.1.0/24)."
+#| "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."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+"possible, though 256 MiB RAM or more and faster processors are recommended."
 msgstr ""
-"eth1 es usada para servir la red de clientes ligeros (192.168.0.0/24 o "
-"192.168.1.0/24)."
+"Los clientes ligeros pueden funcionar con 64 MB de RAM y 133 MHZ de "
+"procesador, aunque se recomiendo 128 MB de RAM y procesadores de mayor "
+"velocidad."
 
-#. 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."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
+msgid ""
+"Swapping over the network is automatically enabled for LTSP clients; the "
+"swap size is 512 MiB, and if you need more you can tune this by editing "
+"<computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> on tjener to set "
+"the SIZE variable."
 msgstr ""
-"Considere al menos 2Gb de memoria RAM para 30 clientes, y 4GB para 50-60 "
-"clientes."
+"La paginación de memoria por red esta habilitada por defecto, tiene un "
+"tamaño de 512Mb. Si necesita más, puede modificarlo desde la variable SIZE, "
+"en el archivo /etc/ltsp/nbdswapd.conf en tjener. Por favor <emphasis>ajuste "
+"el tamaño de la memoria de paginación</emphasis> ya sea localmente en la PC "
+"o en el servidor."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><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 "
-"with disk space on a main-server, it's \"the bigger the better\"."
+"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 ""
-"El espacio en disco requerido dependerá de los perfiles que se utilizarán, "
-"con cualquier disco mayor de 25Gb será suficiente para una estación de "
-"trabajo o un PC individual, 30Gb para un servidor de clientes ligeros y con "
-"uno de al menos 40 Gb para el servidor principal. Como es normal respecto al "
-"espacio en disco para el servidor principal: entre más espacio, mejor."
+"Si sus terminales tienen disco duro, se recomienda que sean utilizados para "
+"paginación, ya que resulta ser más rápida que la paginación por medio de la "
+"red."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "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."
 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."
+"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"512 MiB RAM are the absolute minimum requirements. For running modern "
+"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgstr ""
-"Los clientes ligeros pueden funcionar con 64 MB de RAM y 133 MHZ de "
-"procesador, aunque se recomiendo 128 MB de RAM y procesadores de mayor "
-"velocidad."
+"Para estaciones de trabajo, terminales tontas e instalaciones individuales, "
+"PC's con velocidad de 800 MHz y 320 Mb de RAM son los requerimientos "
+"mínimos, aún con 512 o 1024 Mb de RAM daría un mejor desempeño, pero solo "
+"con un procesador más rápido ayudaría en su funcionamiento."
 
 #. 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."
+"On workstations with little RAM the spell checker might cause LibreOffice to "
+"hang if the swap space is also too small. If this happens frequently the "
+"spell checker can be disabled by system administrators."
 msgstr ""
-"Para ejecutar Iceweasel/Firefox y LibreOffice, recomendamos 128 MiB de RAM."
-"como mínimo."
 
 #. 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 "
-"considerably better. Just a faster CPU will speed things up."
+"The minimum disk space requirements depend on the profile which is installed:"
 msgstr ""
-"Para estaciones de trabajo, terminales tontas e instalaciones individuales, "
-"PC's con velocidad de 800 MHz y 320 Mb de RAM son los requerimientos "
-"mínimos, aún con 512 o 1024 Mb de RAM daría un mejor desempeño, pero solo "
-"con un procesador más rápido ayudaría en su funcionamiento."
 
 #. 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."
+"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"server, \"the bigger the better\"."
 msgstr ""
-"La paginación de memoria por red esta habilitada por defecto, tiene un "
-"tamaño de 512Mb. Si necesita más, puede modificarlo desde la variable SIZE, "
-"en el archivo /etc/ltsp/nbdswapd.conf en tjener. Por favor <emphasis>ajuste "
-"el tamaño de la memoria de paginación</emphasis> ya sea localmente en la PC "
-"o en el servidor."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Thin client server: 618 of 1052 MiB downloaded."
+msgid "thin client server: 40 GiB."
+msgstr "Servidor de clientes ligeros: 618 de 1052 MiB descargados."
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "workstation or standalone: 30 GiB."
+msgstr ""
+
+#. type: Content of: <article><section><section><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."
+"Thin client servers need two network cards when using the default network "
+"architecture:"
 msgstr ""
-"Si sus terminales tienen disco duro, se recomienda que sean utilizados para "
-"paginación, ya que resulta ser más rápida que la paginación por medio de la "
-"red."
+"Los servidores para clientes ligeros necesitan dos tarjetas de red cuando la "
+"arquitectura de red por defecto es usada."
 
 #. 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 conectada a la red principal (10.0.0.0/8),"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
+#| "192.168.1.0/24)."
 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."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
 msgstr ""
-"En estaciones de trabajo con poca memoria RAM, el corrector ortográfico de "
-"LibreOffice puede causar que se cuelgue, ya que el espacio para paginación "
-"es pequeño. Por lo que el administrador tendría que deshabilitar el "
-"corrector ortográfico, o el estudiante terminar el proceso de LibreOffice, "
-"dando como resultado, pérdida de la información. Habilitar al menos 512 Mb "
-"de memoria de paginación con una estación de trabajo con 320 Mb de memoria "
-"RAM podría solventar esto, y el corrector ortográfico funcionaría "
-"correctamente."
+"eth1 es usada para servir la red de clientes ligeros (192.168.0.0/24 o "
+"192.168.1.0/24)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Laptops have the same requirements as for workstations since they are "
+#| "just movable workstations."
 msgid ""
-"Laptops have the same requirements as for workstations since they are just "
-"movable workstations."
+"Laptops are movable workstations, so they have the same requirements as "
+"workstations."
 msgstr ""
 "Para laptops, se necesitan los mismos requerimientos de las estaciones de "
 "trabajo, ya las laptops son estaciones de trabajo móvil."
@@ -1479,8 +1489,8 @@ msgstr ""
 #| "edu-8.0~alpha+edu0-CD.iso|debian-edu-8.0~alpha+edu0-CD.iso </"
 #| "computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0~alpha"
 "+edu0-CD.iso|debian-edu-8.0~alpha+edu0-CD.iso </computeroutput>"
@@ -1532,8 +1542,8 @@ msgstr ""
 #| "edu-8.0~alpha+edu0-USB.iso|debian-edu-8.0~alpha+edu0-USB.iso </"
 #| "computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0~alpha"
 "+edu0-USB.iso|debian-edu-8.0~alpha+edu0-USB.iso </computeroutput>"
@@ -1577,8 +1587,9 @@ msgstr ""
 #| "edu-8.0~alpha+edu0-source-USB.iso debian-edu-8.0~alpha+edu0-source-USB."
 #| "iso</computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0~alpha"
 "+edu0-source-USB.iso debian-edu-8.0~alpha+edu0-source-USB.iso</"
@@ -8753,7 +8764,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+msgid "the browsers Iceweasel 31 ESR and Chromium 40"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8969,7 +8980,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"2014, 2015), 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), FourFire "
 "Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) "
@@ -8979,13 +8990,23 @@ msgstr ""
 "la licencia GPL2 o versiones posteriores."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), 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."
 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), "
 "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."
+"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "La traducción a alemán es copyright 2007 de Holger Levsen y está bajo la "
 "licencia GPL2 o versiones posteriores."
@@ -9004,9 +9025,10 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL v2 or any later version."
+"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
+"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
 "está bajo la licencia GPL2 o versiones posteriores."
@@ -9014,8 +9036,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
 "está bajo la licencia GPL2 o versiones posteriores."
@@ -9023,8 +9045,8 @@ msgstr ""
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
-"released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "La traducción a español es copyright 2007 de José L. Redrejo Rodríguez y "
 "está bajo la licencia GPL2 o versiones posteriores."
@@ -11158,6 +11180,48 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
+#~ msgstr ""
+#~ "Considere al menos 2Gb de memoria RAM para 30 clientes, y 4GB para 50-60 "
+#~ "clientes."
+
+#~ 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 with disk space on a main-server, it's \"the bigger the better\"."
+#~ msgstr ""
+#~ "El espacio en disco requerido dependerá de los perfiles que se "
+#~ "utilizarán, con cualquier disco mayor de 25Gb será suficiente para una "
+#~ "estación de trabajo o un PC individual, 30Gb para un servidor de clientes "
+#~ "ligeros y con uno de al menos 40 Gb para el servidor principal. Como es "
+#~ "normal respecto al espacio en disco para el servidor principal: entre más "
+#~ "espacio, mejor."
+
+#~ msgid ""
+#~ "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
+#~ "requirement."
+#~ msgstr ""
+#~ "Para ejecutar Iceweasel/Firefox y LibreOffice, recomendamos 128 MiB de "
+#~ "RAM.como mínimo."
+
+#~ 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 ""
+#~ "En estaciones de trabajo con poca memoria RAM, el corrector ortográfico "
+#~ "de LibreOffice puede causar que se cuelgue, ya que el espacio para "
+#~ "paginación es pequeño. Por lo que el administrador tendría que "
+#~ "deshabilitar el corrector ortográfico, o el estudiante terminar el "
+#~ "proceso de LibreOffice, dando como resultado, pérdida de la información. "
+#~ "Habilitar al menos 512 Mb de memoria de paginación con una estación de "
+#~ "trabajo con 320 Mb de memoria RAM podría solventar esto, y el corrector "
+#~ "ortográfico funcionaría correctamente."
+
 #~ msgid "The KDE desktop profile for students/pupils."
 #~ msgstr "Perfil de escritorio KDE para estudiantes"
 
@@ -11683,9 +11747,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Servidor principal y estación de trabajo: 618 de 1081 MiB descargados."
 
-#~ msgid "Thin client server: 618 of 1052 MiB downloaded."
-#~ msgstr "Servidor de clientes ligeros: 618 de 1052 MiB descargados."
-
 #~ msgid "Workstation: 618 of 1051 MiB downloaded."
 #~ msgstr "Estación de trabajo: 618 de 1051 MiB descargados."
 
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 ecb4b77..68ab32e 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-01-25 19:07+0000\n"
+"POT-Creation-Date: 2015-02-07 15:48+0000\n"
 "PO-Revision-Date: 2014-12-23 23:13+0100\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1085,9 +1085,14 @@ msgstr ""
 "linkend=\"Architecture\">architecture réseau</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 "
+#| "(oldest supported processors: Intel Pentium/AMD K5) or amd64 processors."
 msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
-"supported processors: Intel Pentium/AMD K5) or amd64 processors."
+"The computers running Debian Edu / Skolelinux must have either 32 bit "
+"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
+"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
 msgstr ""
 "Les ordinateurs exécutant Debian Edu / Skolelinux doivent avoir des "
 "processeurs i386 (les processeurs les plus anciens pris en charge sont les "
@@ -1095,112 +1100,123 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
-"architecture:"
+"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+"recommended for the main and thin client server profiles."
 msgstr ""
-"Les serveurs de clients légers ont besoin de deux cartes réseau lorsque "
-"l'architecture de réseau par défaut est utilisée : "
-
-#. 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 reliée au réseau principal (10.0.0.0/8),"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+"possible, though 256 MiB RAM or more and faster processors are recommended."
 msgstr ""
-"eth1 est utilisée pour servir les clients légers (192.168.0.0/24 par défaut "
-"ou 192.168.1.0/24)."
+"Pour les clients légers, 64 Mio de RAM et une fréquence de 133 MHz est le "
+"minimum recommandé. Cependant, 128 Mio de RAM et un processeur plus puissant "
+"sont recommandés."
 
-#. 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."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
+msgid ""
+"Swapping over the network is automatically enabled for LTSP clients; the "
+"swap size is 512 MiB, and if you need more you can tune this by editing "
+"<computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> on tjener to set "
+"the SIZE variable."
 msgstr ""
-"Considérer 2 Gio de mémoire RAM pour 30 clients et 4 Gio pour 50-60 clients. "
+"L'échange (« swapping ») par le réseau est automatiquement activé, la taille "
+"de la zone d'échange est de 512 Mio ; si vous avez besoin de plus, vous "
+"pouvez régler cela en éditant /etc/ltsp/nbdsapd.conf sur tjener en modifiant "
+"la variable SIZE. Veuillez <emphasis>configurer la taille du fichier "
+"d'échange</emphasis> soit localement sur le PC ou bien sur le serveur."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><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 "
-"with disk space on a main-server, it's \"the bigger the better\"."
+"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 ""
-"Les besoins en espace disque dépendent des profils utilisés, mais un disque "
-"de 25 Gio ou plus est suffisant pour une installation station de travail ou "
-"individuelle, 30 Gio pour un serveur de clients légers et au moins 40 Gio "
-"pour le serveur principal. Comme d'habitude, plus grande est la quantité "
-"d'espace disque sur le serveur principal, mieux c'est."
+"Si vos stations de travail ont des disques durs, il est recommandé de les "
+"utiliser comme espace d'échange, ce qui est bien plus rapide qu'à travers le "
+"réseau."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "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."
 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."
+"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"512 MiB RAM are the absolute minimum requirements. For running modern "
+"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgstr ""
-"Pour les clients légers, 64 Mio de RAM et une fréquence de 133 MHz est le "
-"minimum recommandé. Cependant, 128 Mio de RAM et un processeur plus puissant "
-"sont recommandés."
+"Pour les stations de travail (avec ou sans disque) ainsi que les PC "
+"autonomes, 320 Mio de mémoire vive et une fréquence de processeur de 800 MHz "
+"ou plus sont le minimum nécessaire, cependant, 512 ou 1024 Mio de mémoire "
+"vive amélioreront l'utilisation, de même qu'un processeur plus rapide."
 
 #. 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."
+"On workstations with little RAM the spell checker might cause LibreOffice to "
+"hang if the swap space is also too small. If this happens frequently the "
+"spell checker can be disabled by system administrators."
 msgstr ""
-"Pour exécuter Iceweasel ou Firefox et LibreOffice, 128 Mio de RAM sont un "
-"minimum."
 
 #. 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 "
-"considerably better. Just a faster CPU will speed things up."
+"The minimum disk space requirements depend on the profile which is installed:"
 msgstr ""
-"Pour les stations de travail (avec ou sans disque) ainsi que les PC "
-"autonomes, 320 Mio de mémoire vive et une fréquence de processeur de 800 MHz "
-"ou plus sont le minimum nécessaire, cependant, 512 ou 1024 Mio de mémoire "
-"vive amélioreront l'utilisation, de même qu'un processeur plus rapide."
 
 #. 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."
+"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"server, \"the bigger the better\"."
 msgstr ""
-"L'échange (« swapping ») par le réseau est automatiquement activé, la taille "
-"de la zone d'échange est de 512 Mio ; si vous avez besoin de plus, vous "
-"pouvez régler cela en éditant /etc/ltsp/nbdsapd.conf sur tjener en modifiant "
-"la variable SIZE. Veuillez <emphasis>configurer la taille du fichier "
-"d'échange</emphasis> soit localement sur le PC ou bien sur le serveur."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Thin Client Server/s"
+msgid "thin client server: 40 GiB."
+msgstr "Serveur de clients légers"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "workstation or standalone: 30 GiB."
+msgstr ""
+
+#. type: Content of: <article><section><section><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."
+"Thin client servers need two network cards when using the default network "
+"architecture:"
 msgstr ""
-"Si vos stations de travail ont des disques durs, il est recommandé de les "
-"utiliser comme espace d'échange, ce qui est bien plus rapide qu'à travers le "
-"réseau."
+"Les serveurs de clients légers ont besoin de deux cartes réseau lorsque "
+"l'architecture de réseau par défaut est utilisée : "
+
+#. 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 reliée au réseau principal (10.0.0.0/8),"
 
 #. 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."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
 msgstr ""
-"Sur les stations de travail avec peu de mémoire vive, le correcteur "
-"orthographique peut faire planter LibreOffice si la taille du fichier "
-"d'échange est trop petite. L'administrateur doit alors désactiver le "
-"correcteur orthographique dans LibreOffice, ou bien les étudiants doivent "
-"terminer l'application brutalement et perdre ainsi leur travail. Pour une "
-"station de travail possédant 320 Mio de mémoire vive, activer un fichier "
-"d'échange d'au moins 512 Mio permet de résoudre le problème."
+"eth1 est utilisée pour servir les clients légers (192.168.0.0/24 par défaut "
+"ou 192.168.1.0/24)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Laptops have the same requirements as for workstations since they are "
+#| "just movable workstations."
 msgid ""
-"Laptops have the same requirements as for workstations since they are just "
-"movable workstations."
+"Laptops are movable workstations, so they have the same requirements as "
+"workstations."
 msgstr ""
 "Les ordinateurs portables ont les mêmes spécifications que les stations de "
 "travail car ils ne sont que de simples postes de travail mobiles."
@@ -1456,9 +1472,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
@@ -1498,9 +1518,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
@@ -1530,9 +1554,15 @@ msgstr ""
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-source-USB.iso debian-edu-8.0+edu0-source-USB.iso</"
+#| "computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
@@ -9706,7 +9736,9 @@ msgstr ""
 "consultez ce manuel."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+#, fuzzy
+#| msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+msgid "the browsers Iceweasel 31 ESR and Chromium 40"
 msgstr "Navigateurs web Iceweasel 31 ESR et Chromium 39"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9929,9 +9961,17 @@ msgstr ""
 "ultérieure."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), "
+#| "FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar "
+#| "Wisløff (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 "
+"2014, 2015), 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), FourFire "
 "Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) "
@@ -9946,13 +9986,23 @@ msgstr ""
 "ultérieure."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), 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."
 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), "
 "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."
+"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "La traduction allemande, dont les droits d'auteur appartiennent à Holger "
 "Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), "
@@ -9974,11 +10024,19 @@ msgstr ""
 "ultérieure."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
+#| "French l10n team (2009, 2010, 2012) and is released under the GPL v2 or "
+#| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL v2 or any later version."
+"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
+"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "La traduction française, dont les droits d'auteur appartiennent à Christophe "
 "Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-"
@@ -9987,17 +10045,25 @@ msgstr ""
 "GPL v2 ou toute version ultérieure."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
 "(2012, 2013), est distribuée sous GPL v2 ou toute version ultérieure."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
-"released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "La traduction danoise, dont les droits d'auteur appartiennent à Frans "
 "Spiesschaert (2014) est distribuée sous GPL v2 ou toute version ultérieure."
@@ -12536,6 +12602,46 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
+#~ msgstr ""
+#~ "Considérer 2 Gio de mémoire RAM pour 30 clients et 4 Gio pour "
+#~ "50-60 clients. "
+
+#~ 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 with disk space on a main-server, it's \"the bigger the better\"."
+#~ msgstr ""
+#~ "Les besoins en espace disque dépendent des profils utilisés, mais un "
+#~ "disque de 25 Gio ou plus est suffisant pour une installation station de "
+#~ "travail ou individuelle, 30 Gio pour un serveur de clients légers et au "
+#~ "moins 40 Gio pour le serveur principal. Comme d'habitude, plus grande est "
+#~ "la quantité d'espace disque sur le serveur principal, mieux c'est."
+
+#~ msgid ""
+#~ "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
+#~ "requirement."
+#~ msgstr ""
+#~ "Pour exécuter Iceweasel ou Firefox et LibreOffice, 128 Mio de RAM sont un "
+#~ "minimum."
+
+#~ 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 ""
+#~ "Sur les stations de travail avec peu de mémoire vive, le correcteur "
+#~ "orthographique peut faire planter LibreOffice si la taille du fichier "
+#~ "d'échange est trop petite. L'administrateur doit alors désactiver le "
+#~ "correcteur orthographique dans LibreOffice, ou bien les étudiants doivent "
+#~ "terminer l'application brutalement et perdre ainsi leur travail. Pour une "
+#~ "station de travail possédant 320 Mio de mémoire vive, activer un fichier "
+#~ "d'échange d'au moins 512 Mio permet de résoudre le problème."
+
 #~ msgid "The KDE desktop profile for students/pupils."
 #~ msgstr "Le profil de bureau KDE pour étudiants/élèves."
 
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 7d905ae..bafa855 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2015-01-25 19:07+0000\n"
+"POT-Creation-Date: 2015-02-07 15:48+0000\n"
 "PO-Revision-Date: 2014-12-19 20:45+0100\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1067,116 +1067,134 @@ msgstr ""
 "\"Architecture\">architettura della rete</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 "
+#| "(oldest supported processors: Intel Pentium/AMD K5) or amd64 processors."
 msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
-"supported processors: Intel Pentium/AMD K5) or amd64 processors."
+"The computers running Debian Edu / Skolelinux must have either 32 bit "
+"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
+"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
 msgstr ""
 "I computer su cui eseguire Debian Edu / Skolelinux devono aver processori "
 "i386 (i processori più vecchi supportati sono Intel Pentium/AMD K5) o amd64."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
-"architecture:"
+"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+"recommended for the main and thin client server profiles."
 msgstr ""
-"i server thin-client devono avere due schede di rete quando si usa "
-"l'architettura di rete predefinita:"
 
-#. 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 connessa alla rete principale (10.0.0.0/8)"
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
+msgid ""
+"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+"possible, though 256 MiB RAM or more and faster processors are recommended."
+msgstr ""
+"i thin-client possono essere operativi con solo 64 MiB di RAM e con un "
+"processore a 133 MHz, sebbene 128 MiB e processori più veloci sono "
+"raccomandati."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"Swapping over the network is automatically enabled for LTSP clients; the "
+"swap size is 512 MiB, and if you need more you can tune this by editing "
+"<computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> on tjener to set "
+"the SIZE variable."
 msgstr ""
-"eth1 è usata per i client LTSP (192.168.0.0/24 di default o  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."
-msgstr "occorrono 2 GB di RAM per 30 client e 4 GB di RAM per 50-60 client."
+"L'uso della memoria di swap in rete è automaticamente abilitato: la sua "
+"grandezza è di 512 MiB, se ne serve di più si può modificare il file /etc/"
+"ltsp/nbdswapd.conf su tjener e configurare la variabile SIZE. Si consiglia "
+"di <emphasis>regolare la grandezza della swap</emphasis> sul PC locale o sul "
+"server."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><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 "
-"with disk space on a main-server, it's \"the bigger the better\"."
+"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 ""
-"Lo spazio disco necessario dipende dal profilo usato, ma un disco maggiore "
-"di 25 GiB sarà sufficiente per l'installazione di una workstation o per una "
-"installazione singola, 30 GiB per un server di thin-client e almeno 40 GiB "
-"sul sever principale. Come al solito, per quanto rigurada il server "
-"principale, \"più grande è meglio\"."
+"Se le workstation senza dischi hanno hard disk, è raccomandato usarli per la "
+"memoria di swap in quanto più veloce dell'uso dello swap in rete."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "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."
 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."
+"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"512 MiB RAM are the absolute minimum requirements. For running modern "
+"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgstr ""
-"i thin-client possono essere operativi con solo 64 MiB di RAM e con un "
-"processore a 133 MHz, sebbene 128 MiB e processori più veloci sono "
-"raccomandati."
+"Per le workstation senza dischi e per i singoli PC sono richiesti come "
+"minimo 800 MHz e 320 MiB di RAM, sebbene con 512 o 1024 MiB di RAM "
+"funzioneranno meglio e una CPU più veloce permetterebbe migliori prestazioni."
 
 #. 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."
+"On workstations with little RAM the spell checker might cause LibreOffice to "
+"hang if the swap space is also too small. If this happens frequently the "
+"spell checker can be disabled by system administrators."
 msgstr ""
-"Per eseguire Iceweasel/Firefox e LibreOffice, si raccomandano almeno 128 MiB "
-"di RAM come minimo."
 
 #. 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 "
-"considerably better. Just a faster CPU will speed things up."
+"The minimum disk space requirements depend on the profile which is installed:"
 msgstr ""
-"Per le workstation senza dischi e per i singoli PC sono richiesti come "
-"minimo 800 MHz e 320 MiB di RAM, sebbene con 512 o 1024 MiB di RAM "
-"funzioneranno meglio e una CPU più veloce permetterebbe migliori prestazioni."
 
 #. 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."
+"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"server, \"the bigger the better\"."
 msgstr ""
-"L'uso della memoria di swap in rete è automaticamente abilitato: la sua "
-"grandezza è di 512 MiB, se ne serve di più si può modificare il file /etc/"
-"ltsp/nbdswapd.conf su tjener e configurare la variabile SIZE. Si consiglia "
-"di <emphasis>regolare la grandezza della swap</emphasis> sul PC locale o sul "
-"server."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Thin Client Server/s"
+msgid "thin client server: 40 GiB."
+msgstr "Server di thin-client"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "workstation or standalone: 30 GiB."
+msgstr ""
+
+#. type: Content of: <article><section><section><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."
+"Thin client servers need two network cards when using the default network "
+"architecture:"
 msgstr ""
-"Se le workstation senza dischi hanno hard disk, è raccomandato usarli per la "
-"memoria di swap in quanto più veloce dell'uso dello swap in rete."
+"i server thin-client devono avere due schede di rete quando si usa "
+"l'architettura di rete predefinita:"
+
+#. 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 connessa alla rete principale (10.0.0.0/8)"
 
 #. 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."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
 msgstr ""
-"Sulle workstation con poca memoria il correttore ortografico di OpenOffice."
-"org funziona male se la swap è troppo piccola. In questo caso "
-"l'amministratore deve disattivare il correttore ortografico in OpenOffice."
-"org o gli studenti devono terminare LibreOffice perdendo il proprio lavoro. "
-"Abilitare almeno 512 MiB di swap su una workstation con 320 MiB RAM "
-"risolverà questo problema, facendo funzionare il correttore ortografico."
+"eth1 è usata per i client LTSP (192.168.0.0/24 di default o  192.168.1.0/24)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Laptops have the same requirements as for workstations since they are "
+#| "just movable workstations."
 msgid ""
-"Laptops have the same requirements as for workstations since they are just "
-"movable workstations."
+"Laptops are movable workstations, so they have the same requirements as "
+"workstations."
 msgstr ""
 "I computer portatili richiedono gli stessi requisiti delle workstation dal "
 "momento che sono workstation mobili. "
@@ -1426,9 +1444,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
@@ -1467,9 +1489,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
@@ -1499,9 +1525,15 @@ msgstr ""
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-source-USB.iso debian-edu-8.0+edu0-source-USB.iso</"
+#| "computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
@@ -9508,7 +9540,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "the browsers Iceweasel 31 ESR and Chromium 38"
-msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+msgid "the browsers Iceweasel 31 ESR and Chromium 40"
 msgstr "i browser web sono Iceweasel 31 ESR e Chromium 38"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9732,9 +9764,17 @@ msgstr ""
 "2013) rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), "
+#| "FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar "
+#| "Wisløff (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 "
+"2014, 2015), 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), FourFire "
 "Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) "
@@ -9748,13 +9788,23 @@ msgstr ""
 "(2014) e rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), 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."
 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), "
 "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."
+"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "La traduzione tedesca è protetta da copyright di Holger Levsen (2007), "
 "Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
@@ -9775,11 +9825,19 @@ msgstr ""
 "rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
+#| "French l10n team (2009, 2010, 2012) and is released under the GPL v2 or "
+#| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL v2 or any later version."
+"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
+"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "La traduzione francese è protetta da copyright di Christophe Masson (2008), "
 "Olivier Vitrat (2010)  Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau "
@@ -9787,17 +9845,25 @@ msgstr ""
 "(2009, 2010, 2012), rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "La traduzione in danese  è protetta da copyright da Joe Hansen (2012, 2013) "
 "e rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
-"released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "La traduzione in danese  è protetta da copyright da Frans Spiesschaert "
 "(2014) e rilasciata sotto licenza GPL v2 o successiva."
@@ -12311,6 +12377,44 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
+#~ msgstr "occorrono 2 GB di RAM per 30 client e 4 GB di RAM per 50-60 client."
+
+#~ 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 with disk space on a main-server, it's \"the bigger the better\"."
+#~ msgstr ""
+#~ "Lo spazio disco necessario dipende dal profilo usato, ma un disco "
+#~ "maggiore di 25 GiB sarà sufficiente per l'installazione di una "
+#~ "workstation o per una installazione singola, 30 GiB per un server di thin-"
+#~ "client e almeno 40 GiB sul sever principale. Come al solito, per quanto "
+#~ "rigurada il server principale, \"più grande è meglio\"."
+
+#~ msgid ""
+#~ "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
+#~ "requirement."
+#~ msgstr ""
+#~ "Per eseguire Iceweasel/Firefox e LibreOffice, si raccomandano almeno 128 "
+#~ "MiB di RAM come minimo."
+
+#~ 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 ""
+#~ "Sulle workstation con poca memoria il correttore ortografico di "
+#~ "OpenOffice.org funziona male se la swap è troppo piccola. In questo caso "
+#~ "l'amministratore deve disattivare il correttore ortografico in OpenOffice."
+#~ "org o gli studenti devono terminare LibreOffice perdendo il proprio "
+#~ "lavoro. Abilitare almeno 512 MiB di swap su una workstation con 320 MiB "
+#~ "RAM risolverà questo problema, facendo funzionare il correttore "
+#~ "ortografico."
+
 #~ msgid "The KDE desktop profile for students/pupils."
 #~ msgstr "Il profilo desktop KDE per studenti/allievi."
 
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 cf4ebe1..9893d79 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-01-25 19:07+0000\n"
+"POT-Creation-Date: 2015-02-07 15:48+0000\n"
 "PO-Revision-Date: 2015-01-31 17:45+0000\n"
 "Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -40,13 +40,11 @@ msgstr "Debian Edu / Skolelinux Jessie 8.0+edu0 utgivelseshåndbok"
 msgid "Manual for Debian Edu 8.0+edu0 Codename Jessie"
 msgstr "Utgivelseshåndbok for Debian Edu 8.0+edu0 kodenavn Jessie"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/23-Tjener-KDM_Login.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of:
-#. <article><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu login"
 msgstr "Skolelinux innlogging"
 
@@ -186,13 +184,11 @@ msgstr ""
 msgid "Network"
 msgstr "Nettverk"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/Debian_Edu_Network_Jessie.png"
 msgstr "./images/Debian_Edu_Network_Jessie.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "The Debian Edu network topology"
 msgstr "Nettverket Debian Edu sitt oppsett"
 
@@ -358,128 +354,103 @@ msgstr ""
 "domenenavnet). Dette gjør det enkelt for skoler å enten bytte domenet\n"
 "(hvis de har eget DNS-domene), eller IP-adressene de bruker."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\"> Table of services</emphasis>"
 msgstr "<emphasis role='strong'>Tabell over tjenester</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Service description</emphasis>"
 msgstr "<emphasis role='strong'>Tjenestebeskrivelse</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgstr "<emphasis role='strong'>Vanlig navn</emphasis>:"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">DNS service name</emphasis>"
 msgstr "<emphasis role='strong'>Tjenestenavn i DNS</emphasis>:"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Centralised Logging"
 msgstr "Sentralisert logging"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "rsyslog"
 msgstr "rsyslog"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "syslog"
 msgstr "syslog"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Domain Name Service"
 msgstr "Domenenavntjeneste"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "DNS (BIND)"
 msgstr "DNS (BIND)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "domain"
 msgstr "domain"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Automatic Network Configuration of Machines"
 msgstr "Automatisk nettverksoppsett for maskiner"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "DHCP"
 msgstr "DHCP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "bootps"
 msgstr "bootps"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Clock Synchronisation"
 msgstr "Klokkesynkronisering"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "NTP"
 msgstr "NTP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ntp"
 msgstr "ntp"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Home Directories via Network File System"
 msgstr "Hjemmeområder på nettverksfilsystem (SMB/NFS) [homes]"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "SMB / NFS"
 msgstr "SMB / NFS"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "homes"
 msgstr "homes"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Electronic Post Office"
 msgstr "Elektronisk postkontor"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "IMAP (Dovecot)"
 msgstr "IMAP (Dovecot)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "postoffice"
 msgstr "postkontor"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Directory Service"
 msgstr "Katalogtjeneste"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "OpenLDAP"
 msgstr "OpenLDAP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ldap"
 msgstr "ldap"
 
@@ -487,123 +458,99 @@ msgstr "ldap"
 msgid "User Administration"
 msgstr "Brukeradministrasjon"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "GOsa²"
 msgstr "GOsa²"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "---"
 msgstr "---"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Web Server"
 msgstr "Webtjener"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Apache/PHP"
 msgstr "Apache/PHP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "www"
 msgstr "www"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Central Backup"
 msgstr "Sentral sikkerhetskopi"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "sl-backup, slbackup-php"
 msgstr "sl-backup, slbackup-php"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "backup"
 msgstr "sikkerhetskopi"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Web Cache"
 msgstr "Web-mellomlager"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Proxy (Squid)"
 msgstr "Proxy (Squid)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "webcache"
 msgstr "webcache"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Printing"
 msgstr "Utskrift"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "CUPS"
 msgstr "CUPS"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ipp"
 msgstr "ipp"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Secure Remote Login"
 msgstr "Sikker ekstern pålogging"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "OpenSSH"
 msgstr "OpenSSH"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ssh"
 msgstr "ssh"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Automatic Configuration"
 msgstr "Automatisk oppsett"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Cfengine"
 msgstr "Cfengine"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "cfengine"
 msgstr "cfengine"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Thin Client Server/s"
 msgstr "Tynnklienttjener(e)"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
 msgstr "LTSP"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ltsp"
 msgstr "ltsp"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -611,8 +558,7 @@ msgstr ""
 "Maskin og tjenesteovervåkning med feilrapportering, pluss status og historie "
 "på web. Feilrapportering via e-post"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "munin, nagios and site-summary"
 msgstr "munin, nagios og site-summary"
 
@@ -813,11 +759,11 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som (X-)"
-"terminaler. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. Tynnklientoppsettet som er brukt er Linux Terminal "
-"Server Project (LTSP)."
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som "
+"(X-)terminaler. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er Linux "
+"Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1105,123 +1051,134 @@ msgstr ""
 "\">nettverksarkitektur</ulink>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 "
+#| "(oldest supported processors: Intel Pentium/AMD K5) or amd64 processors."
 msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
-"supported processors: Intel Pentium/AMD K5) or amd64 processors."
+"The computers running Debian Edu / Skolelinux must have either 32 bit "
+"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
+"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 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."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
-"architecture:"
+"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+"recommended for the main and thin client server profiles."
 msgstr ""
-"Tynnklienttjenere trenger to nettverkskort ved bruk av standard "
-"nettverksarkitektur:"
 
-#. 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><para>
+#, fuzzy
+#| 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."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+"possible, though 256 MiB RAM or more and faster processors are recommended."
 msgstr ""
-"eth1 brukes til å betjene LTSP klienter (92.168.0.0/24 som standard eller "
-"192.168.1.0/24)."
+"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><para>
-msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
-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><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
+msgid ""
+"Swapping over the network is automatically enabled for LTSP clients; the "
+"swap size is 512 MiB, and if you need more you can tune this by editing "
+"<computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> on tjener to set "
+"the SIZE variable."
+msgstr ""
+"Vekselminne (swap) over nettverket er satt opp automatisk. Størrelsen på "
+"veksleminnet er satt til 512 MB. Hvis det er nødvendig, 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><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><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 "
-"with disk space on a main-server, it's \"the bigger the better\"."
+"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 ""
-"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. "
+"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><para>
+#, fuzzy
+#| msgid ""
+#| "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."
 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."
+"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"512 MiB RAM are the absolute minimum requirements. For running modern "
+"webbrowsers and LibreOffice 1024 MiB RAM is 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."
+"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 ""
-"For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
-"requirement."
+"On workstations with little RAM the spell checker might cause LibreOffice to "
+"hang if the swap space is also too small. If this happens frequently the "
+"spell checker can be disabled by system administrators."
 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 "
-"considerably better. Just a faster CPU will speed things up."
+"The minimum disk space requirements depend on the profile which is installed:"
 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."
+"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"server, \"the bigger the better\"."
 msgstr ""
-"Vekselminne (swap) over nettverket er satt opp automatisk. Størrelsen på "
-"veksleminnet er satt til 512 MB. Hvis det er nødvendig, 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><para>
+#, fuzzy
+#| msgid "Thin Client Server/s"
+msgid "thin client server: 40 GiB."
+msgstr "Tynnklienttjener(e)"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "workstation or standalone: 30 GiB."
+msgstr ""
+
+#. type: Content of: <article><section><section><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."
+"Thin client servers need two network cards when using the default network "
+"architecture:"
 msgstr ""
-"Hvis din diskløse arbeidsstasjon har harddisker, er det anbefalt å bruke dem "
-"for lokal swap da dette er raskere enn nettverks-swap."
+"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>
 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."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
 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 "
-"arbeidsstasjon med 320 MB RAM løser problemet, og stavekontroll skal nå "
-"kjøre helt fint. "
+"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>
+#, fuzzy
+#| msgid ""
+#| "Laptops have the same requirements as for workstations since they are "
+#| "just movable workstations."
 msgid ""
-"Laptops have the same requirements as for workstations since they are just "
-"movable workstations."
+"Laptops are movable workstations, so they have the same requirements as "
+"workstations."
 msgstr ""
 "Laptops har samme systemkrav som vanlige arbeidsstasjoner, bare at de er "
 "flyttbare arbeidsstasjoner."
@@ -1238,13 +1195,11 @@ msgstr ""
 "En liste over testet maskinvare kan finnes på <ulink url=\"http://wiki."
 "debian.org/DebianEdu/Hardware/\"/>. Denne listen er på ingen måte komplett. "
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/smile.png"
 msgstr "./images/smile.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid ":)"
 msgstr ":)"
 
@@ -1405,18 +1360,15 @@ msgstr ""
 "Hvis du bare vil prøve Debian Edu/Skolelinux, så trenger du ikke det. Det "
 "skal bare fungere. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid ":-)"
 msgstr ":-)"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/alert.png"
 msgstr "./images/alert.png"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid "/!\\"
 msgstr "/!\\"
 
@@ -1458,8 +1410,7 @@ msgstr ""
 "nettinstall (CD), som kan brukes til installasjon fra USB flash-disker, er "
 "egnet for installasjon på  i386-, amd64-maskiner.  Den er tilgjengelig via"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD."
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
@@ -1467,8 +1418,7 @@ msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD."
 "iso\">debian-edu-8.0+edu0-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-CD."
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
@@ -1476,11 +1426,14 @@ msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD."
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
@@ -1502,8 +1455,7 @@ msgstr ""
 "under installasjonen. Som de andre kan den lastes ned via FTP, HTTP eller "
 "rsync via:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
@@ -1511,8 +1463,7 @@ msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
@@ -1520,11 +1471,14 @@ msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
@@ -1537,8 +1491,7 @@ msgstr "Kildebilde"
 msgid "The source image is available via"
 msgstr "Kildekodebildet er tilgjengelig via"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
@@ -1546,8 +1499,7 @@ msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
@@ -1555,11 +1507,16 @@ msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-source-USB.iso debian-edu-8.0+edu0-source-USB.iso</"
+#| "computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
@@ -1612,18 +1569,15 @@ msgstr ""
 msgid "Select type of installation"
 msgstr "Velg type installasjon"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/01-Installer_boot_menu.png"
 msgstr "./images/01-Installer_boot_menu.png"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer boot menu"
 msgstr "Installasjons-oppstartmeny"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
 "installation on i386 and amd64."
@@ -1631,8 +1585,7 @@ msgstr ""
 "<emphasis role=\"strong\">Install</emphasis>  er den standardiserte "
 "tekstmodus-innstallasjonen for i386- og amd64-maskiner."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
 "install."
@@ -1640,8 +1593,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit install</emphasis> kjører en amd64 "
 "installasjon i tekstmodus. "
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1649,8 +1601,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis> bruker en GTK-"
 "installasjon hvor du kan bruke musen."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
 "GTK installer where you can use the mouse."
@@ -1658,8 +1609,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical install</emphasis> for å kjøre en "
 "64-bit GTK-installasjon hvor du kan bruke en mus."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose"
@@ -1667,8 +1617,7 @@ msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> viser en "
 "undermeny med flere detaljerte valg å velge mellom"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer"
@@ -1676,26 +1625,22 @@ msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> gir noen hint i bruk av "
 "installasjonsprosessen"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/Installer_advanced_options_a.png"
 msgstr "./images/Installer_advanced_options_a.png"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer advanced options screen 1"
 msgstr "Installer avanserte alternativer skjermbilde1"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 "<emphasis role=\"strong\">Back..</emphasis> bringer deg tilbake til "
 "hovedmenyen."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1703,8 +1648,7 @@ msgstr ""
 "<emphasis role=\"strong\">Expert install</emphasis> gir tilgang til alle "
 "tilgjengelige spørsmål i klartekst."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
 "become a rescue disk for emergency tasks."
@@ -1712,16 +1656,14 @@ msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> gjør dette "
 "installasjonsmediet til en redningsdisk for nødsituasjonsoppgaver."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
 msgstr ""
 "<emphasis role=\"strong\">Automated install</emphasis> trenger en «preseed»-"
 "fil (for automatisk installasjon)."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
 "all available questions in text mode on amd64."
@@ -1729,8 +1671,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit expert install</emphasis> gir tilgang til "
 "alle tilgjengelige spørsmål i klartekst tilknyttet amd64. "
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
 "medium become a rescue disk for emergency tasks on amd64."
@@ -1738,8 +1679,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit rescue mode</emphasis> gjør dette "
 "installasjonsmedium til en redningsdisk for beredskapsoppgaver på amd64."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
 "preseed file."
@@ -1747,18 +1687,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> trenger en "
 "«preseed»-fil (for automatisk installasjon)."
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/Installer_advanced_options_b.png"
 msgstr "./images/Installer_advanced_options_b.png"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer advanced options screen 2"
 msgstr "Avanserte installasjonsvalg på skjerm 2"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
 "to all available questions in graphical mode."
@@ -1766,8 +1703,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gir tilgang "
 "til alle tilgjengelige spørsmål i grafisk modus."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
 "install medium become a rescue disk for emergency tasks with a graphical GTK "
@@ -1777,8 +1713,7 @@ msgstr ""
 "installasjonsmedium til en redningsdisk for beredskapsmessige oppgaver med "
 "et grafisk GTK-utseende."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -1786,8 +1721,7 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> trenger en "
 "«preseed»-fil (for automatisk installasjon)."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
 "access to all available questions in graphical mode on amd64."
@@ -1795,8 +1729,7 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gir "
 "tilgang til alle tilgjengelige spørsmål i grafisk modus for amd64."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
 "install medium become a rescue disk for emergency tasks on amd64 with a "
@@ -1806,8 +1739,7 @@ msgstr ""
 "installasjonsmedium til en redningsdisk for beredskapsoppgaver på amd64 med "
 "et grafisk GTK-utseende."
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
 "needs a preseed file."
@@ -1815,18 +1747,15 @@ msgstr ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
 "trenger en «preseed»-fil."
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/Installer_help.png"
 msgstr "./images/Installer_help.png"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr "Installasjons-hjelpeskjerm"
 
-#. type: Content of:
-#. <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1846,8 +1775,7 @@ msgstr ""
 "På i386/amd64, så kan oppstartsalternativer redigeres ved å trykke TAB-"
 "tasten i oppstartsmenyen."
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The multi-architecture USB flash drive / Blue-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
@@ -1857,8 +1785,7 @@ msgstr ""
 "amd64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 "
 "maskiner."
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you want to boot the amd64 text mode with the multi-architecture image, "
 "that would be <computeroutput>amd64-install</computeroutput>."
@@ -1866,8 +1793,7 @@ msgstr ""
 "Hvis du vil starte opp en amd64 i tekstmodus med en fler-arkitektur type, må "
 "du bruke <computeroutput>amd64-install</computeroutput>."
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
 "get the GUI version on amd64."
@@ -1875,8 +1801,7 @@ msgstr ""
 "På samme måte kan du velge <computeroutput>amd64-expertgui</computeroutput> "
 "for å få GUI-versjonen på amd64."
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you want to boot the i386 mode with the multi-arch image on an amd64 "
 "machine you need to manually select <computeroutput>install</computeroutput> "
@@ -1886,8 +1811,7 @@ msgstr ""
 "maskin må du skrive <computeroutput>install</computeroutput> (tekstmodus) "
 "eller <computeroutput>expertgui</computeroutput> (grafisk modus). "
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
@@ -1899,8 +1823,7 @@ msgstr ""
 "<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> som "
 "en ekstra oppstartsparameter."
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you have already installed the main server profile on a machine, further "
 "installations should be done via PXE, as this will automatically use the "
@@ -1910,8 +1833,7 @@ msgstr ""
 "skal videre installasjoner gjøres via PXE, da denne automatisk vil bruke "
 "mellomlageret i hovedtjeneren."
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
@@ -1922,8 +1844,7 @@ msgstr ""
 "legg til <computeroutput>desktop=gnome</computeroutput> i kjernens "
 "oppstartparametere. "
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
@@ -1933,8 +1854,7 @@ msgstr ""
 "i stedet, legg til <computeroutput>desktop=lxde</computeroutput> i kjernens "
 "boot/oppstart-parametere. "
 
-#. 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 "
@@ -1944,8 +1864,7 @@ msgstr ""
 "i stedet, legg til <computeroutput>desktop=xfce</computeroutput> i kjernens "
 "boot/oppstarts-parametere. "
 
-#. 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 "
@@ -1970,34 +1889,28 @@ msgstr ""
 "Requirements\">system requirements</ulink> og pass på at du har minst to "
 "nettverkskort (NICer) hvis du planlegger å sette opp en tynnklientserver."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a language (for the installation and the installed system)"
 msgstr "Velg et språk (for installasjonen og det installerte systemet)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a location which normally should be the location where you live."
 msgstr "Velg et sted som vanligvis er stedet du bor."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a keyboard keymap (the country's default is usually fine)"
 msgstr ""
 "Velg et tastaturoppsett (vanligvis er standardoppsettet for landet ditt bra)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose profile(s) from the following list:"
 msgstr "Velg profil(er) fra denne listen:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Hoved-tjener</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
@@ -2012,13 +1925,11 @@ msgstr ""
 "et grafisk brukergrensesnitt velger du en Arbeidsstasjon eller Tynn-klient-"
 "server i tillegg til denne."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Workstation</emphasis>"
 msgstr "<emphasis role=\"strong\">Arbeidsstasjon</emphasis>:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "A computer booting from its local hard drive, and running all software and "
 "devices locally like an ordinary computer, except that user logins are "
@@ -2030,13 +1941,11 @@ msgstr ""
 "brukeren logger inn og autentiseres av hovedtjeneren, der brukerens filer og "
 "skrivebordsoppsett er lagret."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Roaming workstation</emphasis>"
 msgstr "<emphasis role=\"strong\">Vandrende arbeidsstasjon</emphasis>:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Same as workstation but capable of authentication using cached credentials, "
 "meaning it can be used outside the school network. The users' files and "
@@ -2049,13 +1958,11 @@ msgstr ""
 "filer og profiler blir lagret på den lokale disken. Bærbare PC-er skal velge "
 "denne profilen."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
 msgstr "<emphasis role='strong'>Tynnklient-tjener</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "A thin client (and diskless workstation) server, also called a LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
@@ -2074,13 +1981,11 @@ msgstr ""
 "profilen, (selv om den ikke er valgt), og en tynnklienttjener kan alltid "
 "brukes som en arbeidsstasjon også."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Standalone</emphasis>"
 msgstr "<emphasis role='strong'>Frittstående</emphasis>:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "An ordinary computer that can function without a main server (that is, it "
 "doesn't need to be on the network). Includes laptops."
@@ -2088,13 +1993,11 @@ msgstr ""
 "En vanlig maskin som kan fungere uten en hovedtjener. Dvs. den trenger ikke "
 "være inne på nettverket. Denne profilen passer bra for bærbare."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Minimal</emphasis>"
 msgstr "<emphasis role='strong'>Minimal</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This profile will install the base packages and configure the machine to "
 "integrate into the Debian Edu network, but without any services and "
@@ -2106,8 +2009,7 @@ msgstr ""
 "applikasjoner. Den er nyttig som en plattform for enkle tjenester som man "
 "flytter manuelt ut fra hovedtjeneren."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
 "\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
@@ -2150,8 +2052,7 @@ msgstr ""
 "vanligvis ønske å erstatte eth0 med eth1 og eth1 med eth0. Omstart må til "
 "for å at endringene skal tre i kraft."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
 "\" will destroy all data on the hard drives! Saying \"no\" on the other hand "
@@ -2162,8 +2063,7 @@ msgstr ""
 "Svarer du derimot nei, vil det kreve mer arbeid. I tillegg må man være "
 "sikker på at de nødvendige partisjoner både er laget, og at de har nok plass."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Please say \"yes\" to submitting information to <ulink url=\"http://popcon."
 "skolelinux.org/\"/> to allow us to know which packages are popular and "
@@ -2175,8 +2075,7 @@ msgstr ""
 "pakker som er populære, og som bør beholdes i fremtidige utgivelser - dette "
 "er selvfølgelig frivillig. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Wait. If the selected profiles include Thin-client-server then the installer "
 "will spend quite some time at the end, \"Finishing the installation - "
@@ -2186,8 +2085,7 @@ msgstr ""
 "del tid mot slutten, og det står da \"Fullfører installasjonen ...\" på "
 "skjermen."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "After giving the root password, you will be asked to create a normal user "
 "account \"for non-administrative tasks\". For Debian Edu this account is "
@@ -2198,8 +2096,7 @@ msgstr ""
 "\"for ikke-administrative oppgaver\". For Debian Edu er denne kontoen svært "
 "viktig: denne skal du bruke til å administrere Skolelinux-nettverket."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The password for this user <emphasis role=\"strong\">must</emphasis> have a "
 "length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
@@ -2211,8 +2108,7 @@ msgstr ""
 "vil ikke innlogging være mulig (selv om et kortere passord er godkjent av "
 "installereren)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Be happy"
 msgstr "Vær glad"
 
@@ -2408,13 +2304,11 @@ msgstr ""
 "Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong"
 "\">hovedtjener</emphasis> tilgjengelig: "
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/pxe-tjener.png"
 msgstr "./images/pxe-tjener.png"
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "width=400"
 msgstr "width=400"
 
@@ -2428,8 +2322,7 @@ msgstr ""
 "emphasis> og <emphasis role=\"strong\">tynnklienttjener</emphasis> "
 "profilene :"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
@@ -2603,303 +2496,243 @@ msgstr ""
 "første oppstart av tjener, en PXE start både på arbeidsstasjonens og "
 "tynnklientens nettverk:"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "01-Installer_boot_menu.png"
 msgstr "01-Installer_boot_menu.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
 msgstr "./images/02-select_a_language.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "02-select_a_language.png"
 msgstr "02-select_a_language.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/03-select_your_location.png"
 msgstr "./images/03-select_your_location.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "03-select_your_location.png"
 msgstr "03-select_your_location.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/04-Configure_the_keyboard.png"
 msgstr "./images/04-Configure_the_keyboard.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "04-Configure_the_keyboard.png"
 msgstr "04-Configure_the_keyboard.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr "05-Detect_and_mount_CD-ROM.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr "./images/06-Load_installer_components_from_CD.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "06-Load_installer_components_from_CD.png"
 msgstr "06-Load_installer_components_from_CD.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/07-Detect_network_hardware.png"
 msgstr "./images/07-Detect_network_hardware.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "07-Detect_network_hardware.png"
 msgstr "07-Detect_network_hardware.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr "08-Choose_Debian_Edu_profile.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr "11-Participate_in_the_package_usage_survey.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "./images/12-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12-Set_up_users_and_passwords.png"
 msgstr "12-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "12a-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "./images/12b-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "12b-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "./images/12c-Set_up_users_and_passwords.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12c-Set_up_users_and_passwords.png"
 msgstr "12c-Set_up_users_and_passwords.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr "./images/12d-Setting-up-the-partitioner.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12d-Setting-up-the-partitioner.png"
 msgstr "12d-Setting-up-the-partitioner.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12e-creating_ext4.png"
 msgstr "./images/12e-creating_ext4.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12e-creating_ext4.png"
 msgstr "12e-creating_ext4.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/13-Install+the+base+system.png"
 msgstr "./images/13-Install+the+base+system.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/14-Select_and_install_software.png"
 msgstr "./images/14-Select_and_install_software.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "14-Select_and_install_software.png"
 msgstr "14-Select_and_install_software.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/17-Select_and_install_software.png"
 msgstr "./images/17-Select_and_install_software.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "17-Select_and_install_software.png"
 msgstr "17-Select_and_install_software.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/18-Build+LTSP+chroot.png"
 msgstr "./images/18-Build+LTSP+chroot.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "18-Build LTSP chroot.png"
 msgstr "18-Build LTSP chroot.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/20-Finish_the_Installation.png"
 msgstr "./images/20-Finish_the_Installation.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "20-Finish_the_Installation.png"
 msgstr "20-Finish_the_Installation.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "tjener KDM Login"
 msgstr "KDM-innlogging på tjener"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/24-Tjener-KDE_Start.png"
 msgstr "./images/24-Tjener-KDE_Start.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE starting..."
 msgstr "KDE starter..."
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE and Browser"
 msgstr "KDE og nettleser"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE Desktop"
 msgstr "KDE Desktop"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Diskless Workstation Login"
 msgstr "Diskløs Arbeidstasjoner Innlogging"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
@@ -2999,8 +2832,7 @@ msgstr ""
 "hyppige stilte spørsmål.\n"
 " "
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu KDE desktop"
 msgstr "Debian Edu KDE desktop"
 
@@ -3104,13 +2936,11 @@ msgstr ""
 msgid "GOsa² Login plus Overview"
 msgstr "GOsa² Login pluss oversikt"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² overview page after login as the first user"
 msgstr "GOsa² oversiktsside etter innlogging, som den første brukeren"
 
@@ -3234,8 +3064,7 @@ msgstr ""
 "skjermen; velg \"Opprett\" («Create») her, og deretter «Bruker» (\"User\"). "
 "Du blir veiledet av brukerveiviseren."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The most important thing to add is the template (newstudent or newteacher) "
 "and the full name of your user (see image)."
@@ -3243,8 +3072,7 @@ msgstr ""
 "Den viktigste tingen å legge til er malen (newstudent eller newteacher) det "
 "fulle navnet for din bruker (se bilde)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "As you follow the wizard, you will see that GOsa² generates a username "
 "automatically based on the real name. It automatically chooses a username "
@@ -3258,8 +3086,7 @@ msgstr ""
 "hele navnet, ikke er et problem. Merk at GOsa² kan generere ugyldige "
 "brukernavn hvis hele navnet inneholder ikke-ASCII-tegn."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
@@ -3276,8 +3103,7 @@ msgstr ""
 "til<computeroutput>allowUIDProposalModification=\"true\"</computeroutput> "
 "som et ekstra alternativ til «location-definisjonen»)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "When the wizard has finished, you are presented with the GOsa² screen for "
 "your new user object. Use the tabs at the top to check the completed fields."
@@ -3319,13 +3145,11 @@ msgstr ""
 msgid "Search, modify and delete users"
 msgstr "Søk etter og slett brukere"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/filterbox.png"
 msgstr "./images/filterbox.png"
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Filterbox"
 msgstr "Filterbox"
 
@@ -3368,13 +3192,11 @@ msgstr ""
 "bruker, endre passordet til brukeren og endre listen over grupper som "
 "brukeren tilhører."
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/edit_user.png"
 msgstr "./images/edit_user.png"
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Editing user data"
 msgstr "Legge til brukere"
 
@@ -3411,34 +3233,29 @@ msgstr ""
 msgid "To administratively set a new password for a user"
 msgstr "For å gi en bruker et nytt passord"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "search for the user to be modified, as explained above"
 msgstr ""
 "Søk etter brukeren, som skal modifiseres, som beskrevet ovenfor. Klikk på "
 "brukernavnet når brukeren er funnet."
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "click on the key symbol at the end of the line that the username is shown in"
 msgstr "klikk på nøkkelsymbolet ved slutten av linjen som brukernavn er vist i"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "on the page subsequently presented you can set a new password chosen by "
 "yourself"
 msgstr ""
 "på den påfølgende siden kan du sette et nytt passord som du selv velger"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
-#. type: Content of:
-#. <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Set user password"
 msgstr "Sett brukerpassord"
 
@@ -3485,18 +3302,15 @@ msgstr ""
 "Dette er format for retningslinjene slik som CSV-fil (GOsa² er ganske "
 "intolerant når det gjelder disse):"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Use \",\" as field separator"
 msgstr "Bruk «,»som feltskille"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Do not use quotes"
 msgstr "Ikke bruk hermetegn"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The CSV file <emphasis role=\"strong\">must not</emphasis> contain a header "
 "line (of the sort that normally contains the column names)"
@@ -3504,8 +3318,7 @@ msgstr ""
 "CSV-filen <emphasis role=\"strong\">må ikke</emphasis> inneholde en "
 "topptekst linje (av den typen som vanligvis inneholder kolonnenavnene)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The order of the fields is not relevant, and can be defined in GOsa² during "
 "the mass import"
@@ -3517,18 +3330,15 @@ msgstr ""
 msgid "The mass import steps are:"
 msgstr "Masseimport trinnene er: "
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "click the \"LDAP Manager\" link in the navigation menu on the left"
 msgstr "klikk på «LDAP Manager» lenken i navigasjonsmenyen til venstre"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "click the \"Import\" tab in the screen on the right"
 msgstr "klikk på «Import»-fanen i skjermen til høyre"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "browse your local disk and select a CSV file with the list of users to be "
 "imported"
@@ -3536,8 +3346,7 @@ msgstr ""
 "bla gjennom lokal disk, og velg en CSV-fil med en liste over brukere som "
 "skal importeres"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "choose an available user template that should be applied during mass import "
 "(such as NewTeacher or NewStudent)"
@@ -3545,8 +3354,7 @@ msgstr ""
 "velg en tilgjengelig brukermal som skal brukes under masse import/"
 "overføringer (som NewTeacher eller NewStudent)"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "click the \"Import\" button in the bottom-right corner"
 msgstr "klikk på «Import»-knappen i nederste høyre hjørne"
 
@@ -3562,18 +3370,15 @@ msgstr ""
 msgid "Group Management with GOsa²"
 msgstr "Gruppeadministrasjon med GOsa²"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/create_group.png"
 msgstr "./images/create_group.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "create group"
 msgstr "lag gruppe"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/list_groups.png"
 msgstr "./images/list_groups.png"
 
@@ -3758,43 +3563,35 @@ msgstr ""
 "Tilkobling til LDAP som cn=admin, ou=ldap-access, dc=skole, dc = skolelinux, dc=no\n"
 "oppgi passord:"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² systems listing"
 msgstr "Systemopplisting i "
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Host details"
 msgstr "Maskindetaljer"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Modify host"
 msgstr "Endre maskindetaljer"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Add netgroup"
 msgstr "Legg til nettgruppe"
 
@@ -3861,53 +3658,43 @@ msgid ""
 "computeroutput>"
 msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "cups-queue-autoflush-hosts"
 msgstr "cups-queue-autoflush-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "cups-queue-autoreenable-hosts"
 msgstr "cups-queue-autoreenable-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "fsautoresize-hosts"
 msgstr "fsautoresize-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "ltsp-server-hosts"
 msgstr "ltsp-server-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "netblock-hosts"
 msgstr "netblock-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "printer-hosts"
 msgstr "printer-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "server-hosts"
 msgstr "server-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "shutdown-at-night-hosts"
 msgstr "shutdown-at-night-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "winstation-hosts"
 msgstr "workstation-hosts"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "workstation-hosts"
 msgstr "workstation-hosts"
 
@@ -3919,13 +3706,11 @@ msgstr ""
 "Se på koden i <computeroutput>/etc/init.d/kdm</computeroutput> for å få "
 "informasjon om hvordan disse variablene blir brukt."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "NFS."
 msgstr "NFS."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "The home directories are exported by the main-server to be mounted by the "
 "workstations and the LTSP servers. For security reasons, only hosts within "
@@ -3946,8 +3731,7 @@ msgstr ""
 "maskinene riktig i ldap-treet ved bruk av lwat, og å konfigurere dem til å "
 "bruke statiske IP-adresser fra ldap."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Remember to configure workstations and ltsp-servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -3959,13 +3743,11 @@ msgstr ""
 "arbeidsstasjoner og tynne klienter bruker ikke NFS så de trenger ikke å "
 "settes opp."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "fs-autoresize"
 msgstr "fs-autoresize"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Debian Edu machines in this group will automatically resize LVM partitions "
 "that run out of space."
@@ -3973,13 +3755,11 @@ msgstr ""
 "maskiner med Skolelinux/Debian Edu i denne gruppen vil automatisk justere "
 "størrelsen på LVM-partisjoner som får for liten plass.  "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "shutdown at night"
 msgstr "nattestenging"
 
-#. 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."
@@ -3987,13 +3767,11 @@ msgstr ""
 "Maskiner med Skolelinux/DebianEdu i denne gruppen vil automatisk slå seg av "
 "om natten for å spare energi."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "CUPS (cups-queue-autoflush-hosts and cups-queue-autoreenable-hosts)"
 msgstr "CUPS (cups-queue-autoflush-hosts og cups-queue-autoreenable-hosts)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Debian Edu machines in these groups will automatically flush all print "
 "queues every night, and re-enable any disabled print queue every hour."
@@ -4001,8 +3779,7 @@ msgstr ""
 "maskiner med Skolelinux/DebianEdu i denne gruppen vil automatisk slå seg av "
 "om natten for å spare energi."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Debian Edu machines in this group will only be allowed to connect to "
 "machines on the local network.  Combined with web proxy restrictions this "
@@ -4359,13 +4136,11 @@ msgstr ""
 "i menyen på sikkerhetskopi-siden og velg å beholde det eldste "
 "øyeblikksbildet:"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "slbackup-php Maintenance"
 msgstr "slbackup-php Vedlikehold"
 
@@ -4527,13 +4302,11 @@ msgstr ""
 "Her er instruksjoner om hvordan du skal håndtere de mest vanlige Nagios "
 "advarsler."
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid "DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):"
 msgstr "DISK CRITICAL - ledig plass: /usr 309 MB (5% inode=47%):"
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "The partition (/usr/ in the example) is too full.  There are in general two "
 "ways to handle this: (1) remove some files or (2) increase the size of the "
@@ -4554,15 +4327,13 @@ msgstr ""
 "programmet automatisk hver time, kan verten det gjelder legges til "
 "nettgruppen <computeroutput> fsautoresize-hosts </computeroutput>."
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr ""
 "APT KRITISK: 13 pakker tilgjengelig for oppgradering (13 kritiske "
 "oppdateringer)."
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
@@ -4578,8 +4349,7 @@ msgstr ""
 "med<computeroutput> ltsp-chroot apt-get update && ltsp-chroot apt-"
 "get upgrade </computeroutput>."
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "If you do not want to manually upgrade packages and trust Debian to do a "
 "good job with new versions, you can install the <computeroutput>unattended-"
@@ -4592,8 +4362,7 @@ msgstr ""
 "automatisk oppgradere alle nye pakker hver natt. Dette vil ikke oppgradere "
 "LTSP chroot-er."
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "To upgrade the LTSP chroot, one can use <computeroutput>ltsp-chroot apt-get "
 "update && ltsp-chroot apt-get upgrade</computeroutput>.  On 64-bit "
@@ -4607,8 +4376,7 @@ msgstr ""
 "til ltsp-chroot. Det er en god idé å oppdatere chroot når man oppdaterer "
 "vertssystemet."
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid ""
 "WARNING - Reboot required : running kernel = 2.6.32-37.81.0, installed "
 "kernel = 2.6.32-38.83.0"
@@ -4616,8 +4384,7 @@ msgstr ""
 "ADVARSEL: Restart nødvendig: Kjerne i bruk = 2.6.32-37.81.0, installert "
 "kjerne= 2.6.32-38.83.0"
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "The running kernel is older than the newest installed kernel, and a reboot "
 "is required to activate the newest installed kernel.  This is normally "
@@ -4628,13 +4395,11 @@ msgstr ""
 "må til for å aktivere den nyest installerte kjernen. Dette vil normalt haste "
 "endel, fordi nye kjerner i Debian Edu bidrar til å løse sikkerhetsproblemer."
 
-#. type: Content of:
-#. <article><section><section><section><section><section><title>
+#. type: Content of: <article><section><section><section><section><section><title>
 msgid "WARNING: CUPS queue size - 61"
 msgstr "ADVARSEL: CUPS køstørrelse - 61"
 
-#. type: Content of:
-#. <article><section><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
 "The printer queues in CUPS have a lot of jobs pending.  This is most likely "
 "because of a unavailable printer.  Disabled print queues are enabled every "
@@ -4822,8 +4587,7 @@ msgstr ""
 msgid "The basic upgrade operation"
 msgstr "Standard upgraderings metode"
 
-#. 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\"."
@@ -4831,18 +4595,15 @@ msgstr ""
 "Nå kan du endre <computeroutput>/etc/apt/sources.list</computeroutput> slik "
 "at de inneholder disse linjene"
 
-#. 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 "<computeroutput>git pull</computeroutput>"
 
-#. 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 "<computeroutput>git pull</computeroutput>"
 
-#. 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 "<computeroutput>git pull</computeroutput>"
 
@@ -5856,8 +5617,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"
 
@@ -5869,8 +5629,7 @@ msgstr "mkdir /skole/tjener/home0/2014 "
 msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgstr "<emphasis role='strong'>rolle</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Department"
 msgstr "Avdeling"
 
@@ -5890,8 +5649,7 @@ msgstr ""
 "(should be «/Students»). Lagre ved å klikke «Ok». Nå vil det nye department "
 "(2014) vises nedenfor under /Students. Klikk på det."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Group"
 msgstr "Gruppe"
 
@@ -5905,8 +5663,7 @@ msgstr ""
 "«Base» stå som det er, det skal være /Students/2014) og kryss av i boksen "
 "til venstre for «Samba group» «Ok» for å lagre.  "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Template"
 msgstr "Mal"
 
@@ -5931,8 +5688,7 @@ msgstr ""
 "inn de ønskede verdier, først i Generic fanen (legg til din nye 2014 groupe "
 "under Group Membership, også), legg derettet til POSIX and Samba konto."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Importer brukere"
 
@@ -6146,8 +5902,7 @@ msgstr ""
 "<link linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-"
 "\">Getting started</link> kapitlet i denne manualen."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This example uses 'nas-server.intern' as the server name. Once 'nas-server."
 "intern' is configured, check if the NFS export points on the new storage "
@@ -6170,8 +5925,7 @@ msgstr ""
 "    /storage         10.0.0.0/8\n"
 "    root at tjener:~# "
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Here everything on the backbone network is granted access to the /storage "
 "export. (This could be restricted to netgroup membership or single IP "
@@ -6191,8 +5945,7 @@ msgstr ""
 "Legg til automont informasjon om 'nas-server.intern' i LDAP for å tillate "
 "alle klienter å automatisk  montere ny eksport på forespørsel."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "This can't be done using GOsa², because a module for automount is missing. "
 "Instead, use ldapvi and add the required LDAP objects using an editor."
@@ -6201,8 +5954,7 @@ msgstr ""
 "Bruk isteden ldapvi og tilføy de nødvendige LDAP-objekter ved å bruke en "
 "tekstbehandler."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
 "dc=skolelinux,dc=no</computeroutput>"
@@ -6210,8 +5962,7 @@ msgstr ""
 "<computeroutput>ldapvi --ldap-conf -ZD '(cn=admin)' -b ou=automount,dc=skole,"
 "dc=skolelinux,dc=no</computeroutput> "
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "When the editor shows up, add the following LDAP objects at the bottom of "
 "the document. (The \"/&\" part in the last LDAP object is a wild card "
@@ -6264,8 +6015,7 @@ msgstr ""
 "Legg til relevante oppføringer i tjener.intern:/etc/fstab, fordi tjener."
 "intern ikke bruker automonter for å unngå monteringssløyfer:"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Create the mount directories using <computeroutput>mkdir</computeroutput>, "
 "edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
@@ -6316,8 +6066,7 @@ msgstr ""
 msgid "Managing this case with GOsa is quite simple:"
 msgstr "Håndtering av dette tilfellet er ganske enkelt med GOsa: "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Create a group <computeroutput>sshusers</computeroutput> on the root level "
 "(where already other system management related groups like "
@@ -6327,13 +6076,11 @@ msgstr ""
 "de andre systemadministrasjonsrelaterte grupper som <computeroutput>gosa-"
 "admins</computeroutput> allerede dukker opp)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgstr "<computeroutput>git pull</computeroutput>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add <computeroutput>AllowGroups sshusers</computeroutput> to /etc/ssh/"
 "sshd_config."
@@ -6341,8 +6088,7 @@ msgstr ""
 "Legg <computeroutput>AllowGroups sshusers</computeroutput> til /etc/ssh/"
 "sshd_config."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Execute <computeroutput>service ssh restart</computeroutput>."
 msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>"
 
@@ -6358,13 +6104,11 @@ msgstr ""
 "Standard LTSP-oppsett for klienter bruker ssh-oppkobling til LTSP-tjener. "
 "Derfor trengs en annen bruk av PAM . "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Enable pam_access.so in the LTSP server's /etc/pam.d/sshd file."
 msgstr "Skru på pam_access.so i LTSP-serverens fil /etc/pam.d/sshd ."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Configure /etc/security/access.conf to allow connections for (sample) users "
 "alice, jane, bob and john from everywhere and for all other users only from "
@@ -6659,10 +6403,10 @@ msgid ""
 "boots from a diskette or directly from the server using network-PROM (or "
 "PXE) without using a local client hard drive."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. "
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -7047,8 +6791,7 @@ msgstr ""
 "For å la ltspserver00 betjene diskløse arbeidsstasjoner på hovednettverket "
 "(10.0.0.0 /8), når tjener ikke er en kombinert server, gjør du følgende:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
@@ -7058,8 +6801,7 @@ msgstr ""
 "avmontere <computeroutput>/var/spool/squid</computeroutput>-partisjonen også "
 "for at dette skal fungere:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> to the same directory on tjener."
@@ -7068,8 +6810,7 @@ msgstr ""
 "avmontere <computeroutput>/var/spool/squid</computeroutput>-partisjonen også "
 "for at dette skal fungere:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "edit <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> to use the IP address of ltspserver00; the following example "
@@ -7085,8 +6826,7 @@ msgstr ""
 msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
 "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
@@ -8006,8 +7746,7 @@ msgstr ""
 "Du kan redigere retningslinjer for maskiner, og kopiere de til alle andre "
 "maskiner."
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Pick a freshly installed Windows computer, and run <computeroutput>gpedit."
 "msc</computeroutput>"
@@ -8015,8 +7754,7 @@ msgstr ""
 "Bruk en nyinstallert Windows-maskin, og kjør <computeroutput>gpedit.msc</"
 "computeroutput>"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Under the selection \"User Configuration\" -> \"Administrative Templates"
 "\" -> \"System\" -> \"User Profiles\" -> \"Exclude directories in "
@@ -8032,38 +7770,31 @@ msgstr ""
 "inn navnet på installasjonspråket slik de er i profilen. Eksempel på "
 "kataloger som kan ekskluderes er:"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "log"
 msgstr "logg"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Locale settings"
 msgstr "Lokale innstillinger"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Temporary Internet Files"
 msgstr "Midlertidige 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 "Lagre endringer, og forlat editoren."
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Copy <computeroutput>c:\\windows\\system32\\GroupPolicy</computeroutput> to "
 "all other Windows machines."
@@ -8071,8 +7802,7 @@ msgstr ""
 "Kopier <computeroutput>c:\\windows\\system32\\GroupPolicy</computeroutput> "
 "til alle andre maskiner."
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "It's a good idea to copy it to your Windows OS deployment system to have it "
 "included at install time."
@@ -8166,13 +7896,11 @@ msgstr ""
 "Du kan redigere registeret på den lokale maskinen, og kopiere denne "
 "registernøkkelen til andre maskiner."
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Start the Registry Editor."
 msgstr "Start registereditoren"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Navigate to <computeroutput>HKEY_CURRENT_USER\\Software\\Microsoft\\Windows "
 "NT\\CurrentVersion\\Winlogon</computeroutput>"
@@ -8180,18 +7908,15 @@ msgstr ""
 "Naviger til <computeroutput>HKEY_CURRENT_USER\\Software\\Microsoft\\Windows "
 "NT\\CurrentVersion\\Winlogon</computeroutput>"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Use the menu \"Edit menu\" -> \"New\" -> \"String Value\"."
 msgstr "Bruk menyen «Endre meny» -> «Ny» -> «Verdi-streng»."
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid "Call it <computeroutput>ExcludeProfileDirs</computeroutput>"
 msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>"
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Enter a semicolon-separated list of paths to exclude (in the same way as for "
 "a machine policy)"
@@ -8199,8 +7924,7 @@ msgstr ""
 "Skriv inn en semikolonbasert liste med stier som skal ekskluderes (samme "
 "måte som maskinregler)."
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Now you can choose to export this registry key as a .reg file. Mark a "
 "selection, right-click, and select \"Export\"."
@@ -8209,8 +7933,7 @@ msgstr ""
 "utvalg, høyreklikk og velg «Eksporter». Lagre filen og du kan dobbelklikke "
 "på den, eller legge den til et skript for å spre den til andre maskiner."
 
-#. type: Content of:
-#. <article><section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Save the file and you can double click it, or add it to a script to spread "
 "it to other machines."
@@ -8222,8 +7945,7 @@ msgstr ""
 msgid "Sources:"
 msgstr "Kilder:"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://technet2.microsoft.com/windowsserver/en/technologies/"
 "featured/gp/default.mspx\"/>"
@@ -8231,8 +7953,7 @@ msgstr ""
 "<ulink url=\"http://technet2.microsoft.com/windowsserver/en/technologies/"
 "featured/gp/default.mspx\"/>"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/"
 "PolicyMgmt.html\"/>"
@@ -8240,13 +7961,11 @@ msgstr ""
 "<ulink url=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/"
 "PolicyMgmt.html\"/>"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://isg.ee.ethz.ch/tools/realmen/det/skel.en.html\"/>"
 msgstr "<ulink url=\"http://isg.ee.ethz.ch/tools/realmen/det/skel.en.html\"/>"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://www.css.taylor.edu/~nehresma/samba.html\"/>"
 msgstr "<ulink url=\"http://www.css.taylor.edu/~nehresma/samba.html\"/>"
 
@@ -8297,15 +8016,13 @@ msgstr ""
 "katalogene automatisk bli lagt i listen over synkroniserte kataloger. Hvis "
 "du ikke vil dette, så må du i tillegg også slå av følgende"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "\"User Configuration\" -> \"Administrative Templates\" -> \"Network\" -"
 "> \"Offline Files\""
 msgstr "Brukeroppsett -> Administrative Maler -> Nettverk -> Frakoblete filer"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "\"Computer Configuration\" -> \"Administrative Templates\" -> \"Network"
 "\" -> \"Offline Files\""
@@ -8431,8 +8148,7 @@ msgstr ""
 msgid "Available Remote Desktop clients"
 msgstr "Tilgjengelige klienter for skrivebordsomgivelse via nett"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default and is "
 "captable of RDP and VNC."
@@ -8440,8 +8156,7 @@ msgstr ""
 "<computeroutput>freerdp-x11</computeroutput> er installert som standard og "
 "håndterer RDP og VNC."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "RDP - the easiest way to access Windows terminal server. An alternative "
 "client package is <computeroutput>rdesktop</computeroutput>."
@@ -8449,8 +8164,7 @@ msgstr ""
 "RDP - den enkleste måte å kople til windowsterminaltjener. Det er bare å "
 "installere <computeroutput>rdesktop</computeroutput>-pakken."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "VNC client (Virtual Network Computer) gives access to Skolelinux remotely.  "
 "An alternative client package is <computeroutput>xvncviewer</computeroutput>."
@@ -8458,8 +8172,7 @@ msgstr ""
 "VNC-klienter (Virituell Nettverksmaskin) gir tilgang til Skolelinux utenfra. "
 "Bare installer pakken <computeroutput>xvncviewer</computeroutput>."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "NX graphical client gives students and teachers access to Skolelinux "
 "remotely on Windows, Mac or Linux PC. One municipality in Norway has "
@@ -8470,8 +8183,7 @@ msgstr ""
 "Windows, Mac eller Linux. En kommune i Norge har tilbudt NX-støtte for alle "
 "sine elever siden 2005. De rapporterer at løsningen er stabil."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/CitrixApps\">Citrix ICA "
 "client HowTo</ulink> to access Windows terminal server from Skolelinux."
@@ -8557,8 +8269,7 @@ msgstr ""
 "er SKOLELINUX. Bruk en Windows-maskin (eller et Linux system med smbclient) "
 "for å bla gjennom ditt Windows/Samba nettverkmiljø."
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "START -> Run command"
 msgstr "START -> Kjør kommando"
 
@@ -8594,16 +8305,14 @@ msgstr ""
 "hjemmemapper med Windows maskiner <emphasis role=\"strong\">not</emphasis>  "
 "som er sammenføyet med Windows SKOLELINUX domain."
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "enter \\\\TJENER\\HOMES or \\\\TJENER\\<username> and press return"
 msgstr ""
 "Oppgi \\\\TJENER\\HOMES eller \\\\TJENER\\<brukernavn> og klikk på "
 "tilbaketasten (Return)."
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "enter your login credentials (username, password) in the authentication "
 "dialog window that appears"
@@ -8611,8 +8320,7 @@ msgstr ""
 "Oppgi dine innloggingsreferanser (brukernavn, passord) i dialogvinduet som "
 "kommer opp der identiteten skal bekreftes. "
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "-> a Windows Explorer window should open and show files and folders in "
 "your Debian Edu home directory."
@@ -8722,8 +8430,7 @@ msgstr ""
 "MERK: Windows XP Home støtter ikke domene medlemskap; Windows XPProfesjonell "
 "er nødvendig her."
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "log on to the Windows XP machine as Administrator (or any other account with "
 "Administrator privileges)"
@@ -8731,8 +8438,7 @@ msgstr ""
 "logge seg på Windows XP-maskin som Administrator (eller hvilken som helst "
 "annen konto med Administratorrettigheter)"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "click on \"Start\" then right-click on \"Computer\" and click on \"Properties"
 "\""
@@ -8740,13 +8446,11 @@ msgstr ""
 "Klikk på \"Start\", og deretter høyreklikke på \"Computer\" og klikk på "
 "\"Egenskaper\""
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "select tab \"Computer Name\" and click on \"Change...\""
 msgstr "velg fanen «Datamaskinnavn\" og klikk på «Endre ...»"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "under \"Member of\", select the radio button beside \"Domain:\", type "
 "SKOLELINUX and then click \"OK\""
@@ -8754,8 +8458,7 @@ msgstr ""
 "under «Medlem av», velger du alternativknappen ved siden av «Domain», skriv "
 "Skolelinux og klikk deretter på «OK»"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "a pop up box will request to enter credentials of an account with rights to "
 "join the domain. Type username SKOLELINUX\\Administrator and the root "
@@ -8765,8 +8468,7 @@ msgstr ""
 "rettigheter til å bli med i domenet. Skriv inn brukernavn SKOLELINUX"
 "\\Administrator og root-passordet, klikk på «OK»"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "a confirmation pop up box will welcome you to the SKOLELINUX domain. "
 "Clicking on \"OK\", will result in having another message informing that a "
@@ -8808,8 +8510,7 @@ msgstr ""
 "installasjon av et register patch på klienten i Windows Vista/7 klient. "
 "Denne patchen er gitt på dette stedet:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "\\\\tjener\\netlogon\\win7+samba_domain-membership\\Win7_Samba3DomainMember."
 "reg"
@@ -8836,8 +8537,7 @@ msgstr ""
 "Etter bruk av ovennevnte lapp og ny oppstart av klientsystemet, bør du være "
 "i stand til å bli med i Skolelinux domenet:"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "the basic system information page will open. Under \"Computer name, domain, "
 "and workgroup settings\", click on \"Change Settings\""
@@ -8845,8 +8545,7 @@ msgstr ""
 "den grunnleggende systeminformasjonsside åpnes. Under «datamaskinnavn, "
 "domene, og arbeidsgruppeinnstillinger», klikk på «Endre innstillinger»"
 
-#. type: Content of:
-#. <article><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "on the System Properties page, click on \"Change...\""
 msgstr "på siden Systemegenskaper, klikk på \"Endre ...\""
 
@@ -9368,13 +9067,11 @@ msgstr "Bidra"
 msgid "Let us know you exist"
 msgstr "La oss vite at du er der"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/worldmap.png"
 msgstr "./images/worldmap.png"
 
-#. type: Content of:
-#. <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid ""
 "http://www.skolelinux.no/slschools/worldmap.php?lang=en&image=worldmap."
 "png"
@@ -9526,13 +9223,11 @@ msgstr "Frivillighetsbasert støtte"
 msgid "in English"
 msgstr "På engelsk"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/> - support mailing list"
@@ -9540,8 +9235,7 @@ msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/>  - e-postliste for support"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "#debian-edu on irc.debian.org - IRC channel, mostly development related; do "
 "not expect real time support even though it frequently happens"
@@ -9553,8 +9247,7 @@ msgstr ""
 msgid "in Norwegian"
 msgstr "På norsk"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
 "> - support mailing list"
@@ -9562,8 +9255,7 @@ msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
 "> - e-postliste for support"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen\"/> - mailing list for the development member organisation in "
@@ -9573,8 +9265,7 @@ msgstr ""
 "linuxiskolen\"/> - e-postliste for medlemmer i utviklerorganisasjonen i "
 "Norge (FRISK)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "#skolelinux on irc.debian.org - IRC channel to support Norwegian users"
 msgstr "#skolelinux på irc.oftc.net - IRC-kanal for support av norske brukere"
 
@@ -9582,8 +9273,7 @@ msgstr "#skolelinux på irc.oftc.net - IRC-kanal for support av norske brukere"
 msgid "in German"
 msgstr "På tysk"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\"/> - support "
 "mailing list"
@@ -9591,16 +9281,14 @@ msgstr ""
 "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\">http://www."
 "skolelinux.de/mailman/listinfo/user</ulink> - e-postliste for support"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://wiki.skolelinux.de\"/> - wiki with lots of HowTos etc."
 msgstr ""
 "<ulink url='http://wiki.skolelinux.de'>http://wiki.skolelinux.de</ulink> "
 "wiki med mange veiledninger osv."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "#skolelinux.de on irc.debian.org - IRC channel to support German users"
 msgstr ""
 "#skolelinux.de på irc.oftc.net - IRC-kanal for support av tyske brukere"
@@ -9609,8 +9297,7 @@ msgstr ""
 msgid "in French"
 msgstr "På fransk"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - support mailing "
 "list"
@@ -9622,8 +9309,7 @@ msgstr ""
 msgid "in Spanish"
 msgstr "På spansk"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
 msgstr "<ulink url=\"http://www.skolelinux.es\"/> - Spansk portal"
 
@@ -9652,8 +9338,7 @@ msgstr "Nye egenskaper i Debian Edu 8.0+edu0 kodenavn Jessie utgitt 2015-XX-YY"
 msgid "Installation changes"
 msgstr "Installasjonsendringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New version of debian-installer from Debian Jessie, see <ulink url=\"http://"
 "www.debian.org/releases/jessie/installmanual\">installation manual</ulink> "
@@ -9667,13 +9352,11 @@ msgstr ""
 msgid "Software updates"
 msgstr "Programvareoppdateringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian Jessie 8.0, eg:"
 msgstr "Alt som er nytt i Debian Jessie 8.0, for eksempel:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Linux kernel 3.16.x; for the i386 architecture, support for i486 processors "
 "has been dropped; oldest supported ones: i586 (like Intel Pentium and AMD "
@@ -9682,21 +9365,18 @@ msgstr ""
 "Linux-kjernen 3.16.x; for i386 arkitekturen, er støtten til i486 prosessorer "
 "droppet. Eldste som støttes er: i586 (som Intel Pentium og AMD K5)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
 "0.5.6"
 msgstr ""
 "Skrivebordsmiljøet KDE «Plasma» 4.11.12, GNOME 3.14, Xfce 4.10, LXDE 0.5.6"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "new optional desktop environment: MATE 1.8"
 msgstr "nytt valgfritt skrivebordsmiljø: MATE 1.8"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "KDE \"Plasma\" is installed by default; to choose one of the others see this "
 "manual."
@@ -9704,38 +9384,33 @@ msgstr ""
 "KDE \"Plasma\"er installert som standard, for å velge et av de andre gjør du "
 "som beskrevet annet sted i denne håndboken."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+msgid "the browsers Iceweasel 31 ESR and Chromium 40"
 msgstr "nettleserne Iceweasel 31 ESR og Chromium 39"
 
-#. 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 "
@@ -9747,14 +9422,12 @@ msgstr ""
 "url=\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</"
 "ulink>."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Debian Jessie includes about 42000 packages available for installation."
 msgstr ""
 "Debian Jessie omfatter omtrent 42 000 pakker tilgjengelig for installasjon."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "More information about Debian Jessie 8.0 is provided in the <ulink url="
 "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</ulink> "
@@ -9769,8 +9442,7 @@ msgstr ""
 msgid "Documentation and translation updates"
 msgstr "Dokumentasjons- og oversettelsesoppdateringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Translation updates for the templates used in the installer. These templates "
 "are now available in 29 languages."
@@ -9778,14 +9450,12 @@ msgstr ""
 "Oversettelsesoppdateringer for malene som brukes i installasjonsprogrammet. "
 "Disse malene er nå tilgjengelig på 29 språk."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Two manual translations have been completed: Dutch and Norwegian Bokmål."
 msgstr "To oversettelser av håndboken er gjort: nederlandsk og norsk bokmål."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
 "Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
@@ -9799,8 +9469,7 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr "LDAP relaterte endringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "TBD"
 msgstr "TBD"
 
@@ -9812,8 +9481,7 @@ msgstr "Andre endringer"
 msgid "Squid"
 msgstr "Squid"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Shutdown and reboot of the main server takes longer due to a new default "
 "setting <computeroutput>shutdown_lifetime 30 seconds</computeroutput>. As an "
@@ -9831,8 +9499,7 @@ msgstr ""
 msgid "SSH"
 msgstr "SSH"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The root user is no longer allowed to login via SSH with password. The "
 "default <computeroutput>PermitRootLogin yes</computeroutput> has been "
@@ -9849,8 +9516,7 @@ msgstr ""
 msgid "Backup (slbackup-php)"
 msgstr "Sikkerhetskopering (slbackup-php)"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To be able to use the slbackup-php site (which uses root logins via ssh), "
 "<computeroutput>PermitRootLogin yes</computeroutput> has to be set "
@@ -9865,8 +9531,7 @@ msgstr ""
 msgid "gnash (flash player)"
 msgstr "gnash (Flash-avspiller)"
 
-#. type: Content of:
-#. <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The free flash player <computeroutput>gnash</computeroutput> is not "
 "available for Jessie. <link linkend=\"Desktop--Flash\">Installing the non-"
@@ -9881,8 +9546,7 @@ msgstr ""
 msgid "Known issues"
 msgstr "Kjente problemer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "None yet."
 msgstr "Ingen kjente ennå."
 
@@ -9945,9 +9609,17 @@ msgstr ""
 "GPL v2 eller en senere versjon."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), "
+#| "FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar "
+#| "Wisløff (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 "
+"2014, 2015), 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), FourFire "
 "Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) "
@@ -9961,13 +9633,23 @@ msgstr ""
 "utgitt under GPL2 eller senere versjoner."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), 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."
 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), "
 "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."
+"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Den tyske oversettelsen er kopibeskyttet av Holger Levsen (2007), Patrick "
 "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -9986,11 +9668,19 @@ msgstr ""
 "2007, og Beatrice Torracca,  og er utgitt under GPLv2 eller senere versjoner."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
+#| "French l10n team (2009, 2010, 2012) and is released under the GPL v2 or "
+#| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL v2 or any later version."
+"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
+"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Den franske oversettelsen er kopibeskyttet av Christophe Masson (2008), "
 "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau "
@@ -9998,17 +9688,25 @@ msgstr ""
 "(2009, 2010, 2012) og er utgitt under GPL2 eller senere  versjoner."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) 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."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
-"released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "Den nederlandske oversettelsen er kopibeskyttet av Frans Spiesschaert "
 "(2014), og er utgitt under GPL v2 eller en senere versjon."
@@ -10165,7 +9863,7 @@ msgstr ""
 "språk, hvis det ikke finnes allerede, og hvordan oppdatere oversettelser. "
 
 #.  <remark>
-#. status ignore</remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -10841,118 +10539,95 @@ msgstr ""
 "du ønsker angis oppstartsvalget <computeroutput>keyb=KB</computeroutput> der "
 "KB er det ønskede tastaturet. Her er en liste over vanlig brukte landkoder:"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Language (Region)</emphasis>"
 msgstr "<emphasis role='strong'>Spåk (Region)</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgstr "<emphasis role='strong'>Lokalkode</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\">Keyboard layout</emphasis>"
 msgstr "<emphasis role='strong'>Tastaturutforming</emphasis>"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Norwegian Bokmål"
 msgstr "Norsk bokmål"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "nb_NO.UTF-8"
 msgstr "nb_NO.UTF-8"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "no"
 msgstr "no"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Norwegian Nynorsk"
 msgstr "Norsk nynorsk"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "nn_NO.UTF-8"
 msgstr "nn_NO.UTF-8"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "German"
 msgstr "Tysk"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "de_DE.UTF-8"
 msgstr "de_DE.UTF-8"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "de"
 msgstr "de"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "French (France)"
 msgstr "Fransk (Frankrike)"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "fr_FR.UTF-8"
 msgstr "fr_FR.UTF-8"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "fr"
 msgstr "fr"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Greek (Greece)"
 msgstr "Gresk (Hellas)"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "el_GR.UTF-8"
 msgstr "el_GR.UTF-8"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "el"
 msgstr "el"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Japanese"
 msgstr "Japansk"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "ja_JP.UTF-8"
 msgstr "ja_JP.UTF-8"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "jp"
 msgstr "jp"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Northern Sami (Norway)"
 msgstr "Nordsamisk (Norge)"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "se_NO"
 msgstr "se_NO"
 
-#. type: Content of:
-#. <article><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "no(smi)"
 msgstr "no(smi)"
 
@@ -10984,13 +10659,11 @@ msgstr "Kjente problemer med avtrykket"
 msgid "There are no jessie images yet"
 msgstr "Det er ingen jessie avtrykk ennå"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/sad.png"
 msgstr "./images/sad.png"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid ":("
 msgstr ":("
 
@@ -11025,8 +10698,7 @@ msgstr ""
 msgid "User visible changes"
 msgstr "Endringer synlig for brukerne"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
 "installation, in the login screen and as desktop wallpaper."
@@ -11034,8 +10706,7 @@ msgstr ""
 "Oppdatert illustrasjonsmateriale og ny Debian Edu / Skolelinux-logo, som er  "
 "synlig under installasjon, i påloggingsskjermen og som skrivebordsbakgrunn."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
 "www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
@@ -11045,8 +10716,7 @@ msgstr ""
 "www.debian.org/releases/wheezy/installmanual\">installasjons-instruksjonene</"
 "ulink> for ytterligere detaljer."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
 "disc image, which behaves like the DVD image, but is too big to fit on a DVD."
@@ -11055,18 +10725,15 @@ msgstr ""
 "ray plate, som oppfører seg som et DVD-avtrykk, men er for stort til å få "
 "plass på en DVD."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian Wheezy 7.1, eg:"
 msgstr "Alt som er nytt i Debian Wheezy 7.1, for eksempel:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Linux kernel 3.2.x"
 msgstr "Linux kjerneversjon 3.2.x"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
 "0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce or "
@@ -11076,63 +10743,51 @@ msgstr ""
 "(KDE «Plasma» er installert som standard, for å velge GNOME, Xfce eller "
 "LXDE, se håndbok)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Web browser Iceweasel 17 ESR"
 msgstr "Nettleser Iceweasel 17 ESR"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LibreOffice 3.5.4"
 msgstr "Libreoffice 3.5.4"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LTSP 5.4.2"
 msgstr "LTSP 5.4.2"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "CUPS print system 1.5.3"
 msgstr "CUPS utskriftssystem 1.5.3"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Educational toolbox GCompris 12.01"
 msgstr "Pedagogisk verktøykasse GCompris 12.01"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Music creator Rosegarden 12.04"
 msgstr "Musikkskaperen Rosegarden 12.04"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Image editor Gimp 2.8.2"
 msgstr "Bilderedigeringsprogrammet Gimp 2.8.2"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual universe Celestia 1.6.1"
 msgstr "Virtuelt univers Celestia 1.6.1"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual stargazer Stellarium 0.11.3"
 msgstr "Virtuell stjernehimmel Stellarium 0.11.3"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Scratch visual programming environment 1.4.0.6"
 msgstr "Scratch visuelt programmeringsmiljø 1.4.0.6"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Debian Wheezy includes about 37000 packages available for installation."
 msgstr "Debian Wheezy omfatter ca 37 000 pakker tilgjengelig for installasjon."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "More information about Debian Wheezy 7.1 is provided in the <ulink url="
 "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
@@ -11144,8 +10799,7 @@ msgstr ""
 "\"http://www.debian.org/releases/wheezy/installmanual\">Installation Guide</"
 "ulink>."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
 "and Danish. Partly translated versions exist for Norwegian Bokmål and "
@@ -11154,8 +10808,7 @@ msgstr ""
 "Debian Edu Wheezy Manual er oversatt til tysk, fransk, italiensk og dansk. "
 "Delvis oversatte versjoner finnes på norsk bokmål og spansk."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Slight changes to some objects and acls to have more types to choose from "
 "when adding systems in GOsa. Now systems can be of type server, workstation, "
@@ -11166,18 +10819,15 @@ msgstr ""
 "arbeidsstasjon, skriver, terminal eller netdevice (Linux Programmerer "
 "Håndbok)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New Xfce desktop task."
 msgstr "Ny Xfce desktop/skrivebord oppgave."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "LTSP diskless workstations run without any configuration."
 msgstr "LTSP diskløse arbeidsstasjoner kjører uten noen konfigurasjon."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "On the dedicated client network of thin client servers (default "
 "192.168.0.0/24), machines run by default as diskless workstations if they "
@@ -11187,8 +10837,7 @@ msgstr ""
 "(standard192.168.0.0/24), kjører maskiner som standard som diskløse "
 "arbeidsstasjoner dersom de er kraftige nok."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "GOsa gui: Now some options that seemed to be available, but are non "
 "functional, are greyed out (or are not clickable). Some tabs are completely "
@@ -11198,8 +10847,7 @@ msgstr ""
 "funksjonelle, nedtonet/grået ut (eller er ikke klikkbare). Noen kategorier "
 "er helt skjult for sluttbruker, noen også for GOsa admin."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Using KDE \"Plasma\" on standalone and roaming workstations, at least "
 "Konqueror, Chromium and Step sometimes fail to work out-of-the box when the "
@@ -11233,13 +10881,11 @@ msgstr ""
 msgid "sitesummary was updated from 0.1.3 to 0.1.8"
 msgstr "sammendrag ble oppdatert fra 0.1.3 til 0.1.8"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Make Nagios configuration more robust and efficient"
 msgstr "Gjør Nagios oppsett/konfigurasjon mer robust og effektiv"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Comply with 3.X kernel"
 msgstr "Sammenfaller med  3.X kernel"
 
@@ -11247,13 +10893,11 @@ msgstr "Sammenfaller med  3.X kernel"
 msgid "debian-edu-doc from 1.4~20120310~6.0.4+r0 to 1.4~20130228~6.0.7+r1"
 msgstr "debian-edu-doc fra 1.4~20120310~6.0.4+r0 til 1.4~20130228~6.0.7+r1"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Minor updates from the wiki"
 msgstr "Mindre oppdateringer fra wiki"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Danish translation now complete"
 msgstr "Dansk oversettelse er nå komplett "
 
@@ -11261,18 +10905,15 @@ msgstr "Dansk oversettelse er nå komplett "
 msgid "debian-edu-config from 1.453 to 1.455"
 msgstr "debian-edu-config fra 1.453 til 1.455"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
 msgstr "Fikse /etc/hosts for LTSP tynnklienter. Lukker: #699880"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Make ltsp_local_mount script work for multiple devices."
 msgstr "Gjør ltsp_local_mount script arbeid for flere enheter."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Correct Kerberos user policy: don't expire password after 2 days. Closes: "
 "#664596"
@@ -11280,45 +10921,37 @@ msgstr ""
 "Riktig Kerberos brukerpolicy: utløper ikke passord etter to dager. lukker:"
 "#664596 "
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Handle '#' characters in the root or first users password. Closes: #664976"
 msgstr ""
 "Behandle '#' tegn i roten eller første brukers passord. Lukker: # 664976"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fixes for gosa-sync:"
 msgstr "Fikser for GOsa-sync:"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Don't fail if password contains \""
 msgstr "Ikke mislykkes hvis passord inneholder \""
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Don't disclose new password string in syslog"
 msgstr "Ikke oppgi nytt passord-streng i syslog"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fixes for gosa-create:"
 msgstr "Rettelser for GOsa-skaper:"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Invalidate libnss cache before applying changes"
 msgstr "Gjør libnss-mellomlager ugyldig før endriner anvendes"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Multiple failures during mass user import into GOsa²"
 msgstr "Flere feil i løpet av masseimport av brukere i "
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "gosa-netgroups plugin: don't erase entries of attribute type "
 "\"memberNisNetgroup\". Closes: #687256"
@@ -11326,15 +10959,13 @@ msgstr ""
 "innstikkmodul gosa-netgroups: ikke slett attributtoppføringer av type "
 "«memberNisNetgroup». Lukker: #687256"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "First user now uses the same Kerberos policy as all other users"
 msgstr ""
 "Første bruker har nå samme grunnleggende Kerberos-oppsett (policy) som alle "
 "andre brukere"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Add Danish web page"
 msgstr "Legg til dansk nettside"
 
@@ -11342,8 +10973,7 @@ msgstr "Legg til dansk nettside"
 msgid "debian-edu-install from 1.528 to 1.530"
 msgstr "debian-edu-install fra 1.528 til 1.530"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Improve preseeding support and documentation"
 msgstr "Forbedre tidligere støtte og dokumentasjon"
 
@@ -11353,8 +10983,7 @@ msgid ""
 msgstr ""
 "Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Lenny - utgitt  08.02.2010"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Replace LWAT with GOsa² as the LDAP administration interface. See below and "
 "the <ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/"
@@ -11366,13 +10995,11 @@ msgstr ""
 "installasjon.</ulink> for å lære å installere med GNOME i stedet for KDE som "
 "skrivebordmiljø ."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "See below for a list of updated software."
 msgstr "Det ligger en liste med oppdatert programvare lenger ned på siden"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Show welcome page to users when they first log in. This default start page "
 "for Iceweasel is fetched from LDAP at installation and boot time for "
@@ -11384,8 +11011,7 @@ msgstr ""
 "for profiler i nettverket. Sett  <ulink url=\"http://www.skolelinux.org/\"/> "
 "ved frittstående installering."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New LXDE desktop option, in addition to KDE (default) and GNOME. As the "
 "GNOME option, the LXDE desktop option is only supported by the CD "
@@ -11394,18 +11020,15 @@ msgstr ""
 "Nytt LXDE skrivebordsalternativ, i tillegg til KDE (standard) og GNOME. "
 "GNOMEs og LXDEs skrivebordsalternativer støttes bare ved installasjon fra CD."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Speed up LTSP client boot."
 msgstr "Lyd med LTSP-klienter"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Provide a KDE menu entry for changing the password in GOsa²."
 msgstr "Gir en KDE menyinngang for å endre passordet i GOsa²."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "For more information on how to change passwords (including expired passwords "
 "at the KDM/GDM login prompt), please see the <ulink url=\"https://wiki."
@@ -11417,8 +11040,7 @@ msgstr ""
 "detaljert i kapittelet <link linkend=\"NetworkClients\">Veiledning/"
 "Nettverksklienter</link> i denne manualen."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add link to <ulink url=\"http://linuxsignpost.org/\"/> on the start page "
 "shown to new users."
@@ -11426,8 +11048,7 @@ msgstr ""
 "Lagt til lenke til <ulink url=\"http://linuxsignpost.org/\"/> på startsiden "
 "som vises til nye brukere."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "All LTSP servers are also <ulink url=\"http://wiki.debian.org/DebianEdu/"
 "Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service\">RDP "
@@ -11437,8 +11058,7 @@ msgstr ""
 "DebianEdu/Documentation/Squeeze/HowTo/NetworkClients#Remote_Desktop_Service"
 "\">RPD-tjenere</ulink>."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Improve handing of removable media on thin clients. Show desktop "
 "notification longer when inserting new media and provide an option to start "
@@ -11448,8 +11068,7 @@ msgstr ""
 "skrivebordsvarsel lenger når du setter nye medier, og gi en mulighet til å "
 "starte Dolphin når slike medier settes inn."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New version of debian-installer from Debian Squeeze, see <ulink url=\"http://"
 "www.debian.org/releases/squeeze/installmanual\">installation manual</ulink> "
@@ -11458,8 +11077,7 @@ msgstr ""
 "Mer informasjon kan man finne i  <ulink url=\"http://www.debian.org/releases/"
 "lenny/installmanual\"> manualen til Debian Installer</ulink>."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Since root logins are no longer allowed when using gdm/kdm, a user in LDAP "
 "is set up during installation of the Main Server. This user is up as GOsa² "
@@ -11473,8 +11091,7 @@ msgstr ""
 "Debian Edu menyendring er også aktivert ved også å legge brukeren til "
 "<computeroutput>teachers</computeroutput>-gruppen."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The <computeroutput>.iso</computeroutput> images can directly be copied onto "
 "USB flash drives, for example by using <computeroutput>dd</computeroutput> "
@@ -11484,13 +11101,11 @@ msgstr ""
 "computeroutput> som navneserver. Det er imidlertid mulig å forsette å bruke "
 "<computeroutput>bind9</computeroutput>."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "New roaming workstation profile for laptops."
 msgstr "arbeidsstasjon"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Device access for all users is handled by <ulink url=\"https://wiki.debian."
 "org/PolicyKit#\">PolicyKit</ulink>, and no extra group memberships are "
@@ -11500,8 +11115,7 @@ msgstr ""
 "org/PolicyKit#\">PolicyKit</ulink>, og ekstra gruppemedlemskap er ikke "
 "nødvendig for å få tilgang til enheter."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "A warning will be issued when installing on too small disks for the selected "
 "profile."
@@ -11509,8 +11123,7 @@ msgstr ""
 "Det kommer en advarsel når du installerer den valgte profilen på altfor små "
 "disker."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Simplify partitioning for Standalone installs to only have a separate /home/ "
 "but no seperate /usr anymore."
@@ -11518,8 +11131,7 @@ msgstr ""
 "Å forenkle partisjoneringen til frittstående installasjoner kan skje bare "
 "ved å ha en separat /home/ men ikke egen /usr lenger."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "More tests in the test suite, and correct some of the tests that failed "
 "earlier."
@@ -11527,8 +11139,7 @@ msgstr ""
 "Flere tester i testsamlingen, og korrigerte noen av testene som tidligere "
 "feilet."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make sure to report an error and abort the installation when trying to use "
 "the netinst images without a working Internet connection, instead of "
@@ -11538,66 +11149,54 @@ msgstr ""
 "netinst-bildene uten en fungerende Internet-tilkobling, i stedet for å "
 "installere et ødelagt system uten å melde fra."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Everything which is new in Debian Squeeze:"
 msgstr "Alt som er nytt i Debian Squeeze:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "compatibility with the FHS v2.3 and software developed for version 3.2 of "
 "the LSB."
 msgstr ""
 "kompatibilitet med FHS v2.3 og programvare utviklet for versjon 3.2 av LSB."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Linux kernel 2.6.32"
 msgstr "Linux kjerneversjon 2.6.18"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgstr "Skrivebordsomgivelser KDE «Plasma» 4.4 and GNOME 2.30"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Web browser Iceweasel 3.5"
 msgstr "Nettleser Iceweasel 3.5"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "OpenOffice.org 3.2.1"
 msgstr "OpenOffice.org 1.1."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Educational toolbox GCompris 9.3"
 msgstr "Pedagogisk verktøykasse GCompris 9.3"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Music creator Rosegarden 10.04.2"
 msgstr "Musikkskaperen Rosegarden 10.04.2"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Image editor Gimp 2.6.10"
 msgstr "Bilderedigeringsprogrammet Gimp 2.6.10"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual universe Celestia 1.6.0"
 msgstr "Virtuelt univers Celestia 1.6.0"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Virtual stargazer Stellarium 0.10.4"
 msgstr "Virtuell stjernekikker Stellarium 0.10.4"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Debian Squeeze includes over 10,000 new packages available for installation, "
 "including the browser Chromium"
@@ -11605,8 +11204,7 @@ msgstr ""
 "Debian Squeeze inkluderer over 10 000 nye pakker tilgjengelig for "
 "installasjon, inkludert nettleseren Chromium"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "More information about Debian Squeeze 6.0 is provided in the <ulink url="
 "\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
@@ -11620,8 +11218,7 @@ msgstr ""
 msgid "Infrastructural changes"
 msgstr "Installasjon"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
 "gateway is 10.0.0.1/8, not 10.0.2.1/8 as used in the past."
@@ -11629,8 +11226,7 @@ msgstr ""
 "Nå brukes 10.0.0.0/8-nettet i stedet for 10.0.2.0/23, og forhåndsinnstillt "
 "gateway er 10.0.0.1/8, ikke 10.0.2.1/8 slik det var tidligere."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "The dynamic DHCP range was extended on the backbone network to around 4k IP "
 "addresses, and around 200 IP addresses for the thin client network."
@@ -11638,8 +11234,7 @@ msgstr ""
 "Det dynamiske DHCP-området var utvidet på stamnettet til omtrent 4k IP-"
 "adresser og omtrent 200 IP-adresser for tynnklientnettet."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "The DHCP network for 10.0.0.0/8 has been renamed from "
 "<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
@@ -11648,8 +11243,7 @@ msgstr ""
 "Endre <computeroutput>$allowPwSet = false ;</computeroutput> til "
 "<computeroutput>$allowPwSet = true ;</computeroutput>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "There are no pre-defined host entries for client systems in DNS anymore "
 "(staticXX, ..., dhcpYY...)"
@@ -11657,28 +11251,23 @@ msgstr ""
 "Det er ikke lenger noen forhåndsdefinerte oppføringer for klienter i DNS "
 "(staticXX, ..., dhcpYY ...)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "MIT Kerberos5 used for user authentication, enabled for:"
 msgstr "MIT Kerberos5 brukt for brukerautentisering, aktivisert for:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "PAM"
 msgstr "PAM"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "IMAP"
 msgstr "IMAP"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "SMTP"
 msgstr "SMTP"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "NFSv4, but without added Kerberos privacy/integrity/authentication.  The "
 "machines still have to be added to the <computeroutput>workstation</"
@@ -11688,13 +11277,11 @@ msgstr ""
 "Maskinene må fortsatt legges til i nettgruppen <computeroutput>workstation</"
 "computeroutput> for å kunne montere hjemmeområder."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Full Samba NT4 domain support for Windows XP/Vista/7"
 msgstr "Samba støtter  NT4-dome for Windows XP/Vista/7 fullt ut"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "A complete PXE boot environment is setup when installing from the DVD, so "
 "that further installations can be done using PXE network installs only. A "
@@ -11706,8 +11293,7 @@ msgstr ""
 "PXE. Et nytt skript pxe-addfirmware er laget for å støtte flere maskin-"
 "modeller som trenger fastvare.  "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Remove all hard coded settings on workstations, and configure workstations "
 "and roaming workstations using settings detected from the environment using "
@@ -11722,8 +11308,7 @@ msgstr ""
 "No_hardcoded_config_on_Debian_Edu_clients.html\">blogg-post med informasjon "
 "om endringer</ulink>."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Translation updates for the templates used in the installer. These templates "
 "are now available in 28 languages."
@@ -11731,8 +11316,7 @@ msgstr ""
 "Oversetteroppdateringer for malene som brukes av installasjonssystemet.  "
 "Disse malene er nå tilgjengelig i 28 språk."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
 "proof-read with corrections was done by a native English linguist."
@@ -11741,8 +11325,7 @@ msgstr ""
 "forbedret.  En lingvist med engelsk som morsmål har korrekturlest og "
 "korrigert teksten."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
 "Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
@@ -11751,19 +11334,16 @@ msgstr ""
 "Brukerhåndboka for Debian Edu Squeeze er oversatt til tysk, fransk og "
 "italiensk.  Delvis oversettelse finnes på dansk (ny), norsk bokmål og spansk."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to many language tasks, especially French and Danish."
 msgstr ""
 "Forbedringer for mange språkspesifikke oppgaver, spesielt fransk og dansk."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Improvements to the welcome web page shown at first logins."
 msgstr "Forbedringer i velkomstsiden på nett som vises ved første pålogging. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Add new Japanese, Portuguese and Catalan translations of the welcome web "
 "page."
@@ -11774,8 +11354,7 @@ msgstr ""
 msgid "Regressions"
 msgstr "Regresjoner"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://lists.debian.org/20100810061204.GD7929@login2.uio.no"
 "\">CD and DVD installs are different</ulink> - the DVD is only suitable for "
@@ -11785,8 +11364,7 @@ msgstr ""
 "\">CD and DVD er forskjellige</ulink> - DVD-en er bare egnet til å "
 "installere KDE-omgivelsene. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop support for <computeroutput>powerpc</computeroutput> architecture from "
 "netinst installation CDs. It is still possible to run Debian Edu on "
@@ -11797,8 +11375,7 @@ msgstr ""
 "<computeroutput>powerpc</computeroutput>, men installasjonen er mindre "
 "automatisk. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop gtick in the default installation, because it doesn't work on thin "
 "clients (BTS #566335)."
@@ -11810,8 +11387,7 @@ msgstr ""
 msgid "New administration tool: GOsa²"
 msgstr "Brukeradministrasjon (lwat)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "gosa (2.6.11-3+squeeze1~edu+1) from the upcoming 6.0.5 Debian point release, "
 "with:"
@@ -11819,21 +11395,18 @@ msgstr ""
 "gosa (2.6.11-3+squeeze1~edu+1) fra den kommende 6.0.5 Debian point "
 "utgivelsen, med:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Fix DHCP host removal. Closes: #650258"
 msgstr "Reparert DHCP fjerning av vert. Stenger: #650258"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Backport user generator unicode character transliteration. Closes: #657086"
 msgstr ""
 "Tilbakeført brukerskapt unicode-karakterer for transliteration. Stenger: "
 "#657086"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Customized GOsa² configuration to better suit the Debian Edu network "
 "architecture."
@@ -11841,8 +11414,7 @@ msgstr ""
 "Tilpasset GOsa²-konfigurasjon for å passe bedre til nettverk-arkitekturen i "
 "Debian Edu. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "GOsa² updates DNS and NFS exports immediately when a system is updated in "
 "LDAP, making diskless workstations work right after they are added to the "
@@ -11852,8 +11424,7 @@ msgstr ""
 "oppdatert i LDAP, som gjør at diskløse arbeidsstasjoner virker rett etter de "
 "har lagt til i påkrevd netgroup. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Provide script sitesummary2ldapdhcp to update or populate GOsa² with system "
 "objects using information gathered by sitesummary, to make it easier to add "
@@ -11867,16 +11438,14 @@ msgstr ""
 msgid "More software changes"
 msgstr "Flere endringer i programvaren"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add video editor Kdenlive 0.7.7 and interactive geometry tool Geogebra 3.2.42"
 msgstr ""
 "Legg til video-redigerer Kdenlive 0.7.7 og interaktivt geometri-verktøy "
 "Geogebra 3.2.42"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change default package manager from adept to synaptic, to avoid getting two "
 "graphical package managers installed by default."
@@ -11884,8 +11453,7 @@ msgstr ""
 "Endre standard pakke-håndterer fra adept til synaptic, for å unngå at man "
 "får to grafiske pakke-håndterere installert som standard. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Install openoffice.org-kde by default ensure OOo uses KDE file dialogs in "
 "KDE."
@@ -11893,8 +11461,7 @@ msgstr ""
 "Installer openoffice.org-kde for å sikre at kontorpakken OOo bruker KDE "
 "fildialog ved bruk av KDE."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change video player setup to install different players in KDE "
 "(dragonplayer), GNOME (totem) and LXDE (totem)."
@@ -11902,8 +11469,7 @@ msgstr ""
 "Endre oppsett av video-spiller for å bruke andre spillere i KDE "
 "(dragonplayer), GNOME (totem) og LXDE (totem)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add KDE tools freespacenotifier, kinfocenter, update-notifier-kde to the "
 "default KDE installation."
@@ -11911,8 +11477,7 @@ msgstr ""
 "Legg til KDE-verktøyene freespacenotifier, kinfocenter, update-notifier-kde "
 "til standard KDE-installasjon."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Replace network-manager-kde with plasma-widget-networkmanagement in the "
 "standalone KDE profile"
@@ -11920,15 +11485,13 @@ msgstr ""
 "Erstatt network-manager-kde med plasma-widget-networkmanagement i "
 "frittstående KDE-profil. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Install usb-modeswitch on laptops to handle dual mode USB devices."
 msgstr ""
 "Installer usb-modeswitch på bærbare for å håndtere såkalte «dual mode USB "
 "devices»."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add cifs-utils to the default installation to ensure SMB mounting can work "
 "in any profile."
@@ -11936,8 +11499,7 @@ msgstr ""
 "Legg til cifs-utils i standard-installasjonen for å sikre at montering med "
 "SMB virker i alle profiler. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop octave, gpscorrelate, qlandkartegt, viking, starplot, kig, kseg, luma, "
 "and valgrind from the default installation and the DVD to make room for "
@@ -11947,8 +11509,7 @@ msgstr ""
 "og valgrind fra standard-installasjonen og DVD'en for å gi plass til pakker "
 "med høyere prioritet. "
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Drop libnss-mdns from stationary profiles, to make sure DNS is the "
 "authoritive source of host names."
@@ -11956,8 +11517,7 @@ msgstr ""
 "Dropp libnss-mdns fra stasjonære profiler. Da skal DNS være den eneste "
 "kilden til maskin-navn."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
 "and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
@@ -11970,8 +11530,7 @@ msgstr ""
 msgid "Other LDAP related changes"
 msgstr "Andre LDAP-relaterte endringer"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make the LDAP server handle more clients after increasing the server's file "
 "descriptor limit from 1024 to 32768."
@@ -11979,8 +11538,7 @@ msgstr ""
 "Få LDAP-tjenesten til å håndtere flere brukere ved å øke antallet "
 "tilgjengelige filer fra 1024 tl 32768."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Add code to re-enable stopped CUPS queues every hour on the Main Server, and "
 "flush all CUPS queues every night. Both can be disabled in LDAP."
@@ -11989,8 +11547,7 @@ msgstr ""
 "hoved-tjeneren, samt tømme alle CUPS-køer hver natt. Begge funksjoner kan "
 "skrus av i LDAP."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Provide network blocking / exam mode by default, controlled by LDAP. In "
 "addition to network blocking, changes to the Squid proxy configuration is "
@@ -12000,8 +11557,7 @@ msgstr ""
 "kontrollert via LDAP. I tillegg til å hindre nettverkstilgang må det gjøres "
 "endringer i Squid-oppsettet."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Enable automatic extending of full file systems on the Main Server by "
 "default. This can be disabled in LDAP."
@@ -12009,8 +11565,7 @@ msgstr ""
 "Sett opp autmatisk utvidelse når et filsystem går fullt på hoved-tjeneren "
 "som standard. Dette kan skrus av i LDAP."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change SSL certificate name used by the LDAP server and adjust clients to "
 "use the new name to be able to enable certificate checking on clients."
@@ -12018,16 +11573,14 @@ msgstr ""
 "Bytt navnet på SSL-sertifikatet som brukes av LDAP-tjenesten, og la "
 "klientene bruke det nye navnet når sertifikatene sjekkes på klientene."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Switch PowerDNS to use strict LDAP mode, to allow us to simplify the LDAP "
 "setup used for DNS."
 msgstr ""
 "La PowerDNS bruke streng LDAP modus, dette forenkler DNS-oppsettet i LDAP."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Simplify autofs LDAP rules to make sure they work with extra home directory "
 "partitions exported from the main-server without any changes."
@@ -12036,16 +11589,14 @@ msgstr ""
 "katalog-partisjoner som er eksportert fra hoved-server uten noen "
 "forandringer."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make backup system more robust in handling LDAP database dump and restart."
 msgstr ""
 "Lag sikkerhetskopisystemet mer robust i behandling av LDAP database utskrift/"
 "dump og omstart."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Root logins are denied for both KDM and GDM - see above and <ulink url="
 "\"https://wiki.debian.org/DebianEdu/Documentation/Squeeze/GettingStarted#"
@@ -12056,8 +11607,7 @@ msgstr ""
 "installasjon.</ulink> for å lære å innstallere med GNOME i stedet for KDE "
 "som skrivebordmiljø ."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Clients set up to shut down at night will stay up for at least an hour if "
 "they are turned on manually between 16:00 and 07:00."
@@ -12065,8 +11615,7 @@ msgstr ""
 "Klienter satt opp til å stenge om natten vil være oppe i minst en time hvis "
 "de er slått på manuelt 16:00 til 07:00."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Additionally use local NTP clock on the main-server to ensure clients and "
 "server sync clocks also when disconnected from the Internet."
@@ -12074,8 +11623,7 @@ msgstr ""
 "I tillegg, bruk lokal NTP klokke på hovedtjeneren for å sikre at klienter og "
 "server har synkroniserte klokker også når de er koblet fra Internett."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Access to Debian repositories is always done via a proxy on the main server "
 "- read more about the implementation details <ulink url=\"http://lists."
@@ -12086,13 +11634,11 @@ msgstr ""
 "org/20100704221022.GC30542 at login1.uio.no\"> ved hjelp av DHCP og WPAD </"
 "ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "The home0 partition is mounted nosuid, to increase security."
 msgstr "home0 partisjon er montert med nosuid, for å øke sikkerhet"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Change KDE/Akonadi configuration to reduce the disk footprint of every user "
 "from 144 to 24 MiB."
@@ -12100,8 +11646,7 @@ msgstr ""
 "Bytt KDE/Akonadi konfigurasjon for å redusere diskbruk for hver bruker fra "
 "144 til 24 MiB."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
 "users on a machine.  Useful for thin client servers."
@@ -12466,8 +12011,7 @@ msgstr "LSB 3.1-kompatibel"
 msgid "Linux kernel version 2.6.18"
 msgstr "Linux kjerneversjon 2.6.18"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Support for SATA controllers and hard disks"
 msgstr "Støtte for SATA-kontrollere og harddisker"
 
@@ -12503,8 +12047,7 @@ msgstr "Automatisk versjonskontroll av oppsettsfiler i /etc/ ved hjelp av svk."
 msgid "File systems can be extended while the file system is mounted."
 msgstr "Filsystemer kan utvides mens filsystemet er montert."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Support for automatically extending file systems based on predefined rules."
 msgstr ""
@@ -12621,3 +12164,42 @@ msgstr ""
 "Mer informasjon om de gamle utgavene kan du finne på <ulink url='http://"
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
+
+#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
+#~ msgstr ""
+#~ "Vurder å ha 2 GB RAM for 30 klienter og 4 GB RAM for 50-60 klienter."
+
+#~ 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 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. "
+
+#~ 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."
+
+#~ 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 arbeidsstasjon med 320 MB RAM løser problemet, og "
+#~ "stavekontroll skal nå kjøre helt fint. "
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 6da279e..a1bf462 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2015-01-25 19:07+0000\n"
+"POT-Creation-Date: 2015-02-07 15:48+0000\n"
 "PO-Revision-Date: 2015-01-26 18:20+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -1096,9 +1096,14 @@ msgstr ""
 "hoofdstuk <link linkend=\"Architecture\">Architectuur van het netwerk</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The computers running Debian Edu / Skolelinux must have either i386 "
+#| "(oldest supported processors: Intel Pentium/AMD K5) or amd64 processors."
 msgid ""
-"The computers running Debian Edu / Skolelinux must have either i386 (oldest "
-"supported processors: Intel Pentium/AMD K5) or amd64 processors."
+"The computers running Debian Edu / Skolelinux must have either 32 bit "
+"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
+"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
 msgstr ""
 "Om Debian Edu / Skolelinux te kunnen gebruiken moeten computers uitgerust "
 "zijn met een processor van het type i386 (de oudste nog ondersteunde "
@@ -1106,113 +1111,124 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
-"architecture:"
+"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+"recommended for the main and thin client server profiles."
 msgstr ""
-"Als men de standaardarchitectuur voor het netwerk aanhoudt, moet men thin-"
-"clientservers uitrusten met twee netwerkkaarten:"
-
-#. 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 is verbonden met het hoofdnetwerk (10.0.0.0/8),"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
-"192.168.1.0/24)."
+"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+"possible, though 256 MiB RAM or more and faster processors are recommended."
 msgstr ""
-"eth1 wordt gebruikt om de LTSP clients (192.168.0.0/24 als standaardnetwerk "
-"of 192.168.1.0/24) te bedienen."
+"Thin clients hebben minimaal 64 MB RAM nodig en een processor van 133 MHz, "
+"hoewel 128 MB RAM en een iets snellere processor toch aangewezen zijn."
 
-#. 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."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| 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."
+msgid ""
+"Swapping over the network is automatically enabled for LTSP clients; the "
+"swap size is 512 MiB, and if you need more you can tune this by editing "
+"<computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> on tjener to set "
+"the SIZE variable."
 msgstr ""
-"Voorzie 2 GB RAM in het geval van 30 clients en 4 GB RAM bij 50-60 clients."
+"Wisselgeheugen (swap) wordt automatisch over het netwerk ter beschikking "
+"gesteld. De grootte van het wisselgeheugen staat ingesteld op 512 MB. Indien "
+"meer wisselgeheugen wenselijk is, kunt u dit aanpassen door in het bestand /"
+"etc/ltsp/nbdswapd.conf op tjener de variabele SIZE bij te stellen. Gelieve "
+"<emphasis>de grootte van het wisselgeheugen</emphasis> ofwel lokaal op de PC "
+"ofwel op de server aan te passen."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><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 "
-"with disk space on a main-server, it's \"the bigger the better\"."
+"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 ""
-"De vereisten inzake beschikbare opslagruimte zijn afhankelijk van de "
-"gebruikte profielen, maar elke schijf groter dan 25 GB zou moeten volstaan "
-"voor een werkstation of een installatie op een autonome computer, 30 GB voor "
-"een thin-clientserver en tenminste 40 GB voor de hoofdserver. Zoals "
-"gewoonlijk met betrekking tot opslagruimte op een hoofdserver, geldt ook "
-"hier \"hoe meer, hoe beter\"."
+"Indien u over schijfloze werkstations beschikt die wel degelijk een harde "
+"schijf hebben, is het aanbevolen om die als wisselgeheugen te gebruiken "
+"omdat dit sneller werkt dan gebruik te maken van wisselgeheugen over het "
+"netwerk."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "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."
 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."
+"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"512 MiB RAM are the absolute minimum requirements. For running modern "
+"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgstr ""
-"Thin clients hebben minimaal 64 MB RAM nodig en een processor van 133 MHz, "
-"hoewel 128 MB RAM en een iets snellere processor toch aangewezen zijn."
+"Voor werkstations, schijfloze werkstations en autonome PC's gelden de "
+"volgende minimumvereisten: 800 MHz processorsnelheid en 320 MB RAM. Maar 512 "
+"of 1024 MB RAM-geheugen zal tot aanzienlijk betere prestaties leiden, net "
+"zoals een krachtigere CPU de verwerkingssnelheid de hoogte zal injagen."
 
 #. 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."
+"On workstations with little RAM the spell checker might cause LibreOffice to "
+"hang if the swap space is also too small. If this happens frequently the "
+"spell checker can be disabled by system administrators."
 msgstr ""
-"Om Iceweasel/Firefox en LibreOffice te kunnen uitvoeren is 128 MB RAM een "
-"minimumvereiste."
 
 #. 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 "
-"considerably better. Just a faster CPU will speed things up."
+"The minimum disk space requirements depend on the profile which is installed:"
 msgstr ""
-"Voor werkstations, schijfloze werkstations en autonome PC's gelden de "
-"volgende minimumvereisten: 800 MHz processorsnelheid en 320 MB RAM. Maar 512 "
-"of 1024 MB RAM-geheugen zal tot aanzienlijk betere prestaties leiden, net "
-"zoals een krachtigere CPU de verwerkingssnelheid de hoogte zal injagen."
 
 #. 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."
+"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"server, \"the bigger the better\"."
 msgstr ""
-"Wisselgeheugen (swap) wordt automatisch over het netwerk ter beschikking "
-"gesteld. De grootte van het wisselgeheugen staat ingesteld op 512 MB. Indien "
-"meer wisselgeheugen wenselijk is, kunt u dit aanpassen door in het bestand /"
-"etc/ltsp/nbdswapd.conf op tjener de variabele SIZE bij te stellen. Gelieve "
-"<emphasis>de grootte van het wisselgeheugen</emphasis> ofwel lokaal op de PC "
-"ofwel op de server aan te passen."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Thin Client Server/s"
+msgid "thin client server: 40 GiB."
+msgstr "Thin-clientserver/s"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "workstation or standalone: 30 GiB."
+msgstr ""
+
+#. type: Content of: <article><section><section><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."
+"Thin client servers need two network cards when using the default network "
+"architecture:"
 msgstr ""
-"Indien u over schijfloze werkstations beschikt die wel degelijk een harde "
-"schijf hebben, is het aanbevolen om die als wisselgeheugen te gebruiken "
-"omdat dit sneller werkt dan gebruik te maken van wisselgeheugen over het "
-"netwerk."
+"Als men de standaardarchitectuur voor het netwerk aanhoudt, moet men thin-"
+"clientservers uitrusten met twee netwerkkaarten:"
+
+#. 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 is verbonden met het hoofdnetwerk (10.0.0.0/8),"
 
 #. 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."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
 msgstr ""
-"Op werkstations met weinig RAM en met ook nog eens weinig wisselgeheugen kan "
-"de spellingscontrole van LibreOffice vastlopen. In dat geval moet de "
-"systeembeheerder de spellingscontrole uitschakelen. Zo niet zullen de "
-"studenten LibreOffice moeten afbreken met een verlies van gegevens tot "
-"gevolg. Ten minste 512 MB wisselgeheugen toekennen aan een werkstation met "
-"320 MB RAM lost dit op. Daarmee verloopt de spellingscontrole vlot."
+"eth1 wordt gebruikt om de LTSP clients (192.168.0.0/24 als standaardnetwerk "
+"of 192.168.1.0/24) te bedienen."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Laptops have the same requirements as for workstations since they are "
+#| "just movable workstations."
 msgid ""
-"Laptops have the same requirements as for workstations since they are just "
-"movable workstations."
+"Laptops are movable workstations, so they have the same requirements as "
+"workstations."
 msgstr ""
 "Voor draagbare computers gelden dezelfde vereisten als voor werkstations, "
 "aangezien zij niet meer of niet minder dan mobiele werkstations zijn."
@@ -1469,9 +1485,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
@@ -1510,9 +1530,13 @@ msgstr ""
 "iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
@@ -1542,9 +1566,15 @@ msgstr ""
 "source-USB.iso\">debian-edu-8.0+edu0-source-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-8.0+edu0-source-USB.iso debian-edu-8.0+edu0-source-USB.iso</"
+#| "computeroutput>"
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
 "source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
@@ -5327,10 +5357,6 @@ msgid "Using stable-updates"
 msgstr "Het gebruik van 'stable-updates'"
 
 #. 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>."
 msgid ""
 "Since the Squeeze release in 2011, Debian has included packages formerly "
 "maintained in volatile.debian.org in the <ulink url=\"http://wiki.debian.org/"
@@ -9845,7 +9871,9 @@ msgstr ""
 "een van de andere te kiezen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+#, fuzzy
+#| msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+msgid "the browsers Iceweasel 31 ESR and Chromium 40"
 msgstr "de webbrowsers Iceweasel 31 ESR en Chromium 39"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -10075,9 +10103,17 @@ msgstr ""
 "enige latere versie."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), "
+#| "FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar "
+#| "Wisløff (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 "
+"2014, 2015), 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), FourFire "
 "Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) "
@@ -10092,13 +10128,23 @@ msgstr ""
 "enige latere versie."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| 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), 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."
 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), "
 "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."
+"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "De auteursrechten van de Duitse vertaling berusten bij Holger Levsen (2007), "
 "Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. "
@@ -10120,11 +10166,19 @@ msgstr ""
 "of enige latere versie."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
+#| "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the "
+#| "French l10n team (2009, 2010, 2012) and is released under the GPL v2 or "
+#| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL v2 or any later version."
+"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
+"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "De auteursrechten van de Franse vertaling berusten bij Christophe Masson "
 "(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul "
@@ -10133,18 +10187,26 @@ msgstr ""
 "GPL v2 of enige latere versie."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de Deense vertaling berusten bij Joe Hansen (2012, "
 "2013). De vertaling is vrijgegeven onder de licentie GPL v2 of enige latere "
 "versie."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
+#| "released under the GPL v2 or any later version."
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
-"released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de Nederlandse vertaling berusten bij Frans "
 "Spiesschaert (2014). De vertaling is vrijgegeven onder de licentie GPL v2 of "
@@ -10933,7 +10995,6 @@ msgid "Appendix B - no Debian Edu Live CD/DVDs for Jessie yet"
 msgstr "Bijlage B - nog geen live cd/dvd van Jessie"
 
 #. type: Content of: <article><section><para>
-#| msgid "Debian Edu Live CD/DVDs for Jessie are not available at the moment."
 msgid ""
 "Debian Edu Live CD/DVDs for Jessie are not available at the moment, but are "
 "being worked on..."
@@ -10946,12 +11007,10 @@ msgid "Features of the Standalone image"
 msgstr "Functionaliteit van het image voor een autonome computer"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid "KDE Desktop"
 msgid "XFCE desktop"
 msgstr "Bureaublad van XFCE"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid "Almost all packages from the Standalone profile"
 msgid "All packages from the Standalone profile"
 msgstr "Alle pakketten voor het profiel autonome computer"
 
@@ -10960,12 +11019,10 @@ msgid "All packages from the laptop task"
 msgstr "Alle pakketten specifiek voor een draagbare computer"
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Features of the Standalone image"
 msgid "Features of the Workstation image"
 msgstr "Functionaliteit van het image voor een werkstation"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid "Almost all packages from the Standalone profile"
 msgid "All packages from the Workstation profile"
 msgstr "Alle pakketten voor het profiel werkstation"
 
@@ -12713,6 +12770,46 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
+#~ msgstr ""
+#~ "Voorzie 2 GB RAM in het geval van 30 clients en 4 GB RAM bij 50-60 "
+#~ "clients."
+
+#~ 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 with disk space on a main-server, it's \"the bigger the better\"."
+#~ msgstr ""
+#~ "De vereisten inzake beschikbare opslagruimte zijn afhankelijk van de "
+#~ "gebruikte profielen, maar elke schijf groter dan 25 GB zou moeten "
+#~ "volstaan voor een werkstation of een installatie op een autonome "
+#~ "computer, 30 GB voor een thin-clientserver en tenminste 40 GB voor de "
+#~ "hoofdserver. Zoals gewoonlijk met betrekking tot opslagruimte op een "
+#~ "hoofdserver, geldt ook hier \"hoe meer, hoe beter\"."
+
+#~ msgid ""
+#~ "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
+#~ "requirement."
+#~ msgstr ""
+#~ "Om Iceweasel/Firefox en LibreOffice te kunnen uitvoeren is 128 MB RAM een "
+#~ "minimumvereiste."
+
+#~ 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 ""
+#~ "Op werkstations met weinig RAM en met ook nog eens weinig wisselgeheugen "
+#~ "kan de spellingscontrole van LibreOffice vastlopen. In dat geval moet de "
+#~ "systeembeheerder de spellingscontrole uitschakelen. Zo niet zullen de "
+#~ "studenten LibreOffice moeten afbreken met een verlies van gegevens tot "
+#~ "gevolg. Ten minste 512 MB wisselgeheugen toekennen aan een werkstation "
+#~ "met 320 MB RAM lost dit op. Daarmee verloopt de spellingscontrole vlot."
+
 #~ msgid "The KDE desktop profile for students/pupils."
 #~ msgstr "Het profiel bureaubladomgeving van KDE voor studenten/leerlingen."
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 03f06b9..af297c2 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-25 19:07+0000\n"
+"POT-Creation-Date: 2015-02-07 15:48+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -790,84 +790,90 @@ msgstr ""
 
 #. 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."
+"The computers running Debian Edu / Skolelinux must have either 32 bit "
+"(Debian architecture 'i386', oldest supported processors are Intel Pentium "
+"and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
-"architecture:"
+"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+"recommended for the main and thin client server profiles."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+"possible, though 256 MiB RAM or more and faster processors are recommended."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "eth0 is connected to the main network (10.0.0.0/8),"
+msgid ""
+"Swapping over the network is automatically enabled for LTSP clients; the "
+"swap size is 512 MiB, and if you need more you can tune this by editing "
+"<computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> on tjener to set "
+"the SIZE variable."
 msgstr ""
 
 #. 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)."
+"If your diskless workstations have hard drives, it is recommended to use "
+"them for swap as it is a lot faster than network swapping."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients."
+msgid ""
+"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"512 MiB RAM are the absolute minimum requirements. For running modern "
+"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><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 "
-"with disk space on a main-server, it's \"the bigger the better\"."
+"On workstations with little RAM the spell checker might cause LibreOffice to "
+"hang if the swap space is also too small. If this happens frequently the "
+"spell checker can be disabled by system administrators."
 msgstr ""
 
 #. 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."
+"The minimum disk space requirements depend on the profile which is installed:"
 msgstr ""
 
 #. 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."
+"main server + thin client server: 60 GiB. As usual with disk space on a main "
+"server, \"the bigger the better\"."
 msgstr ""
 
-#. 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 "
-"considerably better. Just a faster CPU will speed things up."
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "thin client server: 40 GiB."
 msgstr ""
 
 #. 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."
+msgid "workstation or standalone: 30 GiB."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><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."
+"Thin client servers need two network cards when using the default network "
+"architecture:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 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."
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
+"192.168.1.0/24)."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Laptops have the same requirements as for workstations since they are just "
-"movable workstations."
+"Laptops are movable workstations, so they have the same requirements as "
+"workstations."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -1059,8 +1065,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1089,8 +1095,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1115,8 +1121,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-"
-"source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput>"
+"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</"
+"computeroutput>"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6973,7 +6980,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "the browsers Iceweasel 31 ESR and Chromium 39"
+msgid "the browsers Iceweasel 31 ESR and Chromium 40"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -7147,7 +7154,7 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-"2014), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
+"2014, 2015), 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), FourFire "
 "Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) "
@@ -7161,7 +7168,8 @@ msgid ""
 "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."
+"(2012, 2013, 2014, 2015) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -7174,21 +7182,22 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), "
-"David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, "
-"2010, 2012) and is released under the GPL v2 or any later version."
+"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
+"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is "
-"released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is "
-"released under the GPL v2 or any later version."
+"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and "
+"is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><title>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 70872d5..6bab82e 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -307,47 +307,53 @@
 </para>
 <itemizedlist>
 <listitem>
-<para>The computers running Debian Edu / Skolelinux must have either i386 (oldest supported processors: Intel Pentium/AMD K5) or amd64 processors. 
+<para>The computers running Debian Edu / Skolelinux must have either 32 bit (Debian architecture 'i386', oldest supported processors are Intel Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 processors. 
 </para></listitem>
 <listitem>
-<para>Thin client servers need two network cards when using the default network architecture: 
+<para>At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are recommended for the main and thin client server profiles.  
+</para></listitem>
+<listitem>
+<para>Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are possible, though 256 MiB RAM or more and faster processors are recommended. 
 </para>
 <itemizedlist>
 <listitem>
-<para>eth0 is connected to the main network (10.0.0.0/8), 
+<para>Swapping over the network is automatically enabled for LTSP clients; the swap size is 512 MiB, and if you need more you can tune this by editing <computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> on tjener to set the SIZE variable. 
 </para></listitem>
 <listitem>
-<para>eth1 is used for serving LTSP clients (192.168.0.0/24 as default or 192.168.1.0/24). 
+<para>If your diskless workstations have hard drives, it is recommended to use them for swap as it is a lot faster than network swapping. 
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para>Consider 2 GB RAM for 30 clients and 4 GB RAM for 50-60 clients. 
-</para></listitem>
-<listitem>
-<para>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".  
-</para></listitem>
-<listitem>
-<para>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. 
+<para>For workstations, diskless workstations and standalone systems, 800 MHz and 512 MiB RAM are the absolute minimum requirements. For running modern webbrowsers and LibreOffice 1024 MiB RAM is recommended.  
 </para>
 <itemizedlist>
 <listitem>
-<para>For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum requirement.  
+<para>On workstations with little RAM the spell checker might cause LibreOffice to hang if the swap space is also too small. If this happens frequently the spell checker can be disabled by system administrators. 
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para>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.  
+<para>The minimum disk space requirements depend on the profile which is installed: 
 </para>
 <itemizedlist>
 <listitem>
-<para>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.  
+<para>main server + thin client server: 60 GiB. As usual with disk space on a main server, "the bigger the better". 
+</para></listitem>
+<listitem>
+<para>thin client server: 40 GiB. 
+</para></listitem>
+<listitem>
+<para>workstation or standalone: 30 GiB.  
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Thin client servers need two network cards when using the default network architecture: 
 </para>
 <itemizedlist>
 <listitem>
-<para>If your diskless workstations have hard drives, it is recommended to use them for swap as it is a lot faster than network swapping.  
-</para></listitem></itemizedlist></listitem>
+<para>eth0 is connected to the main network (10.0.0.0/8), 
+</para></listitem>
 <listitem>
-<para>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.  
+<para>eth1 is used for serving LTSP clients (192.168.0.0/24 as default or 192.168.1.0/24). 
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para>Laptops have the same requirements as for workstations since they are just movable workstations. 
+<para>Laptops are movable workstations, so they have the same requirements as workstations. 
 </para></listitem></itemizedlist>
 </section>
 
@@ -439,7 +445,7 @@
 </para>
 <para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD.iso">debian-edu-8.0+edu0-CD.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-CD.iso debian-edu-8.0+edu0-CD.iso </computeroutput> 
+<para><computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 
@@ -453,7 +459,7 @@
 </para>
 <para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB.iso">debian-edu-8.0+edu0-USB.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-USB.iso debian-edu-8.0+edu0-USB.iso </computeroutput> 
+<para><computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 
@@ -467,7 +473,7 @@
 </para>
 <para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-source-USB.iso">debian-edu-8.0+edu0-source-USB.iso</ulink> 
 </para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-source-USB.iso debian-edu-8.0+edu0-source-USB.iso</computeroutput> 
+<para><computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-8.0+edu0-source-USB.iso ./debian-edu-8.0+edu0-source-USB.iso</computeroutput> 
 </para></listitem></itemizedlist>
 </section>
 </section>
@@ -3155,7 +3161,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>KDE "Plasma" is installed by default; to choose one of the others see this manual. 
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para>the browsers Iceweasel 31 ESR and Chromium 39  
+<para>the browsers Iceweasel 31 ESR and Chromium 40 
 </para></listitem>
 <listitem>
 <para>LibreOffice 4.3.3 
@@ -3275,17 +3281,17 @@ 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, 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), FourFire Le'bard (2014),  Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (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, 2015), 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), FourFire 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>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, 2015) and is released under the GPL v2 or any later version. 
 </para>
 <para>The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) and is released under the GPL v2 or any later version. 
 </para>
-<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version. 
+<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Danish translation is copyrighted by Joe Hansen (2012, 2013) and is released under the GPL v2 or any later version. 
+<para>The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Dutch translation is copyrighted by Frans Spiesschaert (2014) and is released under the GPL v2 or any later version. 
+<para>The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) and is released under the GPL v2 or any later version. 
 </para>
 </section>
 
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index 1b7f2b6..1e83e01 100644
Binary files a/documentation/debian-edu-jessie/images/de/worldmap.png and b/documentation/debian-edu-jessie/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/es/worldmap.png b/documentation/debian-edu-jessie/images/es/worldmap.png
index 4e99e16..61daf4d 100644
Binary files a/documentation/debian-edu-jessie/images/es/worldmap.png and b/documentation/debian-edu-jessie/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/fr/worldmap.png b/documentation/debian-edu-jessie/images/fr/worldmap.png
index d48a89b..21e5bc5 100644
Binary files a/documentation/debian-edu-jessie/images/fr/worldmap.png and b/documentation/debian-edu-jessie/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/worldmap.png b/documentation/debian-edu-jessie/images/worldmap.png
index f6a5151..41946b0 100644
Binary files a/documentation/debian-edu-jessie/images/worldmap.png and b/documentation/debian-edu-jessie/images/worldmap.png differ

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

