[debian-edu-commits] debian-edu/ 01/01: Updated Jessie manual from the wiki.

Holger Levsen holger at moszumanska.debian.org
Wed Dec 17 09:05:20 UTC 2014


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

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

commit caf24031cd55fc0f8ee60af4d1849c267678d5d5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Dec 17 10:04:59 2014 +0100

    Updated Jessie manual from the wiki.
---
 .../debian-edu-jessie-manual.da.po                 |  230 ++-
 .../debian-edu-jessie-manual.de.po                 |  233 ++-
 .../debian-edu-jessie-manual.es.po                 |  166 +-
 .../debian-edu-jessie-manual.fr.po                 |  238 ++-
 .../debian-edu-jessie-manual.it.po                 |  234 ++-
 .../debian-edu-jessie-manual.nb.po                 | 1887 ++++++++------------
 .../debian-edu-jessie-manual.nl.po                 |  236 ++-
 .../debian-edu-jessie/debian-edu-jessie-manual.pot |  128 +-
 .../debian-edu-jessie/debian-edu-jessie-manual.xml |   74 +-
 9 files changed, 1930 insertions(+), 1496 deletions(-)

diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index 8bfc46c..bea5bf4 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2014-12-10 20:18+0100\n"
+"POT-Creation-Date: 2014-12-17 09:00+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"
@@ -920,9 +920,17 @@ msgstr ""
 "Kun netinstall-aftrykket kræver adgang til internettet under installation."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
 "workstation, thin client server). All other configuration will be set up "
 "automatically with reasonable values, to be changed from a central location "
 "by the system administrator subsequent to the installation."
@@ -6253,52 +6261,96 @@ msgstr ""
 "om hvordan disse varibaler bruges."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgstr "Brug af KDE »Plasma«, GNOME og LXDE sammen"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
-"linkend=\"Installation--The_installation_process\">installation "
-"instructions</link>."
-msgstr ""
-"Hvis du ønsker at bruge GNOME eller LXDE i stedet for KDE »Plasma«, så følg "
-"<link linkend=\"Installation--The_installation_process"
-"\">installationsinstruktionerne</link>."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "To install other desktop environments after installation, simply use apt-get:"
 msgstr ""
 "For at installere andre skrivebordsmiljøer efter installation, så brug apt-"
 "get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde"
+msgid "apt-get install gnome lxde xfce4 mate-desktop"
 msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
+msgid ""
+"Users will then be able to choose any of the five desktop environment via "
+"the login manager before logging in. Of course, you can also choose to give "
+"less choices."
+msgstr ""
+"Brugere vil være i stand til at vælge et skrivebordsmiljø via "
+"logindhåndteringen før de logger ind. Brugen af LXDE som standard på tynde "
+"klienter kan fremtvinges; se <link linkend=\"NetworkClients"
+"\">netværksklienter</link> for detaljer."
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
 msgid ""
-"Users will then be able to choose the desktop environment via the login "
-"manager before logging in. The usage of LXDE as default on thin clients can "
-"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for "
-"details."
+"The usage of LXDE as default on thin clients can be forced; see <link "
+"linkend=\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "Brugere vil være i stand til at vælge et skrivebordsmiljø via "
 "logindhåndteringen før de logger ind. Brugen af LXDE som standard på tynde "
 "klienter kan fremtvinges; se <link linkend=\"NetworkClients"
 "\">netværksklienter</link> for detaljer."
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the "
+#| "<link linkend=\"Installation--The_installation_process\">installation "
+#| "instructions</link>."
+msgid ""
+"If you don't want to do installations with the default desktop KDE \"Plasma"
+"\", you can also <link linkend=\"Installation--The_installation_process"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
+msgstr ""
+"Hvis du ønsker at bruge GNOME eller LXDE i stedet for KDE »Plasma«, så følg "
+"<link linkend=\"Installation--The_installation_process"
+"\">installationsinstruktionerne</link>."
+
 #. type: Content of: <article><section><section><title>
 msgid "Flash"
 msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The free software flash-player <computeroutput>gnash</computeroutput> is "
-"installed by default, but switching to Adobe Flash is an option. To install "
-"the (non-free) Adobe Flash Player web browser plugin, install the "
+"While the free software flash-player <computeroutput>gnash</computeroutput> "
+"is <emphasis>not</emphasis> installed by default anymore, as it has been "
+"removed from Jessie, installing a non-free flash players is still an option."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The free software flash-player <computeroutput>gnash</computeroutput> is "
+#| "installed by default, but switching to Adobe Flash is an option. To "
+#| "install the (non-free) Adobe Flash Player web browser plugin, install the "
+#| "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
+#| "<computeroutput>contrib</computeroutput>. This requires "
+#| "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/"
+#| "apt/sources.list</computeroutput>."
+msgid ""
+"To install the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
 "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
@@ -6312,6 +6364,14 @@ msgstr ""
 "at <computeroutput>contrib</computeroutput> er aktiveret i <computeroutput>/"
 "etc/apt/sources.list</computeroutput>."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The solution for Chromium is similar, it needs the package "
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
+"which will install the (non-free) Pepper Flash Player web browser plugin "
+"from Google."
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
 msgstr "Afspilning af dvd'er"
@@ -6372,8 +6432,14 @@ msgid "Handwriting fonts"
 msgstr "Håndskrevne skrifttyper"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The package <computeroutput>ttf-linex</computeroutput> (which is "
+#| "installed by default) installs the font \"Abecedario\" which is a nice "
+#| "handwriting font for kids. The font has several forms to be used with "
+#| "kids: dotted, and with lines."
 msgid ""
-"The package <computeroutput>ttf-linex</computeroutput> (which is installed "
+"The package <computeroutput>fonts-linex</computeroutput> (which is installed "
 "by default) installs the font \"Abecedario\" which is a nice handwriting "
 "font for kids. The font has several forms to be used with kids: dotted, and "
 "with lines."
@@ -9371,22 +9437,6 @@ msgstr ""
 "xx-2015"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Brugersynlige ændringer"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: MATE"
-msgstr "nyt valgfrit skrivebordsmiljø: MATE"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new manual translation: Dutch"
-msgstr "ny manualoversættelse: hollandsk"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "TBD"
-
-#. type: Content of: <article><section><section><section><title>
 msgid "Installation changes"
 msgstr "Installationsændringer"
 
@@ -9416,10 +9466,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-"the others see this manual.)"
+"0.5.6"
+msgstr "Skrivebordsmiljøerne KDE »Plasma« 4.4 og GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "new optional desktop environment: MATE"
+msgid "new optional desktop environment: MATE 1.8"
+msgstr "nyt valgfrit skrivebordsmiljø: MATE"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
+msgid ""
+"KDE \"Plasma\" is installed by default; to choose one of the others see this "
+"manual."
 msgstr ""
 "Skrivebordsmiljøet KDE »Plasma« 4.11.12, GNOME 3.4, Xfce 4.10 og LXDE 0.5.6 "
 "og MATE 1.8 (KDE »Plasma« installeres som standard; for at vælge en af de "
@@ -9497,8 +9565,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
+"Two manual translations have been completed: Dutch and Norwegian Bokmål."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Jessie Manual is fully translated to German, French, "
+#| "Italian, Danish and Dutch. Partly translated versions exist for Norwegian "
+#| "Bokmal and Spanish."
+msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
-"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
+"Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
 "Spanish."
 msgstr ""
 "Manualen for Debian Edu Jessie er fuldt oversat til tysk, fransk, italiensk, "
@@ -9509,6 +9587,10 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr "LDAP-relaterede ændringer"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "TBD"
+msgstr "TBD"
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Other changes"
 msgstr "Andre ændringer"
@@ -9553,6 +9635,17 @@ msgid ""
 "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid "gnash (flash player)"
+msgstr ""
+
+#. 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-"
+"free flash player</link> from Adobe is still possible however."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
 msgstr "Kendte problemstillinger"
@@ -9699,11 +9792,17 @@ msgid "Translations of this document"
 msgstr "Oversættelse af dette dokument"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Versions of this document fully translated into German, Italian, French "
+#| "and Danish are available. Incomplete translations exist for Norwegian "
+#| "Bokmål and Spanish. This is an <ulink url=\"http://maintainer.skolelinux."
+#| "org/debian-edu-doc/\">online overview of all languages</ulink>."
 msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
-"doc/\">online overview of all languages</ulink>."
+"Versions of this document fully translated into German, Italian, French, "
+"Danish, Dutch and Norwegian Bokmål are available. An incomplete translation "
+"exists for Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/"
+"debian-edu-doc/\">online overview of all languages</ulink>."
 msgstr ""
 "Fuldt oversatte versioner af dette dokument på tysk, italiensk, fransk og "
 "dansk er tilgængelige. Ufuldstændige oversættelser findes for norsk bokmål "
@@ -10667,6 +10766,10 @@ msgid "New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
 msgstr ""
 "Nye funktioner for Debian Edu 7.1+edu0 kodenavn Wheezy udgivet 28-09-2013"
 
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Brugersynlige ændringer"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
@@ -10771,9 +10874,14 @@ msgstr ""
 "\">installationsmanualen</ulink>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Wheezy Manual is fully translated to German, French, "
+#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
+#| "and Spanish."
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
-"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"and Danish. Partly translated versions exist for Norwegian Bokmål and "
 "Spanish."
 msgstr ""
 "Manualen for Debian Edu er fuldt oversat til tysk, fransk, italiensk og "
@@ -11302,9 +11410,14 @@ msgstr ""
 "engelsk lingvistik."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Squeeze Manual is fully translated to German, French and "
+#| "Italian. Partly translated versions exist for Danish (new), Norwegian "
+#| "Bokmal and Spanish."
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
 "and Spanish."
 msgstr ""
 "Manualen for Debian Edu er fuldt oversat til tysk, fransk og italiensk. "
@@ -11682,16 +11795,24 @@ msgstr ""
 "computeroutput> for at reflektere det anvendte sprog"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-install: Slovak translation added, updates to German, Basque, "
+#| "Italian, Bokmal, Vietnamese and Chinese translations."
 msgid ""
 "Debian-edu-install: Slovak translation added, updates to German, Basque, "
-"Italian, Bokmal, Vietnamese and Chinese translations."
+"Italian, Bokmål, Vietnamese and Chinese translations."
 msgstr ""
 "Debian-edu-install: Slovakisk oversættelse tilføjet, opdateringer for tysk, "
 "baskisk, italiensk, bokmål, vietnamesisk og kinesisk."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-doc: improvements to Italian, Bokmal and German translations "
+#| "as well as overall content and layout"
 msgid ""
-"Debian-edu-doc: improvements to Italian, Bokmal and German translations as "
+"Debian-edu-doc: improvements to Italian, Bokmål and German translations as "
 "well as overall content and layout"
 msgstr ""
 "Debian-edu-doc: Forbedringer for italiensk, bokmål og tysk samt generelt "
@@ -11943,9 +12064,13 @@ msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
 msgstr "Nye funktioner i »3.0r1 Terra« version 05-12-2007"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Much improved documentation with updated translations to German, "
+#| "Norwegian Bokmal and Italian"
 msgid ""
 "Much improved documentation with updated translations to German, Norwegian "
-"Bokmal and Italian"
+"Bokmål and Italian"
 msgstr ""
 "Stærkt forbedret dokumentation med opdaterede oversættelser på tysk, norsk "
 "bokmål og italiensk"
@@ -12139,6 +12264,9 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "new manual translation: Dutch"
+#~ msgstr "ny manualoversættelse: hollandsk"
+
 #~ msgid ""
 #~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
 #~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
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 081e80a..6f1d041 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 20:53+0100\n"
+"POT-Creation-Date: 2014-12-17 09:00+0000\n"
 "PO-Revision-Date: 2014-12-10 20:52+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -940,9 +940,17 @@ msgstr ""
 "Nur das Image »netinst« benötigt während der Installation Internetzugang."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
 "workstation, thin client server). All other configuration will be set up "
 "automatically with reasonable values, to be changed from a central location "
 "by the system administrator subsequent to the installation."
@@ -6383,37 +6391,35 @@ msgstr ""
 "an, um zu erfahren, wie diese Variablen benutzt werden."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgstr "KDE »Plasma«, GNOME und LXDE nebeneinander benutzen"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
-"linkend=\"Installation--The_installation_process\">installation "
-"instructions</link>."
-msgstr ""
-"Wenn GNOME oder LXDE statt KDE »Plasma« benutzt werden soll, dann finden Sie "
-"hier <link linkend=\"Installation--The_installation_process\">Installations-"
-"Hinweise</link>."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "To install other desktop environments after installation, simply use apt-get:"
 msgstr ""
 "Um nach der Installation andere graphische Arbeitsumgebungen zu "
 "installieren, verwenden Sie einfach apt-get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde"
+msgid "apt-get install gnome lxde xfce4 mate-desktop"
 msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
 msgid ""
-"Users will then be able to choose the desktop environment via the login "
-"manager before logging in. The usage of LXDE as default on thin clients can "
-"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for "
-"details."
+"Users will then be able to choose any of the five desktop environment via "
+"the login manager before logging in. Of course, you can also choose to give "
+"less choices."
 msgstr ""
 "Benutzer können dann (unter »Sitzung«) vor dem Anmelden wählen, welche "
 "graphische Arbeitsumgebung verwendet werden soll. Für Thin Clients kann die "
@@ -6421,15 +6427,62 @@ msgstr ""
 "Informationen finden Sie dazu unter <link linkend=\"NetworkClients"
 "\">Netzwerk-Rechner</link>."
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
+msgid ""
+"The usage of LXDE as default on thin clients can be forced; see <link "
+"linkend=\"NetworkClients\">networked clients</link> for details."
+msgstr ""
+"Benutzer können dann (unter »Sitzung«) vor dem Anmelden wählen, welche "
+"graphische Arbeitsumgebung verwendet werden soll. Für Thin Clients kann die "
+"Verwendung von LXDE als Voreinstellung erzwungen werden; weitere "
+"Informationen finden Sie dazu unter <link linkend=\"NetworkClients"
+"\">Netzwerk-Rechner</link>."
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the "
+#| "<link linkend=\"Installation--The_installation_process\">installation "
+#| "instructions</link>."
+msgid ""
+"If you don't want to do installations with the default desktop KDE \"Plasma"
+"\", you can also <link linkend=\"Installation--The_installation_process"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
+msgstr ""
+"Wenn GNOME oder LXDE statt KDE »Plasma« benutzt werden soll, dann finden Sie "
+"hier <link linkend=\"Installation--The_installation_process\">Installations-"
+"Hinweise</link>."
+
 #. type: Content of: <article><section><section><title>
 msgid "Flash"
 msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The free software flash-player <computeroutput>gnash</computeroutput> is "
-"installed by default, but switching to Adobe Flash is an option. To install "
-"the (non-free) Adobe Flash Player web browser plugin, install the "
+"While the free software flash-player <computeroutput>gnash</computeroutput> "
+"is <emphasis>not</emphasis> installed by default anymore, as it has been "
+"removed from Jessie, installing a non-free flash players is still an option."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The free software flash-player <computeroutput>gnash</computeroutput> is "
+#| "installed by default, but switching to Adobe Flash is an option. To "
+#| "install the (non-free) Adobe Flash Player web browser plugin, install the "
+#| "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
+#| "<computeroutput>contrib</computeroutput>. This requires "
+#| "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/"
+#| "apt/sources.list</computeroutput>."
+msgid ""
+"To install the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
 "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
@@ -6444,6 +6497,14 @@ msgstr ""
 "computeroutput> in <computeroutput>/etc/apt/sources.list</computeroutput> "
 "vorhanden sein."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The solution for Chromium is similar, it needs the package "
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
+"which will install the (non-free) Pepper Flash Player web browser plugin "
+"from Google."
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
 msgstr "DVDs abspielen"
@@ -6504,8 +6565,14 @@ msgid "Handwriting fonts"
 msgstr "Schreibschrift-Zeichensätze"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The package <computeroutput>ttf-linex</computeroutput> (which is "
+#| "installed by default) installs the font \"Abecedario\" which is a nice "
+#| "handwriting font for kids. The font has several forms to be used with "
+#| "kids: dotted, and with lines."
 msgid ""
-"The package <computeroutput>ttf-linex</computeroutput> (which is installed "
+"The package <computeroutput>fonts-linex</computeroutput> (which is installed "
 "by default) installs the font \"Abecedario\" which is a nice handwriting "
 "font for kids. The font has several forms to be used with kids: dotted, and "
 "with lines."
@@ -9574,22 +9641,6 @@ msgstr ""
 "XX.2015"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Für den Benutzer wahrnehmbare Änderungen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: MATE"
-msgstr "neue optionale Desktop-Umgebung: MATE"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new manual translation: Dutch"
-msgstr "neue Handbuchübersetzung: Niederländisch"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "Noch zu bearbeiten."
-
-#. type: Content of: <article><section><section><section><title>
 msgid "Installation changes"
 msgstr "Installationsbezogene Änderungen"
 
@@ -9622,10 +9673,28 @@ msgstr ""
 "(wie Intel Pentium und AMD K5)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-"the others see this manual.)"
+"0.5.6"
+msgstr "Graphische Arbeitsumgebungen KDE »Plasma« 4.4 und GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "new optional desktop environment: MATE"
+msgid "new optional desktop environment: MATE 1.8"
+msgstr "neue optionale Desktop-Umgebung: MATE"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
+msgid ""
+"KDE \"Plasma\" is installed by default; to choose one of the others see this "
+"manual."
 msgstr ""
 "Desktop-Umgebungen KDE »Plasma« 4.11.12, GNOME 3.14, Xfce 4.10 und LXDE "
 "0.5.6 und MATE 1.8 (KDE »Plasma« wird als Standard installiert; sehen Sie im "
@@ -9697,8 +9766,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
+"Two manual translations have been completed: Dutch and Norwegian Bokmål."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Jessie Manual is fully translated to German, French, "
+#| "Italian, Danish and Dutch. Partly translated versions exist for Norwegian "
+#| "Bokmal and Spanish."
+msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
-"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
+"Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
 "Spanish."
 msgstr ""
 "Das Benutzerhandbuch für Debian Edu »Jessie« wurde vollständig ins Deutsche, "
@@ -9709,6 +9788,10 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr "Änderungen mit Bezug auf LDAP"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "TBD"
+msgstr "Noch zu bearbeiten."
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Other changes"
 msgstr "Sonstige Änderungen"
@@ -9763,6 +9846,17 @@ msgstr ""
 "computeroutput> vorübergehend <computeroutput>PermitRootLogin yes</"
 "computeroutput> gesetzt werden."
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid "gnash (flash player)"
+msgstr ""
+
+#. 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-"
+"free flash player</link> from Adobe is still possible however."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
 msgstr "Bekannte Probleme"
@@ -9907,11 +10001,17 @@ msgid "Translations of this document"
 msgstr "Übersetzungen dieses Dokuments"
 
 #. type: Content of: <article><section><para>
-msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
-"doc/\">online overview of all languages</ulink>."
+#, fuzzy
+#| msgid ""
+#| "Versions of this document fully translated into German, Italian, French "
+#| "and Danish are available. Incomplete translations exist for Norwegian "
+#| "Bokmål and Spanish. This is an <ulink url=\"http://maintainer.skolelinux."
+#| "org/debian-edu-doc/\">online overview of all languages</ulink>."
+msgid ""
+"Versions of this document fully translated into German, Italian, French, "
+"Danish, Dutch and Norwegian Bokmål are available. An incomplete translation "
+"exists for Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/"
+"debian-edu-doc/\">online overview of all languages</ulink>."
 msgstr ""
 "Vollständige Übersetzungen dieses Dokuments ins Deutsche, Italienische, "
 "Französische und Dänische sind vorhanden. Es gibt unvollständige "
@@ -10882,6 +10982,10 @@ msgid "New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
 msgstr ""
 "Neuerungen in Debian Edu 7.1+edu0, Codename Wheezy, freigegeben am 28.09.2013"
 
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Für den Benutzer wahrnehmbare Änderungen"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
@@ -10985,9 +11089,14 @@ msgstr ""
 "Installationsanleitung</ulink> zu finden."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Wheezy Manual is fully translated to German, French, "
+#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
+#| "and Spanish."
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
-"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"and Danish. Partly translated versions exist for Norwegian Bokmål and "
 "Spanish."
 msgstr ""
 "Das Benutzerhandbuch für Debian Edu »Wheezy« wurde vollständig ins Deutsche, "
@@ -11534,9 +11643,14 @@ msgstr ""
 "Linguisten mit Englisch als Muttersprache."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Squeeze Manual is fully translated to German, French and "
+#| "Italian. Partly translated versions exist for Danish (new), Norwegian "
+#| "Bokmal and Spanish."
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
 "and Spanish."
 msgstr ""
 "Das Benutzerhandbuch für Debian Edu »Squeeze« wurde vollständig ins "
@@ -11930,17 +12044,25 @@ msgstr ""
 "wiederzuspiegeln."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-install: Slovak translation added, updates to German, Basque, "
+#| "Italian, Bokmal, Vietnamese and Chinese translations."
 msgid ""
 "Debian-edu-install: Slovak translation added, updates to German, Basque, "
-"Italian, Bokmal, Vietnamese and Chinese translations."
+"Italian, Bokmål, Vietnamese and Chinese translations."
 msgstr ""
 "debian-edu-install: Die Übersetzung ins Slowakische ist hinzugekommen, dazu "
 "Aktualisierungen für die Übersetzungen ins Deutsche, Baskische, "
 "Italienische, Bokmål, Vietnamesische und Chinesische."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-doc: improvements to Italian, Bokmal and German translations "
+#| "as well as overall content and layout"
 msgid ""
-"Debian-edu-doc: improvements to Italian, Bokmal and German translations as "
+"Debian-edu-doc: improvements to Italian, Bokmål and German translations as "
 "well as overall content and layout"
 msgstr ""
 "Debian-edu-doc: Verbesserungen der Übersetzung ins Italienische, Bokmål und "
@@ -12195,9 +12317,13 @@ msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
 msgstr "Neuerungen im »3.0r1-Terra«-Release vom 05.12.2007"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Much improved documentation with updated translations to German, "
+#| "Norwegian Bokmal and Italian"
 msgid ""
 "Much improved documentation with updated translations to German, Norwegian "
-"Bokmal and Italian"
+"Bokmål and Italian"
 msgstr ""
 "Stark verbesserte Dokumentation mit verbesserten Übersetzungen in die "
 "Sprachen Deutsch, Norwegisch, Bokmål und Italienisch"
@@ -12394,6 +12520,9 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "new manual translation: Dutch"
+#~ msgstr "neue Handbuchübersetzung: Niederländisch"
+
 #~ msgid "'gosa-admins' show up)."
 #~ msgstr "'gosa-admins'."
 
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 da422c7..f4adbb2 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 20:18+0100\n"
+"POT-Creation-Date: 2014-12-17 09:00+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"
@@ -938,9 +938,17 @@ msgstr ""
 "Solo la instalación en red necesita acceso a Internet durante la instalación."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
 "workstation, thin client server). All other configuration will be set up "
 "automatically with reasonable values, to be changed from a central location "
 "by the system administrator subsequent to the installation."
@@ -6004,20 +6012,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgstr "Usar KDE, GNOME y LXDE juntos"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid ""
-"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
-"linkend=\"Installation--The_installation_process\">installation "
-"instructions</link>."
-msgstr ""
-"<ulink url=\"/DebianEdu/Documentation/Squeeze/Translations\">Traducciones</"
-"ulink> de este documento"
-
-#. type: Content of: <article><section><section><para>
 msgid ""
 "To install other desktop environments after installation, simply use apt-get:"
 msgstr ""
@@ -6025,17 +6023,40 @@ msgstr ""
 "solamente use apt-get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde"
+msgid "apt-get install gnome lxde xfce4 mate-desktop"
 msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the desktop environment via the login "
-"manager before logging in. The usage of LXDE as default on thin clients can "
-"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for "
-"details."
+"Users will then be able to choose any of the five desktop environment via "
+"the login manager before logging in. Of course, you can also choose to give "
+"less choices."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information about network clients can be found in the <link linkend="
+#| "\"NetworkClients\">Network clients HowTo</link> chapter."
+msgid ""
+"The usage of LXDE as default on thin clients can be forced; see <link "
+"linkend=\"NetworkClients\">networked clients</link> for details."
 msgstr ""
+"Más información acerca de los clientes de red puede ser encontrada en el "
+"capítulo <link linkend=\"NetworkClients\">clientes de red</link>."
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+msgid ""
+"If you don't want to do installations with the default desktop KDE \"Plasma"
+"\", you can also <link linkend=\"Installation--The_installation_process"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
+msgstr ""
+"<ulink url=\"/DebianEdu/Documentation/Squeeze/Translations\">Traducciones</"
+"ulink> de este documento"
 
 #. type: Content of: <article><section><section><title>
 msgid "Flash"
@@ -6043,9 +6064,23 @@ msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The free software flash-player <computeroutput>gnash</computeroutput> is "
-"installed by default, but switching to Adobe Flash is an option. To install "
-"the (non-free) Adobe Flash Player web browser plugin, install the "
+"While the free software flash-player <computeroutput>gnash</computeroutput> "
+"is <emphasis>not</emphasis> installed by default anymore, as it has been "
+"removed from Jessie, installing a non-free flash players is still an option."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The free software flash-player <computeroutput>gnash</computeroutput> is "
+#| "installed by default, but switching to Adobe Flash is an option. To "
+#| "install the (non-free) Adobe Flash Player web browser plugin, install the "
+#| "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
+#| "<computeroutput>contrib</computeroutput>. This requires "
+#| "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/"
+#| "apt/sources.list</computeroutput>."
+msgid ""
+"To install the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
 "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
@@ -6059,6 +6094,14 @@ msgstr ""
 "computeroutput>. Esto requiere que tenga habilitado <computeroutput>contrib</"
 "computeroutput> en <computeroutput>/etc/apt/sources.list</computeroutput>."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The solution for Chromium is similar, it needs the package "
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
+"which will install the (non-free) Pepper Flash Player web browser plugin "
+"from Google."
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
 msgstr "Reproducir DVDs"
@@ -6115,7 +6158,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The package <computeroutput>ttf-linex</computeroutput> (which is installed "
+"The package <computeroutput>fonts-linex</computeroutput> (which is installed "
 "by default) installs the font \"Abecedario\" which is a nice handwriting "
 "font for kids. The font has several forms to be used with kids: dotted, and "
 "with lines."
@@ -8663,22 +8706,6 @@ msgstr ""
 "publicado el 09-28-2013"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: MATE"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new manual translation: Dutch"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
 #, fuzzy
 msgid "Installation changes"
 msgstr "Cambios en la instalación"
@@ -8711,8 +8738,17 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-"the others see this manual.)"
+"0.5.6"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "new optional desktop environment: MATE 1.8"
+msgstr ""
+
+#. 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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8781,8 +8817,13 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
+"Two manual translations have been completed: Dutch and Norwegian Bokmål."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
-"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
+"Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
 "Spanish."
 msgstr ""
 
@@ -8791,6 +8832,10 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr "paquete en"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "TBD"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
 msgid "Other changes"
@@ -8836,6 +8881,17 @@ msgid ""
 "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid "gnash (flash player)"
+msgstr ""
+
+#. 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-"
+"free flash player</link> from Adobe is still possible however."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
 msgid "Known issues"
@@ -8964,10 +9020,10 @@ msgstr "Traducciones de este documento"
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
-"doc/\">online overview of all languages</ulink>."
+"Versions of this document fully translated into German, Italian, French, "
+"Danish, Dutch and Norwegian Bokmål are available. An incomplete translation "
+"exists for Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/"
+"debian-edu-doc/\">online overview of all languages</ulink>."
 msgstr ""
 "Todavía no están disponibles traducciones de este documento, puesto que el "
 "propio documento está incompleto. Hay traducciones incompletas para noruego "
@@ -9695,6 +9751,10 @@ msgstr ""
 "Nuevas características en Debian Edu 7.1+edu0 nombre código \"Wheezy\" "
 "publicado el 09-28-2013"
 
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
@@ -9793,7 +9853,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
-"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"and Danish. Partly translated versions exist for Norwegian Bokmål and "
 "Spanish."
 msgstr ""
 
@@ -10258,7 +10318,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
 "and Spanish."
 msgstr ""
 
@@ -10576,7 +10636,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Debian-edu-install: Slovak translation added, updates to German, Basque, "
-"Italian, Bokmal, Vietnamese and Chinese translations."
+"Italian, Bokmål, Vietnamese and Chinese translations."
 msgstr ""
 "debian-edu-install: traducción Eslovaca agregada, actualización a los "
 "idiomas: Alemán, Vasco, Vietnamita, Chino y Bokmal."
@@ -10584,7 +10644,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
-"Debian-edu-doc: improvements to Italian, Bokmal and German translations as "
+"Debian-edu-doc: improvements to Italian, Bokmål and German translations as "
 "well as overall content and layout"
 msgstr ""
 "debian-edu-doc: mejoras en los idiomas: Italiano, Bokmal y Alemán. Así "
@@ -10861,9 +10921,13 @@ msgstr ""
 "Características nuevas en la versión \"3.0 Terra\" publicado el 12-05-2007"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Much improved documentation with updated translations to German, "
+#| "Norwegian Bokmal and Italian"
 msgid ""
 "Much improved documentation with updated translations to German, Norwegian "
-"Bokmal and Italian"
+"Bokmål and Italian"
 msgstr ""
 "Una mejor documentación con traducciones actualizadas a Alemán, Noruego "
 "Bokmål e Italiano."
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 1b6074a..fb18356 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-12-10 20:18+0100\n"
+"POT-Creation-Date: 2014-12-17 09:00+0000\n"
 "PO-Revision-Date: 2014-12-01 00:18+0100\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -937,9 +937,17 @@ msgstr ""
 "pendant l'installation."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
 "workstation, thin client server). All other configuration will be set up "
 "automatically with reasonable values, to be changed from a central location "
 "by the system administrator subsequent to the installation."
@@ -6411,52 +6419,96 @@ msgstr ""
 "des informations concernant l'utilisation de ces variables."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgstr "Utiliser KDE « Plasma », GNOME et LXDE ensemble"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
-"linkend=\"Installation--The_installation_process\">installation "
-"instructions</link>."
-msgstr ""
-"Si vous voulez utiliser GNOME ou LXDE au lieu de KDE « Plasma », veuillez "
-"consulter les <link linkend=\"Installation--The_installation_process"
-"\">instructions d'installation</link>."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "To install other desktop environments after installation, simply use apt-get:"
 msgstr ""
 "Pour installer d'autres environnements de bureau après l'installation, "
 "utilisez simplement apt-get :"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde"
+msgid "apt-get install gnome lxde xfce4 mate-desktop"
 msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
+msgid ""
+"Users will then be able to choose any of the five desktop environment via "
+"the login manager before logging in. Of course, you can also choose to give "
+"less choices."
+msgstr ""
+"Les utilisateurs pourront choisir leur environnement de bureau à partir du "
+"gestionnaire de connexion avant de s'identifier. L'utilisation de LXDE par "
+"défaut sur les clients légers peut être imposée. Consultez la section <link "
+"linkend=\"NetworkClients\">clients en réseau</link> pour plus d'informations."
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
 msgid ""
-"Users will then be able to choose the desktop environment via the login "
-"manager before logging in. The usage of LXDE as default on thin clients can "
-"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for "
-"details."
+"The usage of LXDE as default on thin clients can be forced; see <link "
+"linkend=\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "Les utilisateurs pourront choisir leur environnement de bureau à partir du "
 "gestionnaire de connexion avant de s'identifier. L'utilisation de LXDE par "
 "défaut sur les clients légers peut être imposée. Consultez la section <link "
 "linkend=\"NetworkClients\">clients en réseau</link> pour plus d'informations."
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the "
+#| "<link linkend=\"Installation--The_installation_process\">installation "
+#| "instructions</link>."
+msgid ""
+"If you don't want to do installations with the default desktop KDE \"Plasma"
+"\", you can also <link linkend=\"Installation--The_installation_process"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
+msgstr ""
+"Si vous voulez utiliser GNOME ou LXDE au lieu de KDE « Plasma », veuillez "
+"consulter les <link linkend=\"Installation--The_installation_process"
+"\">instructions d'installation</link>."
+
 #. type: Content of: <article><section><section><title>
 msgid "Flash"
 msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The free software flash-player <computeroutput>gnash</computeroutput> is "
-"installed by default, but switching to Adobe Flash is an option. To install "
-"the (non-free) Adobe Flash Player web browser plugin, install the "
+"While the free software flash-player <computeroutput>gnash</computeroutput> "
+"is <emphasis>not</emphasis> installed by default anymore, as it has been "
+"removed from Jessie, installing a non-free flash players is still an option."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The free software flash-player <computeroutput>gnash</computeroutput> is "
+#| "installed by default, but switching to Adobe Flash is an option. To "
+#| "install the (non-free) Adobe Flash Player web browser plugin, install the "
+#| "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
+#| "<computeroutput>contrib</computeroutput>. This requires "
+#| "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/"
+#| "apt/sources.list</computeroutput>."
+msgid ""
+"To install the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
 "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
@@ -6470,6 +6522,14 @@ msgstr ""
 "l'activation de <computeroutput>contrib</computeroutput> dans "
 "<computeroutput>/etc/apt/sources.list</computeroutput>."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The solution for Chromium is similar, it needs the package "
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
+"which will install the (non-free) Pepper Flash Player web browser plugin "
+"from Google."
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
 msgstr "Lire des DVD"
@@ -6531,8 +6591,14 @@ msgid "Handwriting fonts"
 msgstr "Polices scripturales"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The package <computeroutput>ttf-linex</computeroutput> (which is "
+#| "installed by default) installs the font \"Abecedario\" which is a nice "
+#| "handwriting font for kids. The font has several forms to be used with "
+#| "kids: dotted, and with lines."
 msgid ""
-"The package <computeroutput>ttf-linex</computeroutput> (which is installed "
+"The package <computeroutput>fonts-linex</computeroutput> (which is installed "
 "by default) installs the font \"Abecedario\" which is a nice handwriting "
 "font for kids. The font has several forms to be used with kids: dotted, and "
 "with lines."
@@ -7190,10 +7256,10 @@ msgid ""
 "address or IP address like this: <computeroutput>[192.168.0.10]</"
 "computeroutput>."
 msgstr ""
-"Les valeurs par défaut sont définies dans la section <computeroutput>"
-"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
-"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
-"computeroutput>."
+"Les valeurs par défaut sont définies dans la section "
+"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
+"indiquez son adresse MAC ou son adresse IP de cette manière : "
+"<computeroutput>[192.168.0.10]</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9625,22 +9691,6 @@ msgstr ""
 "XX XXXembre 2015"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Changements visibles pour l'utilisateur"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: MATE"
-msgstr "nouvel environnement de bureau proposé en option : MATE"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new manual translation: Dutch"
-msgstr "nouvelle traduction du manuel : néerlandais"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "à déterminer"
-
-#. type: Content of: <article><section><section><section><title>
 msgid "Installation changes"
 msgstr "Changements dans l'installation"
 
@@ -9673,10 +9723,28 @@ msgstr ""
 "anciens sont les i586 (tels qu'Intel Pentium et AMD K5)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-"the others see this manual.)"
+"0.5.6"
+msgstr "Environnements de bureau KDE « Plasma » 4.4 et GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "new optional desktop environment: MATE"
+msgid "new optional desktop environment: MATE 1.8"
+msgstr "nouvel environnement de bureau proposé en option : MATE"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
+msgid ""
+"KDE \"Plasma\" is installed by default; to choose one of the others see this "
+"manual."
 msgstr ""
 "Environnements de bureau KDE « Plasma » 4.11.12, GNOME 3.14, Xfce 4.10, "
 "LXDE 0.5.6 et MATE 1.8 (KDE « Plasma » est installé par défaut ; pour "
@@ -9748,8 +9816,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
+"Two manual translations have been completed: Dutch and Norwegian Bokmål."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Jessie Manual is fully translated to German, French, "
+#| "Italian, Danish and Dutch. Partly translated versions exist for Norwegian "
+#| "Bokmal and Spanish."
+msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
-"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
+"Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
 "Spanish."
 msgstr ""
 "Le manuel de Debian Edu Jessie est traduit entièrement en allemand, "
@@ -9760,6 +9838,10 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr "Changements liés à LDAP"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "TBD"
+msgstr "à déterminer"
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Other changes"
 msgstr "Autres changements"
@@ -9804,6 +9886,17 @@ msgid ""
 "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid "gnash (flash player)"
+msgstr ""
+
+#. 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-"
+"free flash player</link> from Adobe is still possible however."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
 msgstr "Problèmes connus"
@@ -9949,11 +10042,17 @@ msgid "Translations of this document"
 msgstr "Traductions de ce document"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Versions of this document fully translated into German, Italian, French "
+#| "and Danish are available. Incomplete translations exist for Norwegian "
+#| "Bokmål and Spanish. This is an <ulink url=\"http://maintainer.skolelinux."
+#| "org/debian-edu-doc/\">online overview of all languages</ulink>."
 msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
-"doc/\">online overview of all languages</ulink>."
+"Versions of this document fully translated into German, Italian, French, "
+"Danish, Dutch and Norwegian Bokmål are available. An incomplete translation "
+"exists for Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/"
+"debian-edu-doc/\">online overview of all languages</ulink>."
 msgstr ""
 "Des versions complètement traduites de ce document sont disponibles en "
 "allemand, italien, français et danois. Des versions incomplètes en norvégien "
@@ -10928,6 +11027,10 @@ msgstr ""
 "Nouvelles fonctionnalités de Debian Edu 7.1+edu0 Wheezy, publiée le "
 "28 septembre 2013"
 
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Changements visibles pour l'utilisateur"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
@@ -11030,9 +11133,14 @@ msgstr ""
 "wheezy/installmanual\">manuel d'installation</ulink>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Wheezy Manual is fully translated to German, French, "
+#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
+#| "and Spanish."
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
-"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"and Danish. Partly translated versions exist for Norwegian Bokmål and "
 "Spanish."
 msgstr ""
 "Le manuel de Debian Edu Wheezy est traduit entièrement en allemand, "
@@ -11587,9 +11695,14 @@ msgstr ""
 "langue maternelle."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Squeeze Manual is fully translated to German, French and "
+#| "Italian. Partly translated versions exist for Danish (new), Norwegian "
+#| "Bokmal and Spanish."
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
 "and Spanish."
 msgstr ""
 "Le manuel de Debian Edu Squeeze est traduit entièrement en allemand, "
@@ -11981,17 +12094,25 @@ msgstr ""
 "pour refléter la langue utilisée."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-install: Slovak translation added, updates to German, Basque, "
+#| "Italian, Bokmal, Vietnamese and Chinese translations."
 msgid ""
 "Debian-edu-install: Slovak translation added, updates to German, Basque, "
-"Italian, Bokmal, Vietnamese and Chinese translations."
+"Italian, Bokmål, Vietnamese and Chinese translations."
 msgstr ""
 "debian-edu-install : ajout de la traduction slovaque, mise à jour des "
 "versions allemande, basque, italienne, norvégienne Bokmål, vietnamienne et "
 "chinoise."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-doc: improvements to Italian, Bokmal and German translations "
+#| "as well as overall content and layout"
 msgid ""
-"Debian-edu-doc: improvements to Italian, Bokmal and German translations as "
+"Debian-edu-doc: improvements to Italian, Bokmål and German translations as "
 "well as overall content and layout"
 msgstr ""
 "debian-edu-doc : améliorations des traductions italienne, norvégienne Bokmål "
@@ -12259,9 +12380,13 @@ msgstr ""
 "5 décembre 2007"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Much improved documentation with updated translations to German, "
+#| "Norwegian Bokmal and Italian"
 msgid ""
 "Much improved documentation with updated translations to German, Norwegian "
-"Bokmal and Italian"
+"Bokmål and Italian"
 msgstr ""
 "documentation améliorée et mise à jour des traductions en allemand, "
 "norvégien Bokmål et en italien."
@@ -12459,6 +12584,9 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid "new manual translation: Dutch"
+#~ msgstr "nouvelle traduction du manuel : néerlandais"
+
 #~ msgid ""
 #~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
 #~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
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 2f40f2a..19bd7af 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2014-12-10 20:18+0100\n"
+"POT-Creation-Date: 2014-12-17 09:00+0000\n"
 "PO-Revision-Date: 2014-12-02 00:37+0100\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -924,9 +924,17 @@ msgstr ""
 "l'installazione."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
 "workstation, thin client server). All other configuration will be set up "
 "automatically with reasonable values, to be changed from a central location "
 "by the system administrator subsequent to the installation."
@@ -6291,52 +6299,96 @@ msgstr ""
 "avere informazioni su come queste variabili vanno usate."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgstr "Usare insieme KDE \"Plasma\", GNOME e LXDE"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
-"linkend=\"Installation--The_installation_process\">installation "
-"instructions</link>."
-msgstr ""
-"Se si vuole usare GNOME o LXDE al posto di KDE \"Plasma\", seguire <link "
-"linkend=\"Installation--The_installation_process\">le istruzioni di "
-"installazione</link> ."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "To install other desktop environments after installation, simply use apt-get:"
 msgstr ""
 "Per installare altri ambienti di desktop dopo l'installazione, usare "
 "semplicemente apt-get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde"
+msgid "apt-get install gnome lxde xfce4 mate-desktop"
 msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
+msgid ""
+"Users will then be able to choose any of the five desktop environment via "
+"the login manager before logging in. Of course, you can also choose to give "
+"less choices."
+msgstr ""
+"Gli utenti, quindi, saranno in grado di scegliere l'ambiente desktop "
+"attraverso il gestore degli accessi prima di effettuare l'accesso. L'uso in "
+"modo predefinito di LXDE sui thin-client può essere forzato; vedere per i "
+"dettagli <link linkend=\"NetworkClients\">client di rete</link>."
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
 msgid ""
-"Users will then be able to choose the desktop environment via the login "
-"manager before logging in. The usage of LXDE as default on thin clients can "
-"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for "
-"details."
+"The usage of LXDE as default on thin clients can be forced; see <link "
+"linkend=\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "Gli utenti, quindi, saranno in grado di scegliere l'ambiente desktop "
 "attraverso il gestore degli accessi prima di effettuare l'accesso. L'uso in "
 "modo predefinito di LXDE sui thin-client può essere forzato; vedere per i "
 "dettagli <link linkend=\"NetworkClients\">client di rete</link>."
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the "
+#| "<link linkend=\"Installation--The_installation_process\">installation "
+#| "instructions</link>."
+msgid ""
+"If you don't want to do installations with the default desktop KDE \"Plasma"
+"\", you can also <link linkend=\"Installation--The_installation_process"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
+msgstr ""
+"Se si vuole usare GNOME o LXDE al posto di KDE \"Plasma\", seguire <link "
+"linkend=\"Installation--The_installation_process\">le istruzioni di "
+"installazione</link> ."
+
 #. type: Content of: <article><section><section><title>
 msgid "Flash"
 msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The free software flash-player <computeroutput>gnash</computeroutput> is "
-"installed by default, but switching to Adobe Flash is an option. To install "
-"the (non-free) Adobe Flash Player web browser plugin, install the "
+"While the free software flash-player <computeroutput>gnash</computeroutput> "
+"is <emphasis>not</emphasis> installed by default anymore, as it has been "
+"removed from Jessie, installing a non-free flash players is still an option."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The free software flash-player <computeroutput>gnash</computeroutput> is "
+#| "installed by default, but switching to Adobe Flash is an option. To "
+#| "install the (non-free) Adobe Flash Player web browser plugin, install the "
+#| "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
+#| "<computeroutput>contrib</computeroutput>. This requires "
+#| "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/"
+#| "apt/sources.list</computeroutput>."
+msgid ""
+"To install the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
 "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
@@ -6350,6 +6402,14 @@ msgstr ""
 "occorre avere <computeroutput>contrib</computeroutput> in <computeroutput>/"
 "etc/apt/sources.list</computeroutput>."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The solution for Chromium is similar, it needs the package "
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
+"which will install the (non-free) Pepper Flash Player web browser plugin "
+"from Google."
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
 msgstr "Riprodurre DVD"
@@ -6410,8 +6470,14 @@ msgid "Handwriting fonts"
 msgstr "Tipi di carattere calligrafici"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The package <computeroutput>ttf-linex</computeroutput> (which is "
+#| "installed by default) installs the font \"Abecedario\" which is a nice "
+#| "handwriting font for kids. The font has several forms to be used with "
+#| "kids: dotted, and with lines."
 msgid ""
-"The package <computeroutput>ttf-linex</computeroutput> (which is installed "
+"The package <computeroutput>fonts-linex</computeroutput> (which is installed "
 "by default) installs the font \"Abecedario\" which is a nice handwriting "
 "font for kids. The font has several forms to be used with kids: dotted, and "
 "with lines."
@@ -7056,8 +7122,8 @@ msgid ""
 msgstr ""
 "I valori predefiniti sono definiti in <computeroutput>[default]</"
 "computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
-"</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: "
+"<computeroutput>[192.168.0.10]</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -9433,22 +9499,6 @@ msgstr ""
 "rilasciata il XX-YY-2015"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Cambiamenti evidenti per gli utenti"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: MATE"
-msgstr "nuovo ambiente opzionale di desktop: MATE"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new manual translation: Dutch"
-msgstr "nuova traduzione del manuale: olandese"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "TBD"
-
-#. type: Content of: <article><section><section><section><title>
 msgid "Installation changes"
 msgstr "Cambiamenti nell'installazione"
 
@@ -9481,10 +9531,28 @@ msgstr ""
 "sono i586 (come Intel Pentium e AMD K5)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-"the others see this manual.)"
+"0.5.6"
+msgstr "Ambienti di desktop KDE \"Plasma\" 4.4 e GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "new optional desktop environment: MATE"
+msgid "new optional desktop environment: MATE 1.8"
+msgstr "nuovo ambiente opzionale di desktop: MATE"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
+msgid ""
+"KDE \"Plasma\" is installed by default; to choose one of the others see this "
+"manual."
 msgstr ""
 "Ambienti desktop KDE \"Plasma\"  4.11.12, GNOME 3.4, Xfce 4.10, LXDE 0.5.6 e "
 "MATE 1.8 (KDE \"Plasma\" è installato in modo predefinito; per scegliere uno "
@@ -9558,8 +9626,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
+"Two manual translations have been completed: Dutch and Norwegian Bokmål."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Jessie Manual is fully translated to German, French, "
+#| "Italian, Danish and Dutch. Partly translated versions exist for Norwegian "
+#| "Bokmal and Spanish."
+msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
-"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
+"Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
 "Spanish."
 msgstr ""
 "Il Manuale Debian Edu Jessie è completamente tradotto in tedesco, francese, "
@@ -9570,6 +9648,10 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr "Modifiche relative a LDAP"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "TBD"
+msgstr "TBD"
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Other changes"
 msgstr "Altre modifiche"
@@ -9614,6 +9696,17 @@ msgid ""
 "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid "gnash (flash player)"
+msgstr ""
+
+#. 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-"
+"free flash player</link> from Adobe is still possible however."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
 msgstr "Problemi noti"
@@ -9755,11 +9848,17 @@ msgid "Translations of this document"
 msgstr "Traduzioni di questo documento"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Versions of this document fully translated into German, Italian, French "
+#| "and Danish are available. Incomplete translations exist for Norwegian "
+#| "Bokmål and Spanish. This is an <ulink url=\"http://maintainer.skolelinux."
+#| "org/debian-edu-doc/\">online overview of all languages</ulink>."
 msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
-"doc/\">online overview of all languages</ulink>."
+"Versions of this document fully translated into German, Italian, French, "
+"Danish, Dutch and Norwegian Bokmål are available. An incomplete translation "
+"exists for Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/"
+"debian-edu-doc/\">online overview of all languages</ulink>."
 msgstr ""
 "Esistono  traduzioni complete di questo documento in tedesco, italiano, "
 "francese e danese. Esistono traduzioni incomplete in norvegese bokmål e "
@@ -10727,6 +10826,10 @@ msgstr ""
 "Nuove caratteristiche in Debian Edu 7.1+edu0 nome in codice Wheezy "
 "rilasciata il 28-09-2013"
 
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Cambiamenti evidenti per gli utenti"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
@@ -10831,9 +10934,14 @@ msgstr ""
 "\">manuale di installazione</ulink>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Wheezy Manual is fully translated to German, French, "
+#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
+#| "and Spanish."
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
-"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"and Danish. Partly translated versions exist for Norwegian Bokmål and "
 "Spanish."
 msgstr ""
 "Il Manuale Debian Edu Wheezy è completamente tradotto in tedesco, francese, "
@@ -11368,9 +11476,14 @@ msgstr ""
 "inglese è stata verificata e corretta da un linguista di lingua madre."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Squeeze Manual is fully translated to German, French and "
+#| "Italian. Partly translated versions exist for Danish (new), Norwegian "
+#| "Bokmal and Spanish."
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
 "and Spanish."
 msgstr ""
 "Il manuale Debian Edu Squeeze è completamente tradotto in tedesco, francese "
@@ -11755,16 +11868,24 @@ msgstr ""
 "per adattarsi alla lingua usata"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-install: Slovak translation added, updates to German, Basque, "
+#| "Italian, Bokmal, Vietnamese and Chinese translations."
 msgid ""
 "Debian-edu-install: Slovak translation added, updates to German, Basque, "
-"Italian, Bokmal, Vietnamese and Chinese translations."
+"Italian, Bokmål, Vietnamese and Chinese translations."
 msgstr ""
 "Debian-edu-install: aggiunta la traduzione in Slovacco, aggiornate le "
 "traduzioni in tedesco, basco, italiano, bokmal, vietnamita e cinese."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-doc: improvements to Italian, Bokmal and German translations "
+#| "as well as overall content and layout"
 msgid ""
-"Debian-edu-doc: improvements to Italian, Bokmal and German translations as "
+"Debian-edu-doc: improvements to Italian, Bokmål and German translations as "
 "well as overall content and layout"
 msgstr ""
 "Debian-edu-doc: miglioramenti nelle traduzioni in Italiano, bokmal e tedesco "
@@ -12024,9 +12145,13 @@ msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
 msgstr "Nuove caratteristiche nella versione del 5-12-2007 \"3.0r1 Terra\""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Much improved documentation with updated translations to German, "
+#| "Norwegian Bokmal and Italian"
 msgid ""
 "Much improved documentation with updated translations to German, Norwegian "
-"Bokmal and Italian"
+"Bokmål and Italian"
 msgstr ""
 "la documentazione è migliorata con traduzioni aggiornate in Tedesco, "
 "Norvegese, Bokmal e Italiano"
@@ -12219,6 +12344,9 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "new manual translation: Dutch"
+#~ msgstr "nuova traduzione del manuale: olandese"
+
 #~ msgid ""
 #~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/jessie/debian-"
 #~ "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
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 93d4d19..15666ed 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: 2014-11-30 12:49+0100\n"
+"POT-Creation-Date: 2014-12-17 09:00+0000\n"
 "PO-Revision-Date: 2014-12-09 20:19+0000\n"
 "Last-Translator: Ragnar Wisløff <ragnar at wisloff.no>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -41,13 +41,11 @@ msgstr "Debian Edu / Skolelinux Jessie 8.0+edu0~alpha0 utgivelseshåndbok"
 msgid "Manual for Debian Edu 8.0+edu0~alpha0 Codename Jessie"
 msgstr "Utgivelseshåndbok for Debian Edu 8.0+edu0~alpha0 kodenavn Jessie"
 
-#. type: Attribute 'fileref' of:
-#. <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/23-Tjener-KDM_Login.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
-#. type: Content of:
-#. <article><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu login"
 msgstr "Skolelinux innlogging"
 
@@ -188,13 +186,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"
 
@@ -360,128 +356,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"
 
@@ -489,123 +460,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"
@@ -613,8 +560,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"
 
@@ -815,11 +761,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 ""
@@ -972,9 +918,17 @@ msgstr ""
 "installasjonen."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
 "workstation, thin client server). All other configuration will be set up "
 "automatically with reasonable values, to be changed from a central location "
 "by the system administrator subsequent to the installation."
@@ -1122,13 +1076,11 @@ msgstr ""
 "Tynnklienttjenere trenger to nettverkskort ved bruk av standard "
 "nettverksarkitektur:"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 koblet til hovednettverket (10.0.2.0/23)"
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
 "192.168.1.0/24)."
@@ -1161,8 +1113,7 @@ msgstr ""
 "Tynnklienter kan kjøres på så lite som 64 MB RAM og en 133 MHz prosessor, "
 "men 128MB RAM og noe raskere prosessor anbefales."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "For running Iceweasel/Firefox and LibreOffice, 128 MiB RAM is a minimum "
 "requirement."
@@ -1180,8 +1131,7 @@ msgstr ""
 "anbefales det minimum 320 MB RAM og 800MHz prosessor, men 512 eller 1024 MB "
 "RAM vil gi langt bedre ytelse. En raskere CPU vil også økte ytelsen."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Swapping over the network is automatically enabled; the swap size is 512 "
 "MiB, and if you need more you can tune this by editing /etc/ltsp/nbdswapd."
@@ -1194,8 +1144,7 @@ msgstr ""
 "endre SIZE-variabelen her. Vennligst <emphasis> juster vekselminnestørrelsen "
 "(swap)</emphasis> enten lokalt på PC eller på serveren. "
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "If your diskless workstations have hard drives, it is recommended to use "
 "them for swap as it is a lot faster than network swapping."
@@ -1203,8 +1152,7 @@ msgstr ""
 "Hvis din diskløse arbeidsstasjon har harddisker, er det anbefalt å bruke dem "
 "for lokal swap da dette er raskere enn nettverks-swap."
 
-#. type: Content of:
-#. <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "On workstations with little RAM the spell checker can cause LibreOffice to "
 "hang if the swap space is too small. Then the system administrator has to "
@@ -1240,13 +1188,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 ":)"
 
@@ -1407,18 +1353,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 "/!\\"
 
@@ -1462,8 +1405,7 @@ msgstr ""
 "nettinstall (CD), som kan brukes til installasjon fra USB flash-disker, er "
 "egnet for installasjon på  i386-, amd64-maskiner.  Den er tilgjengelig via"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
@@ -1471,8 +1413,7 @@ msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
@@ -1480,8 +1421,7 @@ msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso\">debian-edu-8.0+edu0~alpha0-CD.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-CD.iso debian-edu-8.0+edu0~alpha0-CD.iso </"
@@ -1508,8 +1448,7 @@ msgstr ""
 "under installasjonen. Som de andre kan den lastes ned via FTP, HTTP eller "
 "rsync via:"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
@@ -1517,8 +1456,7 @@ msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
@@ -1526,8 +1464,7 @@ msgstr ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso\">debian-edu-8.0+edu0~alpha0-USB.iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-USB.iso debian-edu-8.0+edu0~alpha0-USB.iso </"
@@ -1545,8 +1482,7 @@ msgstr "Kildebilde"
 msgid "The source image is available via"
 msgstr "Kildekodebildet er tilgjengelig via"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
@@ -1556,8 +1492,7 @@ msgstr ""
 "edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
 "iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
@@ -1567,8 +1502,7 @@ msgstr ""
 "edu-8.0+edu0~alpha0-source-USB.iso\">debian-edu-8.0+edu0~alpha0-source-USB."
 "iso</ulink>"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-8.0+edu0~alpha0-source-USB.iso debian-edu-8.0+edu0~alpha0-source-USB."
@@ -1626,18 +1560,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."
@@ -1645,8 +1576,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."
@@ -1654,8 +1584,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."
@@ -1663,8 +1592,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."
@@ -1672,8 +1600,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"
@@ -1681,8 +1608,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"
@@ -1690,26 +1616,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."
@@ -1717,8 +1639,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."
@@ -1726,16 +1647,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."
@@ -1743,8 +1662,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."
@@ -1752,8 +1670,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."
@@ -1761,18 +1678,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."
@@ -1780,8 +1694,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 "
@@ -1791,8 +1704,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."
@@ -1800,8 +1712,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."
@@ -1809,8 +1720,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 "
@@ -1820,8 +1730,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."
@@ -1829,18 +1738,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."
@@ -1860,8 +1766,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 "
@@ -1871,8 +1776,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>."
@@ -1880,8 +1784,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."
@@ -1889,8 +1792,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> "
@@ -1900,8 +1802,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/"
@@ -1913,8 +1814,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 "
@@ -1924,8 +1824,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 "
@@ -1936,8 +1835,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 "
@@ -1947,8 +1845,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 "
@@ -1958,8 +1855,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 "
@@ -1984,34 +1880,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 "
@@ -2026,13 +1916,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 "
@@ -2044,13 +1932,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 "
@@ -2063,13 +1949,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 "
@@ -2088,13 +1972,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."
@@ -2102,13 +1984,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 "
@@ -2120,8 +2000,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</"
@@ -2164,8 +2043,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 "
@@ -2176,8 +2054,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 "
@@ -2189,8 +2066,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 - "
@@ -2200,8 +2076,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 "
@@ -2212,8 +2087,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> - "
@@ -2225,8 +2099,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"
 
@@ -2422,13 +2295,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"
 
@@ -2442,8 +2313,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"
 
@@ -2617,303 +2487,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"
 
@@ -2980,6 +2790,15 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"There is additional information available elsewhere in this manual: the "
+"<link linkend=\"Features\">New features in Jessie</link> chapter should be "
+"read by everyone who is familar with previous releases. And for those "
+"upgrading from a previous relase, make sure to read the <link linkend="
+"\"Upgrades\">Upgrades</link> chapter."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "If generic DNS traffic is blocked out of your network and you need to use "
 "some specific DNS server to look up internet hosts, you need to tell the DNS "
 "server to use this server as its \"forwarder\".  Update /etc/bind/named.conf."
@@ -2999,8 +2818,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 +2922,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 +3050,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 +3058,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 +3072,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 +3089,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 +3131,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 +3178,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 +3219,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 +3288,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 +3304,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 +3316,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 +3332,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 +3340,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 +3356,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 +3549,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 +3644,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 +3692,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 +3717,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 +3729,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 +3741,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 +3753,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 +3765,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 +4122,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 +4288,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 +4313,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 +4335,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 +4348,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 +4362,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 +4370,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 +4381,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 "
@@ -4722,7 +4473,11 @@ msgstr ""
 "du starter å oppgradere."
 
 #. type: Content of: <article><section><para>
-msgid "Please read this chapter completely before attempting to upgrade."
+#, fuzzy
+#| msgid "Please read this chapter completely before attempting to upgrade."
+msgid ""
+"Please read this chapter and the <link linkend=\"Features\">New features in "
+"Jessie</link> chapter of this manual completely before attempting to upgrade."
 msgstr ""
 "Vær snill og les hele dette kapittelet før du starter å oppgradere systemet "
 "ditt."
@@ -4820,8 +4575,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\"."
@@ -4829,18 +4583,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>"
 
@@ -5787,12 +5538,19 @@ msgid "HowTos from wiki.debian.org"
 msgstr "Veiledninger fra wiki.debian.org"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> "
+#| "are either user- or developer-specific. Let's move the user-specific "
+#| "HowTos over here (and delete them over there)! (But first ask the authors "
+#| "(see the history of those pages to find them) if they are fine with "
+#| "moving the howto and putting it under the GPL.)"
 msgid ""
-"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
-"either user- or developer-specific. Let's move the user-specific HowTos over "
-"here (and delete them over there)! (But first ask the authors (see the "
-"history of those pages to find them) if they are fine with moving the howto "
-"and putting it under the GPL.)"
+"FIXME: The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/"
+"\"/> are either user- or developer-specific. Let's move the user-specific "
+"HowTos over here (and delete them over there)! (But first ask the authors "
+"(see the history of those pages to find them) if they are fine with moving "
+"the howto and putting it under the GPL.)"
 msgstr ""
 "Veiledninger fra  <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> "
 "er enten bruker- eller utviklerorientert. La oss flytte de brukerorienterte "
@@ -5854,8 +5612,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"
 
@@ -5867,8 +5624,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"
 
@@ -5888,8 +5644,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"
 
@@ -5903,8 +5658,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"
 
@@ -5929,8 +5683,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"
 
@@ -6144,8 +5897,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 "
@@ -6168,8 +5920,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 "
@@ -6189,8 +5940,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."
@@ -6199,8 +5949,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>"
@@ -6208,8 +5957,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 "
@@ -6262,8 +6010,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</"
@@ -6314,8 +6061,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 "
@@ -6325,13 +6071,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."
@@ -6339,8 +6083,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>"
 
@@ -6356,13 +6099,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 "
@@ -6459,51 +6200,95 @@ msgstr ""
 "informasjon om hvordan disse variablene blir brukt."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgstr "Bruk av KDE «Plasma», GNOME og LXDE sammen"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
-"linkend=\"Installation--The_installation_process\">installation "
-"instructions</link>."
-msgstr ""
-"Veiledninger for <link linkend=\"Administration\">generell administrasjon</"
-"link>"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "To install other desktop environments after installation, simply use apt-get:"
 msgstr ""
 "For å installere andre skrivebordmiljøer etter installasjonen, bruk rett og "
 "slett apt-get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde"
+msgid "apt-get install gnome lxde xfce4 mate-desktop"
 msgstr "apt-get install killer"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
 msgid ""
-"Users will then be able to choose the desktop environment via the login "
-"manager before logging in. The usage of LXDE as default on thin clients can "
-"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for "
-"details."
+"Users will then be able to choose any of the five desktop environment via "
+"the login manager before logging in. Of course, you can also choose to give "
+"less choices."
 msgstr ""
 "Brukerne vil da kunne velge skrivebordsmiljø via innloggingsvinduet når man "
 "logger seg inn. Bruken av LXDE som standard på tynne klienter kan gjøres "
 "tvunget; se: <link linkend=\"NetworkClients\">networked clients</link> for "
 "detaljer."
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
+msgid ""
+"The usage of LXDE as default on thin clients can be forced; see <link "
+"linkend=\"NetworkClients\">networked clients</link> for details."
+msgstr ""
+"Brukerne vil da kunne velge skrivebordsmiljø via innloggingsvinduet når man "
+"logger seg inn. Bruken av LXDE som standard på tynne klienter kan gjøres "
+"tvunget; se: <link linkend=\"NetworkClients\">networked clients</link> for "
+"detaljer."
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the "
+#| "<link linkend=\"Installation--The_installation_process\">installation "
+#| "instructions</link>."
+msgid ""
+"If you don't want to do installations with the default desktop KDE \"Plasma"
+"\", you can also <link linkend=\"Installation--The_installation_process"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
+msgstr ""
+"Veiledninger for <link linkend=\"Administration\">generell administrasjon</"
+"link>"
+
 #. type: Content of: <article><section><section><title>
 msgid "Flash"
 msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The free software flash-player <computeroutput>gnash</computeroutput> is "
-"installed by default, but switching to Adobe Flash is an option. To install "
-"the (non-free) Adobe Flash Player web browser plugin, install the "
+"While the free software flash-player <computeroutput>gnash</computeroutput> "
+"is <emphasis>not</emphasis> installed by default anymore, as it has been "
+"removed from Jessie, installing a non-free flash players is still an option."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The free software flash-player <computeroutput>gnash</computeroutput> is "
+#| "installed by default, but switching to Adobe Flash is an option. To "
+#| "install the (non-free) Adobe Flash Player web browser plugin, install the "
+#| "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
+#| "<computeroutput>contrib</computeroutput>. This requires "
+#| "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/"
+#| "apt/sources.list</computeroutput>."
+msgid ""
+"To install the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
 "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
@@ -6515,6 +6300,14 @@ msgstr ""
 "(ufri programvare) kan du installere debianpakken "
 "<computeroutput>flashplugin-nonfree</computeroutput> fra backports.org."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The solution for Chromium is similar, it needs the package "
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
+"which will install the (non-free) Pepper Flash Player web browser plugin "
+"from Google."
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
 msgstr "Avspilling av DVD"
@@ -6577,8 +6370,14 @@ msgid "Handwriting fonts"
 msgstr "Håndskrevne fonter"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The package <computeroutput>ttf-linex</computeroutput> (which is "
+#| "installed by default) installs the font \"Abecedario\" which is a nice "
+#| "handwriting font for kids. The font has several forms to be used with "
+#| "kids: dotted, and with lines."
 msgid ""
-"The package <computeroutput>ttf-linex</computeroutput> (which is installed "
+"The package <computeroutput>fonts-linex</computeroutput> (which is installed "
 "by default) installs the font \"Abecedario\" which is a nice handwriting "
 "font for kids. The font has several forms to be used with kids: dotted, and "
 "with lines."
@@ -6617,10 +6416,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>"
@@ -7005,8 +6804,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 "
@@ -7016,8 +6814,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."
@@ -7026,8 +6823,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 "
@@ -7043,8 +6839,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/"
@@ -7964,8 +7759,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>"
@@ -7973,8 +7767,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 "
@@ -7990,38 +7783,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."
@@ -8029,8 +7815,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."
@@ -8124,13 +7909,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>"
@@ -8138,18 +7921,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)"
@@ -8157,8 +7937,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\"."
@@ -8167,8 +7946,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."
@@ -8180,8 +7958,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\"/>"
@@ -8189,8 +7966,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\"/>"
@@ -8198,13 +7974,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\"/>"
 
@@ -8255,15 +8029,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\""
@@ -8389,8 +8161,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."
@@ -8398,8 +8169,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>."
@@ -8407,8 +8177,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>."
@@ -8416,8 +8185,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 "
@@ -8428,8 +8196,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."
@@ -8438,6 +8205,20 @@ msgstr ""
 "for Citrix ICA-klient</ulink> å kople til Windows terminaltjenere fra "
 "Skolelinux."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
+"either user- or developer-specific. Let's move the user-specific HowTos over "
+"here (and delete them over there)! (But first ask the authors (see the "
+"history of those pages to find them) if they are fine with moving the howto "
+"and putting it under the GPL.)"
+msgstr ""
+"Veiledninger fra  <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> "
+"er enten bruker- eller utviklerorientert. La oss flytte de brukerorienterte "
+"veiledningene hit (og slette dem derfra)! (Men først må vi spørre "
+"forfatterne (se historien til disse sidene for å finne dem) om dem synes det "
+"er greit å flytte veiledningen og utgi dem under GPL.) "
+
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/LocalDeviceLtspfs\"/>"
@@ -8501,8 +8282,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"
 
@@ -8538,16 +8318,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"
@@ -8555,8 +8333,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."
@@ -8666,8 +8443,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)"
@@ -8675,8 +8451,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"
 "\""
@@ -8684,13 +8459,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\""
@@ -8698,8 +8471,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 "
@@ -8709,8 +8481,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 "
@@ -8752,8 +8523,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"
@@ -8780,8 +8550,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\""
@@ -8789,8 +8558,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 ...\""
 
@@ -9312,13 +9080,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"
@@ -9470,13 +9236,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"
@@ -9484,8 +9248,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"
@@ -9497,8 +9260,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"
@@ -9506,8 +9268,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 "
@@ -9517,8 +9278,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"
 
@@ -9526,8 +9286,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"
@@ -9535,16 +9294,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"
@@ -9553,8 +9310,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"
@@ -9566,8 +9322,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"
 
@@ -9595,30 +9350,10 @@ msgstr ""
 "Nye egenskaper i Debian Edu 8.0+edu0~alpha0 kodenavn Jessie utgitt 2015-XX-YY"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Endringer synlig for brukerne"
-
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: MATE"
-msgstr "nytt valgfritt skrivebordsmiljø: MATE"
-
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
-msgid "new manual translation: Dutch"
-msgstr "ny oversettelse av brukerhåndbok: Nederlandsk"
-
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "TBD"
-
-#. type: Content of: <article><section><section><section><title>
 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> "
@@ -9632,13 +9367,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 "
@@ -9647,49 +9380,59 @@ msgstr ""
 "Linux-kjernen 3.16.x; for i386 arkitekturen, er støtten til i486 prosessorer "
 "droppet. Eldste som støttes er: i586 (som Intel Pentium og AMD K5)."
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-"the others see this manual.)"
+"0.5.6"
+msgstr "Skrivebordsomgivelser KDE «Plasma» 4.4 and GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "new optional desktop environment: MATE"
+msgid "new optional desktop environment: MATE 1.8"
+msgstr "nytt valgfritt skrivebordsmiljø: MATE"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
+msgid ""
+"KDE \"Plasma\" is installed by default; to choose one of the others see this "
+"manual."
 msgstr ""
 "Skrivebordene KDE «Plasma» 4.11.12, GNOME 3.14, Xfce 4.10, LXDE 0.5.6 og "
 "MATE 1.8 (KDE «Plasma» er installert som standard, for å velge et av de "
 "andre se denne håndboken.)"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "the browsers Iceweasel 31 ESR and Chromium 38"
 msgstr "nettleserne Iceweasel 31 ESR og Chromium 38"
 
-#. type: 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 "
@@ -9701,14 +9444,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> "
@@ -9723,8 +9464,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."
@@ -9732,11 +9472,20 @@ 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 ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Jessie Manual is fully translated to German, French, "
+#| "Italian, Danish and Dutch. Partly translated versions exist for Norwegian "
+#| "Bokmal and Spanish."
 msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
-"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
+"Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
 "Spanish."
 msgstr ""
 "Debian Edu Jessie Manual er fullt oversatt til tysk, fransk, italiensk og "
@@ -9747,16 +9496,70 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr "LDAP relaterte endringer"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "TBD"
+msgstr "TBD"
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Other changes"
 msgstr "Andre endringer"
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid "Squid"
+msgstr ""
+
+#. 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 "
+"example the delay could be set to 10 seconds by appending the line "
+"<computeroutput>shutdown_lifetime 10 seconds</computeroutput> to "
+"<computeroutput>/etc/squid3/squid.conf</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "OpenSSH"
+msgid "SSH"
+msgstr "OpenSSH"
+
+#. 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 "
+"replaced with <computeroutput>PermitRootLogin without-password</"
+"computeroutput>, so ssh-keys will work."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+#| msgid "sl-backup, slbackup-php"
+msgid "Backup (slbackup-php)"
+msgstr "sl-backup, slbackup-php"
+
+#. 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 "
+"temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><title>
+msgid "gnash (flash player)"
+msgstr ""
+
+#. 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-"
+"free flash player</link> from Adobe is still possible however."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 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å."
 
@@ -9890,11 +9693,17 @@ msgid "Translations of this document"
 msgstr "Oversettelser av dette dokumentet"
 
 #. type: Content of: <article><section><para>
-msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
-"doc/\">online overview of all languages</ulink>."
+#, fuzzy
+#| msgid ""
+#| "Versions of this document fully translated into German, Italian, French "
+#| "and Danish are available. Incomplete translations exist for Norwegian "
+#| "Bokmål and Spanish. This is an <ulink url=\"http://maintainer.skolelinux."
+#| "org/debian-edu-doc/\">online overview of all languages</ulink>."
+msgid ""
+"Versions of this document fully translated into German, Italian, French, "
+"Danish, Dutch and Norwegian Bokmål are available. An incomplete translation "
+"exists for Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/"
+"debian-edu-doc/\">online overview of all languages</ulink>."
 msgstr ""
 "(Ferdig oversatte versjoner av dette dokumentet er ikke tilgjengelig ennå. "
 "Ufullstendige oversettelser for norsk bokmål, spansk og tysk eksisterer)??. "
@@ -10043,7 +9852,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 "
@@ -10712,118 +10521,95 @@ msgstr ""
 "dokumentasjonen for byggeskriptet til live-CDen</ulink>. 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)"
 
@@ -10855,13 +10641,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 ":("
 
@@ -10892,8 +10676,11 @@ msgid "New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
 msgstr ""
 "Nye egenskaper i Debian Edu 7.1+edu0 Kodenavn Wheezy  - utgitt  28.09.2013"
 
-#. type: Content of:
-#. <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Endringer synlig for brukerne"
+
+#. 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."
@@ -10901,8 +10688,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> "
@@ -10912,8 +10698,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."
@@ -10922,18 +10707,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 "
@@ -10943,63 +10725,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> "
@@ -11011,18 +10781,21 @@ 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>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Wheezy Manual is fully translated to German, French, "
+#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
+#| "and Spanish."
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
-"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"and Danish. Partly translated versions exist for Norwegian Bokmål and "
 "Spanish."
 msgstr ""
 "Debian Edu Wheezy Manual er fullt oversatt til tysk, fransk, italiensk og "
 "dansk. Delvis oversatte versjoner finnes for 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, "
@@ -11033,18 +10806,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 "
@@ -11054,8 +10824,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 "
@@ -11065,8 +10834,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 "
@@ -11100,13 +10868,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"
 
@@ -11114,13 +10880,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 "
 
@@ -11128,18 +10892,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"
@@ -11147,45 +10908,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"
@@ -11193,15 +10946,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"
 
@@ -11209,8 +10960,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"
 
@@ -11220,8 +10970,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/"
@@ -11233,13 +10982,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 "
@@ -11251,8 +10998,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 "
@@ -11261,18 +11007,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."
@@ -11284,8 +11027,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."
@@ -11293,8 +11035,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 "
@@ -11304,8 +11045,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 "
@@ -11315,8 +11055,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> "
@@ -11325,8 +11064,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² "
@@ -11340,8 +11078,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> "
@@ -11351,13 +11088,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 "
@@ -11367,8 +11102,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."
@@ -11376,8 +11110,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."
@@ -11385,8 +11118,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."
@@ -11394,8 +11126,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 "
@@ -11405,66 +11136,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"
@@ -11472,8 +11191,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</"
@@ -11487,8 +11205,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."
@@ -11496,8 +11213,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."
@@ -11505,8 +11221,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</"
@@ -11515,8 +11230,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...)"
@@ -11524,28 +11238,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</"
@@ -11555,13 +11264,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 "
@@ -11573,8 +11280,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 "
@@ -11589,8 +11295,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."
@@ -11598,8 +11303,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."
@@ -11608,30 +11312,31 @@ 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>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Squeeze Manual is fully translated to German, French and "
+#| "Italian. Partly translated versions exist for Danish (new), Norwegian "
+#| "Bokmal and Spanish."
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
 "and Spanish."
 msgstr ""
 "Brukerhåndboka for Debian Edu Squeeze er fullt oversatt til tysk, fransk og "
 "italiensk.  Delvis oversettelse finnes for 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."
@@ -11642,8 +11347,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 "
@@ -11653,8 +11357,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 "
@@ -11665,8 +11368,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)."
@@ -11678,8 +11380,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:"
@@ -11687,21 +11388,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."
@@ -11709,8 +11407,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 "
@@ -11720,8 +11417,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 "
@@ -11735,16 +11431,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."
@@ -11752,8 +11446,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."
@@ -11761,8 +11454,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)."
@@ -11770,8 +11462,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."
@@ -11779,8 +11470,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"
@@ -11788,15 +11478,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."
@@ -11804,8 +11492,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 "
@@ -11815,8 +11502,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."
@@ -11824,8 +11510,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 "
@@ -11838,8 +11523,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."
@@ -11847,8 +11531,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."
@@ -11857,8 +11540,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 "
@@ -11868,8 +11550,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."
@@ -11877,8 +11558,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."
@@ -11886,16 +11566,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."
@@ -11904,16 +11582,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#"
@@ -11924,8 +11600,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."
@@ -11933,8 +11608,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."
@@ -11942,8 +11616,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."
@@ -11954,13 +11627,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."
@@ -11968,8 +11639,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."
@@ -12029,9 +11699,13 @@ msgstr ""
 "computeroutput> for å gjenspeile/vise  det språket som brukes"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-install: Slovak translation added, updates to German, Basque, "
+#| "Italian, Bokmal, Vietnamese and Chinese translations."
 msgid ""
 "Debian-edu-install: Slovak translation added, updates to German, Basque, "
-"Italian, Bokmal, Vietnamese and Chinese translations."
+"Italian, Bokmål, Vietnamese and Chinese translations."
 msgstr ""
 "Debian-edu-install: Slovakisk oversettelse lagt til, oppdateringer i Tysk, "
 "Basque, Italliensk, Bokmål, Vietnamesisk og Kinesiske oversettelser.\n"
@@ -12041,8 +11715,12 @@ msgstr ""
 "oversettelser."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-doc: improvements to Italian, Bokmal and German translations "
+#| "as well as overall content and layout"
 msgid ""
-"Debian-edu-doc: improvements to Italian, Bokmal and German translations as "
+"Debian-edu-doc: improvements to Italian, Bokmål and German translations as "
 "well as overall content and layout"
 msgstr ""
 "Debian-edu-doc: forbedringer i Italiensk, norsk (bokmål ) og tyske "
@@ -12298,9 +11976,13 @@ msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
 msgstr "Nye egenskaper i «3.0r1 Terra»-utgaven 2007-12-05"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Much improved documentation with updated translations to German, "
+#| "Norwegian Bokmal and Italian"
 msgid ""
 "Much improved documentation with updated translations to German, Norwegian "
-"Bokmal and Italian"
+"Bokmål and Italian"
 msgstr ""
 "Forbedret dokumentasjon med oppdaterte oversettelser til tysk, norsk bokmål "
 "og italiensk."
@@ -12337,8 +12019,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"
 
@@ -12374,8 +12055,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 ""
@@ -12492,3 +12172,6 @@ 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 "new manual translation: Dutch"
+#~ msgstr "ny oversettelse av brukerhåndbok: Nederlandsk"
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 0c2c95b..4d31bba 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-12-10 20:18+0100\n"
+"POT-Creation-Date: 2014-12-17 09:00+0000\n"
 "PO-Revision-Date: 2014-11-29 21:05+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -781,9 +781,9 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Een thin-clientopstelling laat toe om eenvoudige PC's te gebruiken als (X-)"
-"terminals. Dit houdt in dat de machine wordt opgestart met een diskette of "
-"rechtstreeks vanaf de server met behulp van netwerk-PROM (of PXE) zonder "
+"Een thin-clientopstelling laat toe om eenvoudige PC's te gebruiken als "
+"(X-)terminals. Dit houdt in dat de machine wordt opgestart met een diskette "
+"of rechtstreeks vanaf de server met behulp van netwerk-PROM (of PXE) zonder "
 "gebruik te maken van de lokale harde schijf. Het thin-clientsysteem dat "
 "Skolelinux gebruikt, is dat van het Linux Terminal Server Project (LTSP)."
 
@@ -946,9 +946,17 @@ msgstr ""
 "tijdens het installatieproces."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
 "workstation, thin client server). All other configuration will be set up "
 "automatically with reasonable values, to be changed from a central location "
 "by the system administrator subsequent to the installation."
@@ -6514,52 +6522,96 @@ msgstr ""
 "informatie over het gebruik van deze variabelen."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+#, fuzzy
+#| msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgstr "KDE \"Plasma\", GNOME en LXDE samen gebruiken"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
-"linkend=\"Installation--The_installation_process\">installation "
-"instructions</link>."
-msgstr ""
-"Indien u GNOME of LXDE wilt gebruiken in de plaats van  KDE \"Plasma\", volg "
-"dan de <link linkend=\"Installation--The_installation_process\">installatie-"
-"instructies</link>."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "To install other desktop environments after installation, simply use apt-get:"
 msgstr ""
 "Om na het installatieproces bijkomende bureaubladomgevingen te installeren, "
 "gebruikt u apt-get:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde"
+msgid "apt-get install gnome lxde xfce4 mate-desktop"
 msgstr "apt-get install gnome lxde"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
+msgid ""
+"Users will then be able to choose any of the five desktop environment via "
+"the login manager before logging in. Of course, you can also choose to give "
+"less choices."
+msgstr ""
+"Gebruikers kunnen dan via het aanmeldscherm hun favoriete bureaubladomgeving "
+"kiezen alvorens ze zich aanmelden. Het gebruik van LXDE als standaard "
+"bureaubladomgeving voor thin clients kan afgedwongen worden: zie <link "
+"linkend=\"NetworkClients\">netwerkclients</link> voor meer uitleg."
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the desktop environment via the login "
+#| "manager before logging in. The usage of LXDE as default on thin clients "
+#| "can be forced; see <link linkend=\"NetworkClients\">networked clients</"
+#| "link> for details."
 msgid ""
-"Users will then be able to choose the desktop environment via the login "
-"manager before logging in. The usage of LXDE as default on thin clients can "
-"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for "
-"details."
+"The usage of LXDE as default on thin clients can be forced; see <link "
+"linkend=\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "Gebruikers kunnen dan via het aanmeldscherm hun favoriete bureaubladomgeving "
 "kiezen alvorens ze zich aanmelden. Het gebruik van LXDE als standaard "
 "bureaubladomgeving voor thin clients kan afgedwongen worden: zie <link "
 "linkend=\"NetworkClients\">netwerkclients</link> voor meer uitleg."
 
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the "
+#| "<link linkend=\"Installation--The_installation_process\">installation "
+#| "instructions</link>."
+msgid ""
+"If you don't want to do installations with the default desktop KDE \"Plasma"
+"\", you can also <link linkend=\"Installation--The_installation_process"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
+msgstr ""
+"Indien u GNOME of LXDE wilt gebruiken in de plaats van  KDE \"Plasma\", volg "
+"dan de <link linkend=\"Installation--The_installation_process\">installatie-"
+"instructies</link>."
+
 #. type: Content of: <article><section><section><title>
 msgid "Flash"
 msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The free software flash-player <computeroutput>gnash</computeroutput> is "
-"installed by default, but switching to Adobe Flash is an option. To install "
-"the (non-free) Adobe Flash Player web browser plugin, install the "
+"While the free software flash-player <computeroutput>gnash</computeroutput> "
+"is <emphasis>not</emphasis> installed by default anymore, as it has been "
+"removed from Jessie, installing a non-free flash players is still an option."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The free software flash-player <computeroutput>gnash</computeroutput> is "
+#| "installed by default, but switching to Adobe Flash is an option. To "
+#| "install the (non-free) Adobe Flash Player web browser plugin, install the "
+#| "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
+#| "<computeroutput>contrib</computeroutput>. This requires "
+#| "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/"
+#| "apt/sources.list</computeroutput>."
+msgid ""
+"To install the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
 "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
@@ -6574,6 +6626,14 @@ msgstr ""
 "<computeroutput>contrib</computeroutput> in <computeroutput>/etc/apt/sources."
 "list</computeroutput> als pakketbron toegevoegd werd."
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The solution for Chromium is similar, it needs the package "
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
+"which will install the (non-free) Pepper Flash Player web browser plugin "
+"from Google."
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
 msgstr "Dvd's afspelen"
@@ -6634,8 +6694,14 @@ msgid "Handwriting fonts"
 msgstr "Tekensets met lettertekens in handschrift"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The package <computeroutput>ttf-linex</computeroutput> (which is "
+#| "installed by default) installs the font \"Abecedario\" which is a nice "
+#| "handwriting font for kids. The font has several forms to be used with "
+#| "kids: dotted, and with lines."
 msgid ""
-"The package <computeroutput>ttf-linex</computeroutput> (which is installed "
+"The package <computeroutput>fonts-linex</computeroutput> (which is installed "
 "by default) installs the font \"Abecedario\" which is a nice handwriting "
 "font for kids. The font has several forms to be used with kids: dotted, and "
 "with lines."
@@ -9768,22 +9834,6 @@ msgstr ""
 "uitgebracht op 2015-XX-YY"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr "Wijzigingen die zichtbaar zijn voor de gebruiker"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: MATE"
-msgstr "nieuwe optionele bureaubladomgeving: MATE"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new manual translation: Dutch"
-msgstr "nieuwe vertaling van de handleiding: Nederlands"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr "TBD"
-
-#. type: Content of: <article><section><section><section><title>
 msgid "Installation changes"
 msgstr "Veranderingen aan het installatieproces"
 
@@ -9817,10 +9867,28 @@ msgstr ""
 "het type i586 (zoals Intel Pentium en AMD K5)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Desktop environments KDE \"Plasma\" 4.4 and GNOME 2.30"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-"the others see this manual.)"
+"0.5.6"
+msgstr "Bureaubladomgevingen KDE \"Plasma\" 4.4 en GNOME 2.30"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "new optional desktop environment: MATE"
+msgid "new optional desktop environment: MATE 1.8"
+msgstr "nieuwe optionele bureaubladomgeving: MATE"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
+#| "0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one "
+#| "of the others see this manual.)"
+msgid ""
+"KDE \"Plasma\" is installed by default; to choose one of the others see this "
+"manual."
 msgstr ""
 "Bureaubladomgevingen KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
 "0.5.6 en MATE 1.8 (KDE \"Plasma\" wordt standaard geïnstalleerd; raadpleeg "
@@ -9894,8 +9962,18 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
+"Two manual translations have been completed: Dutch and Norwegian Bokmål."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Jessie Manual is fully translated to German, French, "
+#| "Italian, Danish and Dutch. Partly translated versions exist for Norwegian "
+#| "Bokmal and Spanish."
+msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
-"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
+"Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
 "Spanish."
 msgstr ""
 "De handleiding van Debian Edu Jessie is volledig vertaald naar het Duits, "
@@ -9906,6 +9984,10 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr "LDAP-gerelateerde wijzigingen"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "TBD"
+msgstr "TBD"
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Other changes"
 msgstr "Overige wijzigingen"
@@ -9950,6 +10032,17 @@ msgid ""
 "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid "gnash (flash player)"
+msgstr ""
+
+#. 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-"
+"free flash player</link> from Adobe is still possible however."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
 msgstr "Bekende problemen"
@@ -10102,11 +10195,17 @@ msgid "Translations of this document"
 msgstr "Vertalingen van dit document"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Versions of this document fully translated into German, Italian, French "
+#| "and Danish are available. Incomplete translations exist for Norwegian "
+#| "Bokmål and Spanish. This is an <ulink url=\"http://maintainer.skolelinux."
+#| "org/debian-edu-doc/\">online overview of all languages</ulink>."
 msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
-"doc/\">online overview of all languages</ulink>."
+"Versions of this document fully translated into German, Italian, French, "
+"Danish, Dutch and Norwegian Bokmål are available. An incomplete translation "
+"exists for Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/"
+"debian-edu-doc/\">online overview of all languages</ulink>."
 msgstr ""
 "Versies van dit document zijn beschikbaar in het Duits, Italiaans, Frans en "
 "het Deens. Deze vertalingen zijn volledig. Gedeeltelijke vertalingen van dit "
@@ -11082,6 +11181,10 @@ msgstr ""
 "Nieuwe functionaliteit in Debian Edu 7.1+edu0, codenaam Wheezy, uitgebracht "
 "op 28-09-2013"
 
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr "Wijzigingen die zichtbaar zijn voor de gebruiker"
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
@@ -11187,9 +11290,14 @@ msgstr ""
 "installmanual\">installatiehandleiding</ulink>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Wheezy Manual is fully translated to German, French, "
+#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
+#| "and Spanish."
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
-"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"and Danish. Partly translated versions exist for Norwegian Bokmål and "
 "Spanish."
 msgstr ""
 "De handleiding van Debian Edu Wheezy is volledig vertaald naar het Duits, "
@@ -11758,9 +11866,14 @@ msgstr ""
 "taalkundige."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The Debian Edu Squeeze Manual is fully translated to German, French and "
+#| "Italian. Partly translated versions exist for Danish (new), Norwegian "
+#| "Bokmal and Spanish."
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
 "and Spanish."
 msgstr ""
 "De handleiding voor Debian Edu Squeeze werd volledig vertaald naar het "
@@ -12163,17 +12276,25 @@ msgstr ""
 "te geven."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-install: Slovak translation added, updates to German, Basque, "
+#| "Italian, Bokmal, Vietnamese and Chinese translations."
 msgid ""
 "Debian-edu-install: Slovak translation added, updates to German, Basque, "
-"Italian, Bokmal, Vietnamese and Chinese translations."
+"Italian, Bokmål, Vietnamese and Chinese translations."
 msgstr ""
 "Debian-edu-install: een vertaling naar het Slovaaks is toegevoegd, en de "
 "vertalingen naar het Duits, Baskisch, Italiaans, Bokmål, Vietnamees en "
 "Chinees zijn bijgewerkt."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian-edu-doc: improvements to Italian, Bokmal and German translations "
+#| "as well as overall content and layout"
 msgid ""
-"Debian-edu-doc: improvements to Italian, Bokmal and German translations as "
+"Debian-edu-doc: improvements to Italian, Bokmål and German translations as "
 "well as overall content and layout"
 msgstr ""
 "Debian-edu-doc: verbeteringen aan de vertaling naar het Italiaans, Bokmål en "
@@ -12441,9 +12562,13 @@ msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
 msgstr "Nieuwe functionaliteit in de uitgave \"3.0r1 Terra\" van 05-12-2007"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Much improved documentation with updated translations to German, "
+#| "Norwegian Bokmal and Italian"
 msgid ""
 "Much improved documentation with updated translations to German, Norwegian "
-"Bokmal and Italian"
+"Bokmål and Italian"
 msgstr ""
 "Sterk verbeterde documentatie met bijgewerkte vertalingen naar het Duits, "
 "Noors Bokmål en Italiaans"
@@ -12643,6 +12768,9 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "new manual translation: Dutch"
+#~ msgstr "nieuwe vertaling van de handleiding: Nederlands"
+
 #~ msgid "'gosa-admins' show up)."
 #~ msgstr "'gosa-admins')."
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index ddf3ee2..a4f2903 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-10 20:18+0100\n"
+"POT-Creation-Date: 2014-12-17 09:00+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"
@@ -702,7 +702,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
 "workstation, thin client server). All other configuration will be set up "
 "automatically with reasonable values, to be changed from a central location "
 "by the system administrator subsequent to the installation."
@@ -4627,32 +4627,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME and LXDE together"
+msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you want to use GNOME or LXDE instead of KDE \"Plasma\", follow the <link "
-"linkend=\"Installation--The_installation_process\">installation "
-"instructions</link>."
+"To install other desktop environments after installation, simply use apt-get:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get install gnome lxde xfce4 mate-desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"Users will then be able to choose any of the five desktop environment via "
+"the login manager before logging in. Of course, you can also choose to give "
+"less choices."
 msgstr ""
 
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install gnome lxde"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The usage of LXDE as default on thin clients can be forced; see <link "
+"linkend=\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the desktop environment via the login "
-"manager before logging in. The usage of LXDE as default on thin clients can "
-"be forced; see <link linkend=\"NetworkClients\">networked clients</link> for "
-"details."
+"If you don't want to do installations with the default desktop KDE \"Plasma"
+"\", you can also <link linkend=\"Installation--The_installation_process"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4661,15 +4667,28 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The free software flash-player <computeroutput>gnash</computeroutput> is "
-"installed by default, but switching to Adobe Flash is an option. To install "
-"the (non-free) Adobe Flash Player web browser plugin, install the "
+"While the free software flash-player <computeroutput>gnash</computeroutput> "
+"is <emphasis>not</emphasis> installed by default anymore, as it has been "
+"removed from Jessie, installing a non-free flash players is still an option."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"To install the (non-free) Adobe Flash Player web browser plugin, install the "
 "<computeroutput>flashplugin-nonfree</computeroutput> Debian package from "
 "<computeroutput>contrib</computeroutput>. This requires "
 "<computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/"
 "sources.list</computeroutput>."
 msgstr ""
 
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The solution for Chromium is similar, it needs the package "
+"<computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, "
+"which will install the (non-free) Pepper Flash Player web browser plugin "
+"from Google."
+msgstr ""
+
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
 msgstr ""
@@ -4716,7 +4735,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The package <computeroutput>ttf-linex</computeroutput> (which is installed "
+"The package <computeroutput>fonts-linex</computeroutput> (which is installed "
 "by default) installs the font \"Abecedario\" which is a nice handwriting "
 "font for kids. The font has several forms to be used with kids: dotted, and "
 "with lines."
@@ -6911,22 +6930,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "User visible changes"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new optional desktop environment: MATE"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "new manual translation: Dutch"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "TBD"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
 msgid "Installation changes"
 msgstr ""
 
@@ -6955,8 +6958,17 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
-"the others see this manual.)"
+"0.5.6"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "new optional desktop environment: MATE 1.8"
+msgstr ""
+
+#. 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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -7015,8 +7027,13 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
+"Two manual translations have been completed: Dutch and Norwegian Bokmål."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
 "The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
-"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
+"Danish, Dutch and Norwegian Bokmål. A partly translated version exists for "
 "Spanish."
 msgstr ""
 
@@ -7024,6 +7041,10 @@ msgstr ""
 msgid "LDAP related changes"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "TBD"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Other changes"
 msgstr ""
@@ -7064,6 +7085,17 @@ msgid ""
 "temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><section><title>
+msgid "gnash (flash player)"
+msgstr ""
+
+#. 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-"
+"free flash player</link> from Adobe is still possible however."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
 msgstr ""
@@ -7163,10 +7195,10 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Versions of this document fully translated into German, Italian, French and "
-"Danish are available. Incomplete translations exist for Norwegian Bokmål and "
-"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
-"doc/\">online overview of all languages</ulink>."
+"Versions of this document fully translated into German, Italian, French, "
+"Danish, Dutch and Norwegian Bokmål are available. An incomplete translation "
+"exists for Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/"
+"debian-edu-doc/\">online overview of all languages</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -7851,6 +7883,10 @@ msgstr ""
 msgid "New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
 msgstr ""
 
+#. type: Content of: <article><section><section><section><title>
+msgid "User visible changes"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Updated artwork and new Debian Edu / Skolelinux logo, visible during "
@@ -7940,7 +7976,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Wheezy Manual is fully translated to German, French, Italian "
-"and Danish. Partly translated versions exist for Norwegian Bokmal and "
+"and Danish. Partly translated versions exist for Norwegian Bokmål and "
 "Spanish."
 msgstr ""
 
@@ -8362,7 +8398,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The Debian Edu Squeeze Manual is fully translated to German, French and "
-"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal "
+"Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål "
 "and Spanish."
 msgstr ""
 
@@ -8642,12 +8678,12 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "Debian-edu-install: Slovak translation added, updates to German, Basque, "
-"Italian, Bokmal, Vietnamese and Chinese translations."
+"Italian, Bokmål, Vietnamese and Chinese translations."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Debian-edu-doc: improvements to Italian, Bokmal and German translations as "
+"Debian-edu-doc: improvements to Italian, Bokmål and German translations as "
 "well as overall content and layout"
 msgstr ""
 
@@ -8837,7 +8873,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "Much improved documentation with updated translations to German, Norwegian "
-"Bokmal and Italian"
+"Bokmål and Italian"
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index cb3deb6..3c002ca 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -274,7 +274,7 @@
 </para>
 <para>Only the netinstall image needs access to the Internet during installation. 
 </para>
-<para>The installation should not ask any questions, with the exception of desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, workstation, thin client server). All other configuration will be set up automatically with reasonable values, to be changed from a central location by the system administrator subsequent to the installation. 
+<para>The installation should not ask any questions, with the exception of desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, workstation, thin client server). All other configuration will be set up automatically with reasonable values, to be changed from a central location by the system administrator subsequent to the installation. 
 </para>
 </section>
 
@@ -1993,21 +1993,27 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"]]></screen>
 </para>
 </section>
 
-<section id="Desktop--Using_KDE_.26quot.3BPlasma.26quot.3B.2C_GNOME_and_LXDE_together">
-<title>Using KDE "Plasma", GNOME and LXDE together
+<section id="Desktop--Using_KDE_.26quot.3BPlasma.26quot.3B.2C_GNOME.2C_LXDE.2C_Xfce_and.2BAC8or_MATE_together">
+<title>Using KDE "Plasma", GNOME, LXDE, Xfce and/or MATE together
 </title>
-<para>If you want to use GNOME or LXDE instead of KDE "Plasma", follow the <link linkend="Installation--The_installation_process">installation instructions</link>. 
-</para>
 <para>To install other desktop environments after installation, simply use apt-get: 
-</para><screen><![CDATA[ apt-get install gnome lxde]]></screen>
-<para>Users will then be able to choose the desktop environment via the login manager before logging in. The usage of LXDE as default on thin clients can be forced; see  <link linkend="NetworkClients">networked clients</link> for details. 
+</para><screen><![CDATA[ apt-get install gnome lxde xfce4 mate-desktop]]></screen>
+<para>Users will then be able to choose any of the five desktop environment via the login manager before logging in. Of course, you can also choose to give less choices. 
+</para>
+<para>The usage of LXDE as default on thin clients can be forced; see  <link linkend="NetworkClients">networked clients</link> for details. 
+</para>
+<para>If you don't want to do installations with the default desktop KDE "Plasma", you can also <link linkend="Installation--The_installation_process">install with one of the four alternative desktops, GNOME, LXDE, Xfce or MATE</link> directly.  
 </para>
 </section>
 
 <section id="Desktop--Flash">
 <title>Flash
 </title>
-<para>The free software flash-player <computeroutput>gnash</computeroutput> is installed by default, but switching to Adobe Flash is an option. To install the (non-free) Adobe Flash Player web browser plugin, install the <computeroutput>flashplugin-nonfree</computeroutput> Debian package from <computeroutput>contrib</computeroutput>. This requires <computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/sources.list</computeroutput>. 
+<para>While the free software flash-player <computeroutput>gnash</computeroutput> is <emphasis>not</emphasis> installed by default anymore, as it has been removed from Jessie, installing a non-free flash players is still an option.  
+</para>
+<para>To install the (non-free) Adobe Flash Player web browser plugin, install the <computeroutput>flashplugin-nonfree</computeroutput> Debian package from <computeroutput>contrib</computeroutput>. This requires <computeroutput>contrib</computeroutput> enabled in <computeroutput>/etc/apt/sources.list</computeroutput>.  
+</para>
+<para>The solution for Chromium is similar, it needs the package <computeroutput>pepperflashplugin-nonfree</computeroutput> to be installed, which will install the (non-free) Pepper Flash Player web browser plugin from Google. 
 </para>
 </section>
 
@@ -2037,7 +2043,7 @@ apt-get update]]></screen>
 <section id="Desktop--Handwriting_fonts">
 <title>Handwriting fonts
 </title>
-<para>The package <computeroutput>ttf-linex</computeroutput> (which is installed by default) installs the font "Abecedario" which is a nice handwriting font for kids. The font has several forms to be used with kids: dotted, and with lines. 
+<para>The package <computeroutput>fonts-linex</computeroutput> (which is installed by default) installs the font "Abecedario" which is a nice handwriting font for kids. The font has several forms to be used with kids: dotted, and with lines. 
 </para>
 </section>
 </section>
@@ -3116,21 +3122,6 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <title>New features for Debian Edu 8.0+edu0~alpha0 Codename Jessie released 2015-XX-YY
 </title>
 
-<section id="Features--User_visible_changes">
-<title>User visible changes
-</title>
-<itemizedlist>
-<listitem>
-<para>new optional desktop environment: MATE 
-</para></listitem>
-<listitem>
-<para>new manual translation: Dutch 
-</para></listitem>
-<listitem>
-<para>TBD 
-</para></listitem></itemizedlist>
-</section>
-
 <section id="Features--Installation_changes">
 <title>Installation changes
 </title>
@@ -3152,9 +3143,16 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>Linux kernel 3.16.x; for the i386 architecture, support for i486 processors has been dropped; oldest supported ones: i586 (like Intel Pentium and AMD K5). 
 </para></listitem>
 <listitem>
-<para>Desktop environments KDE "Plasma" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE 0.5.6 and MATE 1.8 (KDE "Plasma" is installed by default; to choose one of the others see this manual.) 
+<para>Desktop environments KDE "Plasma" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE 0.5.6 
+</para>
+<itemizedlist>
+<listitem>
+<para>new optional desktop environment: MATE 1.8 
 </para></listitem>
 <listitem>
+<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 38  
 </para></listitem>
 <listitem>
@@ -3192,7 +3190,10 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>Translation updates for the templates used in the installer. These templates are now available in 29 languages. 
 </para></listitem>
 <listitem>
-<para>The Debian Edu Jessie Manual is fully translated to German, French, Italian, Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and Spanish. 
+<para>Two manual translations have been completed: Dutch and Norwegian Bokmål. 
+</para></listitem>
+<listitem>
+<para>The Debian Edu Jessie Manual is fully translated to German, French, Italian, Danish, Dutch and Norwegian Bokmål. A partly translated version exists for Spanish. 
 </para></listitem></itemizedlist>
 </section>
 
@@ -3235,6 +3236,15 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>To be able to use the slbackup-php site (which uses root logins via ssh), <computeroutput>PermitRootLogin yes</computeroutput> has to be set temporarily in <computeroutput>/etc/ssh/sshd_config</computeroutput>. 
 </para></listitem></itemizedlist>
 </section>
+
+<section id="Features--gnash_.28flash_player.29">
+<title>gnash (flash player)
+</title>
+<itemizedlist>
+<listitem>
+<para>The free flash player <computeroutput>gnash</computeroutput> is not available for Jessie. <link linkend="Desktop--Flash">Installing the non-free flash player</link> from Adobe is still possible however. 
+</para></listitem></itemizedlist>
+</section>
 </section>
 
 <section id="Features--Known_issues">
@@ -3281,7 +3291,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <section id="Translations">
 <title>Translations of this document
 </title>
-<para>Versions of this document fully translated into German, Italian, French and  Danish are available. Incomplete translations exist for Norwegian Bokmål and Spanish. This is an <ulink url="http://maintainer.skolelinux.org/debian-edu-doc/">online overview of all languages</ulink>. 
+<para>Versions of this document fully translated into German, Italian, French, Danish, Dutch and Norwegian Bokmål are available. An incomplete translation exists for Spanish. This is an <ulink url="http://maintainer.skolelinux.org/debian-edu-doc/">online overview of all languages</ulink>. 
 </para>
 
 <section id="Translations--HowTo_translate_this_document">
@@ -3625,7 +3635,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>Translation updates for the templates used in the installer. These templates are now available in 29 languages. 
 </para></listitem>
 <listitem>
-<para>The Debian Edu Wheezy Manual is fully translated to German, French, Italian and Danish. Partly translated versions exist for Norwegian Bokmal and Spanish. 
+<para>The Debian Edu Wheezy Manual is fully translated to German, French, Italian and Danish. Partly translated versions exist for Norwegian Bokmål and Spanish. 
 </para></listitem></itemizedlist>
 </section>
 
@@ -3926,7 +3936,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>The Debian Edu Squeeze Manual has generally been cleaned up and improved. A proof-read with corrections was done by a native English linguist. 
 </para></listitem>
 <listitem>
-<para>The Debian Edu Squeeze Manual is fully translated to German, French and Italian. Partly translated versions exist for Danish (new), Norwegian Bokmal and Spanish. 
+<para>The Debian Edu Squeeze Manual is fully translated to German, French and Italian. Partly translated versions exist for Danish (new), Norwegian Bokmål and Spanish. 
 </para></listitem>
 <listitem>
 <para>Improvements to many language tasks, especially French and Danish. 
@@ -4092,10 +4102,10 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>Merge new web pages from Squeeze - the text is the same, but it provides a new translation for <computeroutput>zh</computeroutput>, compete translations for all included languages (<computeroutput>de</computeroutput>, <computeroutput>es</computeroutput>, <computeroutput>fr</computeroutput>, <computeroutput>it</computeroutput>, <computeroutput>nb</computeroutput>, <computeroutput>nl</computeroutput>, <computeroutput>ru</computeroutput>, <computeroutput>zh</computeroutput>), and a re [...]
 </para></listitem>
 <listitem>
-<para>Debian-edu-install: Slovak translation added, updates to German, Basque, Italian, Bokmal, Vietnamese and Chinese translations.  
+<para>Debian-edu-install: Slovak translation added, updates to German, Basque, Italian, Bokmål, Vietnamese and Chinese translations.  
 </para></listitem>
 <listitem>
-<para>Debian-edu-doc: improvements to Italian, Bokmal and German translations as well as overall content and layout 
+<para>Debian-edu-doc: improvements to Italian, Bokmål and German translations as well as overall content and layout 
 </para></listitem>
 <listitem>
 <para>Sitesummary: various improvements; most notably, several Nagios checks were added to monitor system health  
@@ -4200,7 +4210,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 </title>
 <itemizedlist>
 <listitem>
-<para>Much improved documentation with updated translations to German, Norwegian Bokmal and Italian 
+<para>Much improved documentation with updated translations to German, Norwegian Bokmål and Italian 
 </para></listitem>
 <listitem>
 <para>Includes more than 40 bug fixes, improvements and security updates that came to our attention after the 3.0r0 release 

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



More information about the debian-edu-commits mailing list