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

[Holger Levsen]

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 3bc2b1b578e52f019e0a110e9859fa1151d2045d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Feb 19 14:10:38 2017 +0100

    Update Debian Edu Stretch manual from the wiki.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../debian-edu-stretch-manual.da.po                | 148 +++++++++++--------
 .../debian-edu-stretch-manual.de.po                | 153 ++++++++++++--------
 .../debian-edu-stretch-manual.es.po                | 115 ++++++++-------
 .../debian-edu-stretch-manual.fr.po                | 134 ++++++++++--------
 .../debian-edu-stretch-manual.it.po                | 132 ++++++++++-------
 .../debian-edu-stretch-manual.ja.po                | 139 +++++++++++-------
 .../debian-edu-stretch-manual.nb.po                | 154 ++++++++++++--------
 .../debian-edu-stretch-manual.nl.po                | 157 +++++++++++++--------
 .../debian-edu-stretch-manual.pl.po                |  59 +++-----
 .../debian-edu-stretch-manual.pot                  |  59 +++-----
 .../debian-edu-stretch-manual.xml                  |  32 ++---
 .../debian-edu-stretch-manual.zh.po                |  65 ++++-----
 documentation/debian-edu-stretch/fixme-status.txt  |   5 +-
 13 files changed, 764 insertions(+), 588 deletions(-)

diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index 63467c8..4ffcc42 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2016-10-06 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -6916,27 +6916,37 @@ msgstr ""
 "get:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
-msgstr "apt-get install gnome lxde xfce4 mate-desktop"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
+msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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."
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 msgstr ""
 "Brugere vil være i stand til at vælge ethvert af de fem skrivebordsmiljøer "
 "via logindhåndteringen før de logger ind. Selvfølgelig kan du vælge at give "
 "færre valgmuligheder."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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."
+"The use of LXDE as default on thin clients can be forced; see <link linkend="
+"\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "Brugen af LXDE som standard på tynde klienter kan fremtvinges; se <link "
 "linkend=\"NetworkClients\">netværksklienter</link> for detaljer."
@@ -6949,10 +6959,10 @@ msgstr ""
 #| "The_installation_process\">install with one of the four alternative "
 #| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 "Hvis du ikke ønsker at udføre installationer med standardskrivebordet KDE "
 "»Plasma«, så kan du også <link linkend=\"Installation--"
@@ -7029,23 +7039,20 @@ msgid "Playing DVDs"
 msgstr "Afspilning af dvd'er"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-
-#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "libdvdcss is needed for playing most commercial DVDs. For legal reasons "
+#| "it's not included in Debian (Edu).  If you are legally allowed to use it, "
+#| "you can use the packages from deb-multimedia.org. Add the multimedia "
+#| "repository (as described in the following section) and install the "
+#| "required libraries:"
 msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 "libdvdcss er krævet for at afspille de fleste kommercielle dvd'er. Af "
 "juridiske årsager er programmet ikke inkluderet i Debian (Edu). Hvis det er "
@@ -7054,43 +7061,22 @@ msgstr ""
 "afsnit) og installer de krævede biblioteker:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr "apt-get install libdvdcss2 w32codecs"
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
-msgstr "Brug af multimediearkivet"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
+msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr "For at bruge www.deb-multimedia.org så udfør følgende:"
-
-# Engelsk fejl= manglende 0 foran kode
-#. type: CDATA
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
-"# installer debian-keyring sikkert:\n"
-"apt-get install debian-keyring\n"
-"# hent nøglen for deb-multimedia usikkert:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# kontroller sikkert om nøglen er korrekt og tilføj den til nøgleringen brugt af APT hvis den er:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# tilføj arkiv til sources.list - kontroller hjemmesiderne for spejle!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# opdater listen over tilgængelige pakker:\n"
-"apt-get update"
+"Tilføj brugere til den nye gruppe <computeroutput>sshusers</computeroutput>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -13208,6 +13194,50 @@ msgstr ""
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
+#~ "contrib now (also in jessie-backports) which can be used to build "
+#~ "libdvdcss and which makes adding the debian multimedia apt repository "
+#~ "moot. Someone should describe here how to use it…"
+#~ msgstr ""
+#~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
+#~ "contrib now (also in jessie-backports) which can be used to build "
+#~ "libdvdcss and which makes adding the debian multimedia apt repository "
+#~ "moot. Someone should describe here how to use it…"
+
+#~ msgid "apt-get install libdvdcss2 w32codecs"
+#~ msgstr "apt-get install libdvdcss2 w32codecs"
+
+#~ msgid "Using the multimedia repository"
+#~ msgstr "Brug af multimediearkivet"
+
+#~ msgid "To use www.deb-multimedia.org do the following:"
+#~ msgstr "For at bruge www.deb-multimedia.org så udfør følgende:"
+
+# Engelsk fejl= manglende 0 foran kode
+#~ msgid ""
+#~ "# install the debian-keyring securely:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# fetch the deb-multimedia key insecurely:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# update the list of available packages:\n"
+#~ "apt-get update"
+#~ msgstr ""
+#~ "# installer debian-keyring sikkert:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# hent nøglen for deb-multimedia usikkert:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# kontroller sikkert om nøglen er korrekt og tilføj den til nøgleringen brugt af APT hvis den er:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# tilføj arkiv til sources.list - kontroller hjemmesiderne for spejle!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# opdater listen over tilgængelige pakker:\n"
+#~ "apt-get update"
+
+#~ msgid ""
 #~ "We use cfengine to edit configuration files. These files are updated from "
 #~ "the server to the clients. In order to change the client configuration, "
 #~ "it suffices to edit the server configuration and let the automation "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index 85b9ae1..717c938 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2017-01-21 13:46+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -6813,34 +6813,51 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
-msgstr "apt-get install gnome lxde xfce4 kde-standard"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
+msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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."
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 msgstr ""
 "Benutzer können dann über den Anmeldemanager vor dem Anmelden wählen, welche "
 "der fünf graphischen Arbeitsumgebungen verwendet werden soll. Die Auswahl "
 "kann natürlich auch eingeschränkt werden."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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."
+"The use of LXDE as default on thin clients can be forced; see <link linkend="
+"\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "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 don't want to do installations with the default desktop MATE, you "
+#| "can also <link linkend=\"Installation--The_installation_process\">install "
+#| "with one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</"
+#| "link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 "Falls Installationen nicht mit dem voreingestellten MATE-Desktop erfolgen "
 "sollen, dann kann die <link linkend=\"Installation--The_installation_process"
@@ -6920,23 +6937,20 @@ msgid "Playing DVDs"
 msgstr "DVDs abspielen"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-
-#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "libdvdcss is needed for playing most commercial DVDs. For legal reasons "
+#| "it's not included in Debian (Edu).  If you are legally allowed to use it, "
+#| "you can use the packages from deb-multimedia.org. Add the multimedia "
+#| "repository (as described in the following section) and install the "
+#| "required libraries:"
 msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 "Um die meisten kommerziellen DVDs abzuspielen, benötigen Sie das Paket "
 "libdvdcss. Dies ist aus rechtlichen Gründen nicht in Debian (Edu) enthalten. "
@@ -6945,42 +6959,25 @@ msgstr ""
 "beschrieben hinzu und installieren Sie die notwendigen Bibliotheken:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr "apt-get install libdvdcss2 w32codecs"
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
-msgstr "Das Multimedia-Repository verwenden"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt update\n"
+#| " apt install gnome lxde xfce4 kde-standard"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
+msgstr "apt-get install gnome lxde xfce4 kde-standard"
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr "Um www.deb-multimedia.org zu verwenden, führen Sie das Folgende aus:"
-
-#. type: CDATA
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
-"# Den Debian-Keyring sicher installieren:\n"
-"apt-get install debian-keyring\n"
-"# Den Debian-Multimedia-Key ungesichert holen:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# Gesichert die Korrektheit des Keys prüfen und diesen gegebenenfalls dem APT-Keyring hinzufügen:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# Das Depot der Datei sources.list hinzufügen - bitte die Homepages wegen Spiegelservern konsultieren!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# Die List der verfügbaren Pakete aktualisieren:\n"
-"apt-get update"
+"Fügen Sie der neuen Gruppe <computeroutput>sshusers</computeroutput> "
+"Benutzer hinzu."
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -13147,6 +13144,50 @@ msgstr ""
 "werden."
 
 #~ msgid ""
+#~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
+#~ "contrib now (also in jessie-backports) which can be used to build "
+#~ "libdvdcss and which makes adding the debian multimedia apt repository "
+#~ "moot. Someone should describe here how to use it…"
+#~ msgstr ""
+#~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
+#~ "contrib now (also in jessie-backports) which can be used to build "
+#~ "libdvdcss and which makes adding the debian multimedia apt repository "
+#~ "moot. Someone should describe here how to use it…"
+
+#~ msgid "apt-get install libdvdcss2 w32codecs"
+#~ msgstr "apt-get install libdvdcss2 w32codecs"
+
+#~ msgid "Using the multimedia repository"
+#~ msgstr "Das Multimedia-Repository verwenden"
+
+#~ msgid "To use www.deb-multimedia.org do the following:"
+#~ msgstr ""
+#~ "Um www.deb-multimedia.org zu verwenden, führen Sie das Folgende aus:"
+
+#~ msgid ""
+#~ "# install the debian-keyring securely:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# fetch the deb-multimedia key insecurely:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# update the list of available packages:\n"
+#~ "apt-get update"
+#~ msgstr ""
+#~ "# Den Debian-Keyring sicher installieren:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# Den Debian-Multimedia-Key ungesichert holen:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
+#~ "# Gesichert die Korrektheit des Keys prüfen und diesen gegebenenfalls dem APT-Keyring hinzufügen:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# Das Depot der Datei sources.list hinzufügen - bitte die Homepages wegen Spiegelservern konsultieren!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# Die List der verfügbaren Pakete aktualisieren:\n"
+#~ "apt-get update"
+
+#~ msgid ""
 #~ "We use cfengine to edit configuration files. These files are updated from "
 #~ "the server to the clients. In order to change the client configuration, "
 #~ "it suffices to edit the server configuration and let the automation "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index bb82aa5..ce2e2f0 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -6345,28 +6345,36 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 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."
+"The use 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>
 msgid ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6418,57 +6426,32 @@ msgstr "Reproducir DVDs"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr "apt-get install libdvdcss2 w32codecs"
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
-msgstr "Uso del repositorio multimedia"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
+msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr "Para usar www.deb-multimedia.org haga lo siguiente:"
-
-#. type: CDATA
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "The default installation provides the <computeroutput>NetGroups</"
+#| "computeroutput>"
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
-"# instale debian-keyring:\n"
-"apt-get install debian-keyring\n"
-"# descargue la llave deb-multimedia:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# revise de manera segura si la llave es correcta y agreguela al keyring usado por APT:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# agregue el repositorio a  sources.list - revise el sitio web para buscar réplicas!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# Actualice la lista de paquetes disponibles::\n"
-"apt-get update"
+"La instalación por defecto proporciona la <computeroutput>Grupo de Red</"
+"computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -11294,6 +11277,38 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "apt-get install libdvdcss2 w32codecs"
+#~ msgstr "apt-get install libdvdcss2 w32codecs"
+
+#~ msgid "Using the multimedia repository"
+#~ msgstr "Uso del repositorio multimedia"
+
+#~ msgid "To use www.deb-multimedia.org do the following:"
+#~ msgstr "Para usar www.deb-multimedia.org haga lo siguiente:"
+
+#~ msgid ""
+#~ "# install the debian-keyring securely:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# fetch the deb-multimedia key insecurely:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# update the list of available packages:\n"
+#~ "apt-get update"
+#~ msgstr ""
+#~ "# instale debian-keyring:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# descargue la llave deb-multimedia:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# revise de manera segura si la llave es correcta y agreguela al keyring usado por APT:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# agregue el repositorio a  sources.list - revise el sitio web para buscar réplicas!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# Actualice la lista de paquetes disponibles::\n"
+#~ "apt-get update"
+
 #~ msgid ""
 #~ "We use cfengine to edit configuration files. These files are updated from "
 #~ "the server to the clients. In order to change the client configuration, "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index 0047a71..daffa46 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -7209,27 +7209,37 @@ msgstr ""
 "utilisez simplement apt-get :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
-msgstr "apt-get install gnome lxde xfce4 mate-desktop"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
+msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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."
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 msgstr ""
 "Les utilisateurs pourront choisir parmi les cinq environnements de bureau à "
 "partir du gestionnaire de connexion avant de s'identifier. Bien sûr, vous "
 "pouvez toujours décider de laisser moins de choix."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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."
+"The use of LXDE as default on thin clients can be forced; see <link linkend="
+"\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "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</"
@@ -7243,10 +7253,10 @@ msgstr ""
 #| "The_installation_process\">install with one of the four alternative "
 #| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 "Si vous ne souhaitez pas installer le bureau par défaut KDE « Plasma », vous "
 "pouvez procéder à <link linkend=\"Installation--The_installation_process"
@@ -7324,19 +7334,20 @@ msgid "Playing DVDs"
 msgstr "Lire des DVD"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "libdvdcss is needed for playing most commercial DVDs. For legal reasons "
+#| "it's not included in Debian (Edu).  If you are legally allowed to use it, "
+#| "you can use the packages from deb-multimedia.org. Add the multimedia "
+#| "repository (as described in the following section) and install the "
+#| "required libraries:"
 msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 "libdvdcss est nécessaire pour lire la plupart des DVD du commerce. Pour des "
 "raisons légales, cette bibliothèque n'est pas incluse dans Debian (Edu). Si "
@@ -7345,43 +7356,23 @@ msgstr ""
 "dans la section suivante) et installez les bibliothèques nécessaires :"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr "apt-get install libdvdcss2 w32codecs"
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
-msgstr "Utilisation du dépôt multimedia"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
+msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr ""
-"Pour utiliser www.deb-multimedia.org, effectuez les opérations suivantes :"
-
-#. type: CDATA
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
-"# installez le trousseau debian en toute sécurité :\n"
-"apt-get install debian-keyring\n"
-"# récupérez la clé pour le dépôt deb-multimedia de manière non sûre :\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# vérifiez avec certitude que la clé est correcte et si tel est le cas, l'ajouter au trousseau utilisé par apt :\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# ajoutez le dépôt au fichier sources.list — cherchez sur la page web un miroir près de chez vous !\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# mettez à jour la liste des paquets disponibles :\n"
-"apt-get update"
+"Ajoutez les utilisateurs au nouveau groupe <computeroutput>sshusers</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -13787,6 +13778,39 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid "apt-get install libdvdcss2 w32codecs"
+#~ msgstr "apt-get install libdvdcss2 w32codecs"
+
+#~ msgid "Using the multimedia repository"
+#~ msgstr "Utilisation du dépôt multimedia"
+
+#~ msgid "To use www.deb-multimedia.org do the following:"
+#~ msgstr ""
+#~ "Pour utiliser www.deb-multimedia.org, effectuez les opérations suivantes :"
+
+#~ msgid ""
+#~ "# install the debian-keyring securely:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# fetch the deb-multimedia key insecurely:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# update the list of available packages:\n"
+#~ "apt-get update"
+#~ msgstr ""
+#~ "# installez le trousseau debian en toute sécurité :\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# récupérez la clé pour le dépôt deb-multimedia de manière non sûre :\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# vérifiez avec certitude que la clé est correcte et si tel est le cas, l'ajouter au trousseau utilisé par apt :\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# ajoutez le dépôt au fichier sources.list — cherchez sur la page web un miroir près de chez vous !\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# mettez à jour la liste des paquets disponibles :\n"
+#~ "apt-get update"
+
 #~ msgid ""
 #~ "We use cfengine to edit configuration files. These files are updated from "
 #~ "the server to the clients. In order to change the client configuration, "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index 4baf0bf..8cb3584 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2015-05-04 19:34+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -7080,27 +7080,37 @@ msgstr ""
 "semplicemente apt-get:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
-msgstr "apt-get install gnome lxde xfce4 mate-desktop"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
+msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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."
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 msgstr ""
 "Gli utenti, quindi, potranno scegliere uno dei cinque ambienti desktop "
 "attraverso il gestore degli accessi prima di effettuare il login. "
 "Naturalmente si può scegliere di avere meno alternative."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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."
+"The use of LXDE as default on thin clients can be forced; see <link linkend="
+"\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "L'uso in modo predefinito di LXDE sui thin client può essere forzato; vedere "
 "per i dettagli <link linkend=\"NetworkClients\">client di rete</link>."
@@ -7113,10 +7123,10 @@ msgstr ""
 #| "The_installation_process\">install with one of the four alternative "
 #| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 "Se non si vuol fare l'installazione con l'ambiente desktop predefinito KDE "
 "\"Plasma\", si può anche <link linkend=\"Installation--"
@@ -7193,19 +7203,20 @@ msgid "Playing DVDs"
 msgstr "Riprodurre DVD"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "libdvdcss is needed for playing most commercial DVDs. For legal reasons "
+#| "it's not included in Debian (Edu).  If you are legally allowed to use it, "
+#| "you can use the packages from deb-multimedia.org. Add the multimedia "
+#| "repository (as described in the following section) and install the "
+#| "required libraries:"
 msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 "libdvdcss è necessaria per vedere la maggioranza dei DVD commerciali. Per "
 "ragioni legali non è inclusa in Debian (Edu). Se si ha il permesso legale di "
@@ -7214,42 +7225,22 @@ msgstr ""
 "e installare le librerie richieste:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr "apt-get install libdvdcss2 w32codecs"
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
-msgstr "Usare il repository multimedia:"
+#, fuzzy, no-wrap
+#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
+msgstr "apt-get install gnome lxde xfce4 mate-desktop"
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr "Se si usa www.deb-multimedia.org occorre eseguire i seguenti comandi:"
-
-#. type: CDATA
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
-"# installare in modo sicuro il debian-keyring:\n"
-"apt-get install debian-keyring\n"
-"# recuperare in modo non sicuro la chiave di deb-multimedia:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# controllare in modo sicuro che la chiave sia corretta e, se la è, aggiungerla al portachiavi di APT:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# aggiungere il repository a sources.list; guardare nella pagina web l'elenco dei mirror!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# aggiornare l'elenco dei pacchetti disponibili:\n"
-"apt-get update"
+"Aggiungere utenti al nuovo gruppo <computeroutput>sshusers</computeroutput>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -13530,6 +13521,39 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "apt-get install libdvdcss2 w32codecs"
+#~ msgstr "apt-get install libdvdcss2 w32codecs"
+
+#~ msgid "Using the multimedia repository"
+#~ msgstr "Usare il repository multimedia:"
+
+#~ msgid "To use www.deb-multimedia.org do the following:"
+#~ msgstr ""
+#~ "Se si usa www.deb-multimedia.org occorre eseguire i seguenti comandi:"
+
+#~ msgid ""
+#~ "# install the debian-keyring securely:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# fetch the deb-multimedia key insecurely:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# update the list of available packages:\n"
+#~ "apt-get update"
+#~ msgstr ""
+#~ "# installare in modo sicuro il debian-keyring:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# recuperare in modo non sicuro la chiave di deb-multimedia:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# controllare in modo sicuro che la chiave sia corretta e, se la è, aggiungerla al portachiavi di APT:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# aggiungere il repository a sources.list; guardare nella pagina web l'elenco dei mirror!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# aggiornare l'elenco dei pacchetti disponibili:\n"
+#~ "apt-get update"
+
 #~ msgid ""
 #~ "We use cfengine to edit configuration files. These files are updated from "
 #~ "the server to the clients. In order to change the client configuration, "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index 451b081..3e50d14 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2016-12-16 23:09+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -6511,36 +6511,51 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
 msgstr ""
-"apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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."
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 msgstr ""
 "そうするとユーザはログイン前にログインマネージャー経由で 5つのデスクトップ環"
 "境から任意に選択できるようになります。もちろんこの選択の幅を狭めることもでき"
 "ます。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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."
+"The use of LXDE as default on thin clients can be forced; see <link linkend="
+"\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "シンクライアントで LXDE をデフォルトとして強制することもできます。詳細は"
 "<link linkend=\"NetworkClients\">ネットワーククライアント</link>を見てくださ"
 "い。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you don't want to do installations with the default desktop MATE, you "
+#| "can also <link linkend=\"Installation--The_installation_process\">install "
+#| "with one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</"
+#| "link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 "デフォルトのデスクトップ MATE に何もインストールしたくない場合、4つの代替デス"
 "クトップ GNOME、LXDE、Xfce、KDE を直接<link linkend=\"Installation--"
@@ -6618,19 +6633,20 @@ msgid "Playing DVDs"
 msgstr "DVDの再生"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "libdvdcss is needed for playing most commercial DVDs. For legal reasons "
+#| "it's not included in Debian (Edu).  If you are legally allowed to use it, "
+#| "you can use the packages from deb-multimedia.org. Add the multimedia "
+#| "repository (as described in the following section) and install the "
+#| "required libraries:"
 msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 "ほとんどの商用DVDの再生に libdvdcss が必要です。法的な理由からこれは Debian "
 "(Edu) には収録されていません。これの利用を法的に許されている場合は deb-"
@@ -6639,42 +6655,27 @@ msgstr ""
 "す:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr "apt-get install libdvdcss2 w32codecs"
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
-msgstr "マルチメディアリポジトリの利用"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt update\n"
+#| " apt install gnome lxde xfce4 kde-standard"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
+msgstr ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr "deb-multimedia.org を利用するには以下を実行します:"
-
-#. type: CDATA
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
-"# debian-keyring を安全にインストールします:\n"
-"apt-get install debian-keyring\n"
-"# deb-multimedia の鍵を不安全に取得します:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# 鍵が正しいものか安全に確認してAPTが利用する鍵リングに追加します:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# sources.list にリポジトリを追加します - ミラーについてはウェブサイトで確認してください!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# 利用可能パッケージの一覧を更新します:\n"
-"apt-get update"
+"新しいグループ <computeroutput>sshusers</computeroutput> にユーザを追加しま"
+"す。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -12325,6 +12326,38 @@ msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
 
+#~ msgid "apt-get install libdvdcss2 w32codecs"
+#~ msgstr "apt-get install libdvdcss2 w32codecs"
+
+#~ msgid "Using the multimedia repository"
+#~ msgstr "マルチメディアリポジトリの利用"
+
+#~ msgid "To use www.deb-multimedia.org do the following:"
+#~ msgstr "deb-multimedia.org を利用するには以下を実行します:"
+
+#~ msgid ""
+#~ "# install the debian-keyring securely:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# fetch the deb-multimedia key insecurely:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# update the list of available packages:\n"
+#~ "apt-get update"
+#~ msgstr ""
+#~ "# debian-keyring を安全にインストールします:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# deb-multimedia の鍵を不安全に取得します:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# 鍵が正しいものか安全に確認してAPTが利用する鍵リングに追加します:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# sources.list にリポジトリを追加します - ミラーについてはウェブサイトで確認してください!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# 利用可能パッケージの一覧を更新します:\n"
+#~ "apt-get update"
+
 #~ msgid ""
 #~ "We use cfengine to edit configuration files. These files are updated from "
 #~ "the server to the clients. In order to change the client configuration, "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index 776fc07..884b0a6 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2017-02-05 11:34+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -6713,34 +6713,49 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
 msgstr ""
-"apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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."
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 msgstr ""
 "Brukerne vil da kunne velge skrivebordsmiljø via innloggingsvinduet når de "
 "logger seg inn. Det er også mulig å tillate færre valg."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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."
+"The use of LXDE as default on thin clients can be forced; see <link linkend="
+"\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "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 don't want to do installations with the default desktop MATE, you "
+#| "can also <link linkend=\"Installation--The_installation_process\">install "
+#| "with one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</"
+#| "link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 "Hvis du ikke ønsker å installere det standard skrivebordsmiljøet MATE, kan "
 "du velge <link linkend=\"Installation--The_installation_process\"> for å "
@@ -6819,23 +6834,20 @@ msgid "Playing DVDs"
 msgstr "Avspilling av DVD"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-"FIXME: Dette er endret i 2016... det finnes nå en pakke libdvd-pkg i contrib "
-"(også i jessie-backports) som kan brukes for å bygge libdvdcss og som "
-"fjerner behovet for å legge til apt-kilden for debian multimedia.  Noen "
-"burde beskrive her hvordan den brukes…"
-
-#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "libdvdcss is needed for playing most commercial DVDs. For legal reasons "
+#| "it's not included in Debian (Edu).  If you are legally allowed to use it, "
+#| "you can use the packages from deb-multimedia.org. Add the multimedia "
+#| "repository (as described in the following section) and install the "
+#| "required libraries:"
 msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 "Libdvdcss trengs for å spille av de fleste kommersielle DVD-er. Av juridiske "
 "grunner er dette ikke inkludert i Debian (Edu). Hvis du har lov til å bruke "
@@ -6844,42 +6856,25 @@ msgstr ""
 "multimedia og DVD-bibliotekene:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr "apt-get install libdvdcss2 w32codecs"
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
-msgstr "Etter å ha lagt til multimediaarkivet"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt update\n"
+#| " apt install gnome lxde xfce4 kde-standard"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
+msgstr ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr "For å bruke www.deb-multimedia.org gjør følgende:"
-
-#. type: CDATA
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
-msgstr ""
-"# installer debian nøkkelringen sikkert:\n"
-"aptitude install debian-keyring\n"
-"# hent deb-multimedianøkkelen usikret:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# sjekk sikkert om nøkkelen er korrekt, og legg den til nøkkelingen apt benytter hvis den er det:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for speil!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# oppdater listen over tilgjengelige pakker:\n"
-"aptitude update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
+msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -12988,6 +12983,49 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
 #~ msgid ""
+#~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
+#~ "contrib now (also in jessie-backports) which can be used to build "
+#~ "libdvdcss and which makes adding the debian multimedia apt repository "
+#~ "moot. Someone should describe here how to use it…"
+#~ msgstr ""
+#~ "FIXME: Dette er endret i 2016... det finnes nå en pakke libdvd-pkg i "
+#~ "contrib (også i jessie-backports) som kan brukes for å bygge libdvdcss og "
+#~ "som fjerner behovet for å legge til apt-kilden for debian multimedia.  "
+#~ "Noen burde beskrive her hvordan den brukes…"
+
+#~ msgid "apt-get install libdvdcss2 w32codecs"
+#~ msgstr "apt-get install libdvdcss2 w32codecs"
+
+#~ msgid "Using the multimedia repository"
+#~ msgstr "Etter å ha lagt til multimediaarkivet"
+
+#~ msgid "To use www.deb-multimedia.org do the following:"
+#~ msgstr "For å bruke www.deb-multimedia.org gjør følgende:"
+
+#~ msgid ""
+#~ "# install the debian-keyring securely:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# fetch the deb-multimedia key insecurely:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# update the list of available packages:\n"
+#~ "apt-get update"
+#~ msgstr ""
+#~ "# installer debian nøkkelringen sikkert:\n"
+#~ "aptitude install debian-keyring\n"
+#~ "# hent deb-multimedianøkkelen usikret:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# sjekk sikkert om nøkkelen er korrekt, og legg den til nøkkelingen apt benytter hvis den er det:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for speil!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# oppdater listen over tilgjengelige pakker:\n"
+#~ "aptitude update"
+
+#~ msgid ""
 #~ "We use cfengine to edit configuration files. These files are updated from "
 #~ "the server to the clients. In order to change the client configuration, "
 #~ "it suffices to edit the server configuration and let the automation "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index 0b130cb..fed338c 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2017-01-22 16:31+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -6934,36 +6934,51 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
 msgstr ""
-"apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| 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."
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 msgstr ""
 "Gebruikers kunnen dan via het aanmeldscherm een van deze vijf "
 "bureaubladomgevingen kiezen alvorens ze zich aanmelden. U kunt er uiteraard "
 "ook voor opteren om een beperktere keuze aan te bieden."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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."
+"The use of LXDE as default on thin clients can be forced; see <link linkend="
+"\"NetworkClients\">networked clients</link> for details."
 msgstr ""
 "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 don't want to do installations with the default desktop MATE, you "
+#| "can also <link linkend=\"Installation--The_installation_process\">install "
+#| "with one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</"
+#| "link> directly."
 msgid ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 "Indien u geen installaties wenst uit te voeren met het standaardbureaublad "
 "MATE, kunt u ook onmiddellijk <link linkend=\"Installation--"
@@ -7043,24 +7058,20 @@ msgid "Playing DVDs"
 msgstr "Dvd's afspelen"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-"TE DOEN: in 2016 is dit veranderd. In de sectie contrib (ook in jessie-"
-"backports) van de Debian distributie bevindt zich nu het pakket libdvd-pkg "
-"dat gebruikt kan worden om libdvdcss te bouwen. Dit maakt het overbodig om "
-"multimedia toe te voegen aan de lijst van de Debian pakketbronnen van apt. "
-"Iemand zou hier moeten het gebruik moeten uitleggen..."
-
-#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "libdvdcss is needed for playing most commercial DVDs. For legal reasons "
+#| "it's not included in Debian (Edu).  If you are legally allowed to use it, "
+#| "you can use the packages from deb-multimedia.org. Add the multimedia "
+#| "repository (as described in the following section) and install the "
+#| "required libraries:"
 msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 "U heeft libdvdcss nodig om de meeste commerciële dvd's te kunnen afspelen. "
 "Om redenen van wettelijke aard zit het niet in Debian (Edu). Indien u het "
@@ -7069,42 +7080,27 @@ msgstr ""
 "de volgend paragrafen) en installeer de vereiste bibliotheken:"
 
 #. type: CDATA
-#, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr "apt-get install libdvdcss2 w32codecs"
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
-msgstr "De pakketbron multimedia gebruiken"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt update\n"
+#| " apt install gnome lxde xfce4 kde-standard"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
+msgstr ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr "Om www.deb-multimedia.org te kunnen gebruiken, doet u het volgende:"
-
-#. type: CDATA
-#, no-wrap
+#, fuzzy
+#| msgid ""
+#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
-"# installeer de sleutelbos van debian op een veilige manier:\n"
-"apt-get install debian-keyring\n"
-"# haal de sleutel van deb-multimedia op een onveilige manier op:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# ga op een veilige manier na of het een correcte sleutel is en voeg hem in voorkomend geval toe aan de sleutelbos die door APT gebruikt wordt:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# voeg de pakketbron toe in het bestand sources.list - gelieve op de homepagina na te gaan of u een spiegelserver kunt gebruiken!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# werk de lijst van beschikbare pakketten bij:\n"
-"apt-get update"
+"Gebruikers toevoegen aan de nieuwe groep <computeroutput>sshgebruikers</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -13397,6 +13393,51 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
+#~ "contrib now (also in jessie-backports) which can be used to build "
+#~ "libdvdcss and which makes adding the debian multimedia apt repository "
+#~ "moot. Someone should describe here how to use it…"
+#~ msgstr ""
+#~ "TE DOEN: in 2016 is dit veranderd. In de sectie contrib (ook in jessie-"
+#~ "backports) van de Debian distributie bevindt zich nu het pakket libdvd-"
+#~ "pkg dat gebruikt kan worden om libdvdcss te bouwen. Dit maakt het "
+#~ "overbodig om multimedia toe te voegen aan de lijst van de Debian "
+#~ "pakketbronnen van apt. Iemand zou hier moeten het gebruik moeten "
+#~ "uitleggen..."
+
+#~ msgid "apt-get install libdvdcss2 w32codecs"
+#~ msgstr "apt-get install libdvdcss2 w32codecs"
+
+#~ msgid "Using the multimedia repository"
+#~ msgstr "De pakketbron multimedia gebruiken"
+
+#~ msgid "To use www.deb-multimedia.org do the following:"
+#~ msgstr "Om www.deb-multimedia.org te kunnen gebruiken, doet u het volgende:"
+
+#~ msgid ""
+#~ "# install the debian-keyring securely:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# fetch the deb-multimedia key insecurely:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# update the list of available packages:\n"
+#~ "apt-get update"
+#~ msgstr ""
+#~ "# installeer de sleutelbos van debian op een veilige manier:\n"
+#~ "apt-get install debian-keyring\n"
+#~ "# haal de sleutel van deb-multimedia op een onveilige manier op:\n"
+#~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
+#~ "# ga op een veilige manier na of het een correcte sleutel is en voeg hem in voorkomend geval toe aan de sleutelbos die door APT gebruikt wordt:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# voeg de pakketbron toe in het bestand sources.list - gelieve op de homepagina na te gaan of u een spiegelserver kunt gebruiken!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# werk de lijst van beschikbare pakketten bij:\n"
+#~ "apt-get update"
+
+#~ msgid ""
 #~ "We use cfengine to edit configuration files. These files are updated from "
 #~ "the server to the clients. In order to change the client configuration, "
 #~ "it suffices to edit the server configuration and let the automation "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index c1a7a5e..751e8b4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2017-02-01 08:31+0000\n"
 "Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -5198,28 +5198,30 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 msgstr ""
 
 #. 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."
+"The use 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 ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5271,46 +5273,25 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 98fc202..8b2a31e 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+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"
@@ -4657,28 +4657,30 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 msgstr ""
 
 #. 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."
+"The use 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 ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4730,46 +4732,25 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 43c5a6a..78b0b19 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -2021,12 +2021,12 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 </title>
 <para>To install other desktop environments after installation, simply use apt: 
 </para><screen><![CDATA[ apt update
- apt install gnome lxde xfce4 kde-standard]]></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. 
+ apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde]]></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. Keep in mind that there will be several programs for the same purpose (like file managers, editors, PDF viewers...) if more than one DE is installed; this might confuse users. 
 </para>
-<para>The usage of LXDE as default on thin clients can be forced; see  <link linkend="NetworkClients">networked clients</link> for details. 
+<para>The use 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 MATE, you can also <link linkend="Installation--The_installation_process">install with one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> directly.  
+<para>If you don't want to do installations with the default desktop KDE Plasma, you can also <link linkend="Installation--Installation_types_and_options">install with one of the four alternative desktops, GNOME, LXDE, Xfce or MATE</link> directly.  
 </para>
 </section>
 
@@ -2046,27 +2046,11 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 <section id="Desktop--Playing_DVDs">
 <title>Playing DVDs
 </title>
-<para>
-FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib now (also in jessie-backports) which can be used to build libdvdcss and which makes adding the debian multimedia apt repository moot. Someone should describe here how to use it… 
+<para>libdvdcss is needed for playing most commercial DVDs. For legal reasons it's not included in Debian (Edu).  If you are legally allowed to use it, you can build your own local packages using the <computeroutput>libdvd-pkg</computeroutput> Debian package; make sure <computeroutput>contrib</computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</computeroutput>.  
+</para><screen><![CDATA[apt update
+apt install libdvd-pkg]]></screen>
+<para>Answer the debconf questions, then run <computeroutput>dpkg-reconfigure libdvd-pkg</computeroutput>. 
 </para>
-<para>libdvdcss is needed for playing most commercial DVDs. For legal reasons it's not included in Debian (Edu).  If you are legally allowed to use it, you can use the packages from deb-multimedia.org. Add the multimedia repository (as described in the following section) and install the required libraries: 
-</para><screen><![CDATA[apt-get install libdvdcss2 w32codecs]]></screen>
-</section>
-
-<section id="Desktop--Using_the_multimedia_repository">
-<title>Using the multimedia repository
-</title>
-<para>To use www.deb-multimedia.org do the following: 
-</para><screen><![CDATA[# install the debian-keyring securely:
-apt-get install debian-keyring
-# fetch the deb-multimedia key insecurely:
-gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907
-# check securely if the key is correct and add it to the keyring used by APT if it is:
-gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -
-# add repository to sources.list - please check the homepages for mirrors!
-echo "deb http://deb-multimedia.org stretch main" >> /etc/apt/sources.list
-# update the list of available packages:
-apt-get update]]></screen>
 </section>
 
 <section id="Desktop--Handwriting_fonts">
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
index 0f33504..ddefed6 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-02-19 12:02+0000\n"
+"POT-Creation-Date: 2017-02-19 13:09+0000\n"
 "PO-Revision-Date: 2016-12-24 00:48+0800\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
@@ -5384,28 +5384,36 @@ msgstr ""
 #, no-wrap
 msgid ""
 "apt update\n"
-" apt install gnome lxde xfce4 kde-standard"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-kde"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 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."
+"less choices. Keep in mind that there will be several programs for the same "
+"purpose (like file managers, editors, PDF viewers...) if more than one DE is "
+"installed; this might confuse users."
 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."
+"The use of LXDE as default on thin clients can be forced; see <link linkend="
+"\"NetworkClients\">networked clients</link> for details."
 msgstr ""
+"更多关于网络客户端的信息可以在 <link linkend=\"NetworkClients\">Network "
+"clients HowTo</link> 章中被找到。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you don't want to do installations with the default desktop MATE, you can "
-"also <link linkend=\"Installation--The_installation_process\">install with "
-"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
-"directly."
+"If you don't want to do installations with the default desktop KDE Plasma, "
+"you can also <link linkend=\"Installation--Installation_types_and_options"
+"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
+"MATE</link> directly."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5457,46 +5465,25 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib "
-"now (also in jessie-backports) which can be used to build libdvdcss and "
-"which makes adding the debian multimedia apt repository moot. Someone should "
-"describe here how to use it…"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
-"use the packages from deb-multimedia.org. Add the multimedia repository (as "
-"described in the following section) and install the required libraries:"
+"build your own local packages using the <computeroutput>libdvd-pkg</"
+"computeroutput> Debian package; make sure <computeroutput>contrib</"
+"computeroutput> is enabled in <computeroutput>/etc/apt/sources.list</"
+"computeroutput>."
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install libdvdcss2 w32codecs"
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
-msgid "Using the multimedia repository"
+msgid ""
+"apt update\n"
+"apt install libdvd-pkg"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
-msgid "To use www.deb-multimedia.org do the following:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
 msgid ""
-"# install the debian-keyring securely:\n"
-"apt-get install debian-keyring\n"
-"# fetch the deb-multimedia key insecurely:\n"
-"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# add repository to sources.list - please check the homepages for mirrors!\n"
-"echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
-"# update the list of available packages:\n"
-"apt-get update"
+"Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
+"libdvd-pkg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
diff --git a/documentation/debian-edu-stretch/fixme-status.txt b/documentation/debian-edu-stretch/fixme-status.txt
index 74d1400..149c5dc 100644
--- a/documentation/debian-edu-stretch/fixme-status.txt
+++ b/documentation/debian-edu-stretch/fixme-status.txt
@@ -2,14 +2,11 @@
 https://wiki.debian.org/DebianEdu/Documentation/Stretch//HowTo/Administration
 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.) 
 ----------------------------------
-https://wiki.debian.org/DebianEdu/Documentation/Stretch//HowTo/Desktop
-FIXME: this has changed in 2016… there is the libdvd-pkg package in contrib now (also in jessie-backports) which can be used to build libdvdcss and which makes adding the debian multimedia apt repository moot. Someone should describe here how to use it… 
-----------------------------------
 https://wiki.debian.org/DebianEdu/Documentation/Stretch//HowTo/NetworkClients
 FIXME: It would be even better to first/also explain user groups for Windows  with GOsa² (and then show an example for the command line) 
 FIXME: Maybe it is better to purge the examples. People who want to use roaming profiles should know what they are doing ... 
 FIXME: explain how to use profiles from global policies for Windows machines in the skolelinux network 
 FIXME: describe roaming profile key for the global policy editor here 
 ====================
-6 FIXMEs left to fix
+5 FIXMEs left to fix
 ====================

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