diff -Nru debian-edu-doc-2.10.15/debian/changelog debian-edu-doc-2.10.16/debian/changelog
--- debian-edu-doc-2.10.15/debian/changelog	2019-04-01 18:44:33.000000000 +0200
+++ debian-edu-doc-2.10.16/debian/changelog	2019-05-01 12:20:10.000000000 +0200
@@ -1,3 +1,37 @@
+debian-edu-doc (2.10.16) unstable; urgency=medium
+
+  * Update Debian Edu Buster and Stretch manuals from the wiki.
+  * Update debian/copyright from the wikis.
+
+  [ Translation updates ]
+  * Buster manual:
+    - Dutch: Frans Spiesschaert
+    - German: Wolfgang Schweer
+    - Italian: Claudio Carboncini
+    - Chinese (Simplified): Ma Yong
+    - Polish: Wiktor Wandachowicz
+    - Norwegian Bokmål: Allan Nordhøy
+  * ITIL manual:
+    - Dutch: Frans Spiesschaert
+    - Chinese (Simplified): Ma Yong
+    - Norwegian Bokmål: Allan Nordhøy
+  * Audacity manual:
+    - Dutch: Frans Spiesschaert
+    - Chinese (Simplified): zlffcn
+    - Norwegian Bokmål: Allan Nordhøy
+  * Rosegarden manual:
+    - Dutch: Frans Spiesschaert
+    - Norwegian Bokmål: Allan Nordhøy
+  * Stretch manual:
+    - German: Wolfgang Schweer
+    - Dutch: Frans Spiesschaert
+    - French: Jean-Pierre Giraud. Closes: #927430
+    - Chinese (Simplified): Ma Yong
+    - Polish: Wiktor Wandachowicz
+    - Norwegian Bokmål: Allan Nordhøy
+
+ -- Holger Levsen <holger@debian.org>  Wed, 01 May 2019 12:20:10 +0200
+
 debian-edu-doc (2.10.15) unstable; urgency=medium
 
   * Update all manuals from the wiki.
diff -Nru debian-edu-doc-2.10.15/debian/copyright debian-edu-doc-2.10.16/debian/copyright
--- debian-edu-doc-2.10.15/debian/copyright	2019-04-01 17:27:49.000000000 +0200
+++ debian-edu-doc-2.10.16/debian/copyright	2019-05-01 12:19:21.000000000 +0200
@@ -91,6 +91,7 @@
 Files: documentation/audacity/audacity-manual.zh.po
 Copyright: 2017 Zhang Miao
   2018 Ma Yong
+  2019 zlffcn
 License: GPL-2+
 
 Files: documentation/audacity/audacity-manual.pl.po
@@ -210,10 +211,11 @@
 
 Files: documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
 Copyright: 2016, 2017 Stanisław Krukowski
+  2019 Wiktor Wandachowicz
 License: GPL-2+
 
 Files: documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
-Copyright: 2016, 2017, 2018 Ma Yong
+Copyright: 2016, 2017, 2018, 2019 Ma Yong
   2017 Boyuan Yang
   2017 Roy Zhang
 License: GPL-2+
@@ -243,7 +245,7 @@
 
 Files: documentation/debian-edu-itil/debian-edu-itil-manual.zh.po
 Copyright: 2017 Liang Guo
-  2018 Ma Yong
+  2018, 2019 Ma Yong
 License: GPL-3+
 
 Files: documentation/debian-edu-itil/debian-edu-itil-manual.nl.po
@@ -331,7 +333,8 @@
   2012 Jean-Paul Guilloneau
   2012 David Prévot
   2012 Thomas Vincent
-  2009, 2010, 2012 the French l10n team
+  2019 Jean-Pierre Giraud
+  2009, 2010, 2012, 2019 the French l10n team
 License: GPL-2+
 
 Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -348,10 +351,11 @@
 
 Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
 Copyright: 2016, 2017 Stanisław Krukowski
+  2019 Wiktor Wandachowicz
 License: GPL-2+
 
 Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
-Copyright: 2016, 2017, 2018 Ma Yong
+Copyright: 2016, 2017, 2018, 2019 Ma Yong
   2017 Boyuan Yang
   2017 Roy Zhang
 License: GPL-2+
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.cs.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.cs.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.cs.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.cs.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
 "PO-Revision-Date: 2018-01-12 09:01+0000\n"
 "Last-Translator: Jiří Kučera <redwoodstudio@seznam.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/debian-edu-"
@@ -23,7 +23,7 @@
 msgstr "en"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -444,8 +444,9 @@
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.fr.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.fr.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.fr.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.fr.po	2019-05-01 12:19:14.000000000 +0200
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
 "PO-Revision-Date: 2012-02-25 17:05+0100\n"
 "Last-Translator: Cédric Boutillier <cedric.boutillier@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -27,7 +27,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Audacity manual"
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
 msgstr "Manuel d'Audacity pour Debian Edu / Skolelinux"
 
 #. type: Content of: <article><section><section><title>
@@ -614,8 +614,9 @@
 #| "Holger Levsen (2009) and is released under the GPL2 or any later version. "
 #| "Enjoy!"
 msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Le document est écrit par Alf Tonny Bätz (2008, 2009), Holger Levsen (2009). "
 "Les droits de copie sont la propriété des auteurs. Ce document est distribué "
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.nb.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.nb.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.nb.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.nb.po	2019-05-01 12:19:14.000000000 +0200
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
-"PO-Revision-Date: 2019-01-25 16:04+0000\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
+"PO-Revision-Date: 2019-04-24 12:47+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
 "edu-documentation/audacity/nb_NO/>\n"
@@ -23,17 +23,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.4\n"
+"X-Generator: Weblate 3.7-dev\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
 msgstr "nb"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Audacity manual 2019-01-20"
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
-msgstr "Debian Edu / Skolelinux håndbok for Audacity 20.01.2019"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
+msgstr "Debian Edu / Skolelinux-håndbok for Audacity 01.05.2019"
 
 #. type: Content of: <article><section><section><title>
 msgid "Audacity manual"
@@ -536,17 +534,14 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Chinese (Simplified Chinese) translation is copyrighted by Zhang Miao "
-#| "(2017) and Ma Yong (2018) and is released under the GPL v2 or any later "
-#| "version."
-msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
-msgstr ""
-"Rettighetene for den kinesiske (forenklet kinesisk) oversettelsen tilhører "
-"Zhang Miao (2017) og Ma Yong (2018) og er utgitt med lisensen GPL v2 eller "
-"enhver senere versjon."
+msgid ""
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
+msgstr ""
+"Rettigheten til oversettelsen (forenklet kinesisk) tilhører Zhang Miao "
+"(2017) og Ma Yong (2018), utgitt med lisensen GPL v2 eller enhver senere "
+"versjon."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -585,15 +580,12 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Czech translation is copyrighted by Jiří Kučera (2017) and is "
-#| "released under the GPL v2 or any later version."
 msgid ""
 "The Traditional Chinese translation is copyrighted by Louies (2019) and is "
 "released under the GPL v2 or any later version."
 msgstr ""
-"Rettighetene for den tjekkiske oversettelsen tilhører Jiří Kučera (2017) og "
-"er utgitt med lisensen GPL v2 eller enhver senere versjon."
+"Rettighetene for den kinesiske oversettelsen tilhører Louies (2019), utgitt "
+"med lisensen GPL v2 eller enhver senere versjon."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.nl.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.nl.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.nl.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.nl.po	2019-05-01 12:19:14.000000000 +0200
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: audacity-manual.nl\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
-"PO-Revision-Date: 2019-03-17 12:47+0100\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
+"PO-Revision-Date: 2019-04-25 18:02+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -21,10 +21,8 @@
 msgstr "nl"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Audacity manual 2019-02-28"
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
-msgstr "Handleiding van Debian Edu / Skolelinux voor Audacity, 28-02-2019"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
+msgstr "Handleiding van Debian Edu / Skolelinux voor Audacity, 01-05-2019"
 
 #. type: Content of: <article><section><section><title>
 msgid "Audacity manual"
@@ -543,13 +541,17 @@
 "licentie versie 2 of een latere versie."
 
 #. type: Content of: <article><section><para>
-msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+#| msgid ""
+#| "The Simplified Chinese translation is copyrighted by Zhang Miao (2017) "
+#| "and Ma Yong (2018) and is released under the GPL v2 or any later version."
+msgid ""
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten "
-"bij Zhang Miao (2017) en Ma Yong (2018). De vertaling is uitgebracht onder "
-"de GPL-licentie versie 2 of een latere versie."
+"bij Zhang Miao (2017), Ma Yong (2018) en zlffcn (2019). De vertaling is "
+"uitgebracht onder de GPL-licentie versie 2 of een latere versie."
 
 #. type: Content of: <article><section><para>
 msgid ""
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.pl.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.pl.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.pl.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.pl.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
 "PO-Revision-Date: 2018-08-13 14:42+0000\n"
 "Last-Translator: WaldiS <admin@sto.ugu.pl>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -26,7 +26,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Audacity manual"
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
 msgstr "Podręcznik Debiana Edu / Skolelinux Audacity"
 
 #. type: Content of: <article><section><section><title>
@@ -463,8 +463,9 @@
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.pot debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.pot
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.pot	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.pot	2019-05-01 12:19:14.000000000 +0200
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -438,8 +438,9 @@
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.pt_BR.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.pt_BR.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.pt_BR.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.pt_BR.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
 "PO-Revision-Date: 2019-01-17 18:19+0000\n"
 "Last-Translator: Thi <tcasotti59@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -25,7 +25,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Audacity manual"
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
 msgstr "Manual Debian Edu / Skolelinux Audacity"
 
 #. type: Content of: <article><section><section><title>
@@ -479,8 +479,9 @@
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.sv.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.sv.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.sv.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.sv.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
 "PO-Revision-Date: 2018-01-12 09:01+0000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/debian-edu-"
@@ -25,7 +25,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Audacity manual"
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux manual för Audacity"
 
 #. type: Content of: <article><section><section><title>
@@ -464,8 +464,9 @@
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.uk.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.uk.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.uk.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.uk.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
 "PO-Revision-Date: 2018-09-30 16:07+0000\n"
 "Last-Translator: Володимир Бриняк <bardvv@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/debian-edu-"
@@ -26,7 +26,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Audacity manual"
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
 msgstr "Debian-Edu / Skolelinux Audacity посібник"
 
 #. type: Content of: <article><section><section><title>
@@ -533,8 +533,9 @@
 #. type: Content of: <article><section><para>
 #, fuzzy
 msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Китайський (спрощений китайський) переклад захищений авторським правом Чжан "
 "Мяо (2017) і випущений за версією GPL v2 або будь-якою пізнішою версією."
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.xml debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.xml
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.xml	2019-04-01 17:26:57.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.xml	2019-05-01 12:17:21.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Audacity manual 2019-04-01</title></articleinfo>
+<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Audacity manual 2019-05-01</title></articleinfo>
 <section id="About">
 <title>Audacity manual
 </title>
@@ -176,7 +176,7 @@
 </para>
 <para>The Swedish translation is copyrighted by Erik Sundin (2016) and Anders Jonsson (2018) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and Ma Yong (2018) and is released under the GPL v2 or any later version. 
+<para>The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later version. 
 </para>
 <para>The Polish translation is copyrighted by Stanisław Krukowski (2017) and is released under the GPL v2 or any later version. 
 </para>
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.zh_Hant.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.zh_Hant.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.zh_Hant.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.zh_Hant.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
 "PO-Revision-Date: 2019-01-26 19:04+0000\n"
 "Last-Translator: Louies <louies0623@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -25,7 +25,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Audacity manual 2019-01-20"
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux Audacity 手冊 2019-01-20"
 
 #. type: Content of: <article><section><section><title>
@@ -458,8 +458,9 @@
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff -Nru debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.zh.po debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.zh.po
--- debian-edu-doc-2.10.15/documentation/audacity/audacity-manual.zh.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/audacity/audacity-manual.zh.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
-"PO-Revision-Date: 2018-10-14 05:24+0000\n"
-"Last-Translator: Ma Yong <debuser@yeah.net>\n"
+"POT-Creation-Date: 2019-04-22 23:27+0200\n"
+"PO-Revision-Date: 2019-04-14 12:04+0000\n"
+"Last-Translator: zlffcn <a527408965@hotmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "debian-edu-documentation/audacity/zh_Hans/>\n"
 "Language: zh\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.2.1\n"
+"X-Generator: Weblate 3.6-dev\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
@@ -24,8 +24,8 @@
 
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
-msgid "Debian Edu / Skolelinux Audacity manual 2019-04-01"
-msgstr "Debian Edu / Skolelinux Audacity 手册"
+msgid "Debian Edu / Skolelinux Audacity manual 2019-05-01"
+msgstr "Debian Edu / Skolelinux Audacity 手册 2019-01-20"
 
 #. type: Content of: <article><section><section><title>
 msgid "Audacity manual"
@@ -180,6 +180,7 @@
 msgid ""
 "<imageobject><imagedata fileref=\"./images/recording.png\"/></imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"./images/recording.png\"/></imageobject>"
 
 #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "recording.png"
@@ -191,11 +192,14 @@
 "the volume automatically set right volume on the record without any danger "
 "of have part of the sound overdriven."
 msgstr ""
+"当你录制了你想要的内容时，你可以对录音进行标准化处理，在录音中自动设置正确的"
+"音量而不会有部分声音过载的危险。"
 
 #. type: Content of: <article><section><para><inlinemediaobject>
 msgid ""
 "<imageobject><imagedata fileref=\"./images/normalize.png\"/></imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"./images/normalize.png\"/></imageobject>"
 
 #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "normalize.png"
@@ -475,8 +479,9 @@
 
 #. type: Content of: <article><section><para>
 msgid ""
-"The Simplified Chinese translation is copyrighted by Zhang Miao (2017) and "
-"Ma Yong (2018) and is released under the GPL v2 or any later version."
+"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
+"Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -546,10 +551,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
 "using ssh access: <computeroutput>git clone git@salsa.debian.org:debian-edu/"
@@ -579,10 +580,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
@@ -635,10 +632,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Basic information about Alioth (the host where our Git repository is "
-#| "located) and Git is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Git\"/>."
 msgid ""
 "Basic information about Salsa (the host where our Git repository is located) "
 "and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.da.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.da.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.da.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.da.po	2019-05-01 12:19:14.000000000 +0200
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-buster-manual\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
 "PO-Revision-Date: 2019-02-23 19:25+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -26,7 +26,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-02-11"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
 msgstr "Manual for Debian Edu / Skolelinux Buster 10+edu0 11-02-2019"
 
 #. type: Content of: <article><section><section><title>
@@ -1609,6 +1609,16 @@
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr "Kilder"
 
@@ -4987,12 +4997,9 @@
 #| "<emphasis>mutt</emphasis>)."
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
 "apt-list-changes: vær forberedt på at skulle læse en masse NYHEDER; tryk &lt;"
 "retur&gt; for at rulle ned, &lt;q&gt; for at forlade tekstfremviseren. "
@@ -5750,8 +5757,12 @@
 "automatisk."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To create one for a system already configured with GOsa², login on the "
+#| "main server as root and run"
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 "For at oprette et for et system allerede konfigureret med GOsa², log ind på "
@@ -7033,8 +7044,16 @@
 "/usr/share/debian-edu-config/tools/improve-desktop-l10n"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users will then be able to choose the language via the Lightdm display "
+#| "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
+#| "KDE both come with their own internal region and language configuration "
+#| "tools, use these. MATE uses the Arctica greeter on top of Lightdm "
+#| "whithout a language chooser. Run <computeroutput>apt purge arctica-"
+#| "greeter</computeroutput> to get the stock Lightdm greeter."
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -8533,9 +8552,9 @@
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8577,7 +8596,7 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9633,7 +9652,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -9846,18 +9865,28 @@
 "og er udgivet under GPL version 2 eller enhver senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
+#| "and is released under the GPL v2 or any later version."
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Den japanske oversættelse er underlagt ophavsretten af victory (2016, 2017) "
 "og er udgivet under GPL version 2 eller enhver senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
+#| "2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the "
+#| "GPL v2 or any later version."
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 "Den japanske oversættelse er underlagt ophavsretten af Ma Yong (2016, 2017, "
 "2018), Boyuan Yang (2017) og Roy Zhang (2017) og er udgivet under GPL "
@@ -11479,10 +11508,12 @@
 
 #~ msgid ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 #~ msgstr ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 
 #~ msgid "To set the default desktop environment, run:"
 #~ msgstr "For at angive standardskrivebordsmiljøet, kør:"
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.de.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.de.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.de.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.de.po	2019-05-01 12:19:14.000000000 +0200
@@ -16,8 +16,8 @@
 msgstr ""
 "Project-Id-Version: debian-edu-buster-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
-"PO-Revision-Date: 2019-03-31 11:17+0200\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
+"PO-Revision-Date: 2019-04-23 21:32+0200\n"
 "Last-Translator: Wolfgang Schweer <wschweer@arcor.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -33,8 +33,8 @@
 msgstr "de"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
-msgstr "Handbuch für Debian Edu / Skolelinux Buster 10+edu0 01.04.2019"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
+msgstr "Handbuch für Debian Edu / Skolelinux Buster 10+edu0 01.05.2019"
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 10+edu0 Codename Buster"
@@ -1653,6 +1653,19 @@
 "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-bd/\"/>"
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr "Überprüfung heruntergeladener Image-Dateien"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+"Eine detaillierte Anleitung für das Überprüfen dieser Images ist Teil der "
+"<ulink url=\"https://www.debian.org/CD/faq/index.de.html#verify\">Debian-CD "
+"FAQ</ulink>."
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr "Quellen"
 
@@ -5088,21 +5101,15 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
 "apt-list-changes: Stellen Sie sich darauf ein, eine Menge an NEWS zu lesen; "
 "&lt;Return&gt; drücken, um weiter zu blättern, &lt;q&gt; um das "
-"Anzeigeprogramm zu beenden. Bitte beachten: Die GOsa² betreffende "
-"Information ist falsch (wegen Debian-Bug <ulink url=\"https://bugs.debian."
-"org/918578#\">925138</ulink>), siehe weiter unten, wie die "
-"Passwortverschlüsselung richtigerweise vorgenommen wird. Alle Informationen "
-"werden als E-Mail an »root« geschickt, können also (mittels <emphasis>mailx</"
-"emphasis> oder <emphasis>mutt</emphasis>) noch einmal gelesen werden."
+"Anzeigeprogramm zu beenden. Alle Informationen werden als E-Mail an »root« "
+"geschickt, können also (mittels <emphasis>mailx</emphasis> oder "
+"<emphasis>mutt</emphasis>) noch einmal gelesen werden."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5877,11 +5884,11 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 "Eine solche Datei lässt sich für ein bereits mit GOsa² eingerichtetes System "
-"erzeugen. Als »root« auf dem Hauptserver anmelden und ausführen:"
+"erzeugen. Als »root« auf dem Hauptserver anmelden und ausführen"
 
 #. type: CDATA
 #, no-wrap
@@ -7184,7 +7191,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -7192,12 +7199,12 @@
 "computeroutput> to get the stock Lightdm greeter."
 msgstr ""
 "Benutzern wird es dann möglich sein, die Sprache vor dem Anmelden über den "
-"Lightdm-Displaymanager zu wählen; dies trifft für Xfce, LXDE und LXQt zu. "
+"LightDM-Displaymanager zu wählen; dies trifft für Xfce, LXDE und LXQt zu. "
 "GNOME und auch KDE haben eigene Einstellmöglichkeiten für Region und "
 "Sprache; diese sollten benutzt werden. MATE verwendet (zusätzlich zu "
-"Lightdm) den Arctica-Greeter, der kein Sprachwahlmodul hat. Nach dem "
+"LightDM) den Arctica-Greeter, der kein Sprachwahlmodul hat. Nach dem "
 "Ausführen von <computeroutput>apt purge arctica-greeter</computeroutput> ist "
-"der normale Lightdm-Greeter vorhanden."
+"der normale LightDM-Greeter vorhanden."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -8706,16 +8713,16 @@
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
-msgstr ""
-"Mit X2Go ist es möglich, eine graphische Arbeitsfläche auf dem LTSP-Server "
-"zu nutzen, indem von einem Linux-, Windows- or Mac-PC aus eine schmal-oder "
-"breitbandige Verbindung hergestellt wird. Auf dem Client-PC muss zusätzliche "
-"Software installiert werden, weiterführende Informationen gibt es im "
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
+msgstr ""
+"Mit X2Go ist es möglich, von einem Rechner mit Linux, Windows oder macOS aus "
+"über eine schmal-oder breitbandige Verbindung eine graphische Arbeitsfläche "
+"auf dem LTSP-Server zu nutzen. Auf dem Client-PC muss zusätzliche Software "
+"installiert werden, weiterführende Informationen gibt es im "
 "(englischsprachigen) <ulink url=\"https://wiki.x2go.org/doku.php/doc:"
-"installation:x2goclient\">x2go wiki</ulink>."
+"installation:x2goclient\">X2Go wiki</ulink>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8761,7 +8768,7 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 "<computeroutput>x2goclient</computeroutput> ist ein graphischer Client für "
 "das X2Go-System (nicht standardmäßig installiert). Sie können diesen "
@@ -9851,7 +9858,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -10063,20 +10070,22 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Die polnische Übersetzung wurde verfasst von Stanisław Krukowski (2016, "
-"2017) und ist unter der GPL v2 oder einer späteren Version lizenziert."
+"2017) und Wiktor Wandachowicz (2019) und ist unter der GPL v2 oder einer "
+"späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 "Die chinesische Übersetzung (vereinfachte Schriftzeichen) wurde verfasst von "
-"Ma Yong (2016, 2017, 2018), Boyuan Yang (2017) und Roy Zhang (2017); sie ist "
-"unter der GPL v2 oder einer späteren Version lizenziert."
+"Ma Yong (2016, 2017, 2018, 2019), Boyuan Yang (2017) und Roy Zhang (2017); "
+"sie ist unter der GPL v2 oder einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -10227,8 +10236,8 @@
 "translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre "
 "Sprache anlegen und wie Übersetzungen aktualisiert werden."
 
-#.  <remark>
-#. status ignore</remark> 
+#. <remark>
+#. status ignore</remark>
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -11707,10 +11716,12 @@
 
 #~ msgid ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 #~ msgstr ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 
 #~ msgid "To set the default desktop environment, run:"
 #~ msgstr "Um die Standard-Arbeitsumgebung zu setzen, führen Sie dies aus:"
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.es.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.es.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.es.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.es.po	2019-05-01 12:19:14.000000000 +0200
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat@gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -29,7 +29,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Jessie 8.0+edu0 Manual"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
 msgstr "Manual de Debian Edu / Skolelinux Jessie 8.0+edu0"
 
 #. type: Content of: <article><section><section><title>
@@ -1791,6 +1791,16 @@
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
 #, fuzzy
 #| msgid "Sources:"
 msgid "Sources"
@@ -5329,12 +5339,9 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5990,7 +5997,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 
@@ -7075,7 +7082,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -8273,9 +8280,9 @@
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8311,7 +8318,7 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9237,7 +9244,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -9385,14 +9392,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po	2019-05-01 12:19:14.000000000 +0200
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -27,7 +27,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Jessie 8+edu0 Manual"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
 msgstr "Manuel de Debian Edu/Skolelinux Jessie 8+edu0"
 
 #. type: Content of: <article><section><section><title>
@@ -1852,6 +1852,16 @@
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr "Sources"
 
@@ -5806,12 +5816,9 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6607,7 +6614,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 
@@ -8025,7 +8032,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -9730,9 +9737,9 @@
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -9789,7 +9796,7 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -10971,7 +10978,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -11212,10 +11219,18 @@
 msgstr ""
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015, 2016) and is released under the GPL v2 or any later version."
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
+"La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
+"(2012, 2013, 2014, 2015, 2016), est distribuée sous GPL v2 ou toute version "
+"ultérieure."
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -11224,8 +11239,8 @@
 #| "2015, 2016) and is released under the GPL v2 or any later version."
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 "La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
 "(2012, 2013, 2014, 2015, 2016), est distribuée sous GPL v2 ou toute version "
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.it.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.it.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.it.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.it.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
-"PO-Revision-Date: 2019-02-26 19:07+0100\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
+"PO-Revision-Date: 2019-04-23 21:36+0100\n"
 "Last-Translator: claudio <claudio.carboncini@gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian@list.debian.org>\n"
 "Language: it\n"
@@ -22,10 +22,8 @@
 msgstr "it"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-02-11"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
-msgstr "Manuale 2019-02-11 di Debian Edu / Skolelinux Buster 10+edu0"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
+msgstr "Manuale 2019-05-01 di Debian Edu / Skolelinux Buster 10+edu0"
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 10+edu0 Codename Buster"
@@ -929,18 +927,12 @@
 msgstr "Installazione"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Currently there are two kinds of installation media images: netinstall "
-#| "(CD)  and USB flash drive (BD). Both images can also be booted from USB "
-#| "sticks."
 msgid ""
 "Currently there are two kinds of installation media images: netinst and BD. "
 "Both images can also be booted from USB sticks."
 msgstr ""
-"Attualmente ci sono due tipi di supporti di installazione: installazione da "
-"rete (CD netinstall) e flash drive (BD) Entrambe le immagini possono essere "
-"avviate anche da penna USB. "
+"Attualmente ci sono due tipi di supporti di installazione: netinst and BD. "
+"Entrambe le immagini possono essere avviate anche da penna USB. "
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1523,21 +1515,18 @@
 "Buster"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "These images are still under development - check <ulink url=\"https://"
-#| "wiki.debian.org/DebianEdu/Status/Buster\"/>"
 msgid ""
 "All the Buster images are still under development - check <ulink url="
 "\"https://wiki.debian.org/DebianEdu/Status/Buster\"/> if you are unsure "
 "whether Buster has officially been released."
 msgstr ""
-"Queste immagini sono ancora in fase di sviluppo - controllare <ulink url="
-"\"https://wiki.debian.org/DebianEdu/Status/Buster\"/>"
+"Tutte le immagini Buster sono ancora in fase di sviluppo - controllare "
+"<ulink url=\"https://wiki.debian.org/DebianEdu/Status/Buster\"/> se non si è "
+"sicuri che Buster sia stato ufficialmente rilasciato."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "amd64 or i386"
-msgstr ""
+msgstr "amd64 o i386"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1550,107 +1539,104 @@
 "computeroutput>. <computeroutput>i386</computeroutput> should only be used "
 "for old hardware."
 msgstr ""
+"<computeroutput>amd64</computeroutput> e <computeroutput>i386</"
+"computeroutput> sono i nomi delle due architetture Debian per CPU x86, "
+"entrambe sono o sono state costruite per AMD, Intel e altri produttori.  "
+"<computeroutput>amd64</computeroutput> è un'architettura a 64-bit e "
+"<computeroutput>i386</computeroutput> is un'architettura a 32-bit. "
+"Attualmente le installazioni andrebbero eseguite usando "
+"<computeroutput>amd64</computeroutput>. <computeroutput>i386</"
+"computeroutput> dovrebbe essere usato solo per il vecchio hardware."
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "netinstall CD images for amd64 or i386"
 msgid "netinst iso images for amd64 or i386"
-msgstr "immagine del CD netinstall per amd64 o i386"
+msgstr "immagine iso netinst per amd64 o i386"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The netinstall CD, which also can be used for installation from USB flash "
-#| "drives, is suitable to install amd64 or i386 machines. As the name "
-#| "implies, internet access is required for the installation. They are "
-#| "available via"
 msgid ""
 "The netinst iso image can be used for installation from CD/DVD and USB flash "
 "drives and is available for two Debian architectures: amd64 or i386. As the "
 "name implies, internet access is required for the installation."
 msgstr ""
-"Il CD netinstall, utilizzato anche per l'installazione da unità flash USB, "
-"può essere usato per l'installazione su macchine amd64 e i386 . Come "
-"suggerisce il nome, per l'installazione è necessario l'accesso a internet. "
-"Si può scaricare da:"
+"L'immagine iso netinst può essere usata per l'installazione da CD/DVD e "
+"unità flash USB ed è disponibile per due architetture Debian: amd64 o i386. "
+"Come suggerisce il nome, per l'installazione è richiesto l'accesso a "
+"Internet."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Once Buster has been released these images will be available for download "
 "from:"
 msgstr ""
+"Una volta che Buster è stato rilasciato queste immagini saranno disponibili "
+"per il download:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-cd/\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
+msgstr ""
+"<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-cd/\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-cd/\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
+msgstr ""
+"<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-cd/\"/>"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "USB drive ISO images for i386 or amd64"
 msgid "BD iso images for i386 or amd64"
-msgstr "immagine ISO su USB drive per i386 e amd64"
+msgstr "Immagini iso BD per i386 o amd64"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The ISO image is 5.5 GiB large and can be used for installation of amd64 "
-#| "or i386 machines, also without access to the Internet. Like the "
-#| "netinstall image it can be installed on USB flash drives or disk media of "
-#| "sufficient size. Like the others it can be downloaded over HTTP or rsync "
-#| "via:"
 msgid ""
 "This ISO image is approximately 5 GB large and can be used for installation "
 "of amd64 or i386 machines, also without access to the Internet. Like the "
 "netinst image it can be installed on USB flash drives or disk media of "
 "sufficient size."
 msgstr ""
-"L'immagine ISO è grande 5,5 GiB e può essere usata per l'installazione di "
-"macchine amd64 o i386 senza la connessione a internet. Come l'immagine "
-"netinstall può essere installata su un drive USB o su un disco di grandezza "
-"sufficiente. Come gli altri si può scaricare tramite FTP, HTTP o rsync:"
+"L'immagine ISO è grande circa 5 GB e può essere usata per l'installazione di "
+"macchine amd64 o i386 anche senza la connessione a internet. Come l'immagine "
+"netinst può essere installata su un drive USB o su un disco di grandezza "
+"sufficiente."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-bd/\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
+msgstr ""
+"<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-bd/\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-bd/\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
+msgstr ""
+"<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-bd/\"/>"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr "Verifica dei file immagine scaricati"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+"Istruzioni dettagliate per la verifica di queste immagini sono parte di "
+"<ulink url=\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD "
+"FAQ</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr "Sorgenti:"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Sources are available from the Debian archive, see <ulink url=\"http://"
-#| "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
-#| "options."
 msgid ""
 "Sources are available from the Debian archive at the usual locations, "
 "several media are linked on <ulink url=\"http://get.debian.org/cdimage/"
 "release/current/source/\"/>"
 msgstr ""
-"I sorgenti sono disponibili negli archivi Debian, consultare <ulink url="
-"\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> per altre "
-"opzioni di download."
+"I sorgenti sono disponibili negli archivi Debian nelle consuete posizioni, "
+"più supporti sono disponibili su <ulink url=\"http://get.debian.org/cdimage/"
+"release/current/source/\"/>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD / DVD by mail"
@@ -1810,10 +1796,8 @@
 msgstr "Offline (senza collegamento Internet):"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Use the USB ISO image."
 msgid "Use the BD ISO image."
-msgstr "Utilizzare l'immagine ISO USB."
+msgstr "Utilizzare l'immagine iso BD."
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Make sure all (real/virtual) network cables are unplugged."
@@ -3298,16 +3282,6 @@
 msgstr "Gestione degli utenti con GOsa²"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "First, click on \"Users\" in the left navigation menu. The right side of "
-#| "the screen will change to show a table with department folders for "
-#| "\"Students\" and \"Teachers\" and the account of the GOsa² Super-"
-#| "Administrator (the first created user). Above this table you can see a "
-#| "field called <emphasis>Base</emphasis> that allows you to navigate "
-#| "through your tree structure (move your mouse over that area and a drop-"
-#| "down menu will appear) and to select a base folder for your intended "
-#| "operations (e.g. adding a new user)."
 msgid ""
 "First, click on \"Users\" in the left navigation menu. The right side of the "
 "screen will change to show a table with department folders for \"Students\" "
@@ -3319,12 +3293,12 @@
 msgstr ""
 "Per prima cosa si clicca su \"Users\" nel menu di navigazione a sinistra. La "
 "parte destra dello schermo cambia e si vede una tabella con le cartelle dei "
-"dipartimenti \"Students\" e \"Teachers\" e l'account di Super-Amministratore "
-"di Gosa². Sopra questa tabella c'è un campo chiamato <emphasis>Base</"
-"emphasis> che permette di navigare attraverso la struttura ad albero "
-"(occorre spostare il mouse su quella zona e appare un menu a discesa) e "
-"selezionare una cartella di base per le operazioni che si intendono fare (ad "
-"esempio aggiungere un nuovo utente)."
+"dipartimenti \"Students\" e \"Teachers\" e l'account di Amministratore di "
+"Gosa² (il primo utente creato). Sopra questa tabella c'è un campo chiamato "
+"<emphasis>Base</emphasis> che permette di navigare attraverso la struttura "
+"ad albero (occorre spostare il mouse su quella zona e appare un menu a "
+"discesa) e selezionare una cartella di base per le operazioni che si "
+"intendono fare (ad esempio aggiungere un nuovo utente)."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Adding users"
@@ -4353,13 +4327,6 @@
 "computeroutput>."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Automatic installation of updates can be done easily if desired, it just "
-#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
-#| "be configured as described on <ulink url=\"https://wiki.debian.org/"
-#| "UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
-#| "installations security updates are enabled by default."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
@@ -4367,19 +4334,12 @@
 "org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 msgstr ""
 "L'installazione automatica degli aggiornamenti può essere eseguita "
-"facilmente con l'installazione del pacchetto <computeroutput>unattended-"
-"upgrades</computeroutput>, configurato come descritto in <ulink url="
-"\"https://wiki.debian.org/UnattendedUpgrades\">wiki.debian.org/"
-"UnattendedUpgrades</ulink>. Su una nuova installazione gli aggiornamenti di "
-"sicurezza sono abilitati di default."
+"facilmente se lo si desidera. Si ha solo bisogno del pacchetto "
+"<computeroutput>unattended-upgrades</computeroutput>, installato e "
+"configurato come descritto in <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
-#| "entries to you via email, or alternativly display them in the terminal "
-#| "when running <computeroutput>aptitude</computeroutput> or "
-#| "<computeroutput>apt-get</computeroutput>."
 msgid ""
 "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
 "entries to you via email, or alternatively display them in the terminal when "
@@ -4388,7 +4348,7 @@
 msgstr ""
 "<computeroutput>apt-listchanges</computeroutput> può inviare via posta "
 "elettronica le nuove voci nel file changelog, o in alternativa le mostra nel "
-"terminale quando si esegue <computeroutput>aptitude</computeroutput> o "
+"terminale quando si esegue <computeroutput>apt</computeroutput> o "
 "<computeroutput>apt-get</computeroutput>."
 
 #. type: Content of: <article><section><section><section><title>
@@ -5054,31 +5014,16 @@
 "apt full-upgrade"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-#| "return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-#| "the GOsa² information is wrong (due to Debian bug <ulink url=\"https://"
-#| "bugs.debian.org/918578#\">918578</ulink>), see below how to adjust the "
-#| "password encryption properly. All information will be mailed to root so "
-#| "that you can read it again (using <emphasis>mailx</emphasis> or "
-#| "<emphasis>mutt</emphasis>)."
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
 "apt-list-changes: essere pronti a leggere un sacco di notizie; premere &lt;"
 "return&gt; per scorrere verso il basso, &lt;q&gt; per lasciare la pagina. "
-"Notare che l'informazione su GOsa² è errata (a causa del bug Debian <ulink "
-"url=\"https://bugs.debian.org/918578#\">918578</ulink>), vedere sotto come "
-"regolare correttamente la crittografia della password. Tutte le informazioni "
-"saranno mandata per posta a root in modo  da poterle rileggere (usando "
-"<emphasis>mailx</emphasis> o <emphasis>mutt</emphasis>)."
+"Tutte le informazioni saranno mandata per posta a root in modo  da poterle "
+"rileggere (usando <emphasis>mailx</emphasis> o <emphasis>mutt</emphasis>)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5831,7 +5776,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 "Per crearne uno per un sistema già configurato con GOsa², effettuare il "
@@ -5964,15 +5909,7 @@
 "collegarsi usando:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "host: ldap.intern\n"
-#| "port:636\n"
-#| "Base dn:dc=skole,dc=skolelinux,dc=no \n"
-#| "Security level: ssl + user + password\n"
-#| "User dn: cn=admin,ou=ldap-access\n"
-#| "\n"
-#| "Click \"This session only\" if asked for the certificate."
+#, no-wrap
 msgid ""
 "host: ldap.intern\n"
 "port: 636\n"
@@ -5980,12 +5917,9 @@
 "User dn: cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no"
 msgstr ""
 "host: ldap.intern\n"
-"port:636\n"
-"Base dn:dc=skole,dc=skolelinux,dc=no \n"
+"port: 636\n"
 "Security level: ssl + user + password\n"
-"User dn: cn=admin,ou=ldap-access\n"
-"\n"
-"Fare clic su \"This session only\" se viene chiesto circa il certificato."
+"User dn: cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no"
 
 #. type: Content of: <article><section><section><title>
 msgid "ldap-createuser-krb, a command-line tool"
@@ -6108,21 +6042,17 @@
 "supporto fisico, bisogna procedere come segue:"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use "
-#| "the apt-cdrom command:"
 msgid ""
 "Insert the CD / DVD / Blu-ray disc / USB flash drive and use the apt-cdrom "
 "command:"
 msgstr ""
-"Inserire il CD/ DVD / Blu-ray disc / drive flash USB, montarlo e usare il "
-"comando apt-cdrom:"
+"Inserire il CD/ DVD / Blu-ray disc / drive flash USB e usare il comando apt-"
+"cdrom:"
 
 #. type: CDATA
 #, no-wrap
 msgid "apt-cdrom add"
-msgstr ""
+msgstr "aggiungere apt-cdrom"
 
 #. type: Content of: <article><section><section><para>
 msgid "To quote the apt-cdrom(8) man page:"
@@ -6184,15 +6114,6 @@
 msgstr "Installazione automatica degli aggiornamenti di sicurezza"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
-#| "which will install security (and other) upgrades automatically. The "
-#| "package is installed by default and preconfigured to install security "
-#| "upgrades. The logs are available in <computeroutput>/var/log/unattended-"
-#| "upgrades/</computeroutput>; also, there are always <computeroutput>/var/"
-#| "log/dpkg.log</computeroutput> and <computeroutput>/var/log/apt/</"
-#| "computeroutput>."
 msgid ""
 "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
 "which will install security (and other) upgrades automatically. If "
@@ -6202,12 +6123,11 @@
 "computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
 msgstr ""
 "<computeroutput>unattended-upgrades</computeroutput> è un pacchetto Debian "
-"che installerà aggiornamenti di sicurezza (e altro) automaticamente. Il "
-"pacchetto è installato di default e preconfigurato per installare "
-"aggiornamenti di sicurezza. I log sono disponibili in <computeroutput>/var/"
-"log/unattended-upgrades/</computeroutput>; inoltre, ci sono sempre "
-"<computeroutput>/var/log/dpkg.log</computeroutput> e <computeroutput>/var/"
-"log/apt/</computeroutput>."
+"che installerà aggiornamenti di sicurezza (e altro) automaticamente. Se "
+"installato, il pacchetto è preconfigurato per installare aggiornamenti di "
+"sicurezza. I log sono disponibili in <computeroutput>/var/log/unattended-"
+"upgrades/</computeroutput>; inoltre, ci sono sempre <computeroutput>/var/log/"
+"dpkg.log</computeroutput> e <computeroutput>/var/log/apt/</computeroutput>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic shutdown of machines during the night"
@@ -7135,7 +7055,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -7143,11 +7063,11 @@
 "computeroutput> to get the stock Lightdm greeter."
 msgstr ""
 "Gli utenti potranno quindi scegliere la lingua tramite il display manager di "
-"Lightdm prima di effettuare il login; questo vale per Xfce, LXDE e LXQt. "
+"LightDM prima di effettuare il login; questo vale per Xfce, LXDE e LXQt. "
 "GNOME e KDE hanno i loro strumenti interni di configurazione della regione e "
 "della lingua, si consiglia di usarli. MATE usa il greeter Arctica senza un "
 "selezionatore di lingua. Eseguire <computeroutput>apt purge arctica-greeter</"
-"computeroutput> per avere Lightdm greeter."
+"computeroutput> per avere LightDM greeter."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7738,15 +7658,11 @@
 "aggiuntivo su disco in /opt sarebbero necessari."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
-#| "create chroot and NBD image."
 msgid ""
 "Run <computeroutput>ltsp-build-client --arch i386</computeroutput> to create "
 "chroot and NBD image."
 msgstr ""
-"Eseguire <computeroutput>ltsp-build-client --arch amd64</computeroutput> per "
+"Eseguire <computeroutput>ltsp-build-client --arch i386</computeroutput> per "
 "creare la chroot e l'immagine NBD."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8522,32 +8438,25 @@
 "installs the <emphasis>xrdp</emphasis> and <emphasis>x2goserver</emphasis> "
 "packages."
 msgstr ""
+"Scegliendo il profilo server LTSP o il profilo server combinato si "
+"installano anche i pacchetti <emphasis>xrdp</emphasis> e "
+"<emphasis>x2goserver</emphasis>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Xrdp"
-msgstr ""
+msgstr "Xrdp"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Choosing the LTSP server profile or the combined server profile also "
-#| "installs xrdp, a package which uses the Remote Desktop Protocol to "
-#| "present a graphical login to a remote client. Microsoft Windows users can "
-#| "connect to the LTSP server running xrdp without installing additional "
-#| "software - they simply start a Remote Desktop Connection on their Windows "
-#| "machine and connect."
 msgid ""
 "Xrdp uses the Remote Desktop Protocol to present a graphical login to a "
 "remote client. Microsoft Windows users can connect to the LTSP server "
 "running xrdp without installing additional software - they simply start a "
 "Remote Desktop Connection on their Windows machine and connect."
 msgstr ""
-"Se si sceglie il profilo server LTSP o il profilo server combinato, viene "
-"installato xrdp, un pacchetto che usa il protocollo Remote Desktop per "
-"presentare un login grafico per un client remoto. Gli utenti di Microsoft "
-"Windows si possono connettere al server LTSP eseguendo xrdp senza installare "
-"software aggiuntivo: semplicemente avviando una Remote-Desktop-Connection "
-"sulla macchina Windows e connettendosi."
+"Xrdp usa il protocollo Remote Desktop per presentare un login grafico per un "
+"client remoto. Gli utenti di Microsoft Windows si possono connettere al "
+"server LTSP eseguendo xrdp senza installare software aggiuntivo - possono "
+"avviare una Remote-Desktop-Connection sulla macchina Windows e connettersi."
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Additionally, xrdp can connect to a VNC server or another RDP server."
@@ -8646,31 +8555,31 @@
 
 #. type: Content of: <article><section><section><section><title>
 msgid "X2Go"
-msgstr ""
+msgstr "X2Go"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
-msgstr ""
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
+msgstr ""
+"X2Go consente di accedere a un desktop grafico sul server LTSP sia su "
+"connessioni a bassa che ad alta banda da un PC con Linux, Windows o macOS. È "
+"necessario un software aggiuntivo dal lato client, vedere <ulink url="
+"\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient\">X2Go wiki</"
+"ulink> per maggiori informazioni."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Remove diversion; the postinst from <computeroutput>debian-edu-config</"
-#| "computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
-#| "bugs.debian.org/779641#\">779641</ulink>)."
 msgid ""
 "Please note that the <computeroutput>killer</computeroutput> package should "
 "best be removed on the LTSP server if X2Go is used, see <ulink url=\"https://"
 "bugs.debian.org/890517#\">890517</ulink>."
 msgstr ""
-"Rimuovere diversione; postinst da <computeroutput>debian-edu-config</"
-"computeroutput> sembra funzionare troppo lentamente (Debian bug <ulink url="
-"\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Si prega di notare che il pacchetto <computeroutput>killer</computeroutput> "
+"sarebbe meglio rimuoverlo sul server LTSP, se si utilizza X2Go, vedere "
+"<ulink url=\"https://bugs.debian.org/890517#\">890517</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Available Remote Desktop clients"
@@ -8706,8 +8615,11 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
+"<computeroutput>x2goclient</computeroutput> è un client grafico per il "
+"sistema X2Go (non installato di default). Si può usare per connettersi alle "
+"sessioni in esecuzione e iniziare nuove sessioni."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9487,6 +9399,9 @@
 "<ulink url=\"https://cdimage.debian.org\"/>, thus these are official Debian "
 "images."
 msgstr ""
+"Questa è la prima volta che le immagini di installazione di Debian Edu sono "
+"disponibili su <ulink url=\"https://cdimage.debian.org\"/>, queste sono "
+"quindi immagini ufficiali di Debian."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9550,10 +9465,8 @@
 "0.53, MATE 1.20"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Firefox 60.4 ESR and Chromium 72.0"
 msgid "Firefox 60.5 ESR and Chromium 72.0"
-msgstr "Firefox 60.4 ESR and Chromium 72.0"
+msgstr "Firefox 60.5 ESR e Chromium 72.0"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LibreOffice 6.1"
@@ -9619,27 +9532,21 @@
 "danese, olandese, norvegese, Bokmål  e giapponese."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Partly translated versions exist for French, Polish, Spanish, Simplified "
-#| "Chinese and Ukranian."
 msgid ""
 "Partly translated versions exist for French, Polish, Spanish, Simplified "
 "Chinese and Traditional Chinese."
 msgstr ""
 "Ci sono versioni parzialmente tradotte in francese, polacco, spagnolo, "
-"cinese semplificato e ucraino."
+"cinese semplificato e cinese tradizionale."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Other changes compared to the previous release"
 msgstr "Altre modifiche rispetto alla versione precedente"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "The USB ISO image can be used for offline installations again."
 msgid "The BD ISO image can be used for offline installations again."
 msgstr ""
-"L'immagine ISO USB può essere utilizzata di nuovo per installazioni offline."
+"L'immagine ISO BD può essere utilizzata di nuovo per installazioni offline."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9786,12 +9693,12 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
 "Nuovo strumento <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-"
-"from-scratch</computeroutput>. Permette di rigenerare il data base LDAP come "
+"from-scratch</computeroutput>. Permette di rigenerare il database LDAP come "
 "dopo l'installazione del server principale. Lo strumento potrebbe anche "
 "essere utile per rendere più facili modifiche specifiche del sito."
 
@@ -9814,17 +9721,10 @@
 "eliminato."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Support for nonfree flash has been dropped from the Firefox ESR browser. "
-#| "We have also decided to drop the free but unmaintained gnash "
-#| "implementation."
 msgid ""
 "Support for nonfree flash has been dropped from the Firefox ESR browser."
 msgstr ""
-"Il supporto per flash non libero è stato eliminato dal browser Firefox ESR. "
-"Abbiamo anche deciso di abbandonare l'implementazione libera ma non "
-"mantenuta di gnash ."
+"Il supporto per flash non libero è stato eliminato dal browser Firefox ESR."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9833,6 +9733,10 @@
 "the <link linkend=\"Maintenance--Updating_the_software\">Maintenance</link> "
 "chapter for more information about security upgrades."
 msgstr ""
+"Come è già accaduto prima di Stretch, Debian 10 non installa di default il "
+"pacchetto <computeroutput>unattended-upgrades</computeroutput>, vedere il "
+"capitolo <link linkend=\"Maintenance--Updating_the_software\">Maintenance</"
+"link> per maggiori informazioni sugli aggiornamenti di sicurezza."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
@@ -9997,20 +9901,22 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "La traduzione in polacco  è protetta da copyright da Stanisław Krukowski "
-"(2016, 2017) e rilasciata sotto licenza GPL v2 o successiva."
+"(2016, 2017) e Wiktor Wandachowicz (2019) e rilasciata sotto licenza GPL v2 "
+"o successiva."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 "La traduzione in cinese semplificato  è protetta da copyright di Ma Yong "
-"(2016, 2017, 2018), Boyuan Yang (2017) e Roy Zhang (2017), rilasciata sotto "
-"licenza GPL v2 o successiva."
+"(2016, 2017, 2018, 2019), Boyuan Yang (2017) e Roy Zhang (2017), rilasciata "
+"sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -11645,10 +11551,12 @@
 
 #~ msgid ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 #~ msgstr ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 
 #~ msgid "To set the default desktop environment, run:"
 #~ msgstr "Per impostare l'ambiente desktop predefinito, eseguire:"
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po	2019-05-01 12:19:14.000000000 +0200
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
 "PO-Revision-Date: 2017-10-09 05:36+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -24,7 +24,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux Stretch 9+edu0 マニュアル"
 
 #. type: Content of: <article><section><section><title>
@@ -1700,6 +1700,16 @@
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr "ソース"
 
@@ -5246,15 +5256,19 @@
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
+#| "return&gt; to scroll down, &lt;q&gt; to leave the pager."
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
-msgstr ""
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
+msgstr ""
+"apt-list-changes: 読むべき NEWS が大量にあることを覚悟してください。ペー"
+"ジャーのスクロールを進めるには &lt;enter&gt; を、終了させるには &lt;q&gt; を"
+"押します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -6004,7 +6018,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 
@@ -7267,7 +7281,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -8796,9 +8810,9 @@
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8841,7 +8855,7 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9927,7 +9941,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -10078,14 +10092,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -11686,13 +11701,16 @@
 #, fuzzy
 #~| msgid ""
 #~| "apt update\n"
-#~| " apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
+#~| " apt install education-desktop-gnome education-desktop-lxde education-"
+#~| "desktop-xfce education-desktop-mate"
 #~ msgid ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 #~ msgstr ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-lxde education-"
+#~ "desktop-xfce education-desktop-mate"
 
 #, fuzzy
 #~| msgid "new optional desktop environment: MATE 1.8"
@@ -11885,14 +11903,6 @@
 #~ "持し、<computeroutput>apt</computeroutput> は (インストール成功後に) "
 #~ "キャッシュを削除します。"
 
-#~ msgid ""
-#~ "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-#~ "return&gt; to scroll down, &lt;q&gt; to leave the pager."
-#~ msgstr ""
-#~ "apt-list-changes: 読むべき NEWS が大量にあることを覚悟してください。ペー"
-#~ "ジャーのスクロールを進めるには &lt;enter&gt; を、終了させるには &lt;q&gt; "
-#~ "を押します。"
-
 #~ msgid "You will see some prompts about package configurations:"
 #~ msgstr "パッケージ設定についていくらか聞いてくるものがあります:"
 
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po	2019-05-01 12:19:14.000000000 +0200
@@ -21,8 +21,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
-"PO-Revision-Date: 2019-02-26 10:17+0000\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
+"PO-Revision-Date: 2019-04-30 14:55+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
 "edu-documentation/debian-edu-buster/nb_NO/>\n"
@@ -31,7 +31,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.5-dev\n"
+"X-Generator: Weblate 3.6.1\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
@@ -39,8 +39,7 @@
 
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
-#| msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-01-20"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux Buster 10+edu0 Utgivelseshåndbok 20.01.2019"
 
 #. type: Content of: <article><section><section><title>
@@ -935,10 +934,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Currently there are two kinds of installation media images: netinstall "
-#| "(CD)  and multi-arch USB flash drive. Both images can also be booted from "
-#| "USB sticks."
 msgid ""
 "Currently there are two kinds of installation media images: netinst and BD. "
 "Both images can also be booted from USB sticks."
@@ -1522,9 +1517,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "These images are still under development - check <ulink url=\"https://"
-#| "wiki.debian.org/DebianEdu/Status/Buster\"/>"
 msgid ""
 "All the Buster images are still under development - check <ulink url="
 "\"https://wiki.debian.org/DebianEdu/Status/Buster\"/> if you are unsure "
@@ -1534,8 +1526,9 @@
 "wiki.debian.org/DebianEdu/Status/Buster\"/>"
 
 #. type: Content of: <article><section><section><section><title>
+#, fuzzy
 msgid "amd64 or i386"
-msgstr ""
+msgstr "amd64 eller i386"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1551,17 +1544,11 @@
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "netinstall CD images for amd64 or i386"
 msgid "netinst iso images for amd64 or i386"
 msgstr "netinstall (CD) avtrykk for amd64 eller i386"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The netinstall CD, which also can be used for installation from USB flash "
-#| "drives, is suitable to install amd64 or i386 machines. As the name "
-#| "implies, internet access is required for the installation. They are "
-#| "available via"
 msgid ""
 "The netinst iso image can be used for installation from CD/DVD and USB flash "
 "drives and is available for two Debian architectures: amd64 or i386. As the "
@@ -1577,35 +1564,27 @@
 "Once Buster has been released these images will be available for download "
 "from:"
 msgstr ""
+"Når Buster har blitt sluppet vil disse avtrykkene kunne lastes ned fra:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-cd/\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-cd/\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "USB drive ISO images for i386 or amd64"
 msgid "BD iso images for i386 or amd64"
 msgstr "ISO-avtrykk til USB-lagringsenhet for i386 eller amd64"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The ISO image is 5.5 GiB large and can be used for installation of amd64 "
-#| "or i386 machines, also without access to the Internet. Like the "
-#| "netinstall image it can be installed on USB flash drives or disk media of "
-#| "sufficient size. Like the others it can be downloaded over HTTP or rsync "
-#| "via:"
 msgid ""
 "This ISO image is approximately 5 GB large and can be used for installation "
 "of amd64 or i386 machines, also without access to the Internet. Like the "
@@ -1620,27 +1599,35 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-bd/\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-bd/\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr "Bekreftelse av nedlastede avtrykksfiler"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+"Detaljert instruks for bekreftelse av disse avtrykkene er å finne i <ulink "
+"url=\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD O-S-S</"
+"ulink>."
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr "Kildekode"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Sources are available from the Debian archive, see <ulink url=\"http://"
-#| "ftp.debian.org/debian-cd/8.0.0/source/\"/> for some download options."
 msgid ""
 "Sources are available from the Debian archive at the usual locations, "
 "several media are linked on <ulink url=\"http://get.debian.org/cdimage/"
@@ -1802,7 +1789,6 @@
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Use the USB ISO image."
 msgid "Use the BD ISO image."
 msgstr "Bruk USB ISO-avbildningen."
 
@@ -1973,7 +1959,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/Installer_advanced_options_b.png"
 msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "./images/Installer_advanced_options_b.png"
 
@@ -2074,7 +2059,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/01-Installer_64bit_boot_menu.png"
 msgid "./images/01b-Installer_64bit_command_line.png"
 msgstr "./images/01-Installer_64bit_boot_menu.png"
 
@@ -2084,11 +2068,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "You can use an existing HTTP proxy service on the network to speed up the "
-#| "installation of the main server profile from CD. Add e.g. "
-#| "<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> "
-#| "as an additional boot parameter."
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add e.g. "
@@ -2330,11 +2309,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Please say \"yes\" to submitting information to <ulink url=\"http://"
-#| "popcon.skolelinux.org/\"/> to allow us to know which packages are popular "
-#| "and should be kept for future releases.  Although you don't have to, it "
-#| "is a simple way for you to help."
 msgid ""
 "Please say \"yes\" to submitting information to <ulink url=\"https://popcon."
 "debian.org/\"/> to allow us to know which packages are popular and should be "
@@ -2408,7 +2382,6 @@
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgid "A note on USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "En merknad om USB-minnepinne- / Blu-ray-installasjon med flerarkitektur-"
@@ -2416,12 +2389,6 @@
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "After you install from the multi-arch USB flash drive / Blu-ray disc "
-#| "image, <computeroutput>/etc/apt/sources.list</computeroutput> will only "
-#| "contain sources from that image. If you have an Internet connection, we "
-#| "strongly suggest adding the following lines to it so that available "
-#| "security updates can be installed:"
 msgid ""
 "After you install from the USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
@@ -2437,9 +2404,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://ftp.debian.org/debian/ buster main \n"
-#| "deb http://security.debian.org/ buster/updates main"
 msgid ""
 "deb http://deb.debian.org/debian/ buster main \n"
 "deb http://security.debian.org/ buster/updates main"
@@ -2525,9 +2489,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>sudo dd if=debian-edu-amd64-i386-XXX.iso of=/dev/sdX "
-#| "bs=1024</computeroutput>"
 msgid ""
 "<computeroutput>sudo dd if=debian-edu-amd64-XXX.iso of=/dev/sdX bs=1024</"
 "computeroutput>"
@@ -2578,7 +2539,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "./images/30-Main-Server-GRUB_Boot_menu-PXE.png"
 msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
@@ -2867,7 +2827,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/12a-Set_up_users_and_passwords.png"
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
@@ -2913,7 +2872,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "{{attachment:13-Install the base system.png}}"
 msgid "13-Install the base system.png"
 msgstr "{{attachment:13-Install the base system.png}}"
 
@@ -2971,37 +2929,31 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "tjener KDM Login"
 msgid "tjener Lightdm Login"
 msgstr "KDM-innlogging på tjener"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgid "./images/26-Tjener-Xfce_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "KDE and Browser"
 msgid "Xfce and Browser"
 msgstr "KDE og nettleser"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/27-Tjener-KDE_Desktop.png"
 msgid "./images/27-Tjener-Xfce_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "KDE Desktop"
 msgid "Xfce Desktop"
 msgstr "KDE-skrivebord"
 
@@ -3123,7 +3075,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Debian Edu KDE desktop"
 msgid "Debian Edu Xfce desktop"
 msgstr "Debian Edu KDE skrivebord"
 
@@ -3323,15 +3274,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "First, click on \"Users\" in the left navigation menu. The right side of "
-#| "the screen will change to show a table with department folders for "
-#| "\"Students\" and \"Teachers\" and the account of the GOsa² Super-"
-#| "Administrator (the first created user). Above this table you can see a "
-#| "field called <emphasis>Base</emphasis> that allows you to navigate "
-#| "through your tree structure (move your mouse over that area and a drop-"
-#| "down menu will appear) and to select a base folder for your intended "
-#| "operations (e.g. adding a new user)."
 msgid ""
 "First, click on \"Users\" in the left navigation menu. The right side of the "
 "screen will change to show a table with department folders for \"Students\" "
@@ -4186,12 +4128,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Configure the printer using the web interface <computeroutput>https://"
-#| "www:631</computeroutput> on the main server; choose network printer type "
-#| "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
-#| "regardless of brand or model) and set <computeroutput>socket://&lt;LTSP "
-#| "client ip&gt;:9100</computeroutput> as connection URI."
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://www."
 "intern:631</computeroutput>; choose network printer type "
@@ -4301,12 +4237,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "As Debian Edu uses libpam-tmpdir, setting a per user TMP directory, it is "
-#| "a good idea to run apt-get without the TMP and TMPDIR variables set in "
-#| "the LTSP chroot.  It is also a good idea to upgrade using the C locale to "
-#| "get known output and sorting order, even though that making a difference "
-#| "is a bug in a package."
 msgid ""
 "It is also a good idea to upgrade using the C locale to get English output "
 "which in cases of problems is more likely to produce results in search "
@@ -4320,12 +4250,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "LC_ALL=C apt-get update ; LC_ALL=C TMP= TMPDIR= ltsp-chroot apt-get update\n"
-#| "LC_ALL=C apt-get upgrade -y\n"
-#| "LC_ALL=C TMP= TMPDIR= ltsp-chroot -p apt-get upgrade -y\n"
-#| "ltsp-update-kernels # If a new kernel was installed\n"
-#| "ltsp-update-image"
 msgid ""
 "LC_ALL=C apt-get update ; LC_ALL=C ltsp-chroot apt-get update\n"
 "LC_ALL=C apt-get upgrade -y\n"
@@ -4385,12 +4309,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Automatic installation of updates can be done easily if desired, it just "
-#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
-#| "be configured as described on <ulink url=\"https://wiki.debian.org/"
-#| "UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
-#| "installations security updates are enabled by default."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
@@ -4406,11 +4324,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
-#| "entries to you via email, or alternativly display them in the terminal "
-#| "when running <computeroutput>aptitude</computeroutput> or "
-#| "<computeroutput>apt-get</computeroutput>."
 msgid ""
 "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
 "entries to you via email, or alternatively display them in the terminal when "
@@ -4989,12 +4902,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Please note that the following recipe applies to a default Debian Edu "
-#| "main server installation (desktop=kde, profiles Main Server, Workstation, "
-#| "LTSP Server). (For a general overview concerning stretch to buster "
-#| "upgrade, see: <ulink url=\"https://www.debian.org/releases/buster/"
-#| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
 "server installation (desktop=xfce, profiles Main Server, Workstation, LTSP "
@@ -5044,7 +4951,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid "apt-get clean"
 msgid "apt clean"
 msgstr "apt-get clean"
 
@@ -5055,6 +4961,10 @@
 "See the related <link linkend=\"Administration--Resizing_Partitions\">manual "
 "chapter</link> for more information."
 msgstr ""
+"Forsikre deg om at du har nok lagringsplass. På både <emphasis>/usr</"
+"emphasis> og <emphasis>/var</emphasis> omlag 5 GiB ledig plass trengs "
+"midlertidig. Det relaterte <link linkend=\"Administration--"
+"Resizing_Partitions\">manuelle kapittelet</link> har mer informasjon."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Buster:"
@@ -5071,17 +4981,29 @@
 "apt install apache2    # needed first to avoid additional work later on\n"
 "apt full-upgrade"
 msgstr ""
+"sed -i 's/stretch/buster/g' /etc/apt/sources.list\n"
+"export LC_ALL=C        # valgfritt (for å få Engelsk utdata)\n"
+"apt update\n"
+"apt purge atftpd       # trengs fordi tftpd vil bli intsallert\n"
+"apt install libcurl4   # trengs for å erstatte libcurl3\n"
+"apt install apache2    # trengs innledende for å unngå ytterligere arbeid senere\n"
+"apt full-upgrade"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
-msgstr ""
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
+msgstr ""
+"apt-list-changes: Vær forberedt på mange NYHETER (NEWS) å lese; trykk &lt;"
+"return&gt; for å rulle nedover, &lt;q&gt; for å forlate sideinndeleren. Merk "
+"at GOsa²-informasjonen er feilaktig (som følge av en feil i Debian <ulink "
+"url=\"https://bugs.debian.org/918578#\">918578</ulink>), se nedenfor for å "
+"lære hvordan du justerer passordkryptering ordentlig. All info vil bli e-"
+"postet til root, slik at du kan lese det igjen (ved bruk av <emphasis>mailx</"
+"emphasis> eller <emphasis>mutt</emphasis>)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5095,23 +5017,26 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "restart services: Choose yes."
-msgstr ""
+msgstr "omstart av tjenester: Velg ja."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "ntp: Choose N."
-msgstr ""
+msgstr "ntp: Velg N."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
 msgid "smb"
-msgstr ""
+msgstr "smb"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
 msgid "dovecot"
-msgstr ""
+msgstr "dovecot"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
 msgid "grub"
-msgstr ""
+msgstr "grub"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Apply and adjust configuration:"
@@ -5119,7 +5044,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid "cfengine-debian-edu -D installation"
 msgid "cf-agent -I -D installation"
 msgstr "cfengine-debian-edu -D installation"
 
@@ -5134,26 +5058,29 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Enable otherwise broken PHP 7.0 support:"
 msgid "Enable PHP 7.3 support:"
 msgstr "Aktiver ellers ødelagt PHP 7.0-støtte:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
 "apt purge php7.0*\n"
 "a2enmod php7.3\n"
 "a2enconf php7.3-cgi\n"
 "service apache2 restart"
 msgstr ""
+"apt purge php7.0*\n"
+"a2enmod php7.3\n"
+"a2enconf php7.3-cgi\n"
+"service apache2 restart"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Adjust GOsa² access (changed encryption method):"
-msgstr ""
+msgstr "Juster GOsa²-tilgang (endret krypteringsmetode):"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "backup /etc/gosa/gosa.conf.orig"
-msgstr ""
+msgstr "sikkerhetskopier /etc/gosa/gosa.conf.orig"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -5162,20 +5089,22 @@
 "<emphasis>adminPassword</emphasis> and <emphasis>snapshotAdminPassword</"
 "emphasis>)"
 msgstr ""
+"erstatt det lange (sjekksummerte) passordet i /etc/gosa/gosa.conf, med det "
+"korte (tilfeldige) passordet fra /etc/gosa/gosa.conf.org (for både "
+"<emphasis>adminPassword</emphasis> og <emphasis>snapshotAdminPassword</"
+"emphasis>)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "remove /etc/gosa/gosa.secrets"
-msgstr ""
+msgstr "fjern /etc/gosa/gosa.secrets"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<computeroutput>git pull</computeroutput>"
 msgid "run <computeroutput>gosa-encrypt-passwords</computeroutput>"
 msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
 msgid "run <computeroutput>service apache2 reload</computeroutput>"
 msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>."
 
@@ -5185,9 +5114,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "apt purge linux-image-4.9.0-*\n"
-#| "apt purge linux-headers-4.9.0-*"
 msgid ""
 "apt purge linux-image-4.9.0-*\n"
 "apt purge linux-headers-4.9.0-*\n"
@@ -5235,9 +5161,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Do all the basic things like on the main-server and without doing the "
-#| "things not needed. And then do this in addition."
 msgid ""
 "Do all the basic things like on the main-server and without doing the things "
 "not needed."
@@ -5352,12 +5275,13 @@
 "information about options. The file <emphasis>/etc/ltsp/ltsp-build-client."
 "conf</emphasis> contains some useful (commented) options."
 msgstr ""
+"Se <computeroutput>ltsp-build-client --help</computeroutput> og "
+"<computeroutput>ltsp-build-client --extra-help</computeroutput> for mer info "
+"om tilgjengelige valg. Filen <emphasis>/etc/ltsp/ltsp-build-client.conf</"
+"emphasis> inneholder noen nyttige (kommenterte) valg."
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Here is one example used to activate the theme in the "
-#| "<computeroutput>desktop-base</computeroutput> package:"
 msgid ""
 "Recreate the chroot by running <computeroutput>ltsp-build-client</"
 "computeroutput> as root."
@@ -5807,7 +5731,7 @@
 
 #. type: Content of: <article><section><section><title>
 msgid "Kerberized NFS"
-msgstr ""
+msgstr "Kerberisert NFS"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5819,26 +5743,38 @@
 "server and workstation increases with the security level, <emphasis>krb5i</"
 "emphasis> might be a good choice."
 msgstr ""
+"Bruk av Kerberos for NFS for å montere hjemmemapper er en "
+"sikkerhetsfunksjon. Nivåene <emphasis>krb5</emphasis>, <emphasis>krb5i</"
+"emphasis> og <emphasis>krb5p</emphasis> støttes (<emphasis>krb5</emphasis> "
+"betyr Kerberos-identitetsbekreftelse, <emphasis>i</emphasis> står for "
+"integritetssjekk, og <emphasis>p</emphasis> for personvern, altså "
+"kryptering); last på tjeneren eller arbeidsstasjonen øker for hvert "
+"sikkerhetsnivå <emphasis>krb5i</emphasis> kan være et godt valg."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "For new systems added with GOsa², Kerberos host keytab files are generated "
 "automatically."
 msgstr ""
+"For nye systemer lagt til med GOsa², blir Kerberos-vertsnøkkelfiler generert "
+"automatisk."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
+"For å opprette et med GOsa², for et allerede oppsatt system, logg inn på "
+"hovedtjeneren som root, og kjør"
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
 msgid "/usr/share/debian-edu-config/tools/gosa-modify-host <hostname> <IP>"
 msgstr "/usr/share/debian-edu-config/tools/ltsp-addfirmware"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
 msgid ""
 "<emphasis role=\"strong\">Please note:</emphasis> host keytab creation is "
 "possible for systems of type <emphasis>workstations</emphasis>, "
@@ -5847,20 +5783,26 @@
 "<emphasis>sshfs</emphasis> to mount home directories, so there's nothing to "
 "do for diskless workstations."
 msgstr ""
+"<emphasis role=\"strong\">Merk:</emphasis> vertsnøkkelfilopprettelse er "
+"mulig for systemer av typen <emphasis>arbeidsstasjon</emphasis>, "
+"<emphasis>tjenere</emphasis> og <emphasis>terminaler</emphasis>, men ikke "
+"for <emphasis>nettenheter</emphasis>. I tillegg bruker LTSP-klienter "
+"<emphasis>sshfs</emphasis> for å montere hjemmemapper, slik at det ikke er "
+"noe å gjøre for diskløse arbeidsstasjoner."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "How to enable it"
-msgstr ""
+msgstr "Skru det på slik"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgid "<emphasis role=\"strong\">Main server</emphasis>"
 msgstr "<emphasis role=\"strong\">Hovedtjener</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid "login as root"
-msgstr ""
+msgstr "logg inn som root"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5868,23 +5810,30 @@
 "<emphasis>sec=sys</emphasis> and replace it with <emphasis>sec=krb5i</"
 "emphasis>"
 msgstr ""
+"kjør <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput>, søk etter "
+"<emphasis>sec=sys</emphasis> og erstatt det med <emphasis>sec=krb5i</"
+"emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "edit <computeroutput>/etc/exports</computeroutput>: uncomment/adjust/comment "
 "existing entries for /srv/*; make sure they look like this:"
 msgstr ""
+"rediger <computeroutput>/etc/exports</computeroutput>: Avkommenter/juster/"
+"kommenter eksisterende oppføringer for /srv/*; forsikre deg om at de ser "
+"slik ut:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
 "/srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt,no_subtree_check)\n"
 "/srv/nfs4/home0  gss/krb5i(rw,sync,no_subtree_check)"
 msgstr ""
+"/srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt,no_subtree_check)\n"
+"/srv/nfs4/home0  gss/krb5i(rw,sync,no_subtree_check)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<computeroutput>git pull</computeroutput>"
 msgid "run <computeroutput>exportfs -r</computeroutput>"
 msgstr "<computeroutput>git pull</computeroutput>"
 
@@ -5893,16 +5842,16 @@
 "run <computeroutput>exportfs</computeroutput> to control if <emphasis>gss/"
 "krb5i</emphasis> is active for both entries."
 msgstr ""
+"kjør <computeroutput>exportfs</computeroutput> for å kontrollere at "
+"<emphasis>gss/krb5i</emphasis> er aktivt for begge oppføringer."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid "login as root."
-msgstr ""
+msgstr "logg inn som root."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "and then run <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
-#| "computeroutput> once."
 msgid ""
 "run <computeroutput>/usr/share/debian-edu-config/tools/copy-host-keytab</"
 "computeroutput>"
@@ -5912,7 +5861,7 @@
 
 #. type: Content of: <article><section><section><title>
 msgid "Standardskriver"
-msgstr ""
+msgstr "Standardskriver"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5920,14 +5869,12 @@
 "or group membership. For more information, see <computeroutput>/usr/share/"
 "doc/standardskriver/README.md</computeroutput>."
 msgstr ""
+"Dette verktøyet tillater valg av forvalgt skriver, avhangig av plassering, "
+"maskin, eller gruppemedlemskap. For mer info, se <computeroutput>/usr/share/"
+"doc/standardskriver/README.md</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Icinga configuration file used is <computeroutput>/etc/icinga/"
-#| "sitesummary.cfg</computeroutput>.  The sitesummary cron job generates "
-#| "<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</"
-#| "computeroutput> with the list of hosts and services to monitor."
 msgid ""
 "The configuration file <computeroutput>/etc/standardskriver.cfg</"
 "computeroutput> has to be provided by the admin, see <computeroutput>/usr/"
@@ -5954,14 +5901,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "host: ldap.intern\n"
-#| "port:636\n"
-#| "Base dn:dc=skole,dc=skolelinux,dc=no \n"
-#| "Security level: ssl + user + password\n"
-#| "User dn: cn=admin,ou=ldap-access\n"
-#| "\n"
-#| "Click \"This session only\" if asked for the certificate."
 msgid ""
 "host: ldap.intern\n"
 "port: 636\n"
@@ -6098,9 +6037,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use "
-#| "the apt-cdrom command:"
 msgid ""
 "Insert the CD / DVD / Blu-ray disc / USB flash drive and use the apt-cdrom "
 "command:"
@@ -6111,7 +6047,7 @@
 #. type: CDATA
 #, no-wrap
 msgid "apt-cdrom add"
-msgstr ""
+msgstr "apt-cdrom add"
 
 #. type: Content of: <article><section><section><para>
 msgid "To quote the apt-cdrom(8) man page:"
@@ -6171,14 +6107,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
-#| "which will install security (and other) upgrades automatically. The "
-#| "package is installed by default and preconfigured to install security "
-#| "upgrades. The logs are available in <computeroutput>/var/log/unattended-"
-#| "upgrades/</computeroutput>; also, there are always <computeroutput>/var/"
-#| "log/dpkg.log</computeroutput> and <computeroutput>/var/log/apt/</"
-#| "computeroutput>."
 msgid ""
 "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
 "which will install security (and other) upgrades automatically. If "
@@ -6496,7 +6424,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgid "<emphasis>(as first user in Gosa)</emphasis>"
 msgstr "<emphasis>(som superbruker i Gosa)</emphasis>"
 
@@ -7096,32 +7023,37 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Run these commands as root to install the related packages:"
-msgstr ""
+msgstr "Kjør disse kommandoene som root for å installere de relaterte pakkene:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
 "apt update\n"
 "/usr/share/debian-edu-config/tools/install-task-pkgs\n"
 "/usr/share/debian-edu-config/tools/improve-desktop-l10n"
 msgstr ""
+"apt update\n"
+"/usr/share/debian-edu-config/tools/install-task-pkgs\n"
+"/usr/share/debian-edu-config/tools/improve-desktop-l10n"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
 "language chooser. Run <computeroutput>apt purge arctica-greeter</"
 "computeroutput> to get the stock Lightdm greeter."
 msgstr ""
+"Brukere vil så kunne velge språket via LightDM-skjermbehandleren før "
+"innlogging; dette gjelder Xfce, LXDE og LXQt. GNOME og KDE kommer begge med "
+"egne steds og språksspesifikke verktøy, bruk disse. MATE bruker Arctica-"
+"hilseren på toppen av LightDM, uten en språkvelger. Kjør <computeroutput>apt "
+"purge arctica-greeter</computeroutput> for forvalgt LightDM-hilser."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If LTSP diskless clients are used the above steps need to be done inside "
-#| "the LTSP chroot as well. LDM supports all desktop environments. First use "
-#| "<emphasis>Settings</emphasis> to choose the language, then login."
 msgid ""
 "If LTSP diskless clients are used the above steps need to be done inside the "
 "LTSP chroot as well. LDM supports all desktop environments. First use "
@@ -7695,9 +7627,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
-#| "create chroot and NBD image."
 msgid ""
 "Run <computeroutput>ltsp-build-client --arch i386</computeroutput> to create "
 "chroot and NBD image."
@@ -7951,7 +7880,6 @@
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Desktop choice"
 msgid "Desktop autoloader"
 msgstr "Skrivebordsmiljøvalg"
 
@@ -7961,22 +7889,28 @@
 "choice). It is only useful for diskless clients. The setup is site specific, "
 "also some technical skills are required."
 msgstr ""
+"Dette verktøyet forhåndsinnlaster det forvalgte skrivebordsmiljøet (og "
+"programmene du velger). Det er kun nyttig for diskløse klienter. Oppsettet "
+"er stedsspesifikt, og en del tekniske ferdigheter kreves."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Read about it: run <computeroutput>ltsp-chroot cat /usr/share/doc/desktop-"
 "autoloader/README.Debian</computeroutput>"
 msgstr ""
+"Les om det: Kjør <computeroutput>ltsp-chroot cat /usr/share/doc/desktop-"
+"autoloader/README.Debian</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "At least two files need to be edited. Available &lt;editor&gt; choices are: "
 "vi, nano, mcedit."
 msgstr ""
+"Minst to filer må redigeres. Tilgjengelige &lt;tekstbehandlervalg&gt;: vi, "
+"nano, mcedit."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<computeroutput>git pull</computeroutput>"
 msgid ""
 "run <computeroutput>ltsp-chroot &lt;editor&gt; /etc/cron.d/desktop-"
 "autoloader</computeroutput>"
@@ -7984,7 +7918,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<computeroutput>git pull</computeroutput>"
 msgid ""
 "run <computeroutput>ltsp-chroot &lt;editor&gt; /etc/default/desktop-"
 "autoloader</computeroutput>"
@@ -7992,9 +7925,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Here is one example used to activate the theme in the "
-#| "<computeroutput>desktop-base</computeroutput> package:"
 msgid ""
 "If the setup is complete, update the NBD image running <computeroutput>ltsp-"
 "update-image</computeroutput> and test it."
@@ -8466,20 +8396,15 @@
 "installs the <emphasis>xrdp</emphasis> and <emphasis>x2goserver</emphasis> "
 "packages."
 msgstr ""
+"Valg av LTSP-tjenerprofil, eller kombinert tjenerprofil installerer også "
+"<emphasis>xrdp</emphasis> og <emphasis>x2goserver</emphasis> -pakkene."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Xrdp"
-msgstr ""
+msgstr "Xrdp"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Choosing the LTSP server profile or the combined server profile also "
-#| "installs xrdp, a package which uses the Remote Desktop Protocol to "
-#| "present a graphical login to a remote client. Microsoft Windows users can "
-#| "connect to the LTSP server running xrdp without installing additional "
-#| "software - they simply start a Remote Desktop Connection on their Windows "
-#| "machine and connect."
 msgid ""
 "Xrdp uses the Remote Desktop Protocol to present a graphical login to a "
 "remote client. Microsoft Windows users can connect to the LTSP server "
@@ -8591,23 +8516,25 @@
 
 #. type: Content of: <article><section><section><section><title>
 msgid "X2Go"
-msgstr ""
+msgstr "X2Go"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
-msgstr ""
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
+msgstr ""
+"X2Go lar deg få tilgang til et grafisk skrivebord på LTSP-tjeneren på både "
+"trege og raske tilknttninger fra en PC som kjører Linux, Windows eller "
+"macOS. Ytterligere programvare trengs på klientsiden, se <ulink url="
+"\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient\">X2Go-wikien</"
+"ulink> for mer info."
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Remove diversion; the postinst from <computeroutput>debian-edu-config</"
-#| "computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
-#| "bugs.debian.org/779641#\">779641</ulink>)."
 msgid ""
 "Please note that the <computeroutput>killer</computeroutput> package should "
 "best be removed on the LTSP server if X2Go is used, see <ulink url=\"https://"
@@ -8647,11 +8574,15 @@
 "Bare installer pakken <computeroutput>xvncviewer</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
+"<computeroutput>x2goclient</computeroutput> er en grafisk klient for X2Go-"
+"systemet (ikke installert som forvalg). Du kan bruke den til å koble til "
+"kjørende økter og starte nye."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -8970,10 +8901,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Some schools use control tools like <ulink url=\"https://packages.debian."
-#| "org/stable/epoptes#\">Epoptes</ulink> to supervise their students. See "
-#| "also: <ulink url=\"http://www.epoptes.org\">Epoptes Homepage</ulink>."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/epoptes#\">Epoptes</ulink> or <ulink url=\"https://packages.debian."
@@ -9488,7 +9415,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Firefox 60.4 ESR and Chromium 72.0"
 msgid "Firefox 60.5 ESR and Chromium 72.0"
 msgstr "Firefox 60.4 ESR og Chromium 72.0"
 
@@ -9547,9 +9473,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The Debian Edu Buster Manual is fully translated to German, Italian, "
-#| "Dutch, Norwegian Bokmål and Japanese."
 msgid ""
 "The Debian Edu Buster Manual is fully translated to German, Italian, Danish, "
 "Dutch, Norwegian Bokmål and Japanese."
@@ -9559,9 +9482,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Partly translated versions exist for French, Danish, Polish, Spanish, "
-#| "Simplified Chinese and Ukranian."
 msgid ""
 "Partly translated versions exist for French, Polish, Spanish, Simplified "
 "Chinese and Traditional Chinese."
@@ -9575,7 +9495,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "The USB ISO image can be used for offline installations again."
 msgid "The BD ISO image can be used for offline installations again."
 msgstr "USB-ISO-avbildningen kan brukes for frakoblede installasjoner igjen."
 
@@ -9620,10 +9539,11 @@
 "Set_up_a_multi-language_desktop_environment\">Desktop</link> chapter for "
 "more information."
 msgstr ""
+"Stedsspesifikk multispråksstøtte. Se <link linkend=\"Desktop--Set_up_a_multi-"
+"language_desktop_environment\">skrivebordskapittelet</link> for mer info."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "LXQt 0.14 is offered as new choice for the desktop environment."
 msgid "LXQt 0.14 is offered as a new choice for the desktop environment."
 msgstr "LXQt 0.14 tilbys som et nytt skriverbordsmiljøvalg."
 
@@ -9645,10 +9565,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "More information about modifying PXE installations can be found in the "
-#| "<link linkend=\"Installation--Modifying_PXE_installations\">Installation</"
-#| "link> chapter."
 msgid ""
 "New tool Standardskriver (Default printer). See the <link linkend="
 "\"Administration--Standardskriver\">Administration</link> chapter for more "
@@ -9663,6 +9579,9 @@
 "diskless clients. See the <link linkend=\"NetworkClients--Desktop_autoloader"
 "\">NetworkClients</link> chapter for more information."
 msgstr ""
+"Nytt verktøy, desktop-autoloader bringer med seg ytelsesforbedringer for "
+"diskløse LTSP-klienter. Se kapittelet om <link linkend=\"NetworkClients--"
+"Desktop_autoloader\">nettverksklienter</link> for mer info."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9689,10 +9608,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "More information about modifying PXE installations can be found in the "
-#| "<link linkend=\"Installation--Modifying_PXE_installations\">Installation</"
-#| "link> chapter."
 msgid ""
 "Kerberized NFS. It is now possible to use more secure home directory access, "
 "see the <link linkend=\"Administration--Kerberized_NFS\">Administration</"
@@ -9702,15 +9617,11 @@
 "\"NetworkClients\">nettverksklienter</link>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate "
-#| "the PXE menu."
 msgid ""
 "Added configuration file <computeroutput>/etc/debian-edu/pxeinstall.conf</"
 "computeroutput> with examples to make site specific changes easier."
 msgstr ""
-"Ny oppsettsfil <computeroutput>/etc/debian-edu/pxeinstall.conf</"
+"Oppsettsfil lagt til, <computeroutput>/etc/debian-edu/pxeinstall.conf</"
 "computeroutput> med eksempler for å gjøre stedsspesifikke endringer enklere."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9719,15 +9630,20 @@
 "computeroutput> with examples to make site specific changes easier."
 msgstr ""
 "Ny oppsettsfil <computeroutput>/etc/ltsp/ltsp-build-client.conf</"
-"computeroutput> med eksempler for å gjøre sidespesifikke endringer enklere."
+"computeroutput> med eksempler for å gjøre stedsspesifikke endringer enklere."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
+"Det nye verktøyet <computeroutput>/usr/share/debian-edu-config/tools/edu-"
+"ldap-from-scratch</computeroutput> lar deg generere LDAP-databasen, akkurat "
+"som den har vært rett etter installasjon av hovedtjeneren. Dette verktøyet "
+"kan også være nyttig for å gjøre stedspesifikke endringer enklere."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9749,10 +9665,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Support for nonfree flash has been dropped from the Firefox ESR browser. "
-#| "We have also decided to drop the free but unmaintained gnash "
-#| "implementation."
 msgid ""
 "Support for nonfree flash has been dropped from the Firefox ESR browser."
 msgstr ""
@@ -9766,6 +9678,10 @@
 "the <link linkend=\"Maintenance--Updating_the_software\">Maintenance</link> "
 "chapter for more information about security upgrades."
 msgstr ""
+"Som sedvane har vært før Stretch, vil ikke Debian 10 installere "
+"<computeroutput>unattended-upgrades</computeroutput>-pakken som forvalg, "
+"se<link linkend=\"Maintenance--Updating_the_software\">Vedlikehold</"
+"link>skapittelet for mer info om sikkerhetsoppgraderinger."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
@@ -9785,20 +9701,6 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018), Petter "
-#| "Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, "
-#| "2014), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), "
-#| "Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring "
-#| "(2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo "
-#| "Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
-#| "Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh (2009), Philipp Hübner "
-#| "(2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant "
-#| "Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot "
-#| "(2012), Wolfgang Schweer (2012, 2013, 2014, 2015, 2016, 2017, 2018), "
-#| "Bernhard Hammes (2012) and Joe Hansen (2015) and is released under the "
-#| "GPL2 or any later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019), Petter "
@@ -9835,10 +9737,10 @@
 "Then add your name here and release it under the \"GPL v2 or any later "
 "version\" licence."
 msgstr ""
-"Hvis du legger til innhold,  <emphasis role=\"strong\">så bare gjør det hvis "
+"Hvis du legger til innhold, <emphasis role=\"strong\">så bare gjør det hvis "
 "du er forfatteren av innholdet og planlegger å gi det ut under samme "
-"betingelser</emphasis>! Så legger du navnet ditt til her,  og gir det ut "
-"under GPLv2 eller senere versjoner."
+"betingelser</emphasis>! Så legger du navnet ditt til her, og gir det ut i "
+"henhold til GPL v2 eller enhver senere versjon."
 
 #. type: Content of: <article><section><title>
 msgid "Translation copyright and authors"
@@ -9856,14 +9758,6 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-#| "2014, 2015, 2016, 2017, 2018), Håvard Korsvoll (2007-2009), Tore Skogly "
-#| "(2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin "
-#| "(2014, 2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), Hans Arthur "
-#| "Kielland Aanesen (2014), Knut Yrvin (2014), FourFire Le'bard (2014), "
-#| "Stefan Mitchell-Lauridsen (2014), Ragnar Wisløff (2014) and Allan Nordhøy "
-#| "(2018) and is released under the GPL v2 or any later version."
 msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017, 2018, 2019), Håvard Korsvoll (2007-2009), Tore "
@@ -9883,14 +9777,6 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
-#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
-#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
-#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
-#| "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and "
-#| "Wolfgang Schweer (2012, 2013, 2014, 2015, 2016, 2017, 2018) and is "
-#| "released under the GPL v2 or any later version."
 msgid ""
 "The German translation is copyrighted by Holger Levsen (2007), Patrick "
 "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -9910,11 +9796,6 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018) and Beatrice "
-#| "Torracca (2013, 2014) and is released under the GPL v2 or any later "
-#| "version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
 "2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019) and "
@@ -9942,9 +9823,6 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
-#| "2015, 2016) and is released under the GPL v2 or any later version."
 msgid ""
 "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
 "2016, 2019) and is released under the GPL v2 or any later version."
@@ -9954,9 +9832,6 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-#| "2016, 2017, 2018) and is released under the GPL v2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
 "2016, 2017, 2018, 2019) and is released under the GPL v2 or any later "
@@ -9972,42 +9847,37 @@
 "released under the GPL v2 or any later version."
 msgstr ""
 "Opphavsretten for den japanske oversettelsen tilhører Victory (2016, 2017), "
-"og er utgitt under GPL  v2 eller en senere versjon."
+"og er utgitt under GPL v2, eller enhver senere versjon."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Opphavsretten til den polske oversettelsen tilhører Stanisław Krukowski "
-"(2016, 2017) og er utgitt under GPL  v2 eller senere versjoner."
+"(2016, 2017) og er utgitt under GPL v2, eller enhver senere versjon."
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016, "
-#| "2017), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the "
-#| "GPL v2 or any later version."
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 "Opphavsretten for oversettelsen på forenklet kinesisk tilhører Ma Yong "
-"(2016, 2017), Boyuan Yang (2017) og Roy Zhang (2017) og er gjort "
-"tilgjengelig med vilkårene til GPL  v2 eller en senere versjon."
+"(2016, 2017, 2018), Boyuan Yang (2017) og Roy Zhang (2017) og er gjort "
+"tilgjengelig med vilkårene til GPL v2, eller enhver senere versjon."
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Japanese translation is copyrighted by victory (2016, 2017) and is "
-#| "released under the GPL v2 or any later version."
 msgid ""
 "The Traditional Chinese translation is copyrighted by Louies (2019) and is "
 "released under the GPL v2 or any later version."
 msgstr ""
-"Opphavsretten for den japanske oversettelsen tilhører Victory (2016, 2017), "
-"og er utgitt under GPL  v2 eller en senere versjon."
+"Rettighetene for den kinesiske oversettelsen tilhører Louies (2019), utgitt "
+"med lisensen GPL v2 eller enhver senere versjon."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
@@ -11594,9 +11464,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "More information on even older releases can be found at <ulink url="
-#| "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgid ""
 "More information on even older (pre-)releases can be found at <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
@@ -11605,6 +11472,81 @@
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#~ msgid ""
+#~ "In case you are looking for a complete router firewall solution capable "
+#~ "of running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
+#~ "\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+#~ "ulink>."
+#~ msgstr ""
+#~ "Hvis du leter etter en komplett ruter med brannvegg-løsning som kan kjøre "
+#~ "på en gammel PC, vil vi anbefale <ulink url=\"http://www.ipcop.org\"> "
+#~ "IPCop</ulink> eller <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
+#~ "ulink>."
+
+#~ msgid ""
+#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/amd64/iso-cd/"
+#~ "debian-edu-testing-amd64-netinst.iso\">debian-edu-testing-amd64-netinst."
+#~ "iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/amd64/iso-cd/"
+#~ "debian-edu-testing-amd64-netinst.iso\">debian-edu-testing-amd64-netinst."
+#~ "iso</ulink>"
+
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
+#~ "builds/amd64/iso-cd/debian-edu-testing-amd64-netinst.iso debian-edu-"
+#~ "testing-amd64-netinst.iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
+#~ "builds/amd64/iso-cd/debian-edu-testing-amd64-netinst.iso debian-edu-"
+#~ "testing-amd64-netinst.iso</computeroutput>"
+
+#~ msgid "and"
+#~ msgstr "og"
+
+#~ msgid ""
+#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/i386/iso-cd/"
+#~ "debian-edu-testing-i386-netinst.iso\">debian-edu-testing-i386-netinst."
+#~ "iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/i386/iso-cd/"
+#~ "debian-edu-testing-i386-netinst.iso\">debian-edu-testing-i386-netinst."
+#~ "iso</ulink>"
+
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
+#~ "builds/i386/iso-cd/debian-edu-testing-i386-netinst.iso debian-edu-testing-"
+#~ "i386-netinst.iso</computeroutput>"
+#~ msgstr ""
+#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
+#~ "builds/i386/iso-cd/debian-edu-testing-i386-netinst.iso debian-edu-testing-"
+#~ "i386-netinst.iso</computeroutput>"
+
+#~ msgid ""
+#~ "This image does not yet work, see <ulink url=\"https://wiki.debian.org/"
+#~ "DebianEdu/Status/Buster\"/>"
+#~ msgstr ""
+#~ "Dette avtrykket virker foreløbig ikke, se <ulink url=\"https://wiki."
+#~ "debian.org/DebianEdu/Status/Buster\"/>"
+
+#~ msgid ""
+#~ "Sources are available from the Debian archive at the usual locations."
+#~ msgstr ""
+#~ "Kildekoder er tilgjengelig fra Debian-arkivet på de vanlige stedene."
+
+#~ msgid ""
+#~ "mount /media/cdrom\n"
+#~ "apt-cdrom add -m"
+#~ msgstr ""
+#~ "mount /media/cdrom\n"
+#~ "apt-cdrom add -m"
+
+#~ msgid "To install it run the following command as root:"
+#~ msgstr "For å installere kjør følgende som rot:"
+
+#~ msgid "apt-get install killer"
+#~ msgstr "apt-get install killer"
+
 #~ msgid "Using Xfce, GNOME, KDE Plasma, LXDE, LXQt and/or MATE together"
 #~ msgstr "Bruk av Xfce, GNOME, KDE Plasma, LXDE, LXQt og/eller MATE sammen"
 
@@ -11616,16 +11558,22 @@
 
 #~ msgid ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 #~ msgstr ""
 #~ "apt update\n"
-#~ "apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ "apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 
 #, fuzzy
 #~| msgid "New default desktop environment Xfce (replacing KDE)."
 #~ msgid "To set the default desktop environment, run:"
 #~ msgstr "Nytt forvalgt skrivebordsmiljø Xfce (erstatter KDE)."
 
+#, fuzzy
+#~ msgid "update-alternatives --config x-session-manager"
+#~ msgstr "update-alternatives --config x-session-manager"
+
 #~ msgid ""
 #~ "Users will then be able to choose any of the six desktop environment via "
 #~ "the login manager before logging in. Of course, you can also choose to "
@@ -11657,17 +11605,6 @@
 #~ "installere med ett av de fem alternative skrivebordene, GNOME, KDE, LXDE, "
 #~ "LXQt eller MATE</link> direkte."
 
-#~ msgid ""
-#~ "In case you are looking for a complete router firewall solution capable "
-#~ "of running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
-#~ "\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
-#~ "ulink>."
-#~ msgstr ""
-#~ "Hvis du leter etter en komplett ruter med brannvegg-løsning som kan kjøre "
-#~ "på en gammel PC, vil vi anbefale <ulink url=\"http://www.ipcop.org\"> "
-#~ "IPCop</ulink> eller <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
-#~ "ulink>."
-
 #~ msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
 #~ msgstr "Rediger /etc/debian-edu/pxeinstall.conf (sett ltsparch=i386)."
 
@@ -11678,19 +11615,6 @@
 #~ "Kjør <computeroutput>debian-edu-pxeinstall</computeroutput> for å "
 #~ "regenerere PXE-menyen."
 
-#~ msgid ""
-#~ "mount /media/cdrom\n"
-#~ "apt-cdrom add -m"
-#~ msgstr ""
-#~ "mount /media/cdrom\n"
-#~ "apt-cdrom add -m"
-
-#~ msgid "To install it run the following command as root:"
-#~ msgstr "For å installere kjør følgende som rot:"
-
-#~ msgid "apt-get install killer"
-#~ msgstr "apt-get install killer"
-
 #~ msgid "Remote Desktop Service"
 #~ msgstr "Tjeneste for skrivebordsomgivelse via nett"
 
@@ -11714,57 +11638,6 @@
 #~ "alle sine elever siden 2005. De rapporterer at løsningen er stabil."
 
 #~ msgid ""
-#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/amd64/iso-cd/"
-#~ "debian-edu-testing-amd64-netinst.iso\">debian-edu-testing-amd64-netinst."
-#~ "iso</ulink>"
-#~ msgstr ""
-#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/amd64/iso-cd/"
-#~ "debian-edu-testing-amd64-netinst.iso\">debian-edu-testing-amd64-netinst."
-#~ "iso</ulink>"
-
-#~ msgid "and"
-#~ msgstr "og"
-
-#~ msgid ""
-#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/i386/iso-cd/"
-#~ "debian-edu-testing-i386-netinst.iso\">debian-edu-testing-i386-netinst."
-#~ "iso</ulink>"
-#~ msgstr ""
-#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/i386/iso-cd/"
-#~ "debian-edu-testing-i386-netinst.iso\">debian-edu-testing-i386-netinst."
-#~ "iso</ulink>"
-
-#~ msgid ""
-#~ "This image does not yet work, see <ulink url=\"https://wiki.debian.org/"
-#~ "DebianEdu/Status/Buster\"/>"
-#~ msgstr ""
-#~ "Dette avtrykket virker foreløbig ikke, se <ulink url=\"https://wiki."
-#~ "debian.org/DebianEdu/Status/Buster\"/>"
-
-#~ msgid ""
-#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
-#~ "builds/amd64/iso-cd/debian-edu-testing-amd64-netinst.iso debian-edu-"
-#~ "testing-amd64-netinst.iso</computeroutput>"
-#~ msgstr ""
-#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
-#~ "builds/amd64/iso-cd/debian-edu-testing-amd64-netinst.iso debian-edu-"
-#~ "testing-amd64-netinst.iso</computeroutput>"
-
-#~ msgid ""
-#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
-#~ "builds/i386/iso-cd/debian-edu-testing-i386-netinst.iso debian-edu-testing-"
-#~ "i386-netinst.iso</computeroutput>"
-#~ msgstr ""
-#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
-#~ "builds/i386/iso-cd/debian-edu-testing-i386-netinst.iso debian-edu-testing-"
-#~ "i386-netinst.iso</computeroutput>"
-
-#~ msgid ""
-#~ "Sources are available from the Debian archive at the usual locations."
-#~ msgstr ""
-#~ "Kildekoder er tilgjengelig fra Debian-arkivet på de vanlige stedene."
-
-#~ msgid ""
 #~ "Please note one difference between <computeroutput>apt</computeroutput> "
 #~ "and <computeroutput>apt-get</computeroutput>: By default "
 #~ "<computeroutput>apt-get</computeroutput> keeps downloaded packages, "
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: debian-edu-buster-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc@packages.debian.org\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
-"PO-Revision-Date: 2019-03-17 13:05+0100\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
+"PO-Revision-Date: 2019-04-25 18:06+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -22,10 +22,8 @@
 msgstr "nl"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-02-28"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
-msgstr "Handleiding Debian Edu/Skolelinux Buster 10+edu0, 28-02-2019"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
+msgstr "Handleiding Debian Edu/Skolelinux Buster 10+edu0, 01-05-2019"
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 10+edu0 Codename Buster"
@@ -959,18 +957,12 @@
 msgstr "Installatie"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Currently there are two kinds of installation media images: netinstall "
-#| "(CD)  and USB flash drive (BD). Both images can also be booted from USB "
-#| "sticks."
 msgid ""
 "Currently there are two kinds of installation media images: netinst and BD. "
 "Both images can also be booted from USB sticks."
 msgstr ""
-"Momenteel zijn er images voor twee soorten installatiemedia: netinstall (cd) "
-"en USB-flashgeheugenschijf (BD). Beide images kunnen ook opgestart worden "
-"vanaf een USB-stick."
+"Momenteel zijn er twee soorten installatiemedia-images: netinst en BD. Beide "
+"images kunnen ook opgestart worden vanaf een USB-stick."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1673,6 +1665,19 @@
 "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-bd/\"/>"
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr "Verifiëren van de gedownloade image-bestanden"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+"Een onderdeel van de <ulink url=\"https://www.debian.org/CD/faq/index.en."
+"html#verify\">Debian-CD FAQ</ulink> bevat gedetailleerde instructies voor "
+"het verifiëren van deze images."
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr "Broncode"
 
@@ -1845,10 +1850,8 @@
 msgstr "Offline (zonder internettoegang):"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Use the USB ISO image."
 msgid "Use the BD ISO image."
-msgstr "Gebruik het USB ISO-image."
+msgstr "Gebruik het BD ISO-image."
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Make sure all (real/virtual) network cables are unplugged."
@@ -5171,32 +5174,17 @@
 "apt full-upgrade"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-#| "return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-#| "the GOsa² information is wrong (due to Debian bug <ulink url=\"https://"
-#| "bugs.debian.org/918578#\">918578</ulink>), see below how to adjust the "
-#| "password encryption properly. All information will be mailed to root so "
-#| "that you can read it again (using <emphasis>mailx</emphasis> or "
-#| "<emphasis>mutt</emphasis>)."
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
 "apt-list-changes: bereid u voor op veel te lezen NIEUWS; druk op &lt;"
 "enter&gt; om naar beneden te scrollen, op &lt;q&gt; om het "
-"pagineringsprogramma te verlaten. Merk op dat de GOsa²-informatie foutief is "
-"(wegens Debian bug <ulink url=\"https://bugs.debian.org/918578#\">918578</"
-"ulink>). Zie hieronder hoe u de wachtwoordencryptie juist moet aanpassen. "
-"Alle informatie zal naar de systeembeheerder (root) verzonden worden, zodat "
-"u deze opnieuw kunt lezen (met behulp van <emphasis>mailx</emphasis> of "
-"<emphasis>mutt</emphasis>)."
+"pagineringsprogramma te verlaten. Alle informatie zal naar de "
+"systeembeheerder (root) verzonden worden, zodat u deze opnieuw kunt lezen "
+"(met behulp van <emphasis>mailx</emphasis> of <emphasis>mutt</emphasis>)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5979,7 +5967,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 "Om er een aan te maken voor een systeem dat reeds met GOsa² geconfigureerd "
@@ -7310,14 +7298,14 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
 "language chooser. Run <computeroutput>apt purge arctica-greeter</"
 "computeroutput> to get the stock Lightdm greeter."
 msgstr ""
-"Gebruikers kunnen dan via de beeldschermbeheerder Lightdm hun taal kiezen "
+"Gebruikers kunnen dan via de beeldschermbeheerder LightDM hun taal kiezen "
 "vooraleer ze zich aanmelden. Dit geldt voor Xfce, LXDE en LXQt. GNOME en KDE "
 "hanteren allebei hun eigen interne hulpmiddelen voor het configureren van "
 "taal en regio en u moet deze gebruiken bij deze grafische werkomgevingen. "
@@ -7933,15 +7921,11 @@
 "schijfruimte op /opt is dan vereist."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
-#| "create chroot and NBD image."
 msgid ""
 "Run <computeroutput>ltsp-build-client --arch i386</computeroutput> to create "
 "chroot and NBD image."
 msgstr ""
-"Voer het commando <computeroutput>ltsp-build-client --arch amd64</"
+"Voer het commando <computeroutput>ltsp-build-client --arch i386</"
 "computeroutput> uit om de chroot en het NBD-image aan te maken."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8878,19 +8862,25 @@
 msgstr "X2Go"
 
 #. type: Content of: <article><section><section><section><para>
+#| msgid ""
+#| "X2Go enables you to access a graphical desktop on the LTSP server over "
+#| "both low bandwidth and high bandwidth connections from a PC running "
+#| "Linux, Windows or Mac OS X. Additional software is needed on the client "
+#| "side, see the <ulink url=\"https://wiki.x2go.org/doku.php/doc:"
+#| "installation:x2goclient\">x2go wiki</ulink> for more information."
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
-msgstr ""
-"X2Go maakt het mogelijk om vanaf een pc met Linux, Windows of Mac OS X over "
-"een verbinding met lage of hoge bandbreedte toegang te hebben tot een "
-"grafische werkomgeving op de LTSP-server. Daarvoor is op de client-computer "
-"extra software vereist. Raadpleeg voor bijkomende informatie de <ulink url="
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
+msgstr ""
+"X2Go maakt het mogelijk om vanaf een pc met Linux, Windows of macOS over een "
+"verbinding met lage of hoge bandbreedte toegang te hebben tot een grafische "
+"werkomgeving op de LTSP-server. Daarvoor is op de client-computer extra "
+"software vereist. Raadpleeg voor bijkomende informatie de <ulink url="
 "\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient\">wiki van "
-"x2go</ulink>."
+"X2Go</ulink>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8933,10 +8923,14 @@
 "<computeroutput>xvncviewer</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#| msgid ""
+#| "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
+#| "X2Go system (not installed by default). You can use it to connect to "
+#| "running sessions and start new sessions."
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 "<computeroutput>x2goclient</computeroutput> is een grafische client voor het "
 "X2Go-systeem (niet standaard geïnstalleerd). U kunt dit programma gebruiken "
@@ -9747,6 +9741,9 @@
 "<ulink url=\"https://cdimage.debian.org\"/>, thus these are official Debian "
 "images."
 msgstr ""
+"Dit is de eerste maal dat er installatie-images voor Debian Edu beschikbaar "
+"zijn op <ulink url=\"https://cdimage.debian.org\"/>. Het zijn dus officiële "
+"Debian-images."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9888,11 +9885,9 @@
 msgstr "Andere veranderingen vergeleken met de vorige uitgave"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "The USB ISO image can be used for offline installations again."
 msgid "The BD ISO image can be used for offline installations again."
 msgstr ""
-"Met de USB ISO-images is het opnieuw mogelijk om offline installaties uit te "
+"Met het BD ISO-image is het opnieuw mogelijk om offline installaties uit te "
 "voeren."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -10045,7 +10040,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -10261,21 +10256,23 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "De auteursrechten van de Poolse vertaling berusten bij Stanisław Krukowski "
-"(2016, 2017). De vertaling is vrijgegeven onder de licentie GPL v2 of een "
-"latere versie."
+"(2016, 2017) en Wiktor Wandachowicz (2019). De vertaling is vrijgegeven "
+"onder de licentie GPL v2 of een latere versie."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten "
-"bij Ma Yong (2016, 2017, 2018), Boyuan Yang (2017) en Roy Zhang (2017). De "
-"vertaling is vrijgegeven onder de licentie GPL v2 of een latere versie."
+"bij Ma Yong (2016, 2017, 2018, 2019), Boyuan Yang (2017) en Roy Zhang "
+"(2017). De vertaling is vrijgegeven onder de licentie GPL v2 of een latere "
+"versie."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -11927,10 +11924,12 @@
 
 #~ msgid ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 #~ msgstr ""
 #~ "apt update\n"
-#~ " apt install education-desktop-gnome education-desktop-kde education-desktop-lxde education-desktop-lxqt education-desktop-mate"
+#~ " apt install education-desktop-gnome education-desktop-kde education-"
+#~ "desktop-lxde education-desktop-lxqt education-desktop-mate"
 
 #~ msgid "To set the default desktop environment, run:"
 #~ msgstr ""
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po	2019-05-01 12:19:14.000000000 +0200
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
-"PO-Revision-Date: 2017-06-05 08:57+0000\n"
-"Last-Translator: Stanisław Krukowski <stdf021@riseup.net>\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
+"PO-Revision-Date: 2019-03-27 08:04+0000\n"
+"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
-"documentation/debian-edu-stretch/pl/>\n"
+"documentation/debian-edu-buster/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.15-dev\n"
+"X-Generator: Weblate 3.6-dev\n"
 
 # type: Attribute 'lang' of: <article>
 #. type: Attribute 'lang' of: <article>
@@ -21,15 +21,12 @@
 
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
-#| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
-msgstr "Podręcznik Debian Edu / Skolelinux Stretch 9+edu0"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
+msgstr "Podręcznik Debian Edu / Skolelinux 10+edu0 Manual 2019-02-11"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgid "Manual for Debian Edu 10+edu0 Codename Buster"
-msgstr "Podręcznik dla Debiana Edu 9+edu1 Nazwa kodowa Stretch"
+msgstr "Podręcznik dla Debiana Edu 10+edu0 Nazwa kodowa Buster"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/23-Tjener-Login.png"
@@ -41,31 +38,19 @@
 msgstr "Login Debian Edu"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid "This is the manual for the Debian Edu Stretch 9+edu0 release."
 msgid "This is the manual for the Debian Edu Buster 10+edu0 release."
-msgstr "To jest podręcznik dla wydania Debian Edu Stretch 9+edu0."
+msgstr "To jest podręcznik dla wydania Debian Edu Buster 10+edu0."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Stretch\"/> is a wiki and updated frequently."
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Buster\"/> is a wiki and updated frequently."
 msgstr ""
-"Wersja na <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Stretch"
+"Wersja na <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Buster"
 "\"/> jest wersją wiki i jest często aktualizowana."
 
 # type: Content of: <article><section><para>
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "<link linkend=\"Translations\">Translations</link> are part of the "
-#| "<computeroutput>debian-edu-doc</computeroutput> package which can be "
-#| "installed on a webserver, and is available <ulink url=\"http://maintainer."
-#| "skolelinux.org/debian-edu-doc/\">online</ulink>."
 msgid ""
 "<link linkend=\"Translations\">Translations</link> are part of the "
 "<computeroutput>debian-edu-doc</computeroutput> package which can be "
@@ -74,8 +59,8 @@
 msgstr ""
 "<link linkend=\"Translations\">Tłumaczenia</link> są częścią pakietu "
 "<computeroutput>debian-edu-doc</computeroutput>. Pakiet można zainstalować "
-"na serwerze WWW. Jest on również dostępny <ulink url=\"http://maintainer."
-"skolelinux.org/debian-edu-doc/\">online</ulink>."
+"na serwerze WWW. Jest on również dostępny <ulink url=\"https://jenkins."
+"debian.net/userContent/debian-edu-doc/\">online</ulink>."
 
 # type: Content of: <article><section><title>
 #. type: Content of: <article><section><title>
@@ -98,22 +83,12 @@
 "requirements</link> and about the <link linkend=\"Architecture"
 "\">architecture</link> contain basic environment details."
 msgstr ""
+"Rozdziały opisujące <link linkend=\"Requirements\">wymagania sprzętowe i "
+"sieci komputerowej</link> oraz <link linkend=\"Architecture\">architekturę</"
+"link> zawierają podstawowe szczegóły dotyczące środowiska."
 
 # type: Content of: <article><section><para>
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Directly after installation of a school server all services needed for a "
-#| "school network are set up (see the next chapter <link linkend="
-#| "\"Architecture\">details of the architecture of this setup</link>) and "
-#| "the system is ready to be used. Only users and machines need to be added "
-#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
-#| "environment using PXE has also been prepared, so after initial "
-#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
-#| "all other machines can be installed via the network, this includes "
-#| "\"roaming workstations\" (ones that can be taken away from the school "
-#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
-#| "machines like traditional thin clients."
 msgid ""
 "After installation of a main server all services needed for a school network "
 "are set up and the system is ready to be used. Only users and machines need "
@@ -125,37 +100,29 @@
 "laptops or netbooks) as well as PXE booting for diskless machines like "
 "traditional thin clients."
 msgstr ""
-"Bezpośrednio po instalacji serwera  szkolnego wszystkie usługi, potrzebne do "
-"szkolnej sieci komputerowej, są skonfigurowane (zobacz następny rozdział "
-"<link linkend=\"Architecture\">szczegóły architektury tej konfiguracji</"
-"link>, a system jest gotowy do użycia. Muszą być tylko dodane maszyny i "
-"użytkownicy poprzez GOsa², wygodny interfejs użytkownika, oparty na stronach "
-"WWW lub dowolny inny edytor LDAP. Przygotowane jest też środowisko rozruchu "
-"sieciowego, używające PXE, tak aby po wstępnej instalacji z głównego "
-"serwera  — za pomocą płyty CD, płyty Blu-ray lub napędu flash USB — mogły "
-"być zainstalowane wszystkie inne maszyny poprzez sieć komputerową; dotyczy "
-"to także \"stacji roboczych roaming\" (są to stacje robocze, które można "
-"zabrać ze sobą poza sieć szkolną, zwykle laptopy i netbooki). Rozruch PXE "
-"dotyczy też maszyn bezdyskowych, takich jak tradycyjne cienkie klienty (ang. "
-"thin clients)."
+"Po instalacji głównego serwera wszystkie usługi potrzebne do szkolnej sieci "
+"komputerowej są skonfigurowane, a system jest gotowy do użycia. Muszą być "
+"tylko dodane maszyny i użytkownicy poprzez GOsa², wygodny interfejs "
+"użytkownika oparty na stronach WWW, lub dowolny inny edytor LDAP. "
+"Przygotowane jest też środowisko rozruchu sieciowego używające PXE, tak aby "
+"po wstępnej instalacji z głównego serwera - za pomocą płyty CD, płyty Blu-"
+"ray lub napędu flash USB - mogły być zainstalowane wszystkie inne maszyny "
+"poprzez sieć komputerową; dotyczy to także \"stacji roboczych roaming\" (są "
+"to stacje robocze, które można zabrać ze sobą poza sieć szkolną, zwykle "
+"laptopy i netbooki). Rozruch PXE dotyczy też maszyn bezdyskowych, takich jak "
+"tradycyjne cienkie klienty (ang. thin clients)."
 
 # type: Content of: <article><section><para>
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Several educational applications like celestia, drgeo, gcompris, kalzium, "
-#| "kgeography, solfege and scratch are included in the default desktop "
-#| "setup, which can be extended easily and almost endlessly via the Debian "
-#| "universe."
 msgid ""
 "Several educational applications like GeoGebra, Kalzium, KGeography, GNU "
 "Solfege and Scratch are included in the default desktop setup, which can be "
 "extended easily and almost endlessly via the Debian universe."
 msgstr ""
 "W domyślnej konfiguracji \"biurkowej\" zawartych jest wiele programów "
-"edukacyjnych, takich jak celestia, drgeo, gcompris, kalzium, kgeography, "
-"solfege i scratch. Konfigurację domyślną można łatwo i prawie bez końca "
-"rozszerzać za pomocą universum Debiana."
+"edukacyjnych, takich jak GeoGebra, Kalzium, KGeography, GNU Solfege i "
+"Scratch. Konfigurację domyślną można łatwo i prawie bez końca rozszerzać za "
+"pomocą universum Debiana."
 
 # type: Content of: <article><section><section><title>
 #. type: Content of: <article><section><section><title>
@@ -234,9 +201,8 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/Debian_Edu_Network_Stretch.png"
 msgid "./images/Debian_Edu_Network_Buster.png"
-msgstr "./images/Debian_Edu_Network_Stretch.png"
+msgstr "./images/Debian_Edu_Network_Buster.png"
 
 # type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -244,16 +210,6 @@
 msgstr "Topologia sieci komputerowej Debian Edu"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The figure is a sketch of the assumed network topology. The default setup "
-#| "of a Skolelinux network assumes that there is one (and only one) main "
-#| "server, while allowing the inclusion of both normal workstations and LTSP "
-#| "servers (with associated thin clients and/or diskless workstations). The "
-#| "number of workstations can be as large or small as you want (starting "
-#| "from none to a lot). The same goes for the LTSP servers, each of which is "
-#| "on a separate network so that the traffic between the clients and the "
-#| "LTSP server doesn't affect the rest of the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main server, "
@@ -265,7 +221,7 @@
 "affect the rest of the network services. LTSP is explained in detail in "
 "<link linkend=\"NetworkClients\">the related HowTo</link> chapter."
 msgstr ""
-"Rysunek jest szkicem przypuszczalnej topologii sieci komputerowej. Domyślna "
+"Rysunek jest szkicem przykładowej topologii sieci komputerowej. Domyślna "
 "konfiguracja sieci komputerowej Skolelinux zakłada, że jest jeden (i tylko "
 "jeden) serwer główny, natomiast pozwala ona włączyć w sieć zarówno zwykłe "
 "stacje robocze, jak i serwery LTSP (z podłączonymi cienkimi klientami i /lub "
@@ -273,7 +229,8 @@
 "lub tak mała, jak tylko można chcieć (zaczynając od żadnej, a kończąc na "
 "bardzo dużej liczbie). To samo dotyczy serwerów LTSP, z których każdy jest w "
 "oddzielnej sieci tak, aby ruch sieciowy pomiędzy klientami a serwerem LTSP "
-"nie miał wpływu na resztę usług sieciowych."
+"nie miał wpływu na resztę usług sieciowych. LTSP jest szczegółowo wyjaśnione "
+"w <link linkend=\"NetworkClients\">powiązanym rozdziale HowTo</link>."
 
 # type: Content of: <article><section><section><para>
 #. type: Content of: <article><section><section><para>
@@ -308,20 +265,14 @@
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "DHCPD on Tjener serves the 10.0.0.0/8 network, providing a syslinux menu "
-#| "via PXE-boot where you can choose whether to install a new server/"
-#| "workstation, boot a thin client or a diskless workstation, run memtest, "
-#| "or boot from the local hard disk."
 msgid ""
 "DHCP on the main server serves the 10.0.0.0/8 network, providing a PXE boot "
 "menu where you can choose whether to install a new server/workstation, boot "
 "a thin client or a diskless workstation, run memtest, or boot from the local "
 "hard disk."
 msgstr ""
-"DHCPD na Tjener obsługuje sieć komputerową 10.0.0.0/8, dostarczając menu "
-"syslinux poprzez PXE-boot, gdzie można wybrać, czy zainstalować nowy serwer /"
+"DHCP na głównym serwerze obsługuje sieć komputerową 10.0.0.0/8, dostarczając "
+"menu rozruchowe PXE, w którym można wybrać czy zainstalować nowy serwer lub "
 "stację roboczą, dokonać rozruchu cienkiego klienta lub bezdyskowej stacji "
 "roboczej, uruchomić memtest, czy też dokonać rozruchu z lokalnego dysku "
 "twardego."
@@ -332,21 +283,19 @@
 "\"NetworkClients--Configuring_the_PXE_menu\">the related HowTo</link> "
 "chapter."
 msgstr ""
+"Menu to jest przeznaczone do modyfikacji. Więcej szczegółów znajduje się w "
+"<link linkend=\"NetworkClients--Configuring_the_PXE_menu\">powiązanym "
+"rozdziale HowTo</link>."
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "DHCPD on the LTSP servers only serves a dedicated network on the second "
-#| "interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) "
-#| "and should seldom need to be changed."
 msgid ""
 "DHCP on the LTSP servers only serves a dedicated network on the second "
 "interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) and "
 "should seldom need to be changed."
 msgstr ""
-"DHCPD na serwerach LTSP obsługuje tylko dedykowaną sieć komputerową na "
-"drugim interfejsie (192.168.0.0/24 i 192.168.1.0/24 są opcjami wstępnie "
+"DHCP na serwerach LTSP obsługuje tylko dedykowaną sieć komputerową na drugim "
+"interfejsie (192.168.0.0/24 i 192.168.1.0/24 są opcjami wstępnie "
 "skonfigurowanymi); to powinno być rzadko zmieniane."
 
 # type: Content of: <article><section><section><section><para>
@@ -657,9 +606,8 @@
 # type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "Cfengine"
 msgid "CFEngine"
-msgstr "Cfengine"
+msgstr "CFEngine"
 
 # type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -767,14 +715,6 @@
 "maszynach."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP "
-#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
-#| "network traffic of the thin clients doesn't interfere with the rest of "
-#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. All "
 "types of clients can be connected to the private 10.0.0.0/8 subnet and will "
@@ -784,11 +724,12 @@
 "the rest of the network services)."
 msgstr ""
 "Konfiguracja sieci komputerowej dla klientów jest wykonywana automatycznie "
-"za pomocą DHCP. Zwykłe klienty mają adresy IP  przydzielane w prywatnej "
-"podsieci 10.0.0.0/8, natomiast cienkie klienty są podłączane do "
-"odpowiadającego im serwera LTSP poprzez oddzielną podsieć 192.168.0.0/24 (ma "
-"to zapewnić sytuację, w której ruch sieciowy cienkich klientów nie będzie "
-"kolidował z resztą usług sieci komputerowej)."
+"za pomocą DHCP. Wszystkie rodzaje klientów mogą być podłączane do prywatnej "
+"podsieci 10.0.0.0/8, w której dostaną odpowiednie adresy IP. Z kolei klienty "
+"LTSP powinny być podłączane do odpowiadającego im serwera LTSP poprzez "
+"oddzielną podsieć 192.168.0.0/24 (ma to zapewnić sytuację, w której ruch "
+"sieciowy cienkich klientów nie będzie kolidował z resztą usług sieci "
+"komputerowej)."
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
@@ -929,20 +870,17 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Thin clients are using the programs installed on the server."
-msgstr ""
+msgstr "Cienkie klienty używają programów zainstalowanych na serwerze."
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Diskless workstations were introduced as part of the Linux Terminal "
-#| "Server Project (LTSP) with version 5.0."
 msgid ""
 "Diskless workstations are using the programs installed in the server's LTSP "
 "chroot."
 msgstr ""
-"Bezdyskowe stacje robocze zostały wprowadzone jako część projektu terminal "
-"serwera Linux (ang. Linux Terminal Server Project — LTSP) w wersji 5.0."
+"Bezdyskowe stacje robocze używają programów zainstalowanych w środowisku "
+"chroot serwera LTSP (chroot = ang. change root. Jest to uniksowe polecenie "
+"uruchamiające program ze zmienionym katalogiem głównym - root)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -950,30 +888,21 @@
 "can be set at installation time, see the <link linkend=\"Installation--"
 "Desktop_choice\">Installation chapter</link> for details."
 msgstr ""
+"Dla klientów LTSP powinno być używane środowisko graficzne o mniejszych "
+"wymaganiach; jest to ustawiane przy instalowaniu, szczegóły w rozdziale "
+"dotyczącym <link linkend=\"Installation--Desktop_choice\">instalacji</link>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Please note: Thin clients are using the programs installed on the server. "
-#| "Diskless workstations are using the programs installed in the server's "
-#| "LTSP chroot, the client root filesystem is provided using NBD (Network "
-#| "Block Device). After each modification to the LTSP chroot the related NBD "
-#| "image has to be re-generated; run <computeroutput>ltsp-update-image</"
-#| "computeroutput> on the LTSP server."
 msgid ""
 "The client root filesystem is provided using NBD (Network Block Device). "
 "After each modification to the LTSP chroot the related NBD image has to be "
 "re-generated; run <computeroutput>ltsp-update-image</computeroutput> on the "
 "LTSP server."
 msgstr ""
-"Proszę zauważyć: cienkie klienty używają programów zainstalowanych na "
-"serwerze. Bezdyskowe stacje robocze używają programów zainstalowanych na "
-"chroot serwera LTSP (chroot = ang. change root. Jest to uniksowe polecenie "
-"uruchamiające program ze zmienionym katalogiem głównym — root), klienckim "
-"systemie plików root dostarczonym przy użyciu NBD (ang. Network Block "
-"Device). Po każdej modyfikacji chroot LTSP odnośny obraz NBD musi być "
-"wygenerowany ponownie; uruchom <computeroutput>ltsp-update-image</"
-"computeroutput> na serwerze LTSP."
+"Główny system plików (root filesystem) dla klientów jest dostarczany przy "
+"użyciu NBD (ang. Network Block Device). Po każdej modyfikacji środowiska "
+"chroot LTSP odnośny obraz NBD musi być wygenerowany ponownie, uruchamiając "
+"<computeroutput>ltsp-update-image</computeroutput> na serwerze LTSP."
 
 # type: Content of: <article><section><section><section><title>
 #. type: Content of: <article><section><section><section><title>
@@ -982,13 +911,6 @@
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
-#| "This means that the machine boots from a diskette or directly from the "
-#| "server using network-PROM (or PXE) without using the local client hard "
-#| "drive. The thin client setup used is that of the Linux Terminal Server "
-#| "Project (LTSP)."
 msgid ""
 "A thin client setup enables ordinary PCs to function as (X-)terminals. This "
 "means that the machine boots directly from the server using PXE without "
@@ -996,25 +918,13 @@
 "Linux Terminal Server Project (LTSP)."
 msgstr ""
 "Zainstalowanie cienkiego klienta sprawia, że zwykły komputer klasy PC może "
-"funkcjonować jako (X-)terminal. Oznacza to, że maszyna startuje z dyskietki "
-"lub bezpośrednio z serwera przy użyciu network-PROM (lub PXE), bez potrzeby "
-"używania lokalnego twardego dysku klienta. Instalowanie cienkiego klienta "
-"oparte jest na projekcie terminalu serwera Linux (ang. Linux Terminal Server "
-"Project — LTSP)."
+"funkcjonować jako (X-)terminal. Oznacza to, że maszyna startuje bezpośrednio "
+"z serwera przy użyciu PXE, bez potrzeby używania lokalnego twardego dysku "
+"klienta. Instalator cienkiego klienta pochodzi z projektu serwera terminali "
+"linuksowych LTSP (ang. Linux Terminal Server Project)."
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Thin clients are a good way to make use of older, weaker machines as they "
-#| "effectively run all programs on the LTSP server. This works as follows: "
-#| "the service uses DHCP and TFTP to connect to the network and boot from "
-#| "the network. Next, the file system is mounted from the LTSP server using "
-#| "NBD, and finally the X Window System is started. The display manager "
-#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
-#| "data is encrypted on the network. For very old thin clients which are too "
-#| "slow for the encryption this can be set to the behavior from former "
-#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
@@ -1027,13 +937,11 @@
 "Cienkie klienty są dobrym sposobem, aby skorzystać ze starszych, słabszych "
 "maszyn, ponieważ mogą skutecznie uruchamiać wszystkie programy na serwerze "
 "LTSP. Działa to w następujący sposób: usługa używa DHCP i TFTP, aby połączyć "
-"się z siecią i uruchomić rozruch z sieci. Następnie, system plików jest "
-"montowany przez NFS z serwera LTSP, a na końcu uruchamiany jest System X "
-"Window. Menadżer wyświetlania (LDM) łączy się z serwerem LTSP poprzez "
-"protokół SSH z X-przekierowaniem. W ten sposób, wszystkie dane są szyfrowane "
-"w sieci. W przypadku bardzo starych cienkich klientów, które są zbyt powolne "
-"w szyfrowaniu, można ustawić zachowania z poprzednich wersji, używających "
-"bezpośredniego połączenia X poprzez XDMCP."
+"się z siecią i uruchomić rozruch z sieci. Następnie, system plików z serwera "
+"LTSP jest montowany przez NBD, a na końcu uruchamiany jest System X Window. "
+"Menedżer wyświetlania (LDM) łączy się z serwerem LTSP poprzez protokół SSH, "
+"używając przekierowania protokołu wyświetlania Systemu X (ang. X-"
+"forwarding). W ten sposób wszystkie dane w sieci są szyfrowane."
 
 # type: Content of: <article><section><section><section><title>
 #. type: Content of: <article><section><section><section><title>
@@ -1102,13 +1010,6 @@
 msgstr "Administracja"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "All the Linux machines that are installed with the Skolelinux installer "
-#| "will be administrable from a central computer, most likely the server. It "
-#| "will be possible to log in to all machines via SSH (by default, root is "
-#| "not allowed to log in with password), and thereby have full access to the "
-#| "machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
@@ -1118,9 +1019,10 @@
 msgstr ""
 "Wszystkie maszyny Linux, zainstalowane za pomocą instalatora Skolelinux, "
 "będzie można administrować z komputera centralnego, najprawdopodobniej z "
-"serwera. Domyślnie, możliwe będzie logowanie do wszystkich maszyn poprzez "
-"SSH, natomiast logowanie jako root z hasłem nie będzie dozwolone. Tak więc, "
-"będzie możliwy pełny dostęp do tych maszyn."
+"serwera. Możliwe będzie logowanie do wszystkich maszyn poprzez SSH, aby mieć "
+"do nich pełny dostęp administracyjny. Jako administrator konieczne będzie "
+"uruchamianie <computeroutput>kinit</computeroutput>, aby uzyskać Kerberos "
+"TGT."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1138,16 +1040,12 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Currently there are two kinds of installation media images: netinstall "
-#| "(CD)  and multi-arch USB flash drive. Both images can also be booted from "
-#| "USB sticks."
 msgid ""
 "Currently there are two kinds of installation media images: netinst and BD. "
 "Both images can also be booted from USB sticks."
 msgstr ""
-"Obecnie, dostepne są dwa rodzaje obrazów nośników instalacyjnych: netinstall "
-"(CD) i napęd flash USB multi-arch. Oba obrazy mogą być również uruchamiane z "
+"Obecnie dostępne są dwa rodzaje obrazów nośników instalacyjnych: netinstall "
+"(CD) i napęd flash USB (BD). Oba obrazy mogą być również uruchamiane z "
 "pamięci USB."
 
 #. type: Content of: <article><section><section><section><para>
@@ -1342,9 +1240,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-#| "recommended for the main and LTSP server profiles."
 msgid ""
 "At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
 "clients are recommended for the main and LTSP server profiles."
@@ -1354,10 +1249,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-#| "possible, though 256 MiB RAM or more and faster processors are "
-#| "recommended."
 msgid ""
 "Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
 "and faster processors are recommended."
@@ -1389,10 +1280,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "For workstations, diskless workstations and standalone systems, 800 MHz "
-#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
-#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgid ""
 "For workstations, diskless workstations and standalone systems, 1500 MHz and "
 "1024 MiB RAM are the absolute minimum requirements. For running modern "
@@ -1423,9 +1310,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "combined main server + LTSP server: 70 GiB. As usual with disk space on a "
-#| "main server, \"the bigger the better\"."
 msgid ""
 "combined main server + LTSP server: 70 GiB (plus additional space for user "
 "accounts)."
@@ -1705,12 +1589,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "We recommend that you read or at least take a look at the <ulink url="
-#| "\"http://www.debian.org/releases/stretch/releasenotes\">release notes for "
-#| "Debian Stretch</ulink> before you start installing a system for "
-#| "production use. Please give Debian Edu/Skolelinux a try, it should just "
-#| "work."
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
 "\"http://www.debian.org/releases/buster/releasenotes\">release notes for "
@@ -1742,10 +1620,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Be sure to read the <link linkend=\"GettingStarted\">getting started</"
-#| "link> chapter of this manual, though, as it explains how to log in for "
-#| "the first time."
 msgid ""
 "Be sure to also read the <link linkend=\"GettingStarted\">getting started</"
 "link> chapter of this manual, as it explains how to log in for the first "
@@ -1757,16 +1631,11 @@
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid ""
-#| "Download the installation media for Debian Edu 9+edu0 Codename Stretch"
 msgid "Download the installation media for Debian Edu 10+edu0 Codename Buster"
 msgstr "Pobierz medium instalacyjne dla Debian Edu 9+edu0 Nazwa kodowa Stretch"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Stretch\"/> is a wiki and updated frequently."
 msgid ""
 "All the Buster images are still under development - check <ulink url="
 "\"https://wiki.debian.org/DebianEdu/Status/Buster\"/> if you are unsure "
@@ -1793,7 +1662,6 @@
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "netinstall CD image for i386, amd64"
 msgid "netinst iso images for amd64 or i386"
 msgstr "obraz netinstall CD dla architektur sprzętowych i386 i amd64"
 
@@ -1843,6 +1711,16 @@
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr ""
 
@@ -1911,9 +1789,6 @@
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The purpose of the different profiles is explained in the <link linkend="
-#| "\"Architecture\">network architecture</link> chapter."
 msgid ""
 "Connect all components like shown in the <link linkend=\"Architecture--"
 "Network\">architecture</link> chapter."
@@ -2037,7 +1912,6 @@
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Installation"
 msgid "Modular installation"
 msgstr "Instalacja"
 
@@ -2085,7 +1959,6 @@
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "01-Installer_64bit_boot_menu.png"
 msgid "64-bit Installer boot menu"
 msgstr "01-Installer_64bit_boot_menu.png"
 
@@ -2113,7 +1986,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
@@ -2198,7 +2070,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/01-Installer_64bit_boot_menu.png"
 msgid "./images/01b-Installer_64bit_command_line.png"
 msgstr "./images/01-Installer_64bit_boot_menu.png"
 
@@ -2542,7 +2413,6 @@
 # type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "./images/30-Main-Server-GRUB_Boot_menu-PXE.png"
 msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
@@ -2559,7 +2429,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
@@ -2619,10 +2488,6 @@
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Even more information about the Debian Stretch release is available in "
-#| "its <ulink url=\"http://www.debian.org/releases/stretch/installmanual"
-#| "\">installation manual</ulink>."
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
 "releases/buster/installmanual\">manual of the Debian Installer</ulink>."
@@ -2701,61 +2566,51 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/02-select_a_language.png"
 msgid "./images/02-select_a_language.png"
 msgstr "./images/02-select_a_language.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/02-select_a_language.png"
 msgid "02-select_a_language.png"
 msgstr "./images/02-select_a_language.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/03-select_your_location.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "03-select_your_location.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/04-Configure_the_keyboard.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "04-Configure_the_keyboard.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "06-Load_installer_components_from_CD.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
@@ -2767,21 +2622,18 @@
 # type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/07-Detect_network_hardware.png"
 msgid "07-Detect_network_hardware.png"
 msgstr "./images/07-Detect_network_hardware.png"
 
 # type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
 # type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
@@ -2811,145 +2663,121 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "12-Set_up_users_and_passwords.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "12c-Set_up_users_and_passwords.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "12d-Setting-up-the-partitioner.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/13-Install+the+base+system.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "13-Install the base system.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/14-Select_and_install_software.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "14-Select_and_install_software.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/17-Select_and_install_software.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "17-Select_and_install_software.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/18-Build+LTSP+chroot.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "18-Build LTSP chroot.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/20-Finish_the_Installation.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "20-Finish_the_Installation.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
@@ -2961,7 +2789,6 @@
 # type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
@@ -2971,7 +2798,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgid "./images/26-Tjener-Xfce_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
@@ -2981,7 +2807,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/27-Tjener-KDE_Desktop.png"
 msgid "./images/27-Tjener-Xfce_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
@@ -2991,21 +2816,18 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 # type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
 # type: Content of: <article><section><section><section><title>
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Diskless workstations"
 msgid "Diskless Workstation Login"
 msgstr "Bezdyskowe stacje robocze"
 
@@ -3042,7 +2864,6 @@
 # type: Content of: <article><section><section><section><title>
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid "Upgrading the main server"
 msgid "Log into the server."
 msgstr "Podwyższenie wersji serwera głównego"
 
@@ -3089,7 +2910,6 @@
 # type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Debian Edu KDE desktop"
 msgid "Debian Edu Xfce desktop"
 msgstr "Pulpit KDE Debian Edu"
 
@@ -3172,7 +2992,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/gosa2_overview.png"
 msgstr "./images/smile.png"
 
@@ -3320,7 +3139,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/filterbox.png"
 msgstr "./images/smile.png"
 
@@ -3354,7 +3172,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/pxe-tjener.png"
 msgid "./images/edit_user.png"
 msgstr "./images/pxe-tjener.png"
 
@@ -3501,7 +3318,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/pxe-tjener.png"
 msgid "./images/reset_passwords.png"
 msgstr "./images/pxe-tjener.png"
 
@@ -3515,7 +3331,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/create_group.png"
 msgstr "./images/alert.png"
 
@@ -3525,7 +3340,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/list_groups.png"
 msgstr "./images/alert.png"
 
@@ -3651,7 +3465,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/gosa_systems_list.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
@@ -3661,7 +3474,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
@@ -3671,7 +3483,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
@@ -3681,7 +3492,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
@@ -4131,13 +3941,11 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/23-Tjener-KDM_Login.png"
 msgid "slbackup-php Maintenance"
 msgstr "./images/23-Tjener-KDM_Login.png"
 
@@ -4380,10 +4188,6 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "Be sure to read the <link linkend=\"GettingStarted\">getting started</"
-#| "link> chapter of this manual, though, as it explains how to log in for "
-#| "the first time."
 msgid ""
 "Please read this chapter and the <link linkend=\"Features\">New features in "
 "Buster</link> chapter of this manual completely before attempting to upgrade."
@@ -4520,12 +4324,9 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4561,7 +4362,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid "After the installation:"
 msgid "cf-agent -I -D installation"
 msgstr "Po instalacji:"
 
@@ -5114,7 +4914,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 
@@ -5139,7 +4939,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgid "<emphasis role=\"strong\">Main server</emphasis>"
 msgstr "<emphasis role=\"strong\">Serwer Główny</emphasis>"
 
@@ -5612,7 +5411,6 @@
 # type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "<emphasis>(as root on the main server) </emphasis>"
 msgid "<emphasis>(as first user in Gosa)</emphasis>"
 msgstr "<emphasis>(jako root na serwerze głównym)</emphasis>"
 
@@ -6052,7 +5850,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -6116,7 +5914,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/idea.png"
 msgstr "./images/smile.png"
 
@@ -7107,9 +6904,9 @@
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7145,7 +6942,7 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7719,13 +7516,11 @@
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "New features for Debian Edu 9+edu0 Codename Stretch"
 msgid "New features in Debian Edu Buster"
 msgstr "Nowe cechy dla Debiana Edu 9+edu0 Nazwa kodowa Strech"
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "New features for Debian Edu 9+edu0 Codename Stretch"
 msgid "New features for Debian Edu 10+edu0 Codename Buster"
 msgstr "Nowe cechy dla Debiana Edu 9+edu0 Nazwa kodowa Strech"
 
@@ -7742,10 +7537,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Even more information about the Debian Stretch release is available in "
-#| "its <ulink url=\"http://www.debian.org/releases/stretch/installmanual"
-#| "\">installation manual</ulink>."
 msgid ""
 "New version of debian-installer from Debian Buster, see its <ulink url="
 "\"http://www.debian.org/releases/buster/installmanual\">installation manual</"
@@ -7819,7 +7610,6 @@
 # type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "LTSP"
 msgid "LTSP 5.18"
 msgstr "LTSP"
 
@@ -7830,10 +7620,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Even more information about the Debian Stretch release is available in "
-#| "its <ulink url=\"http://www.debian.org/releases/stretch/installmanual"
-#| "\">installation manual</ulink>."
 msgid ""
 "More information about Debian 10 Buster is provided in the <ulink url="
 "\"http://www.debian.org/releases/buster/releasenotes\">release notes</ulink> "
@@ -7977,7 +7763,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -8014,9 +7800,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Stretch\"/> is a wiki and updated frequently."
 msgid ""
 "see <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Buster#\">the "
 "Debian Edu Buster status page</ulink>."
@@ -8125,14 +7908,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -8842,8 +8626,6 @@
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid ""
-#| "New features for Debian Edu 8+edu0 Codename Jessie released 2016-07-02"
 msgid "New features for Debian Edu 9+edu0 Codename Stretch released 2017-06-17"
 msgstr ""
 "Nowe cechy dla Debiana Edu 8+edu0 Nazwa kodowa Jessie wydany 2016-07-02"
@@ -9334,9 +9116,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "More information on even older releases can be found at <ulink url="
-#| "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgid ""
 "More information on even older (pre-)releases can be found at <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.pot debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.pot
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.pot	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.pot	2019-05-01 12:19:14.000000000 +0200
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -1204,6 +1204,16 @@
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr ""
 
@@ -3716,12 +3726,9 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4309,7 +4316,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 
@@ -5241,7 +5248,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -6290,9 +6297,9 @@
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6328,7 +6335,7 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7137,7 +7144,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -7279,14 +7286,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.xml debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.xml
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.xml	2019-04-01 17:26:40.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.xml	2019-05-01 12:17:02.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01</title></articleinfo>
+<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01</title></articleinfo>
 <section id="AboutDebianEdu">
 <title>Manual for Debian Edu 10+edu0 Codename Buster
 </title>
@@ -532,6 +532,13 @@
 </para></listitem></itemizedlist>
 </section>
 
+<section id="Installation--Verification_of_downloaded_image_files">
+<title>Verification of downloaded image files
+</title>
+<para>Detailed instructions for verifying these images are part of the <ulink url="https://www.debian.org/CD/faq/index.en.html#verify">Debian-CD FAQ</ulink>. 
+</para>
+</section>
+
 <section id="Installation--Sources">
 <title>Sources
 </title>
@@ -1604,7 +1611,7 @@
 apt full-upgrade]]></screen>
 <itemizedlist>
 <listitem>
-<para>apt-list-changes: be prepared for a lot of NEWS to read; press &lt;return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that the GOsa² information is wrong (due to Debian bug <ulink url="https://bugs.debian.org/925138#">925138</ulink>), see below how to adjust the password encryption properly. All information will be mailed to root so that you can read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</emphasis>).  
+<para>apt-list-changes: be prepared for a lot of NEWS to read; press &lt;return&gt; to scroll down, &lt;q&gt; to leave the pager. All information will be mailed to root so that you can read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</emphasis>).  
 </para></listitem>
 <listitem>
 <para>Read all debconf information carefully, choose 'keep your currently-installed version' unless stated differently below; in most cases hitting return will be fine. 
@@ -1900,7 +1907,7 @@
 </para>
 <para>For new systems added with GOsa², Kerberos host keytab files are generated automatically.
 </para>
-<para> To create one for a system already configured with GOsa², login on the main server as root and run 
+<para> To create one for a system already configured with GOsa², log in on the main server as root and run 
 </para><screen><![CDATA[/usr/share/debian-edu-config/tools/gosa-modify-host <hostname> <IP>]]></screen>
 <para><emphasis role="strong">Please note:</emphasis> host keytab creation is possible for systems of type <emphasis>workstations</emphasis>, <emphasis>servers</emphasis> and <emphasis>terminals</emphasis> but not for those of type <emphasis>netdevices</emphasis>. Also, LTSP clients are using <emphasis>sshfs</emphasis> to mount home directories, so there's nothing to do for diskless workstations. 
 </para>
@@ -2377,7 +2384,7 @@
 </para></listitem></itemizedlist><screen><![CDATA[apt update
 /usr/share/debian-edu-config/tools/install-task-pkgs
 /usr/share/debian-edu-config/tools/improve-desktop-l10n]]></screen>
-<para>Users will then be able to choose the language via the Lightdm display manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and KDE both come with their own internal region and language configuration tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a language chooser. Run <computeroutput>apt purge arctica-greeter</computeroutput> to get the stock Lightdm greeter.
+<para>Users will then be able to choose the language via the LightDM display manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and KDE both come with their own internal region and language configuration tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a language chooser. Run <computeroutput>apt purge arctica-greeter</computeroutput> to get the stock Lightdm greeter.
 </para>
 <para> If LTSP diskless clients are used the above steps need to be done inside the LTSP chroot as well. LDM supports all desktop environments. First use <emphasis>Preferences</emphasis> to choose the language, then login.  
 </para>
@@ -2843,7 +2850,7 @@
 <section id="NetworkClients--X2Go">
 <title>X2Go
 </title>
-<para>X2Go enables you to access a graphical desktop on the LTSP server over both low bandwidth and high bandwidth connections from a PC running Linux, Windows or Mac OS X. Additional software is needed on the client side, see the <ulink url="https://wiki.x2go.org/doku.php/doc:installation:x2goclient">x2go wiki</ulink> for more information. 
+<para>X2Go enables you to access a graphical desktop on the LTSP server over both low bandwidth and high bandwidth connections from a PC running Linux, Windows or macOS. Additional software is needed on the client side, see the <ulink url="https://wiki.x2go.org/doku.php/doc:installation:x2goclient">X2Go wiki</ulink> for more information. 
 </para>
 <para>Please note that the <computeroutput>killer</computeroutput> package should best be removed on the LTSP server if X2Go is used, see <ulink url="https://bugs.debian.org/890517#">890517</ulink>.   
 </para>
@@ -2864,7 +2871,7 @@
 <para>VNC client (Virtual Network Computer) gives access to Skolelinux remotely.  An alternative client package is <computeroutput>xvncviewer</computeroutput>. 
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para><computeroutput>x2goclient</computeroutput> is a graphical client for the X2Go system (not installed by default). You can use it to connect to running sessions and start new sessions.  
+<para><computeroutput>x2goclient</computeroutput> is a graphical client for the X2Go system (not installed by default). You can use it to connect to running sessions and start new ones.  
 </para></listitem>
 <listitem>
 <para><ulink url="http://wiki.debian.org/DebianEdu/HowTo/CitrixApps">Citrix ICA client HowTo</ulink> to access Windows terminal server from Skolelinux. 
@@ -3349,7 +3356,7 @@
 <para>Added configuration file <computeroutput>/etc/ltsp/ltsp-build-client.conf</computeroutput> with examples to make site specific changes easier. 
 </para></listitem>
 <listitem>
-<para>New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-scratch</computeroutput>. It allows to re-generate the LDAP data base just like it has been right after the main server installation. The tool might also be useful to make site specific changes easier.  
+<para>New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-scratch</computeroutput>. It allows to re-generate the LDAP database just like it has been right after the main server installation. The tool might also be useful to make site specific changes easier.  
 </para></listitem>
 <listitem>
 <para>With <emphasis>X2Go server</emphasis> now available in Debian, the related packages are now installed on all systems with Profile <emphasis>LTSP-Server</emphasis>. 
@@ -3405,9 +3412,9 @@
 </para>
 <para>The Japanese translation is copyrighted by victory (2016, 2017) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) and is released under the GPL v2 or any later version. 
+<para>The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, 2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or any later version. 
+<para>The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, 2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the GPL v2 or any later version. 
 </para>
 <para>The Traditional Chinese translation is copyrighted by Louies (2019) and is released under the GPL v2 or any later version. 
 </para>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.zh_Hant.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.zh_Hant.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.zh_Hant.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.zh_Hant.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
 "PO-Revision-Date: 2019-01-28 08:11+0000\n"
 "Last-Translator: Louies <louies0623@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -25,7 +25,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-01-20"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux Buster 10+edu0 手冊 2019-01-20"
 
 #. type: Content of: <article><section><section><title>
@@ -1233,6 +1233,16 @@
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
 msgid "Sources"
 msgstr ""
 
@@ -3857,12 +3867,9 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4451,7 +4458,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 
@@ -5387,7 +5394,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -6436,9 +6443,9 @@
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6474,7 +6481,7 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7283,7 +7290,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -7425,14 +7432,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2019-04-01 15:44+0200\n"
-"PO-Revision-Date: 2019-02-27 19:00+0000\n"
+"POT-Creation-Date: 2019-04-23 21:19+0200\n"
+"PO-Revision-Date: 2019-04-30 14:55+0000\n"
 "Last-Translator: Ma Yong <debuser@yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "debian-edu-documentation/debian-edu-buster/zh_Hans/>\n"
@@ -16,17 +16,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.5-dev\n"
+"X-Generator: Weblate 3.6.1\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
 msgstr "zh-cn"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual"
-msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-04-01"
-msgstr "Debian Edu / Skolelinux Buster 10+edu0 手册"
+msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-01"
+msgstr "Debian Edu / Skolelinux Buster 10+edu0 手册 2019-05-01"
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 10+edu0 Codename Buster"
@@ -53,21 +51,16 @@
 "的版本是一个维基，并会时常更新。"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "<link linkend=\"Translations\">Translations</link> are part of the "
-#| "<computeroutput>debian-edu-doc</computeroutput> package which can be "
-#| "installed on a webserver, and is available <ulink url=\"http://maintainer."
-#| "skolelinux.org/debian-edu-doc/\">online</ulink>."
 msgid ""
 "<link linkend=\"Translations\">Translations</link> are part of the "
 "<computeroutput>debian-edu-doc</computeroutput> package which can be "
 "installed on a webserver, and is available <ulink url=\"https://jenkins."
 "debian.net/userContent/debian-edu-doc/\">online</ulink>."
 msgstr ""
-"<link linkend=\"Translations\">翻译</link> 是 <computeroutput>debian-edu-"
-"doc</computeroutput> 软件包的部分可以安装在万维网服务器上，并可 <ulink url="
-"\"http://maintainer.skolelinux.org/debian-edu-doc/\">在线</ulink> 获得。"
+"<link linkend=\"Translations\">各语种翻译</link>是 <computeroutput>debian-"
+"edu-doc</computeroutput> 软件包的一部分，其可以安装在 web 服务器上而能<ulink "
+"url=\"https://jenkins.debian.net/userContent/debian-edu-doc/\">在线</ulink>使"
+"用。"
 
 #. type: Content of: <article><section><title>
 msgid "About Debian Edu and Skolelinux"
@@ -91,19 +84,6 @@
 "\"Architecture\">架构</link>的相关章节包含了基本环境的细节。"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Directly after installation of a school server all services needed for a "
-#| "school network are set up (see the next chapter <link linkend="
-#| "\"Architecture\">details of the architecture of this setup</link>) and "
-#| "the system is ready to be used. Only users and machines need to be added "
-#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
-#| "environment using PXE has also been prepared, so after initial "
-#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
-#| "all other machines can be installed via the network, this includes "
-#| "\"roaming workstations\" (ones that can be taken away from the school "
-#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
-#| "machines like traditional thin clients."
 msgid ""
 "After installation of a main server all services needed for a school network "
 "are set up and the system is ready to be used. Only users and machines need "
@@ -115,28 +95,21 @@
 "laptops or netbooks) as well as PXE booting for diskless machines like "
 "traditional thin clients."
 msgstr ""
-"一俟学校网络所需所有服务的学校服务器安装之后就是设置（参看下一章 <link "
-"linkend=\"Architecture\">details of the architecture of this setup</link>） "
-"而这个系统准备好被使用。仅需要通过 GOsa²，一个感觉良好的 Web-UI，或任何其他 "
-"LDAP 编辑器添加用户和机器。还准备好使用 PXE 的网络引导环境，那样最初从 CD，蓝"
-"光光盘或者 USB 闪存安装主服务器之后所有其他机器可以通过网络安装，这包括“漫游"
-"工作站”（那可以脱离学校网络，通常是笔记本或上网本）而且 PXE 对于无盘机的引导"
-"就像传统的瘦客户端。"
+"主服务器安装之后学校网络所需的所有服务就已建立而系统也准备好使用。仅是用户和"
+"机器需要通过一个友好的 Web 用户界面，GOsa²，或者任何其他的 LDAP 编辑器来添"
+"加。一个使用 PXE 网络引导的环境也已准备就绪，那么最初从 CD，蓝光光盘或者 USB "
+"闪存安装了主服务器之后就可以通过网络安装所有其他的机器，这包括“漫游工作"
+"站”（这个可以脱离学校的网络，通常是笔记本电脑或是上网本）而且 PXE 引导无硬盘"
+"的机器就如同传统的瘦客户机。"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Several educational applications like celestia, drgeo, gcompris, kalzium, "
-#| "kgeography, solfege and scratch are included in the default desktop "
-#| "setup, which can be extended easily and almost endlessly via the Debian "
-#| "universe."
 msgid ""
 "Several educational applications like GeoGebra, Kalzium, KGeography, GNU "
 "Solfege and Scratch are included in the default desktop setup, which can be "
 "extended easily and almost endlessly via the Debian universe."
 msgstr ""
-"一些教学应用如 celestia, dirgeo, gcompris, kalzium, kgeography, solfege 和 "
-"scratch 包含在缺省桌面设置中，通过 Debian 世界可以容易地几乎无尽扩展。"
+"一系列教育应用程序如 GeoGebra，Kalzium，KGeography，GNU Solfege 和 Scratch 已"
+"包含在默认桌面设置中，这可以通过 Debian 体系轻松而几乎无限地扩展。"
 
 #. type: Content of: <article><section><section><title>
 msgid "Some history and why two names"
@@ -199,26 +172,14 @@
 msgstr "网络"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/Debian_Edu_Network_Stretch.png"
 msgid "./images/Debian_Edu_Network_Buster.png"
-msgstr "./images/Debian_Edu_Network_Stretch.png"
+msgstr "./images/Debian_Edu_Network_Buster.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "The Debian Edu network topology"
 msgstr "Debian Edu 网络拓扑"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The figure is a sketch of the assumed network topology. The default setup "
-#| "of a Skolelinux network assumes that there is one (and only one) main "
-#| "server, while allowing the inclusion of both normal workstations and LTSP "
-#| "servers (with associated thin clients and/or diskless workstations). The "
-#| "number of workstations can be as large or small as you want (starting "
-#| "from none to a lot). The same goes for the LTSP servers, each of which is "
-#| "on a separate network so that the traffic between the clients and the "
-#| "LTSP server doesn't affect the rest of the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main server, "
@@ -230,11 +191,12 @@
 "affect the rest of the network services. LTSP is explained in detail in "
 "<link linkend=\"NetworkClients\">the related HowTo</link> chapter."
 msgstr ""
-"该图是假设网络拓扑草图。缺省设置的 Skolelinux 网络假设一个（并且只一个）主服"
-"务器，允许包含常规工作站和 LTSP 服务器（以连接瘦客户端和/或无盘工作站）两者。"
-"工作站的数目可大可小如你所需（从一个没有到大量启动的）。这同样适用于 LTSP 服"
-"务器，其每个是在分开的网络因而客户端和 LTSP 服务器之间的流量不影响其余的网络"
-"服务器。"
+"这是张假定的网络拓扑草图。Skolelinux 网络默认设置假定有一个（而且仅是一个）主"
+"服务器，同时可以包含常规的工作站和 LTSP 服务器（与瘦客户机和/或无盘工作站相"
+"关）。工作站的数量可以是任意多少（从一个都没有到有很多）。LTSP 服务器也一样，"
+"每一个在独立网络上的 LTSP 服务器与其客户机之间的通信不会影响其他的网络服务。"
+"LTSP 的详细说明在<link linkend=\"NetworkClients\">相关的 HowTo</link> 章节"
+"里。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -257,6 +219,9 @@
 "details how to set up such a gateway if it is not possible to configure an "
 "existing one as needed."
 msgstr ""
+"为了简化 Skolelinux 的标准设置，其互联网连接运行在一个单独的路由器上，也称为"
+"网关。参阅<link linkend=\"Requirements--Internet_router\">互联网路由器</link>"
+"章节对于如何设置还不能根据需要配置现有网关的细节。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "The default network setup"
@@ -316,18 +281,6 @@
 msgstr "运行在主服务器上的服务"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "With the exception of the control of the thin-clients, all services are "
-#| "initially set up on one central computer (the main server). For "
-#| "performance reasons, the thin-client-server should be a separate machine "
-#| "(though it is possible to install both the main server and thin-client "
-#| "server profiles on the same machine). All services are allocated a "
-#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
-#| "DNS name makes it easy to move individual services from the main-server "
-#| "to a different machine, by simply stopping the service on the main-"
-#| "server, and changing the DNS configuration to point to the new location "
-#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin clients, all services are "
 "initially set up on one central computer (the main server). For performance "
@@ -340,12 +293,12 @@
 "location of the service (which should be set up on that machine first, of "
 "course)."
 msgstr ""
-"以瘦客户端管理为例外，所有服务最初设置在一个中央计算机（主服务器）上。由于性"
-"能的原因，瘦客户端服务器会是一台独立的机器（不过在同一机器上既能安装主服务器"
-"也能安装瘦客户端服务器profile）。所有服务分配一个专用 DNS 名称并提供唯一通过 "
-"IPv4 传送。分配 DNS 名称使之从主服务器迁移个别的服务到不同的机器，仅以停止主"
-"服务器上的该服务，并改变 DNS 配置指向该服务的新位置（当然，首先要设置那台机"
-"器）。"
+"除了瘦客户机的管理之外，所有的服务最初设置在一台中央计算机上（主服务器）。为"
+"了性能的原因，LTSP 服务器将要分开来（不过在同一机器上可以安装主服务器和 LTSP "
+"服务器两者的配置文件）。所有服务分配了专用 DNS 名称并且只在 IPv4 上提供。分配"
+"的 DNS 名称使其容易地从主服务器迁移单独的服务到不同的机器，简单地在主服务器上"
+"关闭该服务，而后变更 DNS 配置指向该服务的新位置（当然，首先要在这台机器上设"
+"置）。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -545,10 +498,8 @@
 msgstr "自动配置"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-#| msgid "Cfengine"
 msgid "CFEngine"
-msgstr "Cfengine"
+msgstr "CFEngine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "cfengine"
@@ -601,15 +552,6 @@
 "通过 NFS 的 Unix 客户端，SMB 的 Windows 和 Macintosh 客户端提供存取通路。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "By default email is set up for local delivery (i.e. within the school) "
-#| "only, though email delivery to the wider Internet may be set up if the "
-#| "school has a permanent Internet connection. Mailing lists are set up "
-#| "based on the user database, giving each class their own mailing list. "
-#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
-#| "users can <link linkend=\"Users--Using_email\">access their personal "
-#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
@@ -617,10 +559,10 @@
 "server (using 'smarthost'), and users can <link linkend=\"Users--Using_email"
 "\">access their personal mail</link> through IMAP."
 msgstr ""
-"缺省电子邮件设置仅为本地投递（即学校内），不过若学校有固定互联网连接可以设置"
-"电子邮件投递到更宽广的互联网。设置基于用户数据库的邮件列表，给予每个班级他们"
-"自己的邮件列表。设置客户端投递邮件到服务器（使用 'smarthost'），而用户可以通"
-"过 IMAP <link linkend=\"Users--Using_email\">存取他们的个人邮件</link>。"
+"只预设电子邮件本地投递设置（如在学校内），但如果学校有固定互联网连接那么可以"
+"设置投递电子邮件到更广的互联网。客户端设置为投递电子邮件到服务器（使"
+"用‘smarthost’），而用户可以通过 IMAP <link linkend=\"Users--Using_email\">读"
+"取他们的个人邮件</link>。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -640,14 +582,6 @@
 "器上一同做路由上限制的 web 流量与互联网访问的控制。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP "
-#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
-#| "network traffic of the thin clients doesn't interfere with the rest of "
-#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. All "
 "types of clients can be connected to the private 10.0.0.0/8 subnet and will "
@@ -656,9 +590,10 @@
 "ensure that the network traffic of the LTSP clients doesn't interfere with "
 "the rest of the network services)."
 msgstr ""
-"在客户端的网络配置使用 DHCP 自动完成。常规客户端在私有子网 10.0.0.0/8 分配 "
-"IP 地址，而瘦客户端通过分开的子网 192.168.0.0/24 连接到相符的 LTSP 服务器（这"
-"是保证瘦客户端的网络流量不阻碍其他的网络服务）。"
+"客户端的网络配置是使用 DHCP 自动完成的。所有类型的客户端可以连接到私有的 "
+"10.0.0.0/8 子网并且将获得协商 IP 地址；LTSP 客户机将会通过独立的 "
+"192.168.0.0/24 子网（这是保证 LTSP 客户机的网络流量不干扰到其他的网络服务）连"
+"接到相配合的 LTSP 服务器。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -750,17 +685,13 @@
 msgstr "LTSP 服务器"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (also called thin client "
-#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
 "selecting the LTSP Server profile."
 msgstr ""
-"一个 Skolelinux 网络上可以有许多 LTSP 服务器（亦称瘦客户端服务器），是由选择"
-"瘦客户端服务器profile而安装。"
+"一个 Skolelinux 网络上可以有许多 LTSP 服务器（在 Stretch 之前的发行中称之"
+"为“瘦客户机服务器”），是由选择了 LTSP 服务器配置文件而安装的。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -772,21 +703,17 @@
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Please note:"
-msgstr ""
+msgstr "请留意："
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Thin clients are using the programs installed on the server."
-msgstr ""
+msgstr "瘦客户端正在使用安装在服务器上的程序。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Diskless workstations were introduced as part of the Linux Terminal "
-#| "Server Project (LTSP) with version 5.0."
 msgid ""
 "Diskless workstations are using the programs installed in the server's LTSP "
 "chroot."
-msgstr "无盘工作站是采用 Linux 终端服务器方案 (LTSP) 5.0. 版的部分。"
+msgstr "无盘工作站所使用的程序已安装在服务器的 LTSP chroot 里。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -794,61 +721,36 @@
 "can be set at installation time, see the <link linkend=\"Installation--"
 "Desktop_choice\">Installation chapter</link> for details."
 msgstr ""
+"对于 LTSP 客户机应该使用更轻量级的桌面环境；这可以在安装时设置，详情请参阅"
+"<link linkend=\"Installation--Desktop_choice\">安装章节</link>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Please note: Thin clients are using the programs installed on the server. "
-#| "Diskless workstations are using the programs installed in the server's "
-#| "LTSP chroot, the client root filesystem is provided using NBD (Network "
-#| "Block Device). After each modification to the LTSP chroot the related NBD "
-#| "image has to be re-generated; run <computeroutput>ltsp-update-image</"
-#| "computeroutput> on the LTSP server."
 msgid ""
 "The client root filesystem is provided using NBD (Network Block Device). "
 "After each modification to the LTSP chroot the related NBD image has to be "
 "re-generated; run <computeroutput>ltsp-update-image</computeroutput> on the "
 "LTSP server."
 msgstr ""
-"请注意：瘦客户端使用服务器上安装的程序。无盘工作站使用安装在服务器的 LTSP "
-"chroot 中的程序，客户端根文件系统用 NBD （网络块设备）提供。每一修改 LTSP "
-"chroot 之后相关的 NBD 图像需要重新生成；在 LTSP 服务器上运行 "
-"<computeroutput>ltsp-update-image</computeroutput>。"
+"客户机根文件系统是使用 NBD （网络块设备）提供的。在每次修改 LTSP chroot 之"
+"后，必须重新生成相应的 NBD 映像；这在 LTSP 服务器上运行 <computeroutput>ltsp-"
+"update-image</computeroutput>。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "瘦客户端"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
-#| "This means that the machine boots from a diskette or directly from the "
-#| "server using network-PROM (or PXE) without using the local client hard "
-#| "drive. The thin client setup used is that of the Linux Terminal Server "
-#| "Project (LTSP)."
 msgid ""
 "A thin client setup enables ordinary PCs to function as (X-)terminals. This "
 "means that the machine boots directly from the server using PXE without "
 "using the local client hard drive. The thin client setup used is that of the "
 "Linux Terminal Server Project (LTSP)."
 msgstr ""
-"瘦客户端设置普通个人计算机能具有 (X) 终端的功能。这意味着该机器从软盘或者直接"
-"从服务器使用网络 PROM （即 PXE）引导而不使用本地客户端的硬盘驱动器。瘦客户端"
-"设置使用的是 Linux 终端服务器项目 (LTSP)。"
+"瘦客户机的设置使普通个人计算机能具有 (X) 终端的功能。这意味着该机器直接从服务"
+"器使用 PXE 引导而不使用本地客户机的硬盘驱动器。瘦客户机应用了 Linux 终端服务"
+"器项目 (LTSP) 的设置。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Thin clients are a good way to make use of older, weaker machines as they "
-#| "effectively run all programs on the LTSP server. This works as follows: "
-#| "the service uses DHCP and TFTP to connect to the network and boot from "
-#| "the network. Next, the file system is mounted via NFS from the LTSP "
-#| "server, and finally the X Window System is started. The display manager "
-#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
-#| "data is encrypted on the network. For very old thin clients which are too "
-#| "slow for the encryption this can be set to the behavior from former "
-#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
@@ -858,12 +760,11 @@
 "connects to the LTSP server via SSH with X-forwarding. This way all data is "
 "encrypted on the network."
 msgstr ""
-"瘦客户端是实际在 LTSP 服务器上运行所有程序而使用较陈旧，性能不佳机器的好方"
-"法。这个工作顺序是：该服务使用 DHCP 和 TFTP 连接到网络并从网络引导。接下来，"
-"文件系统通过 NFS 从 LTSP 服务器挂载，最后启动 X Window 系统。显示管理器以 X-"
-"forwarding 通过 SSH 连接到 LTSP 服务器。这个途径在网络上的所有数据是加密的。"
-"对于非常陈旧的瘦客户端加密过于缓慢而可以设为从前版本的运行方式，通过 XDMCP "
-"使 X 直接连接。"
+"瘦客户机实际在 LTSP 服务器上运行所有程序因而是使用较陈旧，性能不佳机器的好方"
+"法。这个工作过程如下：该服务使用 DHCP 和 TFTP 连接到网络并从网络引导。接下"
+"来，使用 NBD 从 LTSP 服务器挂载文件系统，最后启动 X Window 系统。显示管理器 "
+"(LDM) 通过 SSH 为 X-forwarding 连接到 LTSP 服务器。这种方式的所有数据在网络上"
+"是加密的。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Diskless workstations"
@@ -919,12 +820,6 @@
 msgstr "管理"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "All the Linux machines that are installed with the Skolelinux installer "
-#| "will be administrable from a central computer, most likely the server. It "
-#| "will be possible to log in to all machines via SSH (root not allowed by "
-#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
@@ -932,8 +827,9 @@
 "the machines. As root one needs to run <computeroutput>kinit</"
 "computeroutput> first to get a Kerberos TGT."
 msgstr ""
-"由 Skolelinux 安装程序安装的所有 Linux 机器将能从中央计算机管理，最适合服务"
-"器。将能通过 SSH （缺省 root 不被允许）登录到所有机器，从而完全访问这些机器。"
+"可以从中央计算机，大概是服务器来管理所有用 Skolelinux 安装程序安装的 Linux 机"
+"器。其通过 SSH 将能登录到所有的机器，从而完全访问这些机器。作为 root 自己首先"
+"需要运行 <computeroutput>kinit</computeroutput> 来获得 Kerberos TGT。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -949,17 +845,11 @@
 msgstr "安装"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Currently there are two kinds of installation media images: netinstall "
-#| "(CD)  and multi-arch USB flash drive. Both images can also be booted from "
-#| "USB sticks."
 msgid ""
 "Currently there are two kinds of installation media images: netinst and BD. "
 "Both images can also be booted from USB sticks."
 msgstr ""
-"现在有两个类型的安装媒体镜像：网络安装 (CD) 和多架构 USB 闪存。两者的镜像还可"
-"以从 USB 棒被引导。"
+"目前有两种安装媒体映像：网络安装和蓝光光盘。这两个映像也都可以从 U 盘引导。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1119,16 +1009,12 @@
 "陈旧被支持的处理器是 686 级）或者 64 位（Debian 架构 'amd64'）x86 处理器。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-#| "recommended for the main and LTSP server profiles."
 msgid ""
 "At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
 "clients are recommended for the main and LTSP server profiles."
 msgstr ""
-"建议主服务器和 LTSP 服务器的配置对于 30 客户端至少 2 GiB 而 50-60 客户端为 4 "
-"GiB。"
+"建议用于 30 瘦客户机的主服务器和 LTSP 服务器配置至少 12 GiB 的内存而对于 "
+"50-60 瘦客户机则为 20 GiB。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1157,18 +1043,14 @@
 "如果你的无盘工作站有硬盘驱动器，建议使用它们作为比网络交换快不少的交换区。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "For workstations, diskless workstations and standalone systems, 800 MHz "
-#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
-#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgid ""
 "For workstations, diskless workstations and standalone systems, 1500 MHz and "
 "1024 MiB RAM are the absolute minimum requirements. For running modern "
 "webbrowsers and LibreOffice at least 2048 MiB RAM is recommended."
 msgstr ""
-"对于工作站，无盘工作站和独立使用的系统，800 MHz 和 512 MiB RAM 绝对是最低限度"
-"的需求。为运行最新的网络浏览器和 Libre)ffice 建议 1024 MiB RAM。"
+"对于工作站，无盘工作站和独立使用的系统，1500 MHz 及 1024 MiB 的内存绝对是最低"
+"限度的需求。为运行最新的 web 浏览器和 LibreOffice 建议至少是 2048 MiB 的内"
+"存。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -1185,16 +1067,10 @@
 msgstr "最低限度的磁盘空间需求取决于所安装的profile："
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "combined main server + LTSP server: 70 GiB. As usual with disk space on a "
-#| "main server, \"the bigger the better\"."
 msgid ""
 "combined main server + LTSP server: 70 GiB (plus additional space for user "
 "accounts)."
-msgstr ""
-"组合主服务器 + LTSP 服务器：70 GiB。像通常一样在主服务器上的磁盘空间，“越多越"
-"好”。"
+msgstr "组合主服务器 + LTSP 服务器：70 GiB（加上用户帐户的额外空间）。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LTSP server: 50 GiB."
@@ -1408,14 +1284,6 @@
 " #apt install wondershaper"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you need something for an embedded router or accesspoint we recommend "
-#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
-#| "you can also use the original firmware. Using the original firmware is "
-#| "easier; using OpenWRT gives you more choices and control. Check the "
-#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
-#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
@@ -1424,10 +1292,10 @@
 "webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
-"如果你需要固定路由或访问点的某事我们建议使用 <ulink url=\"http://openwrt.org"
-"\">OpenWRT</ulink>，当然你也可以使用新颖的固件。使用新颖固件很容易；使用 "
-"OpenWRT 给你更多选择和控制权。检索 OpenWRT 网页的 <ulink url=\"http://wiki."
-"openwrt.org/TableOfHardware\">supported hardware</ulink> 列表。"
+"如果你需要嵌入式路由器或访问点的设备我们建议使用 <ulink url=\"http://openwrt."
+"org\">OpenWRT</ulink>，当然你也可以使用原先的固件。使用原先的固件很容易；使"
+"用 OpenWRT 给你更多选择和控制权。检索 OpenWRT 网页的<ulink url=\"http://wiki."
+"openwrt.org/toh/start\">支持的硬件</ulink>列表。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1452,13 +1320,6 @@
 msgstr "在哪里找到另外的信息"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "We recommend that you read or at least take a look at the <ulink url="
-#| "\"http://www.debian.org/releases/stretch/releasenotes\">release notes for "
-#| "Debian Stretch</ulink> before you start installing a system for "
-#| "production use. Please give Debian Edu/Skolelinux a try, it should just "
-#| "work."
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
 "\"http://www.debian.org/releases/buster/releasenotes\">release notes for "
@@ -1467,13 +1328,14 @@
 "its <ulink url=\"http://www.debian.org/releases/buster/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"我们建议在你开始安装一个为生产使用的系统之前阅读或至少要看 <ulink url="
-"\"http://www.debian.org/releases/stretch/releasenotes\">Debian Stretch 发行注"
-"记</ulink>。请给 Debian Edu/Skolelinux 一个尝试，它将正确工作。"
+"我们建议在开始安装一个用于生产的系统之前阅读或至少要看 <ulink url=\"http://"
+"www.debian.org/releases/buster/releasenotes\">Debian Buster 发行说明</"
+"ulink>。有更多有关 Debian Buster 发行版的信息可以在其<ulink url=\"http://www."
+"debian.org/releases/buster/installmanual\">安装手册</ulink>中获得。"
 
 #. type: Content of: <article><section><section><para>
 msgid "Please give Debian Edu/Skolelinux a try, it should just work."
-msgstr ""
+msgstr "请尝试一下 Debian Edu/Skolelinux，应该能行。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
 msgid ":-)"
@@ -1486,44 +1348,34 @@
 "<link linkend=\"Architecture\">architecture</link> before starting to "
 "install a main server."
 msgstr ""
+"不过，建议在开始安装主服务器之前阅读有关<link linkend=\"Requirements\">硬件和"
+"网络需求</link>以及<link linkend=\"Architecture\">架构</link>的章节。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Be sure to read the <link linkend=\"GettingStarted\">getting started</"
-#| "link> chapter of this manual, though, as it explains how to log in for "
-#| "the first time."
 msgid ""
 "Be sure to also read the <link linkend=\"GettingStarted\">getting started</"
 "link> chapter of this manual, as it explains how to log in for the first "
 "time."
 msgstr ""
-"无疑要阅读本手册的<link linkend=\"GettingStarted\">起始</link>章，虽然，那所"
-"讲解的是第一次如何登录。"
+"还要务必阅读本手册的<link linkend=\"GettingStarted\">入门</link>一章，因为那"
+"说明了第一次如何登录。"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "Download the installation media for Debian Edu 9+edu0 Codename Stretch"
 msgid "Download the installation media for Debian Edu 10+edu0 Codename Buster"
-msgstr "下载 Debian Edu 9+edu0 代号 Stretch 的安装媒体"
+msgstr "下载 Debian Edu 10+edu0 代号 Buster 的安装媒体"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Buster\"/> is a wiki and updated frequently."
 msgid ""
 "All the Buster images are still under development - check <ulink url="
 "\"https://wiki.debian.org/DebianEdu/Status/Buster\"/> if you are unsure "
 "whether Buster has officially been released."
 msgstr ""
-"在 <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Buster\"/> 上"
-"的版本是一个维基，并会时常更新。"
+"所有这些 Buster 映像仍在开发中 - 如果不确知 Buster 是否正式发布请查阅 <ulink "
+"url=\"https://wiki.debian.org/DebianEdu/Status/Buster\"/>。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "amd64 or i386"
-msgstr ""
+msgstr "amd64 或 i386"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1536,81 +1388,81 @@
 "computeroutput>. <computeroutput>i386</computeroutput> should only be used "
 "for old hardware."
 msgstr ""
+"<computeroutput>amd64</computeroutput> 和 <computeroutput>i386</"
+"computeroutput> 是针对 x86 CPU 的两种 Debian 架构名称，两者由 AMD，抑或 "
+"Intel 和其他厂商制造。<computeroutput>amd64</computeroutput> 是 64-bit 架构"
+"而 <computeroutput>i386</computeroutput> 是 32-bit 架构。现在新的安装将使用 "
+"<computeroutput>amd64</computeroutput>。<computeroutput>i386</"
+"computeroutput> 仅会用于旧硬件。"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "netinstall CD image for i386, amd64"
 msgid "netinst iso images for amd64 or i386"
-msgstr "i386，amd64 的网络安装 CD 镜像"
+msgstr "amd64 或 i386 的网络安装 iso 映像"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The netinstall CD, which also can be used for installation from USB flash "
-#| "drives, is suitable to install i386 and amd64 machines. As the name "
-#| "implies, internet access is required for the installation. It's available "
-#| "via"
 msgid ""
 "The netinst iso image can be used for installation from CD/DVD and USB flash "
 "drives and is available for two Debian architectures: amd64 or i386. As the "
 "name implies, internet access is required for the installation."
 msgstr ""
-"网络安装 CD，也可以用于从 USB 闪存安装，适合安装 i386 和 amd64 的机器。作为这"
-"个名称含有的意思，安装需要互联网访问。它可以获得自"
+"网络安装 iso 映像可以用于从 CD/DVD 和 USB 闪存驱动器安装并且有两个 Debian 架"
+"构：amd64 或 i386。顾名思义，安装需要访问互联网。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Once Buster has been released these images will be available for download "
 "from:"
-msgstr ""
+msgstr "在 Buster 发布后这些映像将可以下载自："
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-cd/\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
+msgstr ""
+"<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-cd/\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-cd/\"/>"
 msgstr ""
+"<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-cd/\"/>"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "USB drive ISO image for i386 and amd64"
 msgid "BD iso images for i386 or amd64"
-msgstr "i386 和 amd64 的 USB 驱动器 ISO 镜像"
+msgstr "i386 或 amd64 的蓝光光盘 iso 映像"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. Like the netinstall image it can "
-#| "be installed on USB flash drives or disk media of sufficient size. Please "
-#| "note that internet access during installation is needed. Like the others "
-#| "it can be downloaded over FTP, HTTP or rsync via:"
 msgid ""
 "This ISO image is approximately 5 GB large and can be used for installation "
 "of amd64 or i386 machines, also without access to the Internet. Like the "
 "netinst image it can be installed on USB flash drives or disk media of "
 "sufficient size."
 msgstr ""
-"多架构 ISO 镜像是 5.2 BiB 大并用于安装 amd64 和 i386 机器。像网络安装媒体一样"
-"它可以被安置于 USB 闪存或足够大小的媒介盘。请注意安装时需要互联网访问。像其他"
-"一样它可以在 FTP，HTTP 上或者通过 rsync 下载："
+"这个 ISO 映像大约 5 GB 大并用于安装 amd64 或 i386 的机器，也无需访问互联网。"
+"它像网络安装映像一样可以被置于 USB 闪存或足够大的盘体介质中。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-bd/\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
+msgstr ""
+"<ulink url=\"http://get.debian.org/cdimage/release/current/amd64/iso-bd/\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-bd/\"/>"
 msgstr ""
+"<ulink url=\"http://get.debian.org/cdimage/release/current/i386/iso-bd/\"/>"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Verification of downloaded image files"
+msgstr "已下载映像文件的校验"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Detailed instructions for verifying these images are part of the <ulink url="
+"\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD FAQ</ulink>."
+msgstr ""
+"<ulink url=\"https://www.debian.org/CD/faq/index.en.html#verify\">Debian-CD "
+"常见问答集</ulink>的一部分对于验证这些映像有详细说明。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Sources"
@@ -1622,27 +1474,23 @@
 "several media are linked on <ulink url=\"http://get.debian.org/cdimage/"
 "release/current/source/\"/>"
 msgstr ""
+"源代码是从通常位置的 Debian 归档获得，系列媒介链接于 <ulink url=\"http://get."
+"debian.org/cdimage/release/current/source/\"/>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD / DVD by mail"
 msgstr "以邮件请求 CD / DVD"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "For those without a fast Internet connection, we can offer a CD or DVD "
-#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
-#| "<ulink url=\"mailto:cd@skolelinux.no\">cd@skolelinux.no</ulink> and we "
-#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd@skolelinux.no\">cd@skolelinux.no</ulink> and we will discuss the "
 "payment details (for shipping and media)."
 msgstr ""
-"对于没有快速互联网连接，我们能以 CD 或 DVD 及运输费用发送 CD 或 DVD。直接发送"
-"电子邮件 <ulink url=\"mailto:cd@skolelinux.no\">cd@skolelinux.no</ulink> 而我"
-"们会商议支付细节（运输和媒体介质）"
+"对于那些没有快速互联网连接，我们可以按 CD 或 DVD 以及运输的费用提供 CD 或 "
+"DVD 的发送。只要发送电子邮件到 <ulink url=\"mailto:cd@skolelinux.no"
+"\">cd@skolelinux.no</ulink> 我们就会商量支付细节（运输和媒体）。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1655,14 +1503,6 @@
 msgstr "安装 Debian Edu"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When you do a Debian Edu installation, you have a few options to choose "
-#| "from. Don't be afraid; there aren't many. We have done a good job of "
-#| "hiding the complexity of Debian during the installation and beyond. "
-#| "However, Debian Edu is Debian, and if you want there are more than 52,000 "
-#| "packages to choose from and a billion configuration options. For the "
-#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
@@ -1674,26 +1514,27 @@
 msgstr ""
 "在你安装 Debian Edu 时，你有一些要选择的选项。不要畏惧；那不多。我们很好地做"
 "到隐藏安装期间及以外 Debian 的复杂性。无论如何，Debian Edu 就是 Debian，而你"
-"如果需要这里有超过 52,000 个软件包来选择和亿万配置选项。对于我们的大多数用"
-"户，我们的缺省配置将是高质量的。"
+"如果需要这里有超过 57,000 个软件包来选择和亿万配置选项。对于我们的大多数用"
+"户，我们的缺省配置将是高质量的。请注意：如果有意用LTSP的话，请选择一个轻型桌"
+"面环境。"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "The installation process"
 msgid "Main server installation scenarios"
-msgstr "安装过程"
+msgstr "主要服务器安装"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Typical school or home network with Internet access through a router "
 "providing DHCP:"
-msgstr ""
+msgstr "通过提供 DHCP 的路由器访问互联网的典型学校或家庭网络："
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Installation of a main server is possible, but after reboot there will be no "
 "internet access (due to primary network interface IP 10.0.2.2/8)."
 msgstr ""
+"可以安装一个主服务器，但重新启动后将不能访问互联网（由于主网络接口 IP 是 "
+"10.0.2.2/8）。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -1701,140 +1542,144 @@
 "link> chapter for details how to set up a gateway if it is not possible to "
 "configure an existing one as needed."
 msgstr ""
+"如果不能根据需要配置现有的网关就参阅<link linkend=\"Requirements--"
+"Internet_router\">互联网路由器</link>章节如何设置网关的细节。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The purpose of the different profiles is explained in the <link linkend="
-#| "\"Architecture\">network architecture</link> chapter."
 msgid ""
 "Connect all components like shown in the <link linkend=\"Architecture--"
 "Network\">architecture</link> chapter."
-msgstr ""
-"不同profile的目的在 <link linkend=\"Architecture\">network architecture</"
-"link> 章中解释。"
+msgstr "全部的组件像在<link linkend=\"Architecture--Network\">章里被连接。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "The main server should have Internet connection once bootet the first time "
 "in the correct environment."
-msgstr ""
+msgstr "主服务器在正确环境下第一次启动就会有互联网连接。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Typical school or institution network, similar to the one above, but with "
 "proxy use required."
-msgstr ""
+msgstr "典型的学校或机构网络，类似于上述，但需要使用代理。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Add 'debian-edu-expert' to the kernel command line; see further below for "
 "details how this is done."
-msgstr ""
+msgstr "添加‘debian-edu-expert’到内核命令行；参阅后续细节来做。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Some additional questions must be answered, the proxy server related one "
 "included."
-msgstr ""
+msgstr "必须回答一些附加问题，包括讲到的代理服务器。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid ""
 "Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
 "server) and Internet access:"
 msgstr ""
+"网络由 IP 为 10.0.0.1/8 的路由器/网关（那不提供 DHCP 服务器）而访问互联网："
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "As soon as the automatic network configuration fails (due to missing DHCP), "
 "choose manual network configuration."
-msgstr ""
+msgstr "一旦自动网络配置失败（由于未发现 DHCP），就选择手工网络配置。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Enter 10.0.2.2/8 as host IP"
-msgstr ""
+msgstr "输入 10.0.2.2/8 作为主机 IP"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Enter 10.0.0.1 as gateway IP"
-msgstr ""
+msgstr "输入 10.0.0.1 作为网关 IP"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
-msgstr ""
+msgstr "如果不知道更合适的就输入 8.8.8.8 作为域名服务器 IP"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "The main server should just work after the first boot."
-msgstr ""
+msgstr "主服务器将在第一次启动之后正常工作。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 msgid "Offline (no Internet connection):"
-msgstr ""
+msgstr "离线（无网络连接）："
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Use the BD ISO image."
-msgstr ""
+msgstr "使用蓝光光盘 ISO 映像。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid "Make sure all (real/virtual) network cables are unplugged."
-msgstr ""
+msgstr "核实所有（真实/虚拟）网线插头被拔出。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Choose 'Do not configure the network at this time' (after DHCP failed to "
 "configure the network and you pressed 'Continue')."
-msgstr ""
+msgstr "选择‘现在不进行网络设置’（在 DHCP 配置网络失败并按下‘继续’之后）。"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Update the system once bootet the first time in the correct environment with "
 "Internet access."
-msgstr ""
+msgstr "在互联网联通的正确环境下第一次启动就更新系统。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Desktop choice"
-msgstr ""
+msgstr "桌面选择"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "KDE and GNOME both have good language support, but too big a footprint for "
 "both older computers and for LTSP clients."
 msgstr ""
+"KDE 和 GNOME 都有很好的语言支持，但对于比较陈旧的计算机和 LTSP 客户机都是重"
+"负。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "MATE is lighter than the two above, but is missing good language support for "
 "several countries."
-msgstr ""
+msgstr "MATE 比上面两个轻巧，但对一些国家缺少良好的语言支持。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "LXDE has the smallest footprint and supports 35 languages."
-msgstr ""
+msgstr "LXDE 有着最小的负载而支持 35 种语言。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "LXQt is a lightweight desktop (language support similar to LXDE) with a more "
 "modern look and feel (based on Qt just like KDE)."
 msgstr ""
+"LXQt 是一款有更新式风格和体验（与 KDE 同基于 Qt）的轻量级桌面（语言支持类似 "
+"LXDE）。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Xfce has a slightly bigger footprint than LXDE but a very good language "
 "support (106 languages)."
-msgstr ""
+msgstr "Xfce 的负载比 LXDE 略大但有非常好的语言支持（106 种语言）。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Debian Edu as an international project has chosen to use Xfce as the default "
 "desktop; see below how to set a different one."
 msgstr ""
+"Debian Edu 作为一个国际项目而选择使用了 Xfce 作为默认桌面；参阅以下如何来设置"
+"一个不同的桌面。"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Installation"
 msgid "Modular installation"
-msgstr "安装"
+msgstr "模块化安装"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
 "When installing a system with profile <emphasis>Workstation</emphasis> "
 "included, a lot of education related programs are installed. To install only "
@@ -1843,6 +1688,10 @@
 "details how this is done. This allows one to install a site specific system "
 "and could be used to speed up test installations."
 msgstr ""
+"安装配置文件为<emphasis>工作站（Workstation）</emphasis>的系统时，会安装许多"
+"与教育相关的程序。要仅安装基本配置文件，请在开始安装之前删除"
+"<emphasis>desktop=XXXX<emphasis>kernel命令行参数；有关如何执行此操作的详细信"
+"息，请参阅下文。这允许安装一个特定于站点的系统，并可以用来加速测试安装。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1857,12 +1706,22 @@
 "<emphasis>education-highschool</emphasis> could be installed to match the "
 "use case."
 msgstr ""
+"请注意：如果想要在以后安装桌面，不要使用会牵扯全部教育相关程序有如 <ulink "
+"url=\"https://packages.debian.org/stable/education-desktop-mate#\">education-"
+"desktop-mate</ulink> 的 Debian Edu 综合软件包；而不如改为安装例如 <ulink url="
+"\"https://packages.debian.org/stable/task-mate-desktop#\">task-mate-desktop</"
+"ulink>。一个或更多新的相关学校等级的综合软件包 <emphasis>education-"
+"preschool</emphasis>，<emphasis>education-primaryschool</emphasis>，"
+"<emphasis>education-secondaryschool</emphasis>，<emphasis>education-"
+"highschool</emphasis> 将会配合使用情况而安装。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "For details about Debian Edu meta-packages, see the <ulink url=\"https://"
 "blends.debian.org/edu/tasks/\">Debian Edu packages overview</ulink> page."
 msgstr ""
+"有关 Debian Edu 综合软件包的详细情况，请看 <ulink url=\"https://blends."
+"debian.org/edu/tasks/\">Debian Edu 软件包概览</ulink>页。"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation types and options"
@@ -1993,41 +1852,31 @@
 msgstr "<emphasis>Add or change boot parameters for installations</emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
-#| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu; the screenshot shows the command line for <emphasis role=\"strong"
 "\">Graphical install</emphasis>."
-msgstr "在 i386/amd64 中，以在引导菜单中按 TAB 键可以编辑引导选项。"
+msgstr ""
+"在这两种情况中，在引导菜单中按 TAB 键可以编辑引导选项；屏幕显示 <emphasis "
+"role=\"strong\">Graphical install</emphasis> 的命令行。"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/01-Installer_64bit_boot_menu.png"
 msgid "./images/01b-Installer_64bit_command_line.png"
-msgstr "./images/01-Installer_64bit_boot_menu.png"
+msgstr "./images/01b-Installer_64bit_command_line.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Edit command line options"
 msgstr "编辑命令行选项"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "You can use an existing HTTP proxy service on the network to speed up the "
-#| "installation of the main server profile from CD. Add "
-#| "<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> "
-#| "as an additional boot parameter."
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add e.g. "
 "<computeroutput>mirror/http/proxy=http://10.0.2.2:3128</computeroutput> as "
 "an additional boot parameter."
 msgstr ""
-"你可以使用网络上存在的 HTTP 代理服务来加快从 CD 安装主服务器profile。添加 "
-"<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> 作为"
+"可以使用网络上存在的 HTTP 代理服务来加快从 CD 安装预配置的主服务器。添加如 "
+"<computeroutput>mirror/http/proxy=http://10.0.2.2:3128</computeroutput> 作为"
 "附加的引导参数。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2040,12 +1889,6 @@
 "而这将自动使用主服务器代理。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
@@ -2053,45 +1896,34 @@
 "computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
 "parameter."
 msgstr ""
-"安装 <emphasis role=\"strong\">GNOME</emphasis> 桌面代替 <emphasis role="
-"\"strong\">KDE \"Plasma\"</emphasis> 桌面，加入 "
-"<computeroutput>desktop=gnome</computeroutput> 到内核引导参数。"
+"要安装 <emphasis role=\"strong\">GNOME</emphasis> 桌面来代替默认的 <emphasis "
+"role=\"strong\">Xfce</emphasis> 桌面，在 <computeroutput>desktop=xfce</"
+"computeroutput> 中用 <computeroutput>gnome</computeroutput> 替换 "
+"<computeroutput>xfce</computeroutput> 参数。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-#| "use <computeroutput>desktop=xfce</computeroutput>."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "use <computeroutput>desktop=lxde</computeroutput>."
 msgstr ""
-"替代安装 <emphasis role=\"strong\">Xfce</emphasis> 桌面，使用 "
-"<computeroutput>desktop=xfce</computeroutput>。"
+"要改为安装 <emphasis role=\"strong\">LXDE</emphasis> 桌面，使用 "
+"<computeroutput>desktop=lxde</computeroutput>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-#| "use <computeroutput>desktop=xfce</computeroutput>."
 msgid ""
 "To install the <emphasis role=\"strong\">LXQt</emphasis> desktop instead, "
 "use <computeroutput>desktop=lxqt</computeroutput>."
 msgstr ""
-"替代安装 <emphasis role=\"strong\">Xfce</emphasis> 桌面，使用 "
-"<computeroutput>desktop=xfce</computeroutput>。"
+"要改为安装 <emphasis role=\"strong\">LXQt</emphasis> 桌面，使用 "
+"<computeroutput>desktop=lxqt</computeroutput>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-#| "use <computeroutput>desktop=xfce</computeroutput>."
 msgid ""
 "To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
 "instead, use <computeroutput>desktop=kde</computeroutput>."
 msgstr ""
-"替代安装 <emphasis role=\"strong\">Xfce</emphasis> 桌面，使用 "
-"<computeroutput>desktop=xfce</computeroutput>。"
+"要改为安装 <emphasis role=\"strong\">KDE Plasma</emphasis> 桌面，使用 "
+"<computeroutput>desktop=kde</computeroutput>。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2106,20 +1938,14 @@
 msgstr "安装过程"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-#| "Stretch/Requirements\">system requirements</ulink> and make sure you have "
-#| "at least two network cards (NICs) if you plan on setting up an LTSP "
-#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Buster/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
-"记着如果你计划设置一个 LTSP 服务器<ulink url=\"http://wiki.debian.org/"
-"DebianEdu/Documentation/Stretch/Requirements\">系统需求</ulink>你确保至少有两"
-"个网卡 (NIC)。"
+"如果计划设置一个 LTSP 服务器记着<ulink url=\"http://wiki.debian.org/"
+"DebianEdu/Documentation/Buster/Requirements\">系统需求</ulink>保证至少有两块"
+"网卡（NIC）。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Choose a language (for the installation and the installed system)."
@@ -2142,13 +1968,6 @@
 msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "This is the main server (tjener) for your school providing all services "
-#| "pre-configured to work out of the box. You must only install one main "
-#| "server per school! This profile does not include a graphical user "
-#| "interface. If you want a graphical user interface, then select "
-#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must install only one main server per "
@@ -2156,9 +1975,9 @@
 "want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
-"这是为你的学校提供所有服务的预配置开箱即可工作的主服务器 (tjener)。每一个学校"
-"只可安装一台主服务器！这个profile不包括图形用户界面。如果你需要图形用户界面，"
-"也选择工作站或者瘦客户端服务器加入其中。"
+"这是为学校提供所有服务的预配置“开箱即可工作”的主服务器（tjener）。每一个学校"
+"只可安装一台主服务器！这个预配置不包括图形用户界面。如果需要图形用户界面，此"
+"时在这里选择工作站或 LTSP 服务器。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "<emphasis role=\"strong\">Workstation</emphasis>"
@@ -2195,16 +2014,6 @@
 msgstr "<emphasis role=\"strong\">LTSP 服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "A thin client (and diskless workstation) server, also called a LTSP "
-#| "server. Clients without hard drives boot and run software from this "
-#| "server. This computer needs two network cards, a lot of memory, and "
-#| "ideally more than one processor or core. See the chapter about <link "
-#| "linkend=\"NetworkClients\">networked clients</link> for more information "
-#| "on this subject. Choosing this profile also enables the workstation "
-#| "profile (even if it is not selected) - a thin client server can always be "
-#| "used as a workstation, too."
 msgid ""
 "A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
@@ -2215,11 +2024,11 @@
 "it is not selected) - an LTSP server can always be used as a workstation, "
 "too."
 msgstr ""
-"一个瘦客户（和无盘工作站）服务器，也称为 LTSP 服务器。客户端没有硬盘驱动器而"
-"是从服务器引导和运行软件。这台计算机需要两个网卡，大量的内存，适合更多的处理"
-"器或多核心。对这个主题更多的信息参看<link linkend=\"NetworkClients"
-"\">networked clients</link>一章。选择这个profile也启用工作站profile（甚至在没"
-"有选择） - 瘦客户端服务器也总是可以作为工作站使用。"
+"瘦客户机（和无盘工作站）服务器，也称为 LTSP 服务器。客户端没有硬盘驱动器而是"
+"从服务器引导和运行软件。这台计算机需要两个网卡，大量的内存，适合更多的处理器"
+"或多核心。这个主题更多的信息参阅关于<link linkend=\"NetworkClients\">网络客户"
+"端</link>的章节。选择这个配置也启用了工作站配置（甚至并没有选择） - LTSP 服务"
+"器也总是可以作为工作站使用。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Standalone</emphasis>"
@@ -2247,21 +2056,6 @@
 "用。它用作从主服务器手工移出单一服务的平台。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
-#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
-#| "Client Server</emphasis> profiles are preselected. These profiles can be "
-#| "installed on one machine together if you want to install a so called "
-#| "<emphasis>combined main server</emphasis>. This means the main server "
-#| "will be a thin client server and also be used as a workstation. This is "
-#| "the default choice, since we assume most people will install <link "
-#| "linkend=\"Installation--"
-#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
-#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
-#| "cards installed in a machine which is going to be installed as a combined "
-#| "main server or as a thin client server to become usefull after the "
-#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
 "\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP Server</"
@@ -2275,14 +2069,14 @@
 "installed in a machine which is going to be installed as a combined main "
 "server or as an LTSP server to become useful after the installation."
 msgstr ""
-"<emphasis role=\"strong\">主服务器</emphasis>，<emphasis role=\"strong\">工作"
-"站</emphasis>和<emphasis role=\"strong\">瘦客户端服务器</emphasis>profiles已"
-"是预先选择。如果你想安装称为<emphasis>组合主服务器</emphasis>这些profile可以"
-"一同安装到一台机器上。这意味这台主服务器会是瘦客户端服务器也用作工作站。这是"
-"缺省选择，因为我们设想大多数人其后会<link linkend=\"Installation--"
+"预先选择了<emphasis role=\"strong\">主服务器</emphasis>，<emphasis role="
+"\"strong\">工作站</emphasis>和 <emphasis role=\"strong\">LTSP 服务器</"
+"emphasis>配置。如果想要这些配置能一起安装在一台机器里那就称作<emphasis>组合主"
+"服务器</emphasis>。这意味着这台主服务器会是 LTSP 服务器并且也用作工作站。这是"
+"默认选择，因为我们设想大多数人以后会<link linkend=\"Installation--"
 "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">通过 "
-"PXE</link> 安装。清注意在所安装的机器上必需有两个网卡在安装之后被安装成有用的"
-"组合主服务器或作为瘦客户端服务器。"
+"PXE</link> 安装。请注意必须安装了两块网卡的机器作为组合主服务器或者作为 LTSP "
+"服务器被安装之后变为实用。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2295,35 +2089,24 @@
 "说“不”会依赖更多工作 - 你要保证需要的分区已经建立并且足够大。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Please say \"yes\" to submitting information to <ulink url=\"http://"
-#| "popcon.skolelinux.org/\"/> to allow us to know which packages are popular "
-#| "and should be kept for future releases.  Although you don't have to, it "
-#| "is a simple way for you to help."
 msgid ""
 "Please say \"yes\" to submitting information to <ulink url=\"https://popcon."
 "debian.org/\"/> to allow us to know which packages are popular and should be "
 "kept for future releases.  Although you don't have to, it is a simple way "
 "for you to help."
 msgstr ""
-"请对 <ulink url=\"http://popcon.skolelinux.org/\"/> 说“是”来允许我们得知软件"
-"包的流行度并将被保留到将来的发布版中。尽管你不这样做，这却是你所做帮助的简单"
-"方法。"
+"请对提交信息到 <ulink url=\"https://popcon.debian.org/\"/> 说“是”来允许我们知"
+"道那些软件包的流行度并将其保持到将来的发布中。尽管不必这样做，这却是你所做帮"
+"助的简单方法。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Wait. If the selected profiles include Thin-client-server then the "
-#| "installer will spend quite some time at the end, \"Finishing the "
-#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
 "Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
-"等待。如果你选择的profile包含瘦客户端服务器其后安装程序在最后会用相当的时"
-"间，“完成安装 - 运行 debian-edu-profile-udeb...”"
+"等待。如果所选配置包含 LTSP 服务器而后安装程序在最后会花相当的时间，“完成安"
+"装 - 运行 debian-edu-profile-udeb...”"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2371,19 +2154,10 @@
 "你的笔记本到网络并以新密码登录过可能依赖你的旧密码登录）。"
 
 #. type: Content of: <article><section><section><section><section><title>
-#, fuzzy
-#| msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgid "A note on USB flash drive / Blu-ray disc image installs"
-msgstr "多架构 USB 闪存盘 / 蓝光光盘镜像安装的注释"
+msgstr "USB 闪存盘 / 蓝光光盘映像安装的一个注意点"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "After you install from the multi-arch USB flash drive / Blu-ray disc "
-#| "image, <computeroutput>/etc/apt/sources.list</computeroutput> will only "
-#| "contain sources from that image. If you have an Internet connection, we "
-#| "strongly suggest adding the following lines to it so that available "
-#| "security updates can be installed:"
 msgid ""
 "After you install from the USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
@@ -2391,21 +2165,18 @@
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
-"在你从多架构 USB 闪存盘 / 蓝光光盘镜像安装之后，<computeroutput>/etc/apt/"
-"sources.list</computeroutput> 只会包含来自镜像的源。如果你有互联网连接，我们"
-"强烈建议为了获得可以被安装的安全更新而在其中添加如下数行："
+"在从 USB 闪存盘 / 蓝光光盘映像安装之后，<computeroutput>/etc/apt/sources."
+"list</computeroutput> 只会包含来自那个映像的源。如果有互联网连接，我们强烈建"
+"议在其中添加如下数行而可获得安装安全更新："
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://ftp.debian.org/debian/ stretch main \n"
-#| "deb http://security.debian.org/ stretch/updates main"
+#, no-wrap
 msgid ""
 "deb http://deb.debian.org/debian/ buster main \n"
 "deb http://security.debian.org/ buster/updates main"
 msgstr ""
-"deb http://ftp.debian.org/debian/ stretch main \n"
-"deb http://security.debian.org/ stretch/updates main"
+"deb http://deb.debian.org/debian/ buster main \n"
+"deb http://security.debian.org/ buster/updates main"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "A note on CD installs"
@@ -2432,21 +2203,15 @@
 msgstr "仅用于瘦客户端的 LTSP 服务器安装的注意事项"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-#| "client</computeroutput> makes it possible to skip the step which converts "
-#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
-#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
 "client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
-"提供内核引导参数的 <computeroutput>edu-skip-ltsp-make-client</"
-"computeroutput> 使之能够略过 LTSP chroot 从瘦客户端 chroot 转变成组合瘦客户"
-"端/无盘工作站 chroot 这一步。"
+"提供的内核引导参数 <computeroutput>edu-skip-ltsp-make-client</"
+"computeroutput> 可以跳过将 LTSP chroot 从瘦客户机 chroot 转换成组合瘦客户机/"
+"无盘工作站 chroot 的这个步骤。"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2482,16 +2247,12 @@
 "行像这样的一个命令，仅修改为你所需要的文件和驱动器名称："
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>sudo dd if=debian-edu-amd64-i386-XXX.iso of=/dev/sdX "
-#| "bs=1024</computeroutput>"
 msgid ""
 "<computeroutput>sudo dd if=debian-edu-amd64-XXX.iso of=/dev/sdX bs=1024</"
 "computeroutput>"
 msgstr ""
-"<computeroutput>sudo dd if=debian-edu-amd64-i386-XXX.iso of=/dev/sdX "
-"bs=1024</computeroutput>"
+"<computeroutput>sudo dd if=debian-edu-amd64-XXX.iso of=/dev/sdX bs=1024</"
+"computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2529,28 +2290,21 @@
 "样子："
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "./images/30-Main-Server-GRUB_Boot_menu-PXE.png"
-msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "./images/30-Main-Server-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
 "Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
-"这是有<emphasis role=\"strong\">主服务器</emphasis>和<emphasis role=\"strong"
-"\">瘦客户端服务器</emphasis> profile PXE 菜单的样子："
+"具有<emphasis role=\"strong\">主服务器</emphasis>和 <emphasis role=\"strong"
+"\">LTSP 服务器</emphasis>配置的 PXE 菜单看上去是这样的："
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
@@ -2629,17 +2383,12 @@
 "pxeinstall</computeroutput> 来更新已生成的文件。"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Further information can be found in the <ulink url=\"http://www.debian."
-#| "org/releases/stretch/installmanual\">manual of the Debian Installer</"
-#| "ulink>."
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
 "releases/buster/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
-"进一步的安装可以在 <ulink url=\"http://www.debian.org/releases/stretch/"
-"installmanual\">Debian 安装手册</ulink>中找到。"
+"进一步的信息可以在 <ulink url=\"http://www.debian.org/releases/buster/"
+"installmanual\">Debian 安装手册</ulink>里找到。"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2717,24 +2466,18 @@
 "然看着最宜人并且更新颖。除非用图形方式硬件有困难，那没有理由不使用它。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "So here is a screenshot tour through a graphical Main-Server + "
-#| "Workstation + Thin Client Server installation and how it looks at the "
-#| "first boot of the tjener, a PXE boot on the workstation network and on "
-#| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
 "the main server, a PXE boot on the workstation network and on the LTSP "
 "client network:"
 msgstr ""
-"那么这里是自始至终的主服务器 + 工作站 + 瘦客户端服务器的图形安装以及所看到的 "
-"tjener 第一次引导，在工作站网络和瘦客户端网络上 PXE 引导的屏幕快照观览："
+"那么这里贯穿了一个 64-bit 主服务器 + 工作站 + LTSP 服务器图形安装过程的屏幕快"
+"照观览以及在主服务器第一次引导所看到的，处于工作站网络和 LTSP 客户机网络上 "
+"PXE 引导是怎样的："
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/01-Installer_64bit_boot_menu.png"
 msgid "01-Installer_64bit_boot_menu.png"
 msgstr "./images/01-Installer_64bit_boot_menu.png"
 
@@ -2744,7 +2487,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/02-select_a_language.png"
 msgid "02-select_a_language.png"
 msgstr "./images/02-select_a_language.png"
 
@@ -2754,7 +2496,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/03-select_your_location.png"
 msgid "03-select_your_location.png"
 msgstr "./images/03-select_your_location.png"
 
@@ -2764,7 +2505,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/04-Configure_the_keyboard.png"
 msgid "04-Configure_the_keyboard.png"
 msgstr "./images/04-Configure_the_keyboard.png"
 
@@ -2774,7 +2514,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
@@ -2784,7 +2523,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/06-Load_installer_components_from_CD.png"
 msgid "06-Load_installer_components_from_CD.png"
 msgstr "./images/06-Load_installer_components_from_CD.png"
 
@@ -2794,7 +2532,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/07-Detect_network_hardware.png"
 msgid "07-Detect_network_hardware.png"
 msgstr "./images/07-Detect_network_hardware.png"
 
@@ -2804,7 +2541,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
@@ -2814,7 +2550,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
@@ -2824,7 +2559,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
@@ -2834,19 +2568,16 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/12a-Set_up_users_and_passwords.png"
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/12a-Set_up_users_and_passwords.png"
 msgid "12-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
@@ -2856,7 +2587,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/12a-Set_up_users_and_passwords.png"
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
@@ -2866,7 +2596,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/12b-Set_up_users_and_passwords.png"
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "./images/12b-Set_up_users_and_passwords.png"
 
@@ -2876,7 +2605,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/12c-Set_up_users_and_passwords.png"
 msgid "12c-Set_up_users_and_passwords.png"
 msgstr "./images/12c-Set_up_users_and_passwords.png"
 
@@ -2886,7 +2614,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/12d-Setting-up-the-partitioner.png"
 msgid "12d-Setting-up-the-partitioner.png"
 msgstr "./images/12d-Setting-up-the-partitioner.png"
 
@@ -2896,7 +2623,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "13-Install the base system.png"
 msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
@@ -2906,7 +2632,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/14-Select_and_install_software.png"
 msgid "14-Select_and_install_software.png"
 msgstr "./images/14-Select_and_install_software.png"
 
@@ -2916,7 +2641,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/17-Select_and_install_software.png"
 msgid "17-Select_and_install_software.png"
 msgstr "./images/17-Select_and_install_software.png"
 
@@ -2926,7 +2650,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/18-Build+LTSP+chroot.png"
 msgid "18-Build LTSP chroot.png"
 msgstr "./images/18-Build+LTSP+chroot.png"
 
@@ -2936,7 +2659,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
@@ -2946,7 +2668,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/20-Finish_the_Installation.png"
 msgid "20-Finish_the_Installation.png"
 msgstr "./images/20-Finish_the_Installation.png"
 
@@ -2956,7 +2677,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
@@ -2966,43 +2686,36 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "tjener KDM Login"
 msgid "tjener Lightdm Login"
 msgstr "tjener KDM 登录"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/27-Tjener-KDE_Desktop.png"
 msgid "./images/26-Tjener-Xfce_Desktop_Browser.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "KDE and Browser"
 msgid "Xfce and Browser"
 msgstr "KDE 和浏览器"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/27-Tjener-KDE_Desktop.png"
 msgid "./images/27-Tjener-Xfce_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "KDE Desktop"
 msgid "Xfce Desktop"
 msgstr "KDE 桌面"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
@@ -3039,10 +2752,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "See the information about Debian Edu specific <link linkend="
-#| "\"Architecture--File_system_access_configuration\">file system access "
-#| "configuration</link> before adding users."
 msgid ""
 "See the information about Debian Edu specific <link linkend=\"Architecture--"
 "File_system_access_configuration\">file system access configuration</link> "
@@ -3058,13 +2767,11 @@
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid "Upgrading the main server"
 msgid "Log into the server."
 msgstr "升级主服务器"
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid "Add users with GOsa²"
 msgid "Add users with GOsa²."
 msgstr "使用 GOsa² 添加用户"
 
@@ -3085,12 +2792,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "There is additional information available elsewhere in this manual: the "
-#| "<link linkend=\"Features\">New features in Stretch</link> chapter should "
-#| "be read by everyone who is familiar with previous releases. And for those "
-#| "upgrading from a previous release, make sure to read the <link linkend="
-#| "\"Upgrades\">Upgrades</link> chapter."
 msgid ""
 "There is additional information available elsewhere in this manual: the "
 "<link linkend=\"Features\">New features in Buster</link> chapter should be "
@@ -3122,7 +2823,6 @@
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Debian Edu KDE desktop"
 msgid "Debian Edu Xfce desktop"
 msgstr "Debian Edu KDE 桌面"
 
@@ -3193,9 +2893,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "If you are using a new Debian Edu Stretch machine, the site certificate "
-#| "will be known by the browser."
 msgid ""
 "If you are using a new Debian Edu Buster machine, the site certificate will "
 "be known by the browser."
@@ -3275,18 +2972,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A default Debian Edu main server installation currently provides two "
-#| "\"departments\": Teachers and Students, plus the base level of the LDAP "
-#| "tree. Student accounts are intended to be added to the \"Students\" "
-#| "department, teachers to the \"Teachers\" department; systems (servers, "
-#| "Skolelinux workstations, Windows machines, printers etc.) are currently "
-#| "added to the base level. Find your own scheme for customising this "
-#| "structure. (You can find an example how to create users in year groups, "
-#| "with common home directories for each group in the <ulink url=\"https://"
-#| "wiki.debian.org/DebianEdu/Documentation/Stretch//HowTo/"
-#| "AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
-#| "AdvancedAdministration</ulink> chapter of this manual.)"
 msgid ""
 "A default Debian Edu main server installation currently provides two "
 "\"departments\": Teachers and Students, plus the base level of the LDAP "
@@ -3323,15 +3008,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "First, click on \"Users\" in the left navigation menu. The right side of "
-#| "the screen will change to show a table with department folders for "
-#| "\"Students\" and \"Teachers\" and the account of the GOsa² Super-"
-#| "Administrator (the first created user). Above this table you can see a "
-#| "field called <emphasis>Base</emphasis> that allows you to navigate "
-#| "through your tree structure (move your mouse over that area and a drop-"
-#| "down menu will appear) and to select a base folder for your intended "
-#| "operations (e.g. adding a new user)."
 msgid ""
 "First, click on \"Users\" in the left navigation menu. The right side of the "
 "screen will change to show a table with department folders for \"Students\" "
@@ -3453,12 +3129,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "When using the \"Filter\" box, results will immediately appear in the "
-#| "middle of the text in the table list view. Every line represents a user "
-#| "account and the items farthest to the right on each line are little icons "
-#| "that provide actions for you: cut entry, copy entry, edit user, lock "
-#| "account, set password, take snapshot (not usable) and remove user."
 msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
@@ -3532,7 +3202,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/change_password_administratively.png"
 msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
@@ -3641,13 +3310,11 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/12-Set_up_users_and_passwords.png"
 msgid "./images/reset_passwords.png"
 msgstr "./images/12-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "Reset passwords"
 msgstr "设置密码"
 
@@ -3788,19 +3455,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If the machines have booted as thin clients/diskless workstations or have "
-#| "been installed using any of the networked profiles, the "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
-#| "to automatically add machines to GOsa². For simple machines it will work "
-#| "out of the box, for machines with more than one mac address the actually "
-#| "used one has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</"
-#| "computeroutput> shows usage information. Please note, that the IP "
-#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
-#| "computeroutput> belong to the dynamic IP range. These systems can then be "
-#| "modified to suit your network: rename each new system, activate DHCP and "
-#| "DNS, add it to netgroups if needed, reboot the system afterwards. The "
-#| "following screenshots show how this looks in practice:"
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
@@ -3826,14 +3480,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "root@tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
-#| "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
-#| "\n"
-#| "Enter password if you want to activate these changes, and ^c to abort.\n"
-#| "\n"
-#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-#| "enter password:"
 msgid ""
 "root@tjener:~# sitesummary2ldapdhcp -a -i ether-22:11:33:44:55:ff\n"
 "info: Create GOsa machine for am-2211334455ff.intern [10.0.16.21] id ether-22:11:33:44:55:ff.\n"
@@ -3854,7 +3500,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/gosa2_overview.png"
 msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa2_overview.png"
 
@@ -3864,7 +3509,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/gosa_systems_host_details.png"
 msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
@@ -3874,7 +3518,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/gosa_systems_edit_host.png"
 msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
@@ -3884,7 +3527,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/gosa_systems_add_netgroup.png"
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
@@ -3984,7 +3626,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "shutdown-at-night-hosts"
 msgid "shutdown-at-night-wakeup-hosts-blacklist"
 msgstr "shutdown-at-night-hosts"
 
@@ -4122,7 +3763,6 @@
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Upgrading a workstation"
 msgid "Use printers attached to workstations"
 msgstr "升级工作站"
 
@@ -4247,11 +3887,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "LC_ALL=C apt-get update ; LC_ALL=C TMP= TMPDIR= ltsp-chroot apt-get update\n"
-#| "LC_ALL=C apt-get upgrade -y\n"
-#| "LC_ALL=C TMP= TMPDIR= ltsp-chroot -p apt-get upgrade -y\n"
-#| "ltsp-update-kernels # If a new kernel was installed"
 msgid ""
 "LC_ALL=C apt-get update ; LC_ALL=C ltsp-chroot apt-get update\n"
 "LC_ALL=C apt-get upgrade -y\n"
@@ -4306,12 +3941,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Automatic installation of updates can be done easily if desired, it just "
-#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
-#| "be configured as described on <ulink url=\"https://wiki.debian.org/"
-#| "UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
-#| "installations security updates are enabled by default."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
@@ -4325,11 +3954,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
-#| "entries to you via email, or alternativly display them in the terminal "
-#| "when running <computeroutput>aptitude</computeroutput> or "
-#| "<computeroutput>apt-get</computeroutput>."
 msgid ""
 "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
 "entries to you via email, or alternatively display them in the terminal when "
@@ -4367,13 +3991,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "For backup management point your browser to <ulink url=\"https://www/"
-#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
-#| "since you have to enter the root password there. If you try to access "
-#| "this site without using SSL it will fail. Note: the site will only work "
-#| "if you temporarily allow ssh root login on the backup server (main server "
-#| "'tjener' by default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
@@ -4462,7 +4079,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/slbackup-php_maintenance.png"
 msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
@@ -4778,10 +4394,6 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "Please read this chapter and the <link linkend=\"Features\">New features "
-#| "in Stretch</link> chapter of this manual completely before attempting to "
-#| "upgrade."
 msgid ""
 "Please read this chapter and the <link linkend=\"Features\">New features in "
 "Buster</link> chapter of this manual completely before attempting to upgrade."
@@ -4851,15 +4463,11 @@
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Upgrades from Debian Edu Jessie"
 msgid "Upgrades from Debian Edu Stretch"
 msgstr "从 Debian Edu Jessie 升级"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Be prepared: make sure you have tested the upgrade from Jessie in a test "
-#| "environment or have backups ready to be able to go back."
 msgid ""
 "Be prepared: make sure you have tested the upgrade from Stretch in a test "
 "environment or have backups ready to be able to go back."
@@ -4911,7 +4519,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid "apt-get clean"
 msgid "apt clean"
 msgstr "apt-get clean"
 
@@ -4925,7 +4532,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Prepare and start the upgrade to Stretch:"
 msgid "Prepare and start the upgrade to Buster:"
 msgstr "准备并开始升级到 Stretch："
 
@@ -4942,15 +4548,15 @@
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-"return&gt; to scroll down, &lt;q&gt; to leave the pager. Please note that "
-"the GOsa² information is wrong (due to Debian bug <ulink url=\"https://bugs."
-"debian.org/925138#\">925138</ulink>), see below how to adjust the password "
-"encryption properly. All information will be mailed to root so that you can "
-"read it again (using <emphasis>mailx</emphasis> or <emphasis>mutt</"
-"emphasis>)."
+"return&gt; to scroll down, &lt;q&gt; to leave the pager. All information "
+"will be mailed to root so that you can read it again (using <emphasis>mailx</"
+"emphasis> or <emphasis>mutt</emphasis>)."
 msgstr ""
+"apt-list-changes：准备好阅读大量的消息；按 &lt; 返回 &gt; 向下滚动，&lt;"
+"q&gt; 离开这一页面。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -4985,13 +4591,11 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid "After the installation:"
 msgid "cf-agent -I -D installation"
 msgstr "安装之后："
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Get the new Debian Edu Stretch artwork:"
 msgid "Get the new Debian Edu Buster artwork:"
 msgstr "获得新的 Debian Edu Stretch 插图："
 
@@ -5035,17 +4639,11 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The default installation provides the <computeroutput>NetGroups</"
-#| "computeroutput>"
 msgid "run <computeroutput>gosa-encrypt-passwords</computeroutput>"
 msgstr "默认安装提供<computeroutput>网络组</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The default installation provides the <computeroutput>NetGroups</"
-#| "computeroutput>"
 msgid "run <computeroutput>service apache2 reload</computeroutput>"
 msgstr "默认安装提供<computeroutput>网络组</computeroutput>"
 
@@ -5105,16 +4703,11 @@
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Recreating an LTSP chroot"
 msgid "Upgrading LTSP chroots"
 msgstr "重建 LTSP chroot"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Make sure you have enough disk space. LTSP now uses Network Block Device "
-#| "(NBD). The NBD image file size is about 4 GiB (default installation). If "
-#| "the image is updated, another 4 GiB for a temporary file are needed."
 msgid ""
 "Make sure you have enough disk space. LTSP uses Network Block Device (NBD). "
 "The NBD image file size is about 4 GiB (default installation). If the image "
@@ -5131,14 +4724,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "ltsp-chroot -m -a i386 apt update\n"
-#| "ltsp-chroot -m -a i386 apt -y full-upgrade\n"
-#| "sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-#| "ltsp-chroot -m -a i386 apt update\n"
-#| "ltsp-chroot -m -a i386 apt -y full-upgrade\n"
-#| "ltsp-chroot -m -a i386 apt -f install\n"
-#| "ltsp-chroot -m -a i386 apt -y full-upgrade"
 msgid ""
 "ltsp-chroot -m -a i386 apt update\n"
 "ltsp-chroot -m -a i386 apt -y full-upgrade\n"
@@ -5192,15 +4777,11 @@
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Recreating an LTSP chroot"
 msgid "Recreating an LTSP chroot"
 msgstr "重建 LTSP chroot"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "On the LTSP server(s) the LTSP chroot could also be recreated. The new "
-#| "chroot will still support both thin-clients and diskless workstations."
 msgid ""
 "On the LTSP server(s) the LTSP chroot could also be recreated. The new "
 "chroot will still support both thin-clients and diskless workstations. "
@@ -5230,9 +4811,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
-#| "NBD image(s)."
 msgid ""
 "Recreate the chroot by running <computeroutput>ltsp-build-client</"
 "computeroutput> as root."
@@ -5276,21 +4854,12 @@
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid ""
-#| "Upgrades from older Debian Edu / Skolelinux installations (before Jessie)"
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Stretch)"
 msgstr "从较旧的 Debian Edu / Skolelinux 安装（Jessie 之前）升级"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To upgrade from any older release, you will need to upgrade to the Jessie "
-#| "based Debian Edu release first, before you can follow the instructions "
-#| "provided above. Instructions are given in the <ulink url=\"https://wiki."
-#| "debian.org/DebianEdu/Documentation/Jessie#\">Manual for Debian Edu "
-#| "Jessie</ulink> about how to upgrade to Jessie from the previous release, "
-#| "Wheezy. Likewise the Wheezy manual describes how to upgrade from Squeeze."
 msgid ""
 "To upgrade from any older release, you will need to upgrade to the Stretch "
 "based Debian Edu release first, before you can follow the instructions "
@@ -5664,7 +5233,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To create one for a system already configured with GOsa², login on the main "
+"To create one for a system already configured with GOsa², log in on the main "
 "server as root and run"
 msgstr ""
 
@@ -5689,7 +5258,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgid "<emphasis role=\"strong\">Main server</emphasis>"
 msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 
@@ -5719,9 +5287,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The default installation provides the <computeroutput>NetGroups</"
-#| "computeroutput>"
 msgid "run <computeroutput>exportfs -r</computeroutput>"
 msgstr "默认安装提供<computeroutput>网络组</computeroutput>"
 
@@ -5754,11 +5319,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Icinga configuration file used is <computeroutput>/etc/icinga/"
-#| "sitesummary.cfg</computeroutput>.  The sitesummary cron job generates "
-#| "<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</"
-#| "computeroutput> with the list of hosts and services to monitor."
 msgid ""
 "The configuration file <computeroutput>/etc/standardskriver.cfg</"
 "computeroutput> has to be provided by the admin, see <computeroutput>/usr/"
@@ -5784,14 +5344,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "host: ldap.intern\n"
-#| "port:636\n"
-#| "Base dn:dc=skole,dc=skolelinux,dc=no \n"
-#| "Security level: ssl + user + password\n"
-#| "User dn: cn=admin,ou=ldap-access\n"
-#| "\n"
-#| "Click \"This session only\" if asked for the certificate."
 msgid ""
 "host: ldap.intern\n"
 "port: 636\n"
@@ -5874,9 +5426,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "echo \"deb http://deb.debian.org/debian/ stretch-backports main\" >> /etc/apt/sources.list\n"
-#| "apt-get update"
 msgid ""
 "echo \"deb http://deb.debian.org/debian/ buster-backports main\" >> /etc/apt/sources.list\n"
 "apt-get update"
@@ -5894,7 +5443,6 @@
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid "apt-get install -t stretch-backports tuxtype"
 msgid "apt-get install -t buster-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
@@ -5913,10 +5461,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you want to upgrade from one version to another (for example from "
-#| "Stretch 9.1+edu0 to 9.3+edu1) but you do not have Internet connectivity, "
-#| "only physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Buster "
 "10.1+edu0 to 10.3+edu1) but you do not have Internet connectivity, only "
@@ -5927,9 +5471,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use "
-#| "the apt-cdrom command:"
 msgid ""
 "Insert the CD / DVD / Blu-ray disc / USB flash drive and use the apt-cdrom "
 "command:"
@@ -5992,14 +5533,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
-#| "which will install security (and other) upgrades automatically. The "
-#| "package is installed by default and preconfigured to install security "
-#| "upgrades. The logs are available in <computeroutput>/var/log/unattended-"
-#| "upgrades/</computeroutput>; also, there are always <computeroutput>/var/"
-#| "log/dpkg.log</computeroutput> and <computeroutput>/var/log/apt/</"
-#| "computeroutput>."
 msgid ""
 "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
 "which will install security (and other) upgrades automatically. If "
@@ -6280,7 +5813,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "<emphasis>(as root on the main server) </emphasis>"
 msgid "<emphasis>(as first user in Gosa)</emphasis>"
 msgstr "<emphasis>（作为在主服务器上的 root 用户</emphasis>"
 
@@ -6720,7 +6252,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Users will then be able to choose the language via the Lightdm display "
+"Users will then be able to choose the language via the LightDM display "
 "manager before logging in; this applies to Xfce, LXDE and LXQt. GNOME and "
 "KDE both come with their own internal region and language configuration "
 "tools, use these. MATE uses the Arctica greeter on top of Lightdm whithout a "
@@ -6784,7 +6316,6 @@
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/idea.png"
 msgstr "./images/smile.png"
 
@@ -7147,9 +6678,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
-#| "NBD image(s)."
 msgid ""
 "Run <computeroutput>ltsp-build-client --arch i386</computeroutput> to create "
 "chroot and NBD image."
@@ -7169,9 +6697,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
-#| "NBD image(s)."
 msgid ""
 "Run <computeroutput>service nbd-service restart</computeroutput> to serve "
 "the new NBD file."
@@ -7361,9 +6886,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The default installation provides the <computeroutput>NetGroups</"
-#| "computeroutput>"
 msgid ""
 "run <computeroutput>ltsp-chroot &lt;editor&gt; /etc/cron.d/desktop-"
 "autoloader</computeroutput>"
@@ -7371,9 +6893,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The default installation provides the <computeroutput>NetGroups</"
-#| "computeroutput>"
 msgid ""
 "run <computeroutput>ltsp-chroot &lt;editor&gt; /etc/default/desktop-"
 "autoloader</computeroutput>"
@@ -7789,9 +7308,9 @@
 msgid ""
 "X2Go enables you to access a graphical desktop on the LTSP server over both "
 "low bandwidth and high bandwidth connections from a PC running Linux, "
-"Windows or Mac OS X. Additional software is needed on the client side, see "
-"the <ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
-"\">x2go wiki</ulink> for more information."
+"Windows or macOS. Additional software is needed on the client side, see the "
+"<ulink url=\"https://wiki.x2go.org/doku.php/doc:installation:x2goclient"
+"\">X2Go wiki</ulink> for more information."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7827,7 +7346,7 @@
 msgid ""
 "<computeroutput>x2goclient</computeroutput> is a graphical client for the "
 "X2Go system (not installed by default). You can use it to connect to running "
-"sessions and start new sessions."
+"sessions and start new ones."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8425,7 +7944,6 @@
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgid "New features for Debian Edu 10+edu0 Codename Buster"
 msgstr "对于 Debian Edu 9+edu0 别名 Stretch 的手册"
 
@@ -8442,10 +7960,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "New version of debian-installer from Debian Stretch, see its <ulink url="
-#| "\"http://www.debian.org/releases/stretch/installmanual\">installation "
-#| "manual</ulink> for more details."
 msgid ""
 "New version of debian-installer from Debian Buster, see its <ulink url="
 "\"http://www.debian.org/releases/buster/installmanual\">installation manual</"
@@ -8517,7 +8031,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "LTSP"
 msgid "LTSP 5.18"
 msgstr "LTSP"
 
@@ -8528,10 +8041,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Even more information about the Debian Stretch release is available in "
-#| "its <ulink url=\"http://www.debian.org/releases/stretch/installmanual"
-#| "\">installation manual</ulink>."
 msgid ""
 "More information about Debian 10 Buster is provided in the <ulink url="
 "\"http://www.debian.org/releases/buster/releasenotes\">release notes</ulink> "
@@ -8661,9 +8170,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
-#| "NBD image(s)."
 msgid ""
 "Added configuration file <computeroutput>/etc/debian-edu/pxeinstall.conf</"
 "computeroutput> with examples to make site specific changes easier."
@@ -8672,9 +8178,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
-#| "NBD image(s)."
 msgid ""
 "Added configuration file <computeroutput>/etc/ltsp/ltsp-build-client.conf</"
 "computeroutput> with examples to make site specific changes easier."
@@ -8684,7 +8187,7 @@
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool <computeroutput>/usr/share/debian-edu-config/tools/edu-ldap-from-"
-"scratch</computeroutput>. It allows to re-generate the LDAP data base just "
+"scratch</computeroutput>. It allows to re-generate the LDAP database just "
 "like it has been right after the main server installation. The tool might "
 "also be useful to make site specific changes easier."
 msgstr ""
@@ -8721,9 +8224,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Stretch\"/> is a wiki and updated frequently."
 msgid ""
 "see <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Buster#\">the "
 "Debian Edu Buster status page</ulink>."
@@ -8832,14 +8332,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017), Roy Zhang (2017) and is released under the "
+"GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -8898,10 +8399,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
 "using ssh access: <computeroutput>git clone git@salsa.debian.org:debian-edu/"
@@ -8935,9 +8432,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
 msgid ""
 "<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
@@ -8994,10 +8488,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Basic information about Alioth (the host where our Git repository is "
-#| "located) and Git is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Git\"/>."
 msgid ""
 "Basic information about Salsa (the host where our Git repository is located) "
 "and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
@@ -9600,7 +9090,6 @@
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgid "New features for Debian Edu 9+edu0 Codename Stretch released 2017-06-17"
 msgstr "对于 Debian Edu 9+edu0 别名 Stretch 的手册"
 
@@ -10096,9 +9585,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "More information on even older releases can be found at <ulink url="
-#| "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgid ""
 "More information on even older (pre-)releases can be found at <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
@@ -10106,118 +9592,100 @@
 "更旧发行版本相关的更多信息可以在 <ulink url=\"http://developer.skolelinux.no/"
 "info/cdbygging/news.html\"/> 找到。"
 
-#, fuzzy
-#~| msgid ""
-#~| "More information about network clients can be found in the <link linkend="
-#~| "\"NetworkClients\">Network clients HowTo</link> chapter."
-#~ msgid ""
-#~ "The use of LXDE as default on LTSP clients can be forced; see <link "
-#~ "linkend=\"NetworkClients\">networked clients</link> for details."
-#~ msgstr ""
-#~ "更多关于网络客户端的信息可以在 <link linkend=\"NetworkClients\">Network "
-#~ "clients HowTo</link> 章中被找到。"
-
-#, fuzzy
-#~| msgid ""
-#~| "If you are looking for a router firewall solution capable of running on "
-#~| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</"
-#~| "ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 #~ msgid ""
 #~ "In case you are looking for a complete router firewall solution capable "
 #~ "of running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
 #~ "\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
 #~ "ulink>."
 #~ msgstr ""
-#~ "如果你寻找一个能够运行在旧个人电脑上的路由防火墙方案，我们推荐 <ulink url="
-#~ "\"http://www.ipcop.org\">IPCop</ulink> 或 <ulink url=\"http://www.zelow."
-#~ "no/floppyfw\">floppyfw</ulink>。"
+#~ "如果你正寻找一个能够运行在旧个人电脑上的完善的路由防火墙方案，我们推荐 "
+#~ "<ulink url=\"http://www.ipcop.org\">IPCop</ulink> 或 <ulink url=\"http://"
+#~ "www.zelow.no/floppyfw\">floppyfw</ulink>。"
 
-#, fuzzy
-#~| msgid ""
-#~| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate "
-#~| "the NBD image(s)."
 #~ msgid ""
-#~ "Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate "
-#~ "the PXE menu."
+#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/amd64/iso-cd/"
+#~ "debian-edu-testing-amd64-netinst.iso\">debian-edu-testing-amd64-netinst."
+#~ "iso</ulink>"
 #~ msgstr ""
-#~ "运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映"
-#~ "像。"
+#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/amd64/iso-cd/"
+#~ "debian-edu-testing-amd64-netinst.iso\">debian-edu-testing-amd64-netinst."
+#~ "iso</ulink>"
 
 #~ msgid ""
-#~ "mount /media/cdrom\n"
-#~ "apt-cdrom add -m"
+#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
+#~ "builds/amd64/iso-cd/debian-edu-testing-amd64-netinst.iso debian-edu-"
+#~ "testing-amd64-netinst.iso</computeroutput>"
 #~ msgstr ""
-#~ "mount /media/cdrom\n"
-#~ "apt-cdrom add -m"
-
-#~ msgid "To install it run the following command as root:"
-#~ msgstr "要安装它，以 root 身份运行以下命令："
+#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
+#~ "builds/amd64/iso-cd/debian-edu-testing-amd64-netinst.iso debian-edu-"
+#~ "testing-amd64-netinst.iso</computeroutput>"
 
-#~ msgid "apt-get install killer"
-#~ msgstr "apt-get install killer"
+#~ msgid "and"
+#~ msgstr "和"
 
-#, fuzzy
-#~| msgid ""
-#~| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0-"
-#~| "CD.iso\">debian-edu-9+edu0-CD.iso</ulink>"
 #~ msgid ""
-#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/amd64/iso-cd/"
-#~ "debian-edu-testing-amd64-netinst.iso\">debian-edu-testing-amd64-netinst."
+#~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/i386/iso-cd/"
+#~ "debian-edu-testing-i386-netinst.iso\">debian-edu-testing-i386-netinst."
 #~ "iso</ulink>"
 #~ msgstr ""
-#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0-CD."
-#~ "iso\">debian-edu-9+edu0-CD.iso</ulink>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0-"
-#~| "CD.iso\">debian-edu-9+edu0-CD.iso</ulink>"
-#~ msgid ""
 #~ "<ulink url=\"http://get.debian.org/cdimage/weekly-builds/i386/iso-cd/"
 #~ "debian-edu-testing-i386-netinst.iso\">debian-edu-testing-i386-netinst."
 #~ "iso</ulink>"
+
+#~ msgid ""
+#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
+#~ "builds/i386/iso-cd/debian-edu-testing-i386-netinst.iso debian-edu-testing-"
+#~ "i386-netinst.iso</computeroutput>"
 #~ msgstr ""
-#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0-CD."
-#~ "iso\">debian-edu-9+edu0-CD.iso</ulink>"
+#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
+#~ "builds/i386/iso-cd/debian-edu-testing-i386-netinst.iso debian-edu-testing-"
+#~ "i386-netinst.iso</computeroutput>"
 
-#, fuzzy
-#~| msgid ""
-#~| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#~| "Documentation/Stretch\"/> is a wiki and updated frequently."
 #~ msgid ""
 #~ "This image does not yet work, see <ulink url=\"https://wiki.debian.org/"
 #~ "DebianEdu/Status/Buster\"/>"
 #~ msgstr ""
-#~ "在 <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Stretch\"/"
-#~ "> 上的版本是一个维基，并会时常更新。"
+#~ "这个图像还未完工，见 <ulink url=\"https://wiki.debian.org/DebianEdu/"
+#~ "Status/Buster\"/>"
 
-#, fuzzy
-#~| msgid ""
-#~| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#~| "debian-edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
 #~ msgid ""
-#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
-#~ "builds/amd64/iso-cd/debian-edu-testing-amd64-netinst.iso debian-edu-"
-#~ "testing-amd64-netinst.iso</computeroutput>"
+#~ "Sources are available from the Debian archive at the usual locations."
+#~ msgstr "源代码可以从通常位置的 Debian 仓库获得。"
+
+#~ msgid ""
+#~ "mount /media/cdrom\n"
+#~ "apt-cdrom add -m"
 #~ msgstr ""
-#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#~ "debian-edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
+#~ "mount /media/cdrom\n"
+#~ "apt-cdrom add -m"
+
+#~ msgid "To install it run the following command as root:"
+#~ msgstr "要安装它，以 root 身份运行以下命令："
+
+#~ msgid "apt-get install killer"
+#~ msgstr "apt-get install killer"
 
 #, fuzzy
 #~| msgid ""
-#~| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#~| "debian-edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
+#~| "More information about network clients can be found in the <link linkend="
+#~| "\"NetworkClients\">Network clients HowTo</link> chapter."
 #~ msgid ""
-#~ "<computeroutput>rsync -v --progress cdimage.debian.org::cdimage/weekly-"
-#~ "builds/i386/iso-cd/debian-edu-testing-i386-netinst.iso debian-edu-testing-"
-#~ "i386-netinst.iso</computeroutput>"
+#~ "The use of LXDE as default on LTSP clients can be forced; see <link "
+#~ "linkend=\"NetworkClients\">networked clients</link> for details."
 #~ msgstr ""
-#~ "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#~ "debian-edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
+#~ "更多关于网络客户端的信息可以在 <link linkend=\"NetworkClients\">Network "
+#~ "clients HowTo</link> 章中被找到。"
 
+#, fuzzy
+#~| msgid ""
+#~| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate "
+#~| "the NBD image(s)."
 #~ msgid ""
-#~ "Sources are available from the Debian archive at the usual locations."
-#~ msgstr "源代码可以从通常位置的 Debian 仓库获得。"
+#~ "Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate "
+#~ "the PXE menu."
+#~ msgstr ""
+#~ "运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映"
+#~ "像。"
 
 #, fuzzy
 #~| msgid ""
@@ -10238,13 +9706,6 @@
 #~ "<computeroutput>apt-get</computeroutput> 保留下载的软件包，"
 #~ "<computeroutput>apt</computeroutput> 从仓库移除它们（在成功安装之后）。"
 
-#~ msgid ""
-#~ "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
-#~ "return&gt; to scroll down, &lt;q&gt; to leave the pager."
-#~ msgstr ""
-#~ "apt-list-changes：准备好阅读大量的消息；按 &lt; 返回 &gt; 向下滚动，&lt;"
-#~ "q&gt; 离开这一页面。"
-
 #~ msgid "You will see some prompts about package configurations:"
 #~ msgstr "你将看到有关包配置的一些提示："
 
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po	2019-05-01 12:19:14.000000000 +0200
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
-"PO-Revision-Date: 2019-02-05 21:32+0000\n"
-"Last-Translator: Petter Reinholdtsen <pere-weblate@hungry.com>\n"
+"POT-Creation-Date: 2019-04-22 23:28+0200\n"
+"PO-Revision-Date: 2019-04-24 12:47+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
 "edu-documentation/debian-edu-itil/nb_NO/>\n"
 "Language: nb\n"
@@ -19,17 +19,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.5-dev\n"
+"X-Generator: Weblate 3.7-dev\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
 msgstr "nb"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux ITIL Manual 2019-01-20"
-msgid "Debian Edu / Skolelinux ITIL Manual 2019-04-01"
-msgstr "Debian Edu / Skolelinux ITIL-håndbok 20.01.2019"
+msgid "Debian Edu / Skolelinux ITIL Manual 2019-05-01"
+msgstr "Debian Edu / Skolelinux ITIL-håndbok 01.05.2019"
 
 #. type: Content of: <article><section><title>
 msgid "Knowledge sharing for centralised administration"
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.nl.po debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.nl.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.nl.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.nl.po	2019-05-01 12:19:14.000000000 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: debian-edu-itil-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc@packages.debian.org\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
-"PO-Revision-Date: 2019-03-17 12:42+0100\n"
+"POT-Creation-Date: 2019-04-22 23:28+0200\n"
+"PO-Revision-Date: 2019-04-10 21:18+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -24,10 +24,8 @@
 msgstr "nl"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux ITIL Manual 2019-02-28"
-msgid "Debian Edu / Skolelinux ITIL Manual 2019-04-01"
-msgstr "ITIL-handleiding van Debian Edu / Skolelinux, 28-02-2019"
+msgid "Debian Edu / Skolelinux ITIL Manual 2019-05-01"
+msgstr "ITIL-handleiding van Debian Edu / Skolelinux, 01-05-2019"
 
 #. type: Content of: <article><section><title>
 msgid "Knowledge sharing for centralised administration"
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.pot debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.pot
--- debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.pot	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.pot	2019-05-01 12:19:14.000000000 +0200
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux ITIL Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux ITIL Manual 2019-05-01"
 msgstr ""
 
 #. type: Content of: <article><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.xml debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.xml
--- debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.xml	2019-04-01 17:27:04.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.xml	2019-05-01 12:17:29.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article lang="en"><articleinfo><title>Debian Edu / Skolelinux ITIL Manual 2019-04-01</title></articleinfo>
+<article lang="en"><articleinfo><title>Debian Edu / Skolelinux ITIL Manual 2019-05-01</title></articleinfo>
 <section id="Introduction">
 <title>Knowledge sharing for centralised administration
 </title>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.zh_Hant.po debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.zh_Hant.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.zh_Hant.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.zh_Hant.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-22 23:28+0200\n"
 "PO-Revision-Date: 2019-01-26 19:04+0000\n"
 "Last-Translator: Louies <louies0623@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -25,7 +25,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux ITIL Manual 2019-01-20"
-msgid "Debian Edu / Skolelinux ITIL Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux ITIL Manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux ITIL 手冊 2019-01-20"
 
 #. type: Content of: <article><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.zh.po debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.zh.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-itil/debian-edu-itil-manual.zh.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-itil/debian-edu-itil-manual.zh.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
-"PO-Revision-Date: 2018-10-14 05:24+0000\n"
+"POT-Creation-Date: 2019-04-22 23:28+0200\n"
+"PO-Revision-Date: 2019-03-09 11:03+0000\n"
 "Last-Translator: Ma Yong <debuser@yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "debian-edu-documentation/debian-edu-itil/zh_Hans/>\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.2.1\n"
+"X-Generator: Weblate 3.5.1-dev\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
@@ -24,8 +24,7 @@
 
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
-#| msgid "Debian Edu / Skolelinux ITIL Manual"
-msgid "Debian Edu / Skolelinux ITIL Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux ITIL Manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux ITIL 手册"
 
 #. type: Content of: <article><section><title>
@@ -9053,7 +9052,7 @@
 
 #. type: Content of: <article><section><section><para>
 msgid "and"
-msgstr ""
+msgstr "和"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po	2019-05-01 12:19:14.000000000 +0200
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
 "PO-Revision-Date: 2016-10-06 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -26,7 +26,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
 msgstr "Manual for Debian Edu / Skolelinux Stretch 9+edu0"
 
 #. type: Content of: <article><section><section><title>
@@ -10727,12 +10727,19 @@
 "under GPL version 2 eller en senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-"
+#| "Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and "
+#| "the French l10n team (2009, 2010, 2012) and is released under the GPL v2 "
+#| "or any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 "Den franske oversættelse er underlagt ophavsretten af Christophe Masson "
 "(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), "
@@ -10780,7 +10787,8 @@
 #| "under the GPL v2 or any later version."
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Den japanske oversættelse er underlagt ophavsretten af victory (2016) og er "
 "udgivet under GPL version 2 eller enhver senere version."
@@ -10792,8 +10800,8 @@
 #| "under the GPL v2 or any later version."
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 "Den japanske oversættelse er underlagt ophavsretten af victory (2016) og er "
 "udgivet under GPL version 2 eller enhver senere version."
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po	2019-05-01 12:19:14.000000000 +0200
@@ -16,8 +16,8 @@
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
-"PO-Revision-Date: 2019-03-31 11:18+0200\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
+"PO-Revision-Date: 2019-04-06 13:16+0200\n"
 "Last-Translator: Wolfgang Schweer <wschweer@arcor.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -33,8 +33,8 @@
 msgstr "de"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
-msgstr "Handbuch für Debian Edu / Skolelinux Stretch 9+edu0 01.04.2019"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
+msgstr "Handbuch für Debian Edu / Skolelinux Stretch 9+edu0 01.05.2019"
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
@@ -9973,15 +9973,15 @@
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 "Die französische Übersetzung wurde von Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) und dem "
-"französischen l10n-Team (2009, 2010, 2012) verfasst und ist unter der GPL v2 "
-"oder einer späteren Version lizenziert."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) und dem französischen l10n-Team (2009, 2010, 2012, 2019) "
+"verfasst und ist unter der GPL v2 oder einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -10011,20 +10011,22 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Die polnische Übersetzung wurde verfasst von Stanisław Krukowski (2016, "
-"2017) und ist unter der GPL v2 oder einer späteren Version lizenziert."
+"2017) und Wiktor Wandachowicz (2019) und ist unter der GPL v2 oder einer "
+"späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 "Die chinesische Übersetzung (vereinfachte Schriftzeichen) wurde verfasst von "
-"Ma Yong (2016, 2017, 2018), Boyuan Yang (2017) und Roy Zhang (2017); sie ist "
-"unter der GPL v2 oder einer späteren Version lizenziert."
+"Ma Yong (2016, 2017, 2018, 2019), Boyuan Yang (2017) und Roy Zhang (2017); "
+"sie ist unter der GPL v2 oder einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
@@ -10167,8 +10169,8 @@
 "translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre "
 "Sprache anlegen und wie Übersetzungen aktualisiert werden."
 
-#. <remark>
-#. status ignore</remark>
+#.  <remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po	2019-05-01 12:19:14.000000000 +0200
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat@gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -29,7 +29,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Jessie 8.0+edu0 Manual"
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
 msgstr "Manual de Debian Edu / Skolelinux Jessie 8.0+edu0"
 
 #. type: Content of: <article><section><section><title>
@@ -9165,9 +9165,9 @@
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -9191,14 +9191,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,18 +6,19 @@
 # Jean-Paul Guillonneau <guillonneau.jeanpaul@free.fr>, 2012.
 # David Prévot <david@tilapin.org>, 2012, 2013.
 # Thomas Vincent <thomas@vinc-net.fr>, 2012.
+# Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
-"PO-Revision-Date: 2015-06-22 10:34+0200\n"
-"Last-Translator: Cédric Boutillier <boutil@debian.org>\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
+"PO-Revision-Date: 2019-04-05 18:34+0200\n"
+"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Attribute 'lang' of: <article>
@@ -25,44 +26,32 @@
 msgstr "fr"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Jessie 8+edu0 Manual"
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
-msgstr "Manuel de Debian Edu/Skolelinux Jessie 8+edu0"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
+msgstr "Manuel de Debian Edu/Skolelinux Stretch 9+edu0, 1 mai 2019"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Manual for Debian Edu 8+edu0 Codename Jessie"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
-msgstr "Manuel de Debian Edu 8+edu0 nom de code Jessie"
+msgstr "Manuel de Debian Edu 9+edu0 nom de code Stretch"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "./images/23-Tjener-Login.png"
-msgstr "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/23-Tjener-Login.png"
 
 #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu login"
 msgstr "Connexion à Debian Edu"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid "This is the manual for the Debian Edu Jessie 8+edu0 release."
 msgid "This is the manual for the Debian Edu Stretch 9+edu0 release."
-msgstr "Voici le manuel de la version de Debian Edu Jessie 8+edu0"
+msgstr "Voici le manuel de la version de Debian Edu Stretch 9+edu0"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Jessie\"/> is a wiki and updated frequently."
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch\"/> is a wiki and updated frequently."
 msgstr ""
 "La version disponible depuis <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Jessie\"/> est un wiki fréquemment mis à jour."
+"Documentation/Stretch\"/> est un wiki fréquemment mis à jour."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -90,19 +79,6 @@
 "configuré."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Directly after installation of a school server all services needed for a "
-#| "school network are set up (see the next chapter <link linkend="
-#| "\"Architecture\">details of the architecture of this setup</link>) and "
-#| "the system is ready to be used. Only users and machines need to be added "
-#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
-#| "environment using PXE has also been prepared, so after initial "
-#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
-#| "all other machines can be installed via the network, this includes "
-#| "\"roaming workstations\" (ones that can be taken away from the school "
-#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
-#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -127,7 +103,7 @@
 "installées par le réseau. Cela inclut aussi bien les stations de travail "
 "mobiles (c'est-à-dire celles qui peuvent être retirées du réseau de l'école, "
 "habituellement des ordinateurs portables) que des machines sans disque dur "
-"telles que les clients légers."
+"s'amorçant avec PXE telles que les clients légers."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -168,13 +144,6 @@
 "environnement de réseau scolaire complètement configuré."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
-#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
-#| "both projects are united, but both names stayed. \"Skole\" and "
-#| "(Debian-)\"Education\" are just two well understood terms in these "
-#| "regions."
 msgid ""
 "The Skolelinux project in Norway was founded on July 2nd 2001 and about the "
 "same time Raphaël Hertzog started Debian-Edu in France. Since 2003 both "
@@ -184,7 +153,7 @@
 "Le projet Skolelinux a été lancé en Norvège le 2 juillet 2001, à peu près au "
 "même moment où Raphaël Hertzog démarrait le projet Debian-Edu en France. En "
 "2003, les deux projets ont fusionné, mais les deux noms sont restés. "
-"« Skole » et (Debian-) « Education » sont deux dénominations bien installées "
+"« Skole » et (Debian-)« Education » sont deux dénominations bien installées "
 "dans ces pays."
 
 #. type: Content of: <article><section><section><para>
@@ -215,27 +184,14 @@
 msgstr "Réseau"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/Debian_Edu_Network_Jessie.png"
 msgid "./images/Debian_Edu_Network_Stretch.png"
-msgstr "./images/Debian_Edu_Network_Jessie.png"
+msgstr "./images/Debian_Edu_Network_Stretch.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "The Debian Edu network topology"
 msgstr "Topologie du réseau Debian Edu"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The figure is a sketch of the assumed network topology. The default setup "
-#| "of a Skolelinux network assumes that there is one (and only one) main-"
-#| "server, while allowing the inclusion of both normal workstations and thin-"
-#| "client-servers (with associated thin-clients and/or diskless "
-#| "workstations). The number of workstations can be as large or small as you "
-#| "want (starting from none to a lot). The same goes for the thin-client "
-#| "servers, each of which is on a separate network so that the traffic "
-#| "between the clients and the thin-client server doesn't affect the rest of "
-#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main server, "
@@ -249,22 +205,14 @@
 "Le diagramme est un schéma de la topologie supposée du réseau. La "
 "configuration par défaut d'un réseau Skolelinux suppose qu'il y a un (et un "
 "seul) serveur principal et permet l'accueil à la fois de stations de travail "
-"normales et de serveurs de clients légers (avec les clients légers ou les "
-"stations de travail sans disque associés). Le nombre de stations de travail "
-"peut être aussi grand ou petit que vous le souhaitez (d'aucune à beaucoup). "
-"De même pour les serveurs de clients légers, chacun étant sur un réseau "
-"distinct de sorte que le trafic entre les clients et leur serveur n'affecte "
-"pas le reste des services du réseau."
-
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The reason that there can only be one main server in each school network "
-#| "is that the main server provides DHCP, and there can be only one machine "
-#| "doing so in each network. It is possible to move services from the main "
-#| "server to other machines by setting up the service on another machine, "
-#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
-#| "for that service to the right computer."
+"normales et de serveurs LTSP (avec les clients légers ou les stations de "
+"travail sans disque associés). Le nombre de stations de travail peut être "
+"aussi grand ou petit que vous le souhaitez (d'aucune à beaucoup). De même "
+"pour les serveurs LTSP, chacun étant sur un réseau distinct de sorte que le "
+"trafic entre les clients et le serveur LTSP n'affecte pas le reste des "
+"services du réseau."
+
+#. type: Content of: <article><section><section><para>
 msgid ""
 "The reason that there can only be one main server in each school network is "
 "that the main server provides DHCP, and there can be only one machine doing "
@@ -313,12 +261,6 @@
 "de travail sans disque, exécuter memtest, ou démarrer du disque dur local."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "This is designed to be modified - that is, you can have the NFS-root in "
-#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
-#| "option (stored in LDAP) to have clients directly boot via PXE from the "
-#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
 "syslinux pointing to one of the LTSP servers or change the DHCP next-server "
@@ -349,13 +291,6 @@
 msgstr "Serveur principal (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A Skolelinux network needs one main server (also called \"tjener\" which "
-#| "is Norwegian and means \"server\") which per default has the IP address "
-#| "10.0.2.2 and is installed by selecting the main server profile. It's "
-#| "possible (but not required) to also select and install the thin-client-"
-#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
@@ -364,29 +299,17 @@
 "Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Un réseau Skolelinux a besoin d'un serveur principal (aussi appelé "
-"« tjener »  qui est le mot norvégien pour « serveur ») qui a par défaut "
+"« tjener » qui est le mot norvégien pour « serveur ») qui a par défaut "
 "l'adresse IP 10.0.2.2 et qui est installé en sélectionnant le profil de "
 "serveur principal. Il est possible (mais non nécessaire) de sélectionner et "
-"d'installer également les profils de serveur de clients légers et de station "
-"de travail en plus du profil de serveur principal."
+"d'installer également les profils de serveur LTSP et de station de travail "
+"en plus du profil de serveur principal."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Services running on the main server"
 msgstr "Services exécutés sur le serveur principal"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "With the exception of the control of the thin-clients, all services are "
-#| "initially set up on one central computer (the main server). For "
-#| "performance reasons, the thin-client-server should be a separate machine "
-#| "(though it is possible to install both the main server and thin-client "
-#| "server profiles on the same machine). All services are allocated a "
-#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
-#| "DNS name makes it easy to move individual services from the main-server "
-#| "to a different machine, by simply stopping the service on the main-"
-#| "server, and changing the DNS configuration to point to the new location "
-#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin clients, all services are "
 "initially set up on one central computer (the main server). For performance "
@@ -401,15 +324,15 @@
 msgstr ""
 "À l'exception du contrôle des clients légers, tous les services sont "
 "initialement configurés sur un ordinateur central (le serveur principal). "
-"Pour des raisons de performances, le serveur de clients légers devrait être "
+"Pour des raisons de performances, le(s) serveur(s) LTSP devraient être sur "
 "une machine séparée (bien qu'il soit possible d'installer à la fois les "
-"profils de serveur principal et de serveur de clients légers sur la même "
-"machine). Tous les services se voient attribuer un nom DNS et ne sont "
-"disponibles que sur IPv4. Le nom DNS attribué permet de déplacer facilement "
-"chaque service du serveur central vers une autre machine, simplement en "
-"l'arrêtant sur le serveur principal et en changeant la configuration DNS de "
-"sorte que l'alias pointe vers la nouvelle machine (sur laquelle il aura été "
-"préalablement installé, bien entendu)."
+"profils de serveur principal et de serveur LTSP sur la même machine). Tous "
+"les services se voient attribuer un nom DNS et ne sont disponibles que sur "
+"IPv4. Le nom DNS attribué permet de déplacer facilement chaque service du "
+"serveur central vers une autre machine, simplement en l'arrêtant sur le "
+"serveur principal et en changeant la configuration DNS de sorte que l'alias "
+"pointe vers la nouvelle machine (sur laquelle il aura été préalablement "
+"installé, bien entendu)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -465,7 +388,7 @@
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Domain Name Service"
-msgstr "Service de nom de domaine"
+msgstr "Service de noms de domaine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "DNS (BIND)"
@@ -473,7 +396,7 @@
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "domain"
-msgstr "domain"
+msgstr "domaine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Automatic Network Configuration of Machines"
@@ -620,10 +543,8 @@
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-#| msgid "Web Server"
 msgid "LTSP Server/s"
-msgstr "Serveur web"
+msgstr "Serveur(s) LTSP"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -635,13 +556,11 @@
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "Network Block Device Server"
-msgstr ""
+msgstr "Serveur de périphériques blocs en réseau"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-#| msgid "TBD"
 msgid "NBD"
-msgstr "à déterminer"
+msgstr "NBD"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -652,16 +571,12 @@
 "qu'état et historique sur le web. Rapport d'erreur par courrier électronique"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-#| msgid "munin, nagios and site-summary"
 msgid "Munin, Icinga and Sitesummary"
-msgstr "munin, nagios et site-summary"
+msgstr "Munin, Icinga et Sitesummary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-#| msgid "Sitesummary"
 msgid "sitesummary"
-msgstr "Sitesummary"
+msgstr "sitesummary"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -679,15 +594,6 @@
 "SMB pour les clients Windows et Macintosh."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "By default email is set up for local delivery (i.e. within the school) "
-#| "only, though email delivery to the wider Internet may be set up if the "
-#| "school has a permanent Internet connection. Mailing lists are set up "
-#| "based on the user database, giving each class their own mailing list. "
-#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
-#| "users can <link linkend=\"Users--Using_email\">access their personal "
-#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
@@ -698,9 +604,7 @@
 "Par défaut, le courrier électronique est configuré pour ne délivrer les "
 "messages que localement (c'est-à-dire à l'intérieur de l'école), bien qu'il "
 "puisse être configuré pour délivrer le courrier sur Internet si "
-"l'établissement dispose d'une connexion permanente. Les listes de diffusion "
-"sont élaborées à partir de la base de données des utilisateurs, en "
-"attribuant une liste de diffusion à chaque classe. Les clients sont "
+"l'établissement dispose d'une connexion permanente. Les clients sont "
 "configurés pour envoyer leur courrier au serveur (en relais « smarthost ») "
 "et les utilisateurs peuvent <link linkend=\"Users--Using_email\">accéder à "
 "leur courrier personnel</link> par IMAP."
@@ -727,14 +631,6 @@
 "l'accès à Internet sur chaque machine."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding thin-"
-#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
-#| "that the network traffic of the thin clients doesn't interfere with the "
-#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. All "
 "types of clients can be connected to the private 10.0.0.0/8 subnet and will "
@@ -744,11 +640,11 @@
 "the rest of the network services)."
 msgstr ""
 "La configuration du réseau sur les clients est effectuée automatiquement à "
-"l'aide de DHCP. Les clients normaux reçoivent une adresse IP appartenant au "
-"sous-réseau privé 10.0.0.0/8, tandis que les clients légers sont connectés à "
-"leur serveur de clients légers sur le sous-réseau 192.168.0.0/24 (cela "
-"assure que le trafic réseau des clients légers n'interfère pas avec le reste "
-"des services du réseau)."
+"l'aide de DHCP. Tous les types de clients peuvent être connectés au sous-"
+"réseau privé 10.0.0.0/8 et reçoivent une adresse IP conforme ; les clients "
+"LTSP devraient être connectés à leur serveur LTSP sur sous-réseau "
+"192.168.0.0/24 distinct (cela assure que le trafic réseau des clients LTSP "
+"n'interfère pas avec le reste des services du réseau)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -841,13 +737,6 @@
 "ainsi une heure correcte sur tout le réseau."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Printers are connected where convenient, either directly onto the main "
-#| "network, or connected to a server, workstation or thin-client-server. "
-#| "Access to printers can be controlled for individual users according to "
-#| "the groups they belong to; this will be achieved by using quota and "
-#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
 "network, or connected to a server, workstation or LTSP server. Access to "
@@ -857,40 +746,32 @@
 msgstr ""
 "Les imprimantes sont connectées où cela est le plus pratique, soit "
 "directement au réseau principal, soit à un serveur, une station de travail "
-"ou un serveur de clients légers. L'accès aux imprimantes peut être contrôlé "
-"pour les utilisateurs en fonction des groupes auxquels ils appartiennent, "
-"par l'intermédiaire de quota et de contrôle d'accès aux imprimantes."
+"ou un serveur LTSP. L'accès aux imprimantes peut être contrôlé pour les "
+"utilisateurs en fonction des groupes auxquels ils appartiennent, par "
+"l'intermédiaire de quota et de contrôle d'accès aux imprimantes."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "LTSP server(s)"
-msgstr ""
+msgstr "Serveur(s) LTSP"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (also called thin client "
-#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
 "selecting the LTSP Server profile."
 msgstr ""
 "Un réseau Skolelinux peut avoir plusieurs serveurs LTSP (aussi appelés "
-"serveurs de clients légers) qui sont installés en sélectionnant le profil de "
-"serveur de clients légers."
+"« serveurs de clients légers ») qui sont installés en sélectionnant le "
+"profil de serveur LTSP."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The thin client servers are set up to receive syslog from the thin "
-#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
 "The LTSP servers are set up to receive syslog from thin clients and "
 "workstations, and forward these messages to the central syslog recipient."
 msgstr ""
-"Le serveur de clients légers est configuré pour recevoir le journal système "
-"(syslog) des clients légers et transmettre ces messages au destinataire "
-"central des journaux système."
+"Les serveurs de clients légers sont configuré pour recevoir le journal "
+"système (syslog) des clients légers et transmettre ces messages au "
+"destinataire central des journaux système."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -901,6 +782,12 @@
 "has to be re-generated; run <computeroutput>ltsp-update-image</"
 "computeroutput> on the LTSP server."
 msgstr ""
+"Veuillez noter : les clients légers utilisent les programmes installés sur "
+"le serveur. Les stations de travail sans disque utilisent les programmes "
+"installés sur le chroot LTSP du serveur, le système de fichiers racine du "
+"client est fourni par NBD (Network Block Device). Après chaque modification "
+"du chroot LTSP, l'image NDB doit être régénérée ; exécutez "
+"<computeroutput>ltsp-update-image</computeroutput> sur le serveur LTSP."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
@@ -914,23 +801,12 @@
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
 "La configuration en client léger permet aux PC ordinaires de fonctionner en "
-"terminaux (X). Cela signifie que la machine s'amorce depuis une disquette ou "
+"terminaux(-X). Cela signifie que la machine s'amorce depuis une disquette ou "
 "directement depuis le serveur à l'aide d'une PROM réseau (ou PXE) sans "
 "utiliser le disque dur local du client. La configuration de client léger "
 "utilisée est celle du projet Linux Terminal Server (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Thin clients are a good way to make use of older, weaker machines as they "
-#| "effectively run all programs on the LTSP server. This works as follows: "
-#| "the service uses DHCP and TFTP to connect to the network and boot from "
-#| "the network. Next, the file system is mounted via NFS from the LTSP "
-#| "server, and finally the X Window System is started. The display manager "
-#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
-#| "data is encrypted on the network. For very old thin clients which are too "
-#| "slow for the encryption this can be set to the behavior from former "
-#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
@@ -946,13 +822,13 @@
 "anciennes et moins puissantes car ils lancent tous les programmes sur le "
 "serveur LTSP. Cela fonctionne ainsi : le service utilise DHCP et TFTP pour "
 "se connecter au réseau et s'amorcer depuis celui-ci. Ensuite, le système de "
-"fichiers est monté par NFS depuis le serveur LTSP, enfin le système X Window "
-"est démarré. Le gestionnaire d'affichage (LDM) se connecte au serveur LTSP "
-"par SSH en utilisant X-forwarding. De cette façon, toutes les données sont "
-"chiffrées sur le réseau. Pour les clients légers très anciens et trop lents "
-"pour effectuer le chiffrement, cela peut être configuré de la même façon que "
-"pour les versions précédentes, en utilisant une connexion directe au "
-"serveur X par XDMCP."
+"fichiers est monté depuis le serveur LTSP avec NDB, enfin le système "
+"X Window est démarré. Le gestionnaire d'affichage (LDM) se connecte au "
+"serveur LTSP par SSH en utilisant X-forwarding. De cette façon, toutes les "
+"données sont chiffrées sur le réseau. Pour les clients légers très anciens "
+"et trop lents pour effectuer le chiffrement, cela peut être configuré de la "
+"même façon que pour les versions précédentes, en utilisant une connexion "
+"directe au serveur X par XDMCP."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Diskless workstations"
@@ -1023,12 +899,6 @@
 msgstr "Administration"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "All the Linux machines that are installed with the Skolelinux installer "
-#| "will be administrable from a central computer, most likely the server. It "
-#| "will be possible to log in to all machines via SSH (root not allowed by "
-#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
@@ -1038,8 +908,8 @@
 "Toutes les machines Linux installées avec l'installateur Skolelinux seront "
 "administrables depuis un ordinateur central, très probablement le serveur. "
 "Il sera possible de se connecter à toutes les machines par SSH (l'accès du "
-"superutilisateur est interdit par défaut) et par la suite d'avoir un accès "
-"complet à celles-ci."
+"superutilisateur avec un mot de passe est interdit par défaut) et par la "
+"suite d'avoir un accès complet à celles-ci."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1067,10 +937,6 @@
 "images peuvent également être amorcées à partir de clés USB."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The aim is to be able to install a server from any type medium once, and "
-#| "install all other clients over the network by booting from the network."
 msgid ""
 "The aim is to be able to install a server from any type of medium once, and "
 "install all other clients over the network by booting from the network."
@@ -1087,14 +953,6 @@
 "pendant l'installation."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The installation should not ask any questions, with the exception of "
-#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
-#| "profile (server, workstation, thin client server). All other "
-#| "configuration will be set up automatically with reasonable values, to be "
-#| "changed from a central location by the system administrator subsequent to "
-#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
@@ -1102,12 +960,12 @@
 "up automatically with reasonable values, to be changed from a central "
 "location by the system administrator subsequent to the installation."
 msgstr ""
-"L'installation ne devrait pas poser de questions, excepté la langue (par "
-"exemple norvégien Bokmål, norvégien nynorsk, same) et le profil de la "
-"machine (serveur, station de travail, serveur de clients légers). Toute "
-"autre configuration sera effectuée automatiquement avec des valeurs "
-"raisonnables, modifiables de manière centralisée par l'administrateur "
-"système après la fin de l'installation."
+"L'installation ne devrait pas poser de questions, à l'exception de la langue "
+"(par exemple norvégien Bokmål, norvégien nynorsk, same) et le profil de la "
+"machine (serveur, station de travail, serveur LTSP…). Toute autre "
+"configuration sera effectuée automatiquement avec des valeurs raisonnables, "
+"modifiables de manière centralisée par l'administrateur système après la fin "
+"de l'installation."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "File system access configuration"
@@ -1248,50 +1106,38 @@
 "debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
 "wiki page</ulink>."
 msgstr ""
+"S'il est prévu d'utiliser LTSP, jetez un œil sur la page du wiki sur <ulink "
+"url=\"https://wiki.debian.org/LTSP/Ltsp%20Hardware%20Requirements\">les "
+"besoins matériels de LTSP</ulink>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
-#| "(Debian architecture 'i386', oldest supported processors are Intel "
-#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
-#| "processors."
 msgid ""
 "The computers running Debian Edu / Skolelinux must have either 32 bit "
 "(Debian architecture 'i386', oldest supported processors are 686 class ones) "
 "or 64 bit (Debian architecture 'amd64') x86 processors."
 msgstr ""
-"Les ordinateurs exécutant Debian Edu / Skolelinux doivent avoir des "
+"Les ordinateurs exécutant Debian Edu/Skolelinux doivent avoir des "
 "processeurs x86 à 32 bits (architecture Debian « i386 », les processeurs les "
-"plus anciens pris en charge sont les Intel Pentium et AMD K5) ou 64 bits "
-"(architecture Debian « amd64 »)."
+"plus anciens pris en charge sont les classes 686) ou 64 bits (architecture "
+"Debian « amd64 »)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
 "clients are recommended for the main and LTSP server profiles."
 msgstr ""
 "Il est recommandé d'avoir pour les profils de serveur principal et de "
-"serveur de clients légérs un minimum de 2 Gio de mémoire vive pour "
-"30 clients et 4 Gio pour 50-60 clients."
+"serveur LTSP un minimum de 12 Gio de mémoire vive pour 30 clients et 20 Gio "
+"pour 50-60 clients."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-#| "possible, though 256 MiB RAM or more and faster processors are "
-#| "recommended."
 msgid ""
 "Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
 "and faster processors are recommended."
 msgstr ""
-"Faire fonctionner des clients légers avec 64 Mio de mémoire vive et une "
-"fréquence de 133 MHz sur un processeur 32 bits est possible. Cependant, "
-"256 Mio de mémoire vive et un processeur plus puissant sont recommandés."
+"Faire fonctionner des clients légers avec 256 Mio de mémoire vive et une "
+"fréquence de 400 MHz est possible. Cependant, plus de mémoire vive et un "
+"processeur plus puissant sont recommandés."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -1315,20 +1161,15 @@
 "réseau."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "For workstations, diskless workstations and standalone systems, 800 MHz "
-#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
-#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgid ""
 "For workstations, diskless workstations and standalone systems, 1000 MHz and "
 "512 MiB RAM are the absolute minimum requirements. For running modern "
 "webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
 msgstr ""
 "Pour les stations de travail (avec ou sans disque) ainsi que les systèmes "
-"autonomes, 512 Mio de mémoire vive et une fréquence de processeur de 800 MHz "
-"ou plus sont le strict minimum nécessaire. Pour faire fonctionner un "
-"navigateur web moderne et LibreOffice, disposer d'au moins 1024 Mio de "
+"autonomes, 512 Mio de mémoire vive et une fréquence de processeur de "
+"1000 MHz ou plus sont le strict minimum nécessaire. Pour faire fonctionner "
+"un navigateur web moderne et LibreOffice, disposer d'au moins 1024 Mio de "
 "mémoire vive est recommandé."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1338,7 +1179,7 @@
 "spell checker can be disabled by system administrators."
 msgstr ""
 "Sur les stations de travail avec très peu de mémoire vive, le correcteur "
-"orthographique peut faire planter Libreoffice  si l'espace d'échange est "
+"orthographique peut faire planter Libreoffice si l'espace d'échange est "
 "aussi trop petit. Si cela arrive fréquemment, le correcteur orthographique "
 "peut être désactivé par les administrateurs système."
 
@@ -1348,56 +1189,41 @@
 msgstr "L'espace disque minimal nécessaire dépend du profil installé :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "main server + thin client server: 60 GiB. As usual with disk space on a "
-#| "main server, \"the bigger the better\"."
 msgid ""
 "combined main server + LTSP server: 70 GiB. As usual with disk space on a "
 "main server, \"the bigger the better\"."
 msgstr ""
-"serveur principal + serveur de clients léger : 60 Gio. Comme d'habiture pour "
+"combinaison serveur principal + serveur LTSP : 70 Gio. Comme d'habiture pour "
 "l'espace disque sur un serveur principal, « plus il y a d'espace, mieux "
 "c'est »."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "thin client server: 40 GiB."
 msgid "LTSP server: 50 GiB."
-msgstr "serveur de clients légers : 40 Gio."
+msgstr "serveur LTSP : 50 Gio."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "workstation or standalone: 30 GiB."
-msgstr "station de travail ou post autonome : 30 Gio."
+msgstr "station de travail ou poste autonome : 30 Gio."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Thin client servers need two network cards when using the default network "
-#| "architecture:"
 msgid ""
 "LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
-"Les serveurs de clients légers ont besoin de deux cartes réseau lorsque "
-"l'architecture de réseau par défaut est utilisée : "
+"Les serveurs LTSP ont besoin de deux cartes réseau lorsque l'architecture de "
+"réseau par défaut est utilisée :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 reliée au réseau principal (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
-#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
-#| "\">others are possible</link>."
 msgid ""
 "eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
-"eth1 est utilisé pour servir les clients LTSP (192.168.0.0/24 par défaut, "
+"eth1 est utilisée pour servir les clients LTSP (192.168.0.0/24 par défaut, "
 "mais <link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
 "\">d'autres sont possibles</link>."
 
@@ -1534,28 +1360,30 @@
 "could be turned into a gateway if the Debian Edu 'Minimal' profile is "
 "installed."
 msgstr ""
+"Au cas où vous avez déjà un routeur mais que vous ne pouvez pas le "
+"configurer comme il faut (cela ne vous est pas permis, ou pour des raisons "
+"techniques), un système avec deux interfaces réseau peut être transformé en "
+"passerelle si le profil Debian Edu « Minimal » est installé."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "Configuring the PXE installation"
 msgid "After the installation:"
-msgstr "Configurer l'installation PXE"
+msgstr "Après l'installation :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Adjust the /etc/network/interfaces file."
-msgstr ""
+msgstr "Configurez le fichier /etc/network/interfaces."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Change the hostname permanently to 'gateway'."
-msgstr ""
+msgstr "Modifiez le nom d'hôte de façon permanente en « gateway »."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
-msgstr ""
+msgstr "Activez la redirection de port et le NAT pour le réseau 10.0.0.0/8."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "As an option install a firewall and / or a traffic shaping tool."
-msgstr ""
+msgstr "En option, installez un pare-feu et/ou un outil de lissage de trafic."
 
 #. type: CDATA
 #, no-wrap
@@ -1580,16 +1408,27 @@
 " #apt install ufw\n"
 " #apt install wondershaper"
 msgstr ""
+"#!/bin/sh\n"
+" # Transformer un système avec profil 'Minimal' en passerelle/pare-feu. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # Si vous souhaitez un pare-feu (shorewall ou ufw) et un lissage de trafic.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # ou\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you need something for an embedded router or accesspoint we recommend "
-#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
-#| "you can also use the original firmware. Using the original firmware is "
-#| "easier; using OpenWRT gives you more choices and control. Check the "
-#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
-#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
@@ -1631,12 +1470,6 @@
 msgstr "Où trouver davantage d'informations"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "We recommend that you read or at least take a look at the <ulink url="
-#| "\"http://www.debian.org/releases/jessie/releasenotes\">release notes for "
-#| "Debian Jessie</ulink> before you start installing a system for production "
-#| "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
 "\"http://www.debian.org/releases/stretch/releasenotes\">release notes for "
@@ -1644,8 +1477,8 @@
 "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgstr ""
 "Nous vous recommandons de lire ou au moins de jeter un œil aux <ulink url="
-"\"http://www.debian.org/releases/jessie/releasenotes\">notes de publication "
-"de Debian Jessie</ulink> avant de commencer à installer un système en "
+"\"http://www.debian.org/releases/stretch/releasenotes\">notes de publication "
+"de Debian Stretch</ulink> avant de commencer à installer un système en "
 "production. Cependant, c'est inutile si vous voulez seulement essayer Debian "
 "Edu/Skolelinux, cela devrait fonctionner tout seul."
 
@@ -1672,31 +1505,24 @@
 "lancer une session pour la première fois."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Even more information about the Debian Jessie release is available in its "
-#| "<ulink url=\"http://www.debian.org/releases/jessie/installmanual"
-#| "\">installation manual</ulink>."
 msgid ""
 "Even more information about the Debian Stretch release is available in its "
 "<ulink url=\"http://www.debian.org/releases/stretch/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"Des informations supplémentaires sur Debian Jessie sont disponibles dans son "
-"<ulink url=\"http://www.debian.org/releases/jessie/installmanual\">manuel "
-"d'installation</ulink>."
+"Des informations supplémentaires sur Debian Stretch sont disponibles dans "
+"son <ulink url=\"http://www.debian.org/releases/stretch/installmanual"
+"\">manuel d'installation</ulink>."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "Download the installation media for Debian Edu 8+edu0 Codename \"Jessie\""
 msgid "Download the installation media for Debian Edu 9+edu0 Codename Stretch"
 msgstr ""
-"Téléchargement d'un support d'installation pour Debian Edu 8+edu0 « Jessie »"
+"Téléchargement d'un support d'installation pour Debian Edu 9+edu0 nom de "
+"code Stretch"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "netinstall CD image for i386, amd64"
-msgstr "images CD d'installation par le réseau pour i386 et amd64"
+msgstr "Images CD d'installation par le réseau pour i386 et amd64"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1706,7 +1532,7 @@
 msgstr ""
 "L'image CD d'installation par le réseau, qui peut aussi être utilisée pour "
 "l'installation à partir d'une clé USB, convient à l'installation sur des "
-"machines i386 et amd64. Comme son nom l'indique, un accès internet est "
+"machines i386 et amd64. Comme son nom l'indique, un accès à Internet est "
 "nécessaire pour l'installation. Cette image est disponible :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1726,19 +1552,10 @@
 "edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgid "USB drive ISO image for i386 and amd64"
-msgstr ""
-"image pour clé USB ou disque Blu-ray pour les architectures i386 et amd64"
+msgstr "Image ISO pour clé USB pour les architectures i386 et amd64"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. Please note that internet access "
-#| "during installation is needed. Like the others it can be downloaded over "
-#| "FTP, HTTP or rsync via:"
 msgid ""
 "The multi-architecture ISO image is 5.5 GiB large and can be used for "
 "installation of amd64 and i386 machines. Like the netinstall image it can be "
@@ -1747,10 +1564,12 @@
 "profile is chosen. Like the others it can be downloaded over HTTP or rsync "
 "via:"
 msgstr ""
-"L'image ISO multiarchitecture a une taille de 5,2 Gio et peut être utilisée "
-"pour l'installation de machines amd64 et i386. Veuillez noter qu'elle "
-"nécessite un accès Internet lors de l'installation. Elle peut être "
-"téléchargée en utilisant FTP, HTTP ou rsync :"
+"L'image ISO multiarchitecture a une taille de 5,5 Gio et peut être utilisée "
+"pour l'installation de machines amd64 et i386. Comme l'image d'installation "
+"par le réseau, elle peut être installée sur une clé USB ou un disque de "
+"taille suffisante. Veuillez noter qu'elle nécessite un accès à Internet lors "
+"de l'installation si le profil « serveur LTSP » a été choisi. Comme les "
+"autres, elle peut être téléchargée en utilisant HTTP ou rsync :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1775,18 +1594,14 @@
 #. type: Content of: <article><section><section><section><para>
 msgid "Sources are available from the Debian archive at the usual locations."
 msgstr ""
+"Le code source est disponible depuis l'archive Debian aux emplacements "
+"habituels."
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD / DVD by mail"
 msgstr "Demande d'un CD ou DVD par courrier"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "For those without a fast Internet connection, we can offer a CD or DVD "
-#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
-#| "<ulink url=\"mailto:cd@skolelinux.no\">cd@skolelinux.no</ulink> and we "
-#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
@@ -1812,14 +1627,6 @@
 msgstr "Installer Debian Edu"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When you do a Debian Edu installation, you have a few options to choose "
-#| "from. Don't be afraid; there aren't many. We have done a good job of "
-#| "hiding the complexity of Debian during the installation and beyond. "
-#| "However, Debian Edu is Debian, and if you want there are more than 42,000 "
-#| "packages to choose from and a billion configuration options. For the "
-#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
@@ -1832,32 +1639,26 @@
 "n'ayez pas peur, il y en a peu. Nous nous sommes attachés à cacher la "
 "complexité de Debian durant l'installation et au-delà. Cependant, Debian Edu "
 "est une distribution Debian et si vous le voulez, vous pouvez choisir parmi "
-"plus de 42 000 paquets et un milliard d'options de configuration. Mais nos "
+"plus de 52 000 paquets et un milliard d'options de configuration. Mais nos "
 "choix par défaut conviendront à la plupart des utilisateurs."
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Installation and download options"
 msgid "Installation types and options"
-msgstr "Options de téléchargement et d'installation"
+msgstr "Types et options d'installation"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "Installer boot menu"
 msgid "<emphasis>Installer boot menu on 64-bit Hardware</emphasis>"
-msgstr "Menu de démarrage de l'installateur"
+msgstr ""
+"<emphasis>Menu de démarrage de l'installateur sur une machine 64 bits</"
+"emphasis>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/01-Installer_boot_menu.png"
 msgid "./images/01-Installer_64bit_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_64bit_boot_menu.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Installer boot menu"
 msgid "64-bit Installer boot menu"
-msgstr "Menu de démarrage de l'installateur"
+msgstr "Menu de démarrage de l'installateur 64 bits"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1868,67 +1669,44 @@
 "l'installateur GTK dans lequel vous pouvez utiliser la souris."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
-#| "mode install."
 msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit install</emphasis> effectue une "
-"installation amd64 en mode texte."
+"<emphasis role=\"strong\">Install</emphasis> effectue une installation en "
+"mode texte."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">Advanced options &gt;</emphasis> gives a sub "
-#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options &gt;</emphasis> gives a sub menu "
 "with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Advanced options &gt;</emphasis> affiche un sous-"
-"menu d'options détaillées à choisir"
+"menu d'options détaillées à choisir."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-#| "installation on i386 and amd64."
 msgid ""
 "<emphasis role=\"strong\">32-bit install options &gt;</emphasis> allows a 32-"
 "bit installation on 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">Install</emphasis> est l'installation en mode "
-"texte par défaut sur i386 et amd64."
+"<emphasis role=\"strong\">32-bit install options &gt;</emphasis> permet une "
+"installation en 32 bits sur une machine 64 bits."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> donne quelques conseils pour "
-"utiliser l'installateur"
+"utiliser l'installateur ; voir la copie d'écran ci-dessous."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/Installer_advanced_options_a.png"
 msgid "./images/01a-Installer_64bit_advanced_options.png"
-msgstr "./images/Installer_advanced_options_a.png"
+msgstr "./images/01a-Installer_64bit_advanced_options.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Installer advanced options screen 1"
 msgid "64-bit Installer advanced options screen 1"
-msgstr "Options avancées de l'installateur (écran 1)"
+msgstr "Options avancées de l'installateur 64 bits (écran 1)"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
@@ -1936,28 +1714,20 @@
 "principal."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
-#| "access to all available questions in graphical mode."
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
 "to all available questions, mouse usable."
 msgstr ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> affiche toutes "
-"les questions en mode graphique."
+"les questions, vous pouvez utiliser la souris."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
-#| "medium become a rescue disk for emergency tasks."
 msgid ""
 "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
 "install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> transforme le support "
-"d'installation en disque de secours pour les cas de détresse."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> transforme le "
+"support d'installation en disque de secours pour les cas de détresse."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1976,72 +1746,52 @@
 "questions en mode texte."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
-#| "medium become a rescue disk for emergency tasks."
 msgid ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
 "install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> transforme le support "
-"d'installation en disque de secours pour les cas de détresse."
+"<emphasis role=\"strong\">Rescue mode</emphasis> en mode texte ; transforme "
+"le support d'installation en disque de secours pour les cas de détresse."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
-#| "file."
 msgid ""
 "<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Automated install</emphasis> a besoin d'un fichier "
-"de configuration."
+"<emphasis role=\"strong\">Automated install</emphasis> en mode texte ; a "
+"besoin d'un fichier de configuration."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "Installer boot menu"
 msgid "<emphasis>Installer boot menu on 32-bit Hardware</emphasis>"
-msgstr "Menu de démarrage de l'installateur"
+msgstr ""
+"<emphasis>Menu de démarrage de l'installateur sur une machine 32 bits</"
+"emphasis>"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/01-Installer_boot_menu.png"
 msgid "./images/01b-Installer_32bit_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+msgstr "./images/01b-Installer_32bit_boot_menu.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Installer boot menu"
 msgid "32-bit Installer boot menu"
-msgstr "Menu de démarrage de l'installateur"
+msgstr "Menu de démarrage de l'installateur 32 bits"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Explanations are similar to those for 64-bit hardware."
-msgstr ""
+msgstr "Les explications sont similaires à celles pour le matériel 64 bits."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgid "<emphasis>Help screen</emphasis>"
-msgstr "<emphasis>(en tant que superutilisateur dans Gosa)</emphasis>"
+msgstr "<emphasis>Écran d'aide</emphasis>"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/01-Installer_boot_menu.png"
 msgid "./images/01c-Installer_help.png"
-msgstr "./images/01-Installer_boot_menu.png"
+msgstr "./images/01c-Installer_help.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
 msgstr "Écran d'aide de l'installateur"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "This Help screen is self explaining and enables the &lt;F&gt;-keys on the "
-#| "keyboard for getting more detailed help on the topics described."
 msgid ""
 "This Help screen is self explaining and enables the &lt;F&gt;-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -2050,33 +1800,29 @@
 "plus d'explications sur les thèmes développés."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "Additional boot parameters for installations"
 msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
-msgstr "Paramètres de démarrage additionnels pour les installations"
+msgstr ""
+"<emphasis>Ajouter ou modifier les paramètres de démarrage pour les "
+"installations</emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
-#| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu; the screenshot shows the command line for <emphasis role=\"strong"
 "\">Graphical install</emphasis>."
 msgstr ""
-"Sur i386 et amd64, les options de démarrage peuvent être éditées en appuyant "
-"sur la <emphasis>touche tabulation</emphasis> dans le menu de démarrage."
+"Dans l'un et l'autre cas, les options de démarrage peuvent être éditées en "
+"appuyant sur la <emphasis>touche tabulation</emphasis> dans le menu de "
+"démarrage, la capture d'écran montre la ligne de commande pour <emphasis "
+"role=\"strong\">Graphical install</emphasis>."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/BD_command_line.png"
-msgstr "./images/smile.png"
+msgstr "./images/BD_command_line.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Edit command line options"
-msgstr ""
+msgstr "Éditer les options en ligne de commande"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2101,89 +1847,58 @@
 "automatiquement le mandataire du serveur principal."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
 "kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "Pour installer le bureau <emphasis role=\"strong\">GNOME</emphasis> au lieu "
-"de <emphasis role=\"strong\">KDE « Plasma »</emphasis>, ajoutez "
-"<computeroutput>desktop=gnome</computeroutput> aux paramètres "
-"d'initialisation du noyau."
+"de <emphasis role=\"strong\">KDE Plasma</emphasis>, le bureau par défaut, "
+"remplacez kde par gnome dans le paramètre <computeroutput>desktop=kde</"
+"computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
 "intended to be used.)"
 msgstr ""
 "Pour installer le bureau <emphasis role=\"strong\">LXDE</emphasis> à la "
-"place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
-"d'initialisation du noyau."
+"place, utilisez <computeroutput>desktop=lxde</computeroutput>. (Recommandé "
+"si vous avez l'intention d'utiliser LTSP.)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
-"Pour installer le bureau <emphasis role=\"strong\">LXDE</emphasis> à la "
-"place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
-"d'initialisation du noyau."
+"Pour installer le bureau <emphasis role=\"strong\">Xfce</emphasis> à la "
+"place, utilisez <computeroutput>desktop=xfce</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
-#| "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
-#| "boot parameters."
 msgid ""
 "And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
 "instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "Pour installer le bureau <emphasis role=\"strong\">MATE</emphasis> à la "
-"place, ajoutez <computeroutput>desktop=mate</computeroutput> aux paramètres "
-"d'initialisation du noyau."
+"place, utilisez <computeroutput>desktop=mate</computeroutput>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "The installation process"
 msgstr "Le processus d'installation"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-#| "Jessie/Requirements\">system requirements</ulink> and make sure you have "
-#| "at least two network cards (NICs) if you plan on setting up a thin client "
-#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
 "least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "Souvenez-vous des <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Jessie/Requirements\">besoins matériels</ulink> et assurez-"
+"Documentation/Stretch/Requirements\">besoins matériels</ulink> et assurez-"
 "vous d'avoir au moins deux cartes réseau si vous envisagez d'installer un "
-"serveur pour clients légers."
+"serveur LTSP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Choose a language (for the installation and the installed system)"
 msgid "Choose a language (for the installation and the installed system)."
 msgstr "Choisissez une langue (pour l'installation et le système installé)."
 
@@ -2193,8 +1908,6 @@
 "Choisissez l'endroit qui devrait normalement être le lieu où vous vivez."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
 msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "Choisissez une disposition de clavier (généralement, le choix par défaut du "
@@ -2205,19 +1918,10 @@
 msgstr "Choisissez le ou les profils de la liste suivante."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Serveur principal</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "This is the main server (tjener) for your school providing all services "
-#| "pre-configured to work out of the box. You must only install one main "
-#| "server per school! This profile does not include a graphical user "
-#| "interface. If you want a graphical user interface, then select "
-#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must install only one main server per "
@@ -2229,7 +1933,7 @@
 "services préconfigurés pour fonctionner sans modification. Vous ne devez "
 "installer qu'un seul serveur principal par école ! Ce profil n'inclut pas "
 "d'interface graphique. Si vous en voulez une, installez en plus le profil "
-"Station de travail ou Serveur de clients légers."
+"Station de travail ou Serveur LTSP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Workstation</emphasis>"
@@ -2269,22 +1973,10 @@
 "versions précédentes."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
-msgstr "<emphasis role=\"strong\">Serveur principal</emphasis>"
+msgstr "<emphasis role=\"strong\">Serveur LTSP</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "A thin client (and diskless workstation) server, also called a LTSP "
-#| "server. Clients without hard drives boot and run software from this "
-#| "server. This computer needs two network cards, a lot of memory, and "
-#| "ideally more than one processor or core. See the chapter about <link "
-#| "linkend=\"NetworkClients\">networked clients</link> for more information "
-#| "on this subject. Choosing this profile also enables the workstation "
-#| "profile (even if it is not selected) - a thin client server can always be "
-#| "used as a workstation, too."
 msgid ""
 "A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
@@ -2297,12 +1989,12 @@
 msgstr ""
 "Serveur de clients légers (et de stations de travail sans disque), également "
 "appelé serveur LTSP. Les clients sans disque dur s'amorcent et exécutent les "
-"logiciels depuis ce serveur. Cet ordinateur a besoin de deux cartes réseau, "
-"de beaucoup de mémoire, et, idéalement, de plus d'un processeur ou cœur. "
-"Consultez le chapitre à propos des <link linkend=\"NetworkClients\">clients "
-"en réseau</link> pour plus d'informations à ce sujet. En installant ce "
-"profil, le profil « station de travail » est également activé (même s'il n'a "
-"pas été sélectionné), puisqu'un serveur de clients légers peut également "
+"logiciels depuis ce serveur. Cet ordinateur a besoin de deux interfaces "
+"réseau, de beaucoup de mémoire, et, idéalement, de plus d'un processeur ou "
+"cœur. Consultez le chapitre à propos des <link linkend=\"NetworkClients"
+"\">clients en réseau</link> pour plus d'informations à ce sujet. En "
+"installant ce profil, le profil « station de travail » est également activé "
+"(même s'il n'a pas été sélectionné), puisqu'un serveur LTSP peut également "
 "être utilisé comme station de travail."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -2335,21 +2027,6 @@
 "même du serveur principal."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
-#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
-#| "Client Server</emphasis> profiles are preselected. These profiles can be "
-#| "installed on one machine together if you want to install a so called "
-#| "<emphasis>combined main server</emphasis>. This means the main server "
-#| "will be a thin client server and also be used as a workstation. This is "
-#| "the default choice, since we assume most people will install <link "
-#| "linkend=\"Installation--"
-#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
-#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
-#| "cards installed in a machine which is going to be installed as a combined "
-#| "main server or as a thin client server to become usefull after the "
-#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
 "\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP Server</"
@@ -2365,16 +2042,16 @@
 msgstr ""
 "Les profils <emphasis role=\"strong\">Serveur principal</emphasis>, "
 "<emphasis role=\"strong\">Station de travail</emphasis> et <emphasis role="
-"\"strong\">Serveur pour clients légers</emphasis> sont préselectionnés. Ces "
-"profils peuvent être installés ensemble sur une machine si vous voulez "
-"installer un <emphasis>serveur principal combiné</emphasis>. Cela signifie "
-"que le serveur principal sera un serveur de clients légers ainsi qu'une "
-"station de travail. C'est le choix par défaut, puisque de futures "
-"installations seront faites <link linkend=\"Installation--"
+"\"strong\">Serveur LTSP</emphasis> sont présélectionnés. Ces profils peuvent "
+"être installés ensemble sur une machine si vous voulez installer un "
+"<emphasis>serveur principal combiné</emphasis>. Cela signifie que le serveur "
+"principal sera un serveur LTSP ainsi qu'une station de travail. C'est le "
+"choix par défaut, puisque les futures installations seront faites <link "
+"linkend=\"Installation--"
 "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\"> à "
 "l'aide de PXE</link>. Notez que deux cartes réseau doivent être installées "
 "dans la machine qui sera configurée comme serveur principal combiné et comme "
-"serveur de clients légers pour pouvoir l'utiliser après l'installation."
+"serveur LTSP pour pouvoir l'utiliser après l'installation."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2402,20 +2079,15 @@
 "moyen facile pour vous de nous aider."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Wait. If the selected profiles include Thin-client-server then the "
-#| "installer will spend quite some time at the end, \"Finishing the "
-#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
 "Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
-"Patientez. Si le profil de serveur de clients légers est dans votre liste de "
-"choix de profils à installer, l'installateur passera un bon moment à la fin "
-"à rester sur le message « Fin de l'installation - Exécution de debian-edu-"
-"profile-udeb... »"
+"Patientez. Si le profil de serveur LTSP est dans votre liste de choix de "
+"profils à installer, l'installateur passera un bon moment à la fin à rester "
+"sur le message « Fin de l'installation - Exécution de debian-edu-profile-"
+"udeb... »"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2523,18 +2195,12 @@
 "éviter de télécharger depuis Internet le même paquet plusieurs fois."
 
 #. type: Content of: <article><section><section><section><section><title>
-#, fuzzy
-#| msgid "A note on thin-client-server installations"
 msgid "Notes on LTSP Server installations using only Thin-Clients"
-msgstr "Note à propos des installations de serveur de clients légers"
+msgstr ""
+"Notes à propos des installations de serveur LTSP utilisant uniquement des "
+"clients légers"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-#| "client</computeroutput> makes it possible to skip the step which converts "
-#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
-#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
 "client</computeroutput> makes it possible to skip one step which converts "
@@ -2542,9 +2208,9 @@
 "diskless workstation chroot."
 msgstr ""
 "En passant le paramètre <computeroutput>edu-skip-ltsp-make-client</"
-"computeroutput> au noyau, il est possible de sauter l'étape qui convertit le "
-"chroot LTSP pour clients légers en un chroot combiné clients légers et "
-"stations de travail."
+"computeroutput> au noyau, il est possible de sauter une étape qui convertit "
+"le chroot LTSP pour client léger en un chroot combiné client léger et "
+"stations de travail sans disque."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2636,29 +2302,22 @@
 "\"strong\">Serveur principal</emphasis> :"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/pxe-tjener.png"
-msgstr "./images/smile.png"
+msgstr "./images/pxe-tjener.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
 "Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 "Voici à quoi ressemble le menu PXE avec les profils <emphasis role=\"strong"
-"\">Serveur principal</emphasis> et <emphasis role=\"strong\">Serveur de "
-"clients légers</emphasis> :"
+"\">Serveur principal</emphasis> et <emphasis role=\"strong\">Serveur LTSP</"
+"emphasis> :"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
@@ -2669,6 +2328,10 @@
 "To install a desktop environment of your choice instead of the default one, "
 "press TAB and edit the kernel boot options (like explained above)."
 msgstr ""
+"Pour installer un environnement de bureau de son choix à la place de celui "
+"qui est proposé par défaut, appuyez sur la <emphasis>touche tabulation</"
+"emphasis> et modifiez les options de démarrage du noyau (tel qu'expliqué "
+"plus haut)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2743,18 +2406,13 @@
 "à jour les fichiers générés."
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Further information can be found in the <ulink url=\"http://www.debian."
-#| "org/releases/jessie/installmanual\">manual of the Debian Installer</"
-#| "ulink>."
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
 "releases/stretch/installmanual\">manual of the Debian Installer</ulink>."
 msgstr ""
-"Davantage <ulink url=\"http://www.debian.org/releases/jessie/installmanual"
-"\">d'informations à propos de Debian</ulink> sont disponibles dans son "
-"manuel d'installation."
+"Davantage d'informations sont disponibles dans son <ulink url=\"http://www."
+"debian.org/releases/stretch/installmanual\"> manuel del'installateur Debian</"
+"ulink>."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2843,12 +2501,6 @@
 "l'utiliser."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "So here is a screenshot tour through a graphical Main-Server + "
-#| "Workstation + Thin Client Server installation and how it looks at the "
-#| "first boot of the tjener, a PXE boot on the workstation network and on "
-#| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
@@ -2856,174 +2508,139 @@
 "client network:"
 msgstr ""
 "Voici la visite guidée montrant l'installation graphique d'un serveur "
-"principal, d'une station de travail, et d'un serveur de clients légers, "
-"ainsi que ce à quoi ressemble le premier démarrage de tjener, un démarrage "
-"PXE sur le réseau des stations de travail et sur le réseau des clients "
-"légers :"
+"principal 64 bits, d'une station de travail et d'un serveur LTSP, ainsi que "
+"ce à quoi ressemble le premier démarrage du serveur principal, un démarrage "
+"PXE sur le réseau des stations de travail et sur le réseau des clients LTSP :"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/01-Installer_boot_menu.png"
 msgid "01-Installer_64bit_boot_menu.png"
-msgstr "./images/01-Installer_boot_menu.png"
+msgstr "01-Installer_64bit_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/02-select_a_language.png"
 msgstr "./images/02-select_a_language.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/02-select_a_language.png"
 msgid "02-select_a_language.png"
-msgstr "./images/02-select_a_language.png"
+msgstr "02-select_a_language.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/03-select_your_location.png"
 msgstr "./images/03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/03-select_your_location.png"
 msgid "03-select_your_location.png"
-msgstr "./images/03-select_your_location.png"
+msgstr "03-select_your_location.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/04-Configure_the_keyboard.png"
 msgstr "./images/04-Configure_the_keyboard.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/04-Configure_the_keyboard.png"
 msgid "04-Configure_the_keyboard.png"
-msgstr "./images/04-Configure_the_keyboard.png"
+msgstr "04-Configure_the_keyboard.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgid "05-Detect_and_mount_CD-ROM.png"
-msgstr "./images/05-Detect_and_mount_CD-ROM.png"
+msgstr "05-Detect_and_mount_CD-ROM.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr "./images/06-Load_installer_components_from_CD.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/06-Load_installer_components_from_CD.png"
 msgid "06-Load_installer_components_from_CD.png"
-msgstr "./images/06-Load_installer_components_from_CD.png"
+msgstr "06-Load_installer_components_from_CD.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/07-Detect_network_hardware.png"
 msgstr "./images/07-Detect_network_hardware.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/07-Detect_network_hardware.png"
 msgid "07-Detect_network_hardware.png"
-msgstr "./images/07-Detect_network_hardware.png"
+msgstr "07-Detect_network_hardware.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgid "08-Choose_Debian_Edu_profile.png"
-msgstr "./images/08-Choose_Debian_Edu_profile.png"
+msgstr "08-Choose_Debian_Edu_profile.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgid "11-Participate_in_the_package_usage_survey.png"
-msgstr "./images/11-Participate_in_the_package_usage_survey.png"
+msgstr "11-Participate_in_the_package_usage_survey.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "./images/12-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/12-Set_up_users_and_passwords.png"
 msgid "12-Set_up_users_and_passwords.png"
-msgstr "./images/12-Set_up_users_and_passwords.png"
+msgstr "12-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "./images/12a-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/12a-Set_up_users_and_passwords.png"
 msgid "12a-Set_up_users_and_passwords.png"
-msgstr "./images/12a-Set_up_users_and_passwords.png"
+msgstr "12a-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "./images/12b-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/12b-Set_up_users_and_passwords.png"
 msgid "12b-Set_up_users_and_passwords.png"
-msgstr "./images/12b-Set_up_users_and_passwords.png"
+msgstr "12b-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "./images/12c-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/12c-Set_up_users_and_passwords.png"
 msgid "12c-Set_up_users_and_passwords.png"
-msgstr "./images/12c-Set_up_users_and_passwords.png"
+msgstr "12c-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr "./images/12d-Setting-up-the-partitioner.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/12d-Setting-up-the-partitioner.png"
 msgid "12d-Setting-up-the-partitioner.png"
-msgstr "./images/12d-Setting-up-the-partitioner.png"
+msgstr "12d-Setting-up-the-partitioner.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/13-Install+the+base+system.png"
 msgstr "./images/13-Install+the+base+system.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "13-Install the base system.png"
 msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
@@ -3032,70 +2649,54 @@
 msgstr "./images/14-Select_and_install_software.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/14-Select_and_install_software.png"
 msgid "14-Select_and_install_software.png"
-msgstr "./images/14-Select_and_install_software.png"
+msgstr "14-Select_and_install_software.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/17-Select_and_install_software.png"
 msgstr "./images/17-Select_and_install_software.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/17-Select_and_install_software.png"
 msgid "17-Select_and_install_software.png"
-msgstr "./images/17-Select_and_install_software.png"
+msgstr "17-Select_and_install_software.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/18-Build+LTSP+chroot.png"
 msgstr "./images/18-Build+LTSP+chroot.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/18-Build+LTSP+chroot.png"
 msgid "18-Build LTSP chroot.png"
-msgstr "./images/18-Build+LTSP+chroot.png"
+msgstr "18-Build+LTSP+chroot.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/20-Finish_the_Installation.png"
 msgstr "./images/20-Finish_the_Installation.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/20-Finish_the_Installation.png"
 msgid "20-Finish_the_Installation.png"
-msgstr "./images/20-Finish_the_Installation.png"
+msgstr "20-Finish_the_Installation.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgid "21-Finish_the_Installation-Installation_complete.png"
-msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr "21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "22-Tjener_GRUB_boot_menu.png"
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "22-Tjener_GRUB_boot_menu.png"
 msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
@@ -3104,8 +2705,6 @@
 msgstr "Invite KDM sur tjener"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
@@ -3114,8 +2713,6 @@
 msgstr "KDE et un navigateur Internet"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/27-Tjener-KDE_Desktop.png"
 msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
@@ -3124,14 +2721,10 @@
 msgstr "Bureau KDE"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
@@ -3140,16 +2733,12 @@
 msgstr "Invite de connexion sur une station de travail sans disque dur"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "KDE Desktop"
 msgid "KDE Desktop and Menu"
-msgstr "Bureau KDE"
+msgstr "Bureau et menu KDE"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -3183,6 +2772,9 @@
 "File_system_access_configuration\">file system access configuration</link> "
 "before adding users."
 msgstr ""
+"Consultez les informations sur la <link linkend=\"Architecture--"
+"File_system_access_configuration\">configuration de l'accès au système de "
+"fichiers</link> spécifique à Debian Edu avant d'ajouter des utilisateurs."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3212,12 +2804,6 @@
 "passer par cette étape) ;"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Adding users and workstations is described in detail below, so please "
-#| "read this chapter completely. It covers how to perform these minumum "
-#| "steps correctly as well, as other stuff that everybody will probably need "
-#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
 "this chapter completely. It covers how to perform these minimum steps "
@@ -3229,13 +2815,6 @@
 "monde a probablement besoin de faire."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "There is additional information available elsewhere in this manual: the "
-#| "<link linkend=\"Features\">New features in Jessie</link> chapter should "
-#| "be read by everyone who is familiar with previous releases. And for those "
-#| "upgrading from a previous release, make sure to read the <link linkend="
-#| "\"Upgrades\">Upgrades</link> chapter."
 msgid ""
 "There is additional information available elsewhere in this manual: the "
 "<link linkend=\"Features\">New features in Stretch</link> chapter should be "
@@ -3245,10 +2824,10 @@
 msgstr ""
 "Des informations complémentaires sont disponibles ailleurs dans ce manuel : "
 "le chapitre sur les <link linkend=\"Features\">nouvelles fonctionnalités "
-"dans Jessie</link> devrait être lu par toute personne familière avec des "
+"dans Stretch</link> devrait être lu par toute personne familière avec des "
 "versions précédentes. Les personnes effectuant une mise à niveau depuis une "
 "version précédente devraient lire le chapitre sur les <link linkend="
-"\"Upgrades\">mises à jour</link>."
+"\"Upgrades\">mises à niveau</link>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3273,8 +2852,6 @@
 "d'astuces et de réponses à des questions courantes."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "Debian Edu KDE desktop"
 msgid "Debian Edu KDE desktop"
 msgstr "bureau Debian Edu KDE"
 
@@ -3323,16 +2900,6 @@
 msgstr "Administration DHCP"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "For GOsa² access you need the Skolelinux main server and a (client) "
-#| "system with a web browser installed which can be the main server itself "
-#| "if it was installed as a so called combined server (main server + thin "
-#| "client server + workstation). If all of the mentioned before is not "
-#| "available, see: <link linkend=\"Administration--"
-#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
-#| "\">Installing a graphical environment on the main-server to use GOsa²</"
-#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
@@ -3345,11 +2912,11 @@
 "Pour accéder à GOsa², vous avez besoin du serveur principal Skolelinux et "
 "d'un système (client) disposant d'un navigateur web qui peut être le serveur "
 "principal lui-même s'il est configuré comme un serveur combiné (serveur "
-"principal + serveur de clients légers + station de travail). Si tout ce qui "
-"est mentionné auparavant n'est pas disponible, consultez <link linkend="
-"\"Administration--Installing_a_graphical_environment_on_the_main-"
-"server_to_use_GOsa.2BALI-\">Installation d'un environnement graphique sur le "
-"serveur principal pour utiliser GOsa²</link>."
+"principal + serveur LTSP + station de travail). Si tout ce qui est mentionné "
+"auparavant n'est pas disponible, consultez <link linkend=\"Administration--"
+"Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+"\">Installation d'un environnement graphique sur le serveur principal pour "
+"utiliser GOsa²</link>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3360,15 +2927,11 @@
 "pour accéder à GOsa² et identifiez-vous en tant que premier utilisateur."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "If you are using a new Debian Edu Jessie machine, the site certificate "
-#| "will be known by the browser."
 msgid ""
 "If you are using a new Debian Edu Stretch machine, the site certificate will "
 "be known by the browser."
 msgstr ""
-"Si vous utilisez une nouvelle machine Debian Edu Jessie, le certificat du "
+"Si vous utilisez une nouvelle machine Debian Edu Stretch, le certificat du "
 "site sera connu du navigateur."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -3394,10 +2957,8 @@
 msgstr "Connexion à GOsa² et aperçu"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/gosa2_overview.png"
-msgstr "./images/smile.png"
+msgstr "./images/gosa2_overview.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² overview page after login as the first user"
@@ -3420,15 +2981,6 @@
 "toutes les pages d'administration de GOsa²."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "In Debian Edu, account, group, and system information is stored in an "
-#| "LDAP directory. This data is used not only by the main server, but also "
-#| "by the (diskless) workstations, the thin client servers and the Windows "
-#| "machines on the network. With LDAP, account information about students, "
-#| "pupils, teachers, etc. only needs to be entered once. After information "
-#| "has been provided in LDAP, the information will be available to all "
-#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
@@ -3439,11 +2991,11 @@
 msgstr ""
 "Dans Debian Edu, les informations de comptes, de groupes et de systèmes sont "
 "enregistrées dans un répertoire LDAP. On y accède non seulement depuis le "
-"serveur principal mais aussi depuis les stations de travail, les serveurs de "
-"clients légers et les machines Windows sur le réseau. Avec LDAP, les "
-"informations concernant les étudiants, élèves, professeurs, etc. ne devront "
-"être renseignées qu'une seule fois et seront ensuite accessibles depuis tous "
-"les systèmes du réseau."
+"serveur principal mais aussi depuis les stations de travail, les serveurs "
+"LTSP et les machines Windows sur le réseau. Avec LDAP, les informations "
+"concernant les étudiants, élèves, professeurs, etc., ne devront être "
+"renseignées qu'une seule fois et seront ensuite accessibles depuis tous les "
+"systèmes du réseau."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3463,19 +3015,6 @@
 "données LDAP du serveur principal Debian Edu."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A default Debian Edu main server installation currently provides two "
-#| "\"departments\": Teachers and Students, plus the base level of the LDAP "
-#| "tree. Student accounts are intended to be added to the \"Students\" "
-#| "department, teachers to the \"Teachers\" department; systems (servers, "
-#| "Skolelinux workstations, Windows machines, printers etc.) are currently "
-#| "added to the base level. Find your own scheme for customising this "
-#| "structure. (You can find an example how to create users in year groups, "
-#| "with common home directories for each group in the <ulink url=\"https://"
-#| "wiki.debian.org/DebianEdu/Documentation/Jessie//HowTo/"
-#| "AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
-#| "AdvancedAdministration</ulink> chapter of this manual.)"
 msgid ""
 "A default Debian Edu main server installation currently provides two "
 "\"departments\": Teachers and Students, plus the base level of the LDAP "
@@ -3499,7 +3038,7 @@
 "structure. Vous trouverez un exemple montrant la création d'utilisateurs "
 "regroupés par année avec un répertoire personnel commun dans chaque groupe "
 "dans le chapitre d'<ulink url=\"https://wiki.debian.org/DebianEdu/"
-"Documentation/Jessie//HowTo/"
+"Documentation/Stretch//HowTo/"
 "AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">administration "
 "avancée</ulink> de ce manuel."
 
@@ -3637,10 +3176,8 @@
 msgstr "Rechercher, modifier et supprimer des utilisateurs"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/filterbox.png"
-msgstr "./images/smile.png"
+msgstr "./images/filterbox.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Filterbox"
@@ -3687,10 +3224,8 @@
 "modifier la liste des groupes auxquels il appartient."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/edit_user.png"
-msgstr "./images/smile.png"
+msgstr "./images/edit_user.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Editing user data"
@@ -3749,8 +3284,6 @@
 "par vous-même."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/change_password_administratively.png"
 msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
@@ -3871,20 +3404,16 @@
 msgstr "Gestion des groupes avec GOsa²"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/create_group.png"
-msgstr "./images/alert.png"
+msgstr "./images/create_group.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "create group"
 msgstr "Créer un groupe"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/list_groups.png"
-msgstr "./images/alert.png"
+msgstr "./images/list_groups.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3971,12 +3500,6 @@
 "\"Architecture\">Architecture</link> de ce manuel."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Diskless workstations and thin-clients work out-of-the-box when connected "
-#| "to the main network. Only workstations with disks <emphasis role=\"strong"
-#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
-#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
@@ -4031,19 +3554,6 @@
 "qui leur correspond."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If the machines have booted as thin clients/diskless workstations or have "
-#| "been installed using any of the networked profiles, the "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
-#| "to automatically add machines to GOsa², "
-#| "<computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage "
-#| "information. Please note, that the IP addresses shown after usage of "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-#| "dynamic IP range. These systems can then be modified though to suit your "
-#| "network: rename each new system, activate DHCP and DNS, add it to "
-#| "netgroups, if needed; reboot the system afterwards.  The following "
-#| "screenshots show how this looks in practice:"
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
@@ -4061,14 +3571,17 @@
 "Si les machines ont démarré comme clients légers ou stations de travail sans "
 "disque, ou ont été installées en utilisant n'importe quel profil réseau, le "
 "script <computeroutput>sitesummary2ldapdhcp</computeroutput> permet "
-"d'ajouter des machines dans GOsa² ; <computeroutput>sitesummary2ldapdhcp -h</"
-"computeroutput> affiche un message d'aide. Notez que l'adresse IP indiquée "
-"après l'utilisation de <computeroutput>sitesummary2ldapdhcp</computeroutput> "
-"appartient à la plage d'adresses IP dynamiques. Néanmoins ces systèmes "
-"peuvent ensuite être modifiés pour s'adapter à votre réseau. Renommez chaque "
-"nouveau système, activez le DHCP et le DNS, et ajoutez le aux groupes "
-"réseaux si besoin. Les captures d'écrans suivantes montrent à quoi ça "
-"ressemble en pratique."
+"d'ajouter automatiquement des machines dans GOsa². Pour des machines simples "
+"cela fonctionnera sans modification. Pour les machines avec plus d'une "
+"adresse mac, il faudra choisir celle qui est réellement utilisée, et "
+"<computeroutput>sitesummary2ldapdhcp -h</computeroutput> affiche un message "
+"d'aide. Notez que l'adresse IP indiquée après l'utilisation de "
+"<computeroutput>sitesummary2ldapdhcp</computeroutput> appartient à la plage "
+"d'adresses IP dynamiques. Néanmoins ces systèmes peuvent ensuite être "
+"modifiés pour s'adapter à votre réseau. Renommez chaque nouveau système, "
+"activez le DHCP et le DNS, et ajoutez-le aux groupes réseaux si besoin, "
+"redémarrez après le système. Les captures d'écrans suivantes montrent à quoi "
+"ça ressemble en pratique."
 
 #. type: CDATA
 #, no-wrap
@@ -4090,8 +3603,6 @@
 "enter password:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/gosa_systems_list.png"
 msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
@@ -4100,8 +3611,6 @@
 msgstr "Liste des systèmes dans GOsa²"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/gosa_systems_host_details.png"
 msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
@@ -4110,8 +3619,6 @@
 msgstr "Renseignements sur le système"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/gosa_systems_edit_host.png"
 msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
@@ -4120,8 +3627,6 @@
 msgstr "Modification du système"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/gosa_systems_add_netgroup.png"
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
@@ -4152,7 +3657,7 @@
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Modify existing machines / Netgroup management"
-msgstr "Modification de machines existantes / gestion des groupes réseau"
+msgstr "Modification de machines existantes et gestion des groupes réseau"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -4267,12 +3772,6 @@
 "LDAP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
-#| "or your users won't be able to access their home directories. Diskless "
-#| "workstations and thin clients don't use NFS, so they don't need to be "
-#| "configured."
 msgid ""
 "Remember to configure workstations and LTSP servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -4323,11 +3822,6 @@
 "d'impression désactivées."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Debian Edu machines in this group will only be allowed to connect to "
-#| "machines on the local network.  Combined with web proxy restrictions this "
-#| "might be used during exams."
 msgid ""
 "Debian Edu machines in this group will be allowed to connect to machines "
 "only on the local network.  Combined with web proxy restrictions this might "
@@ -4363,18 +3857,6 @@
 msgstr "Gestion des imprimantes"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "For Printer Management point your web browser to <ulink url=\"https://"
-#| "www:631\"/>. This is the normal CUPS management interface where you can "
-#| "add/delete/modify your printers and can clean up the printing queue. By "
-#| "default only root is allowed but this can be changed: Open /etc/cups/cups-"
-#| "files.conf with an editor and add one or more valid group names matching "
-#| "your site policy to the line containing <computeroutput>SystemGroup "
-#| "lpadmin</computeroutput>. Existing GOsa² groups that might be used are "
-#| "<computeroutput>gosa-admins</computeroutput> (with the first user as "
-#| "member), <computeroutput>teachers</computeroutput> and "
-#| "<computeroutput>jradmins</computeroutput> (no members after installation)."
 msgid ""
 "For Printer Management point your web browser to <ulink url=\"https://"
 "www:631\"/> and accept the self-signed certificate. This is the normal CUPS "
@@ -4389,18 +3871,19 @@
 "<computeroutput>jradmins</computeroutput> (no members after installation)."
 msgstr ""
 "Pour la gestion des imprimantes, pointez votre navigateur web sur l'adresse "
-"<ulink url=\"https://www:631\"/>. C'est l'interface normale de gestion du "
-"serveur d'impression CUPS, dans laquelle vous pouvez ajouter, supprimer et "
-"modifier vos imprimantes et nettoyer la file d'attente pour l'impression. "
-"Par défaut, seul le superutilisateur est autorisé à faire ces changements, "
-"mais cela peut être modifié : ouvrez le fichier /etc/cups/cups-files.conf "
-"avec un éditeur et ajoutez un ou plusieurs noms de groupes valables "
-"correspondant à votre politique de site sur la ligne contenant "
-"<computeroutput>SystemGroup lpadmin</computeroutput>. Les groupes GOsa² qui "
-"pourraient être utilisés sont <computeroutput>gosa-admins</computeroutput> "
-"(dont le premier utilisateur est membre), <computeroutput>teachers</"
-"computeroutput> et <computeroutput>jradmines</computeroutput> (qui n'ont pas "
-"de membres après l'installation)."
+"<ulink url=\"https://www:631\"/> et acceptez le certificat auto-signé. C'est "
+"l'interface normale de gestion du serveur d'impression CUPS, dans laquelle "
+"vous pouvez ajouter, supprimer et modifier vos imprimantes et nettoyer la "
+"file d'attente pour l'impression. Par défaut, seul le superutilisateur est "
+"autorisé à faire ces changements, mais cela peut être modifié : ouvrez le "
+"fichier /etc/cups/cups-files.conf avec un éditeur et ajoutez un ou plusieurs "
+"noms de groupes valables correspondant à votre politique de site sur la "
+"ligne contenant <computeroutput>SystemGroup lpadmin</computeroutput>. Les "
+"groupes GOsa² qui pourraient être utilisés sont <computeroutput>gosa-admins</"
+"computeroutput> et <computeroutput>printer-admins</computeroutput> (dont le "
+"premier utilisateur est membre), <computeroutput>teachers</computeroutput> "
+"et <computeroutput>jradmins</computeroutput> (qui n'ont pas de membres après "
+"l'installation)."
 
 #. type: Content of: <article><section><title>
 msgid "Clock synchronisation"
@@ -4543,12 +4026,12 @@
 "depuis le chroot LTSP."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "run <computeroutput>apt-get update</computeroutput>"
 msgid ""
 "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
 "NBD image(s)."
-msgstr "exécutez <computeroutput>apt-get update</computeroutput>"
+msgstr ""
+"Exécutez <computeroutput>ltsp-update-image</computeroutput> pour recréer "
+"l'image (ou les images) NBD."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4577,13 +4060,6 @@
 "computeroutput>."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Automatic installation of updates can be done easily if desired, it just "
-#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
-#| "be installed and configured as described on <ulink url=\"https://wiki."
-#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
-#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
@@ -4592,10 +4068,11 @@
 "installations security updates are enabled by default."
 msgstr ""
 "Si vous le souhaitez, l'installation des mises à jour peut être rendue "
-"automatique, simplement en installant et configurant le paquet "
-"<computeroutput>unattended-upgrades</computeroutput> comme décrit sur la "
-"page <ulink url=\"https://wiki.debian.org/UnattendedUpgrades\">wiki.debian."
-"org/UnattendedUpgrades</ulink>."
+"automatique, simplement en configurant le paquet <computeroutput>unattended-"
+"upgrades</computeroutput> comme décrit sur la page <ulink url=\"https://wiki."
+"debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. "
+"Dans les nouvelles installations, les mises à jour de sécurité sont activées "
+"par défaut."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4640,14 +4117,6 @@
 msgstr "Gestion des sauvegardes"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "For backup management point your browser to <ulink url=\"https://www/"
-#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
-#| "since you have to enter the root password there. If you try to access "
-#| "this site without using SSL it will fail. Note: the site will only work "
-#| "if you temporarily allow ssh root login on the backup server (tjener by "
-#| "default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
@@ -4661,8 +4130,8 @@
 "ce site par SSL, puisque le mot de passe du superutilisateur devra être "
 "saisi. En l'absence de chiffrement par SSL, la tentative d'accès échouera. "
 "Remarque : le site ne fonctionnera que si vous permettez temporairement la "
-"connexion du superutilisateur par SSH sur le serveur de sauvegarde (tjener "
-"par défaut)."
+"connexion du superutilisateur par SSH sur le serveur de sauvegarde (le "
+"serveur principal « tjener » par défaut)."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -4744,8 +4213,6 @@
 "dernier instantané à garder :"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/slbackup-php_maintenance.png"
 msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
@@ -4775,17 +4242,6 @@
 "et la cause de problèmes."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The list of machines being monitored using Munin is generated "
-#| "automatically, based on the list of hosts reporting to sitesummary.  All "
-#| "hosts with the package munin-node installed are registered for Munin "
-#| "monitoring.  It will normally take one day from a machine being installed "
-#| "until Munin monitoring starts, because of the order the cron jobs are "
-#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
-#| "update-munin</computeroutput> as root on the sitesummary server (normally "
-#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
-#| "conf</computeroutput> file."
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -4808,13 +4264,6 @@
 "jour le fichier <computeroutput>/etc/munin/munin.conf</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The set of measurements being collected is automatically generated on "
-#| "each machine using the <computeroutput>munin-node-configure</"
-#| "computeroutput> program, which probes the plugins available from "
-#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
-#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
@@ -4823,38 +4272,25 @@
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
 "L'ensemble des mesures collectées est créé automatiquement sur chaque "
-"machine grâce au programme « munin-node-configure » qui sonde les greffons "
-"disponibles dans <computeroutput>/usr/share/munin/plugins/</computeroutput> "
-"et crée des liens symboliques dans <computeroutput>/etc/munin/plugins/</"
-"computeroutput> pour les greffons pertinents."
+"machine grâce au programme <computeroutput>munin-node-configure</"
+"computeroutput> qui sonde les greffons disponibles dans <computeroutput>/usr/"
+"share/munin/plugins/</computeroutput> et crée des liens symboliques dans "
+"<computeroutput>/etc/munin/plugins/</computeroutput> pour les greffons "
+"pertinents."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Information about Munin is available from <ulink url=\"http://munin."
-#| "projects.linpro.no/\"/> ."
 msgid ""
 "Information about Munin is available from <ulink url=\"http://munin-"
 "monitoring.org/\"/>."
 msgstr ""
 "Des informations sur le système Munin sont disponibles depuis <ulink url="
-"\"http://munin.projects.linpro.no/\"/>."
+"\"http://munin-monitoring.org/\"/>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Icinga"
-msgstr ""
+msgstr "Icinga"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Nagios system and service monitoring is available from <ulink url="
-#| "\"https://www/nagios3/\"/>. The set of machines and services being "
-#| "monitored is automatically generated using information collected by the "
-#| "sitesummary system. The machines with the profile Main-server and Thin-"
-#| "client-server receive full monitoring, while workstations and thin "
-#| "clients receive simple monitoring. To enable full monitoring on a "
-#| "workstation, install the <computeroutput>nagios-nrpe-server</"
-#| "computeroutput> package on the workstation."
 msgid ""
 "Icinga system and service monitoring is available from <ulink url=\"https://"
 "www/icinga/\"/>. The set of machines and services being monitored is "
@@ -4865,49 +4301,34 @@
 "<computeroutput>nagios-nrpe-server</computeroutput> package on the "
 "workstation."
 msgstr ""
-"Nagios, l'outil de surveillance du système et des services, est disponible "
-"depuis le site <ulink url=\"https://www/nagios3/\"/>. La liste de machines "
-"et services surveillés est automatiquement générée en utilisant "
-"l'information collectée par le système sitesummary. Les machines ayant le "
-"profil Serveur principal et Serveur de clients légers ont une surveillance "
-"plus complète que les stations de travail et les clients légers. Pour "
-"activer une surveillance complète pour une station de travail, installez-y "
-"le paquet <computeroutput>nagios-nrpe-server</computeroutput>."
-
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
-#| "default password is <computeroutput>skolelinux</computeroutput>. For "
-#| "security reasons, avoid using the same password as root. To change the "
-#| "password you can run the following command as root:"
+"Icinga, l'outil de surveillance du système et des services, est disponible "
+"depuis le site <ulink url=\"https://www/icinga/\"/>. La liste de machines et "
+"services surveillés est automatiquement générée en utilisant l'information "
+"collectée par le système sitesummary. Les machines ayant le profil Serveur "
+"principal et Serveur LTSP ont une surveillance plus complète que les "
+"stations de travail et les clients légers. Pour activer une surveillance "
+"complète pour une station de travail, installez-y le paquet "
+"<computeroutput>nagios-nrpe-server</computeroutput>."
+
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "The username is <computeroutput>icingaadmin</computeroutput> and the default "
 "password is <computeroutput>skolelinux</computeroutput>. For security "
 "reasons, avoid using the same password as root. To change the password you "
 "can run the following command as root:"
 msgstr ""
-"Le nom d'utilisateur est <computeroutput>nagiosadmin</computeroutput> et le "
+"Le nom d'utilisateur est <computeroutput>icingaadmin</computeroutput> et le "
 "mot de passe <computeroutput>skolelinux</computeroutput>. Pour des raisons "
 "de sécurité, évitez d'utiliser le même mot de passe que celui du "
 "superutilisateur. Afin de changer le mot de passe, vous pouvez lancer la "
 "commande suivante en tant que superutilisateur :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+#, no-wrap
 msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
-msgstr "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
+msgstr "htpasswd /etc/icinga/htpasswd.users icingaadmin"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "By default Nagios does not send email. This can be changed by replacing "
-#| "<computeroutput>notify-by-nothing</computeroutput> with "
-#| "<computeroutput>host-notify-by-email</computeroutput> and "
-#| "<computeroutput>notify-by-email</computeroutput> in the file "
-#| "<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
-#| "computeroutput>."
 msgid ""
 "By default Icinga does not send email. This can be changed by replacing "
 "<computeroutput>notify-by-nothing</computeroutput> with <computeroutput>host-"
@@ -4915,73 +4336,53 @@
 "computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
 "contacts.cfg</computeroutput>."
 msgstr ""
-"Par défaut, Nagios n'envoie pas de courrier électronique. Ce comportement "
+"Par défaut, Icinga n'envoie pas de courrier électronique. Ce comportement "
 "peut être modifié en remplaçant <computeroutput>notify-by-nothing</"
 "computeroutput> par <computeroutput>host-notify-by-email</computeroutput> et "
 "<computeroutput>notify-by-email</computeroutput> dans le fichier "
-"<computeroutput>/etc/nagios3/sitesummary-template-contacts.cfg</"
+"<computeroutput>/etc/icinga/sitesummary-template-contacts.cfg</"
 "computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
-#| "sitesummary.cfg</computeroutput>.  The sitesummary cron job generates "
-#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
-#| "computeroutput> with the list of hosts and services to monitor."
 msgid ""
 "The Icinga configuration file used is <computeroutput>/etc/icinga/"
 "sitesummary.cfg</computeroutput>.  The sitesummary cron job generates "
 "<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
 "with the list of hosts and services to monitor."
 msgstr ""
-"Le fichier de configuration utilisé par Nagios est <computeroutput>/etc/"
-"nagios3/sitesummary.cfg</computeroutput>. La tâche cron sitesummary génère "
-"un fichier <computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
+"Le fichier de configuration utilisé par Icinga est <computeroutput>/etc/"
+"icinga/sitesummary.cfg</computeroutput>. La tâche cron sitesummary génère un "
+"fichier <computeroutput>/var/lib/sitesummary/icinga-generated.cfg</"
 "computeroutput> contenant la liste des hôtes et services à surveiller."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
-#| "included in the generated file."
 msgid ""
 "Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
 "sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
 "in the generated file."
 msgstr ""
-"Des validations supplémentaires pour Nagios peuvent être ajoutées au fichier "
-"<computeroutput>/var/lib/sitesummary/nagios-generated.cfg.post</"
+"Des validations supplémentaires pour Icinga peuvent être ajoutées au fichier "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg.post</"
 "computeroutput> afin de les inclure dans le fichier généré."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
-#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
 msgid ""
 "Information about Icinga is available from <ulink url=\"https://www.icinga."
 "com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
 msgstr ""
-"Davantage d'informations sur le système Nagios sont disponibles sur <ulink "
-"url=\"http://www.nagios.org/\"/> ou dans le paquet <computeroutput>nagios3-"
+"Davantage d'informations sur le système Icinga sont disponibles sur <ulink "
+"url=\"https://www.icinga.com/\"/> ou dans le paquet <computeroutput>icinga-"
 "doc</computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><title>
-#, fuzzy
-#| msgid "Common Nagios warnings and how to handle them"
 msgid "Common Icinga warnings and how to handle them"
-msgstr "Avertissements courants de Nagios et comment les gérer"
+msgstr "Avertissements courants d'Icinga et comment les gérer"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Here are instructions on how to handle the most common Nagios warnings."
 msgid "Here are instructions on how to handle the most common Icinga warnings."
 msgstr ""
 "Voici les instructions à suivre pour gérer les avertissements les plus "
-"courants de Nagios."
+"courants de Icinga."
 
 #. type: Content of: <article><section><section><section><section><section><title>
 msgid "DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):"
@@ -5015,14 +4416,6 @@
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "New package are available for upgrades.  The critical ones are normally "
-#| "security fixes.  To upgrade, run 'apt-get upgrade &amp;&amp; apt-get dist-"
-#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-#| "client servers, remember to also update the LTSP chroot using "
-#| "<computeroutput>ltsp-chroot apt-get update &amp;&amp; ltsp-chroot apt-get "
-#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade &amp;&amp; apt-get dist-"
@@ -5031,23 +4424,15 @@
 "chroot apt-get update &amp;&amp; ltsp-chroot apt-get upgrade</"
 "computeroutput>."
 msgstr ""
-"Un nouveau paquet est disponible pour la mise à jour. Les paquets critiques "
-"sont normalement des corrections de sécurité. Pour mettre à jour, lancez "
-"<computeroutput>apt-get upgrade &amp;&amp; apt-get dist-upgrade</"
+"De nouveaux paquets sont disponibles pour la mise à jour. Les paquets "
+"critiques sont normalement des corrections de sécurité. Pour mettre à jour, "
+"lancez <computeroutput>apt-get upgrade &amp;&amp; apt-get dist-upgrade</"
 "computeroutput> en tant que superutilisateur dans un terminal ou en vous "
-"connectant par SSH. Pour les serveurs de clients légers, n'oubliez pas de "
-"mettre également le chroot LTSP à jour avec la commande <computeroutput>ltsp-"
-"chroot apt-get update &amp;&amp; ltsp-chroot apt-get upgrade</"
-"computeroutput>."
+"connectant par SSH. Pour les serveurs LTSP, n'oubliez pas de mettre "
+"également le chroot LTSP à jour avec la commande <computeroutput>ltsp-chroot "
+"apt-get update &amp;&amp; ltsp-chroot apt-get upgrade</computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you do not want to manually upgrade packages and trust Debian to do a "
-#| "good job with new versions, you can install the "
-#| "<computeroutput>unattended-upgrades</computeroutput> package and "
-#| "configure it to automatically upgrade all new packages every night.  This "
-#| "will not upgrade the LTSP chroots."
 msgid ""
 "If you do not want to manually upgrade packages and trust Debian to do a "
 "good job with new versions, you can configure <computeroutput>unattended-"
@@ -5056,9 +4441,9 @@
 msgstr ""
 "Si vous ne voulez pas mettre les paquets à jour vous-même et que vous faites "
 "confiance à Debian pour faire du bon travail avec les nouvelles versions, "
-"vous pouvez installer le paquet <computeroutput>unattended-upgrades</"
-"computeroutput> et le configurer pour mettre à jour automatiquement tous les "
-"nouveaux paquets chaque nuit. Cela ne mettra pas à jour les chroots LTSP."
+"vous pouvez configurer <computeroutput>unattended-upgrades</computeroutput> "
+"pour mettre à jour automatiquement tous les nouveaux paquets chaque nuit. "
+"Cela ne mettra pas à jour les chroots LTSP."
 
 #. type: Content of: <article><section><section><section><section><section><para>
 msgid ""
@@ -5191,18 +4576,13 @@
 "vigueur.</emphasis>."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Please read this chapter and the <link linkend=\"Features\">New features "
-#| "in Jessie</link> chapter of this manual completely before attempting to "
-#| "upgrade."
 msgid ""
 "Please read this chapter and the <link linkend=\"Features\">New features in "
 "Stretch</link> chapter of this manual completely before attempting to "
 "upgrade."
 msgstr ""
 "Veuillez lire en entier ce chapitre et le chapitre <link linkend=\"Features"
-"\">Nouvelles fonctionnalités dans Debian Edu Jessie</link> avant de débuter "
+"\">Nouvelles fonctionnalités dans Debian Edu Stretch</link> avant de débuter "
 "la mise à jour de vos systèmes."
 
 #. type: Content of: <article><section><section><title>
@@ -5280,32 +4660,19 @@
 "ulink>, Debian Edu devra faire de même."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Upgrades from Debian Edu Wheezy"
 msgid "Upgrades from Debian Edu Jessie"
-msgstr "Mises à jour depuis Debian Edu Wheezy"
+msgstr "Mises à niveau depuis Debian Edu Jessie"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Be prepared: make sure you have tested the upgrade from Wheezy in a test "
-#| "environment or have backups ready to be able to go back."
 msgid ""
 "Be prepared: make sure you have tested the upgrade from Jessie in a test "
 "environment or have backups ready to be able to go back."
 msgstr ""
-"Soyez prêt : assurez-vous d'avoir testé la mise à jour à partir de Wheezy "
+"Soyez prêt : assurez-vous d'avoir testé la mise à jour à partir de Jessie "
 "dans un environnement de test, ou bien d'avoir des sauvegardes prêtes à être "
 "restaurées."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Please note that the following recipe applies to a default Debian Edu "
-#| "main server installation (desktop=kde, profiles Main-Server, Workstation, "
-#| "Thin-Client-Server). (For a general overview concerning wheezy to jessie "
-#| "upgrade, see: <ulink url=\"https://www.debian.org/releases/jessie/"
-#| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
 "server installation (desktop=kde, profiles Main Server, Workstation, LTSP "
@@ -5314,13 +4681,15 @@
 msgstr ""
 "Veuillez noter que la recette suivante s'applique à une installation de "
 "serveur principal de Debian Edu (bureau KDE, profils Serveur principal, "
-"Station de travail, Serveur de clients légers). Pour un aperçu global de la "
-"mise à jour de wheezy à jessie, consultez <ulink url=\"https://www.debian."
-"org/releases/jessie/releasenotes\"/>."
+"Station de travail, Serveur LTSP). (Pour un aperçu global de la mise à jour "
+"de Jessie à Stretch, consultez <ulink url=\"https://www.debian.org/releases/"
+"stretch/releasenotes\"/>."
 
 #. type: Content of: <article><section><section><para>
 msgid "Don't use X, use a virtual console, log in as root."
 msgstr ""
+"N'utilisez pas le serveur X, utilisez une console virtuelle, connectez-vous "
+"en tant que superutilisateur."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5330,60 +4699,51 @@
 "<computeroutput>apt</computeroutput> removes them from the cache (after "
 "successful installation)."
 msgstr ""
+"Veuillez noter une différence entre <computeroutput>apt</computeroutput> et "
+"<computeroutput>apt-get</computeroutput> dans Stretch : par défaut, "
+"<computeroutput>apt-get</computeroutput> conserve les paquets téléchargés "
+"après une installation réussie alors qu'<computeroutput>apt</computeroutput> "
+"les supprime du cache."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If <computeroutput>apt-get</computeroutput> finishes with an error, try "
-#| "to fix it and/or run <computeroutput>apt-get -f install</computeroutput> "
-#| "and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once "
-#| "again."
 msgid ""
 "If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
 "it and/or run <computeroutput>apt -f install</computeroutput> and then "
 "<computeroutput>apt -y full-upgrade</computeroutput> once again."
 msgstr ""
-"Si <computeroutput>apt-get</computeroutput> termine avec une erreur, essayez "
-"de la corriger et/ou de lancer <computeroutput>apt-get -f install</"
-"computeroutput>, puis à nouveau <computeroutput>apt-get -y dist-upgrade</"
-"computeroutput>."
+"Si <computeroutput>apt</computeroutput> termine avec une erreur, essayez de "
+"la corriger et/ou de lancer <computeroutput>apt -f install</computeroutput>, "
+"puis à nouveau <computeroutput>apt -y full-upgrade</computeroutput>."
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Upgrade the server side"
 msgid "Upgrading the main server"
-msgstr "Mettez à jour la partie serveur"
+msgstr "Mettez à niveau le serveur principal"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Make sure the current system is up-to-date."
 msgid "Start by making sure the current system is up-to-date:"
-msgstr "Assurez-vous que le système actuel est à jour."
+msgstr "Commencez par vous assurer que le système actuel est à jour."
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "apt-get update\n"
-#| "apt-get upgrade"
+#, no-wrap
 msgid ""
 "apt update\n"
 "apt full-upgrade"
 msgstr ""
-"apt-get update\n"
-"apt-get upgrade"
+"apt update\n"
+"apt full-upgrade"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cleanup the package cache:"
-msgstr ""
+msgstr "Nettoyez le cache de paquets :"
 
 #. type: CDATA
 #, no-wrap
 msgid "apt-get clean"
-msgstr ""
+msgstr "apt-get clean"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Prepare and start the upgrade to Stretch:"
-msgstr ""
+msgstr "Préparer et démarrer la mise à niveau vers Stretch :"
 
 #. type: CDATA
 #, no-wrap
@@ -5397,97 +4757,92 @@
 "apt update\n"
 "apt full-upgrade"
 msgstr ""
+"# D'abord, appliquez le changement de nom de profil :\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Ensuite, le mieux est d'utiliser le nouveau miroir par défaut :\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Enfin, remplacez Jessie par Stretch.\n"
+"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+"apt update\n"
+"apt full-upgrade"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "apt-list-changes: be prepared for a lot of NEWS to read; press &lt;"
 "return&gt; to scroll down, &lt;q&gt; to leave the pager."
 msgstr ""
+"apt-list-changes : soyez prêt à lire beaucoup d'INFORMATIONS ; appuyez sur "
+"&lt;retour&gt; pour les faire défiler, &lt;q&gt; pour quitter l'afficheur."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Don't use X, use a virtual console, log in as root. Read all debconf "
-#| "information carefully, choose 'keep the local version currently "
-#| "installed'; in most cases hitting return will be fine. Press 'q' to quit "
-#| "the apt-listchanges pager once you've read the information."
 msgid ""
 "Read all debconf information carefully, choose 'keep your currently-"
 "installed version' unless stated differently below; in most cases hitting "
 "return will be fine."
 msgstr ""
-"N'utilisez pas le serveur X, utilisez une console virtuelle, connectez-vous "
-"en tant que superutilisateur. Lisez attentivement toutes les informations "
-"debconf, choisissez « garder la version locale installée actuellement ». "
-"Dans la plupart des cas, appuyer sur entrée sera suffisant. Appuyez sur "
-"« q » pour quitter apt-listchanges une fois que vous avez lu les "
-"informations."
+"Lisez attentivement toutes les informations debconf, choisissez « garder la "
+"version locale installée actuellement » sauf indication contraire ci-"
+"dessous. Dans la plupart des cas, appuyer sur entrée sera suffisant."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "You will see some prompts about package configurations:"
-msgstr ""
+msgstr "Vous verrez certaines invites pour la configuration de paquets :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
 msgstr ""
+"icinga-cgi : fournissez le mot de passe d'icingaadmin (le même que celui "
+"utilisé pour nagiosadmin)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Just in case several display managers are installed: display-manager: Choose "
 "<computeroutput>lightdm</computeroutput>."
 msgstr ""
+"Au cas où plusieurs gestionnaires d'affichage sont installés : display-"
+"manager : choisissez <computeroutput>lightdm</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
 "Configuring Kerberos Authentication: Enter <computeroutput>kerberos</"
 "computeroutput> as hostname."
 msgstr ""
-"Ajoutez les utilisateurs au nouveau groupe <computeroutput>sshusers</"
-"computeroutput>."
+"Configuration de l'authentification Kerberos : entrez "
+"<computeroutput>kerberos</computeroutput> comme nom d'hôte."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Configuring icinga-common: Use external commands with Icinga: Choose &lt;"
 "Yes&gt;."
 msgstr ""
+"Configuration d'icinga-common : utilisez les commandes externes avec "
+"Icinga : choisissez &lt;Yes&gt;."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
-#| "org/779646#\">779646</ulink>)."
 msgid ""
 "tftp (etc/inetd.conf): Choose &lt;Yes&gt;. (See atftpd bug <ulink url="
 "\"https://bugs.debian.org/789667#\">789667</ulink>)"
 msgstr ""
-"Considérez une étape optionnelle (bogue Debian nº <ulink url=\"https://bugs."
-"debian.org/779646#\">779646</ulink>)."
+"tftp (etc/inetd.conf) : choisissez &lt;Yes&gt;. (Voir le bogue d'atftpd "
+"<ulink url=\"https://bugs.debian.org/789667#\">nº 789667</ulink>)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/default/ldap2zone: Choose Y."
-msgstr ""
+msgstr "/etc/default/ldap2zone : choisissez Y."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
 msgstr ""
+"/etc/gosa/gosa.conf : choisissez N. (N'acceptez jamais une nouvelle version "
+"de gosa.conf !)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Cope with the Squid3 to Squid renaming:"
-msgstr ""
+msgstr "Gérez le renommage de Squid3 en Squid :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "service squid stop\n"
-#| "umount /var/spool/squid\n"
-#| "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-#| "mount /var/spool/squid3\n"
-#| "service squid3 start\n"
-#| "apt-get -y purge squid squid-common"
+#, no-wrap
 msgid ""
 "service squid stop          # This usually takes some time!\n"
 "rm -rf /var/spool/squid\n"
@@ -5498,16 +4853,20 @@
 "rm /etc/squid3 -rf\n"
 "rm /etc/default/squid3 -rf"
 msgstr ""
-"service squid stop\n"
-"umount /var/spool/squid\n"
-"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-"mount /var/spool/squid3\n"
-"service squid3 start\n"
-"apt-get -y purge squid squid-common"
+"service squid stop          # Cela prend en général un certain temps !\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
 msgstr ""
+"Modifiez LDAP pour utiliser le nom de domaine complètement qualifié (FDQN) "
+"pour sudo :"
 
 #. type: CDATA
 #, no-wrap
@@ -5517,12 +4876,14 @@
 "Search for 'sudoHost :tjener', replace 'tjener' with 'tjener.intern'\n"
 "(Enter 'y' to modify the LDAP data base.)"
 msgstr ""
+"ldapvi -ZD '(cn=admin)'\n"
+"(Entrez le mot de passe du superutilisateur.)\n"
+"Recherchez « sudoHost :tjener », remplacez « tjener » par « tjener.intern »\n"
+"(Entrez « y » pour modifier la base de données de LDAP.)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "click advanced configuration"
 msgid "Apply and adjust configuration:"
-msgstr "cliquez sur configuration avancée"
+msgstr "Appliquer la configuration et l'ajuster :"
 
 #. type: CDATA
 #, no-wrap
@@ -5537,10 +4898,19 @@
 "service squid start\n"
 "service apache2 restart"
 msgstr ""
+"service autofs stop\n"
+"cfengine-debian-edu -D installation\n"
+"rm /etc/apache2/conf-enabled/nagios3.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
+"sed -i 's/udp4/udp/' /etc/inetd.conf   # Debian Bug nº 789667 (atftpd)\n"
+"service squid start\n"
+"service apache2 restart"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Install renamed metapackages:"
-msgstr ""
+msgstr "Installez les méta-paquets renommés :"
 
 #. type: CDATA
 #, no-wrap
@@ -5549,17 +4919,18 @@
 "apt install education-networked-common\n"
 "apt install education-ltsp-server      # Only if profile 'LTSP-Server' is installed."
 msgstr ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server      # Seulement si le profil 'LTSP-Server' est installé."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "New features in Debian Edu Jessie"
 msgid "Get the new Debian Edu Stretch artwork:"
-msgstr "Nouvelles fonctionnalités dans Debian Edu Jessie"
+msgstr "Obtenir le nouveau thème graphique de Debian Edu Stretch :"
 
 #. type: CDATA
 #, no-wrap
 msgid "apt install debian-edu-artwork-softwaves"
-msgstr ""
+msgstr "apt install debian-edu-artwork-softwaves"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -5567,10 +4938,13 @@
 "bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
 "from Broadwell in QEMU might help."
 msgstr ""
+"Si le démarrage du système mis à niveau échoue à démarrer sur qemu/kvm, voir "
+"le bogue <ulink url=\"https://bugs.debian.org/844446#\">844446</ulink>. "
+"Abandonner l'architecture Broadwell dans QEMU pourrait aider."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "After reboot, do some more cleanup:"
-msgstr ""
+msgstr "Après le redémarrage, effectuer un nettoyage supplémentaire :"
 
 #. type: CDATA
 #, no-wrap
@@ -5580,10 +4954,14 @@
 "dpkg -P php5-imagick                   # Package might not be installed in all cases.\n"
 "rm -rf /etc/php5"
 msgstr ""
+"apt purge linux-image-3.16.0-4-amd64 \n"
+"apt purge debian-edu-artwork-lines     # Sauf si vous n'en voulez pas comme thème alternative.\n"
+"dpkg -P php5-imagick                   # Paquet à n'installer en aucun cas.\n"
+"rm -rf /etc/php5"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Enable otherwise broken PHP 7.0 support:"
-msgstr ""
+msgstr "Activer la prise en charge autrement cassée de PHP 7.0 :"
 
 #. type: CDATA
 #, no-wrap
@@ -5591,56 +4969,62 @@
 "a2enmod php7.0                            \n"
 "service apache2 restart"
 msgstr ""
+"a2enmod php7.0                            \n"
+"service apache2 restart"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Check if the upgraded system works."
 msgid "Check if the upgraded system works:"
-msgstr "Vérifiez que le système fonctionne."
+msgstr "Vérifier que le système mis à niveau fonctionne :"
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Reboot; log in as first user and test"
 msgstr ""
+"Redemarrez ; connectez-vous en tant que premier utilisateur et testez pour "
+"voir "
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "if the GOsa² gui is working,"
-msgstr ""
+msgstr "si l'interface graphique de GOsa² fonctionne,"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Introduction to thin clients and diskless workstations"
 msgid "if one is able to connect LTSP clients and workstations,"
-msgstr "Introduction aux clients légers et stations de travail sans disque dur"
+msgstr ""
+"s'il est possible de se connecter aux clients LTSP et aux stations de "
+"travail,"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "if one can add/remove a netgroup membership of a system,"
 msgstr ""
+"s'il est possible d'ajouter ou de supprimer l'appartenance à un groupe "
+"réseau d'un réseau,"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "if one can send and receive internal email,"
-msgstr ""
+msgstr "s'il est possible d'envoyer et de recevoir un courriel interne,"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "if one can manage printers,"
-msgstr ""
+msgstr "s'il est possible de gérer les imprimantes,"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "and if other site specific things are working."
-msgstr ""
+msgstr "et si d'autres choses particulières au site fonctionnent."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Upgrading a workstation"
-msgstr ""
+msgstr "Mettre à niveau une station de travail"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Do all the basic things like on the main-server and without doing the things "
 "not needed. And then do this in addition."
 msgstr ""
+"Réaliser toutes les tâches de base comme sur le serveur principal et sans "
+"faire les actions non indispensables. Puis réaliser ces action en plus."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "To enable LDAP connection, renew the server certificate:"
-msgstr ""
+msgstr "Pour activer la connexion LDAP, renouveler le certificat du serveur :"
 
 #. type: CDATA
 #, no-wrap
@@ -5650,12 +5034,14 @@
 "service fetch-ldap-cert restart\n"
 "service nslcd start"
 msgstr ""
+"rm /etc/ldap/ssl/ldap-server-pubkey.pem\n"
+"service nslcd stop\n"
+"service fetch-ldap-cert restart\n"
+"service nslcd start"
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Upgrade LTSP chroot (default arch i386)"
 msgid "Upgrading LTSP chroots (default arch i386)"
-msgstr "Mise à niveau du chroot LTSP (architecture par défaut i386)"
+msgstr "Mise à niveau des chroots LTSP (architecture par défaut i386)"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -5663,18 +5049,14 @@
 "(NBD). The NBD image file size is about 4 GiB (default installation). If the "
 "image is updated, another 4 GiB for a temporary file are needed."
 msgstr ""
+"Assurez-vous d'avoir suffisamment d'espace disque. LTSP utilise maintenant "
+"les périphériques blocs en réseau (« Network Block Device » – NBD). L'image "
+"NBD a une taille d'environ 4 Gio (installation par défaut). Si l'image est "
+"mise à jour, 4 Gio supplémentaires sont nécessaires pour un fichier "
+"temporaire."
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-#| "ltsp-chroot -m -a i386 apt-get update\n"
-#| "ltsp-chroot -m -a i386 apt-get -y upgrade\n"
-#| "sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-#| "ltsp-chroot -m -a i386 apt-get update\n"
-#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-#| "ltsp-chroot -m -a i386 apt-get -f install\n"
-#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+#, no-wrap
 msgid ""
 "ltsp-chroot -m -a i386 apt update\n"
 "ltsp-chroot -m -a i386 apt -y full-upgrade\n"
@@ -5684,60 +5066,47 @@
 "ltsp-chroot -m -a i386 apt -f install\n"
 "ltsp-chroot -m -a i386 apt -y full-upgrade"
 msgstr ""
-"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
-"sed -i 's/wheezy/jessie/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Cleaning up."
 msgid "Cleaning up:"
-msgstr "Nettoyage."
+msgstr "Nettoyage :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+#, no-wrap
 msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
-msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgstr "ltsp-chroot -m -a i386 apt --purge autoremove"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Update LTSP support on the server side."
 msgid "Update LTSP support on the server side:"
-msgstr "Mettez à jour la prise en charge LTSP du côté serveur."
+msgstr "Mettre à jour la prise en charge LTSP du côté serveur :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "ltsp-update-kernels\n"
-#| "ltsp-update-sshkeys"
+#, no-wrap
 msgid ""
 "ltsp-update-kernels\n"
 "ltsp-update-sshkeys\n"
 "ltsp-update-image"
 msgstr ""
 "ltsp-update-kernels\n"
-"ltsp-update-sshkeys"
+"ltsp-update-sshkeys\n"
+"ltsp-update-image"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-#| "debian-edu/default-diskless.cfg</computeroutput>."
 msgid ""
 "To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
 "could be used instead; see <computeroutput>man ltsp-update-image</"
 "computeroutput>."
 msgstr ""
-"Modifiez le lien symbolique <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> sur tjener pour pointer vers <computeroutput>/var/lib/"
-"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+"Pour économiser de l'espace disque, <computeroutput>ltsp-update-image -n</"
+"computeroutput> peut être utilisé à la place ; consultez <computeroutput>man "
+"ltsp-update-image</computeroutput>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Recreating an LTSP chroot"
@@ -5773,26 +5142,13 @@
 "computeroutput>) en tant que superutilisateur."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)"
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Jessie)"
 msgstr ""
-"Mises à jour depuis des installations antérieures de Debian Edu / Skolelinux "
-"(avant Wheezy)"
+"Mises à jour depuis des installations antérieures de Debian Edu/Skolelinux "
+"(avant Jessie)"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To upgrade from any older release, you will need to upgrade to the Wheezy "
-#| "based Debian Edu release first, before you can follow the instructions "
-#| "provided above. Instructions are given in the <ulink url=\"https://wiki."
-#| "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu "
-#| "Wheezy</ulink> about how to upgrade to Wheezy from the previous release, "
-#| "Squeeze, and the Squeeze manual covers the one before that! (Lenny was "
-#| "it's name and before that there was even another one, based on what was "
-#| "called Etch.)"
 msgid ""
 "To upgrade from any older release, you will need to upgrade to the Jessie "
 "based Debian Edu release first, before you can follow the instructions "
@@ -5802,14 +5158,12 @@
 "Likewise the Wheezy manual describes how to upgrade from Squeeze."
 msgstr ""
 "Pour mettre à jour à partir de toute autre version plus ancienne, vous devez "
-"d'abord mettre à niveau vers la version Wheezy de Debian Edu avant de "
-"pouvoir suivre les instructions fournies ci-dessus. La façon de migrer vers "
-"Wheezy est décrite dans le <ulink url=\"https://wiki.debian.org/DebianEdu/"
-"Documentation/Wheezy#\">Manuel pour Debian Edu Wheezy</ulink>. Le manuel "
-"pour Wheezy contient les instructions pour mettre à niveau à partir de la "
-"version précédente, Squeeze. Le manuel de Squeeze couvre la mise à niveau "
-"depuis la version qui a précédé Squeeze, dont le nom de code est Lenny. Il y "
-"avait même une version antérieure, basée sur Etch."
+"d'abord mettre à niveau vers la version basée sur Jessie de Debian Edu avant "
+"de pouvoir suivre les instructions fournies ci-dessus. Le <ulink url="
+"\"https://wiki.debian.org/DebianEdu/Documentation/Jessie#\">Manuel pour "
+"Debian Edu Jessie</ulink> contient les instructions sur la façon de mettre à "
+"niveau vers Jessie à partir de la version précédente, Wheezy. De même, le "
+"manuel de Wheezy décrit la façon de mettre à niveau à partir de Squeeze."
 
 #. type: Content of: <article><section><title>
 msgid "HowTo"
@@ -6134,12 +5488,7 @@
 "l'installation (premier utilisateur) :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "$ sudo apt-get update\n"
-#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
-#| "  # after installation, start a graphical session for the first user \n"
-#| "  $ startx"
+#, no-wrap
 msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
@@ -6147,7 +5496,7 @@
 "  $ startx"
 msgstr ""
 "$ sudo apt-get update\n"
-"$ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"$ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "# après l'installation, démarrer une session graphique pour le premier utilisateur\n"
 "$ startx"
 
@@ -6267,11 +5616,6 @@
 "paquets qui étaient auparavant maintenus sur volatile.debian.org."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "While you can use stable-updates directly, you don't have to: stable-"
-#| "updates are pushed into the stable suite regularily when stable point "
-#| "releases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
 "are pushed into the stable suite regularly when stable point releases are "
@@ -6283,11 +5627,9 @@
 "ce qui arrive environ tous les deux mois."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Using backports.debian.org to install newer software"
 msgid "Using backports to install newer software"
 msgstr ""
-"Utiliser backports.debian.org pour installer des logiciels plus récents"
+"Utilisation des rétroportages pour installer des logiciels plus récents"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6323,15 +5665,12 @@
 msgstr "L'utilisation des paquets rétroportés est simple :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt sources.list\n"
-#| "apt-get update"
+#, no-wrap
 msgid ""
 "echo \"deb http://deb.debian.org/debian/ stretch-backports main\" >> /etc/apt/sources.list\n"
 "apt-get update"
 msgstr ""
-"echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt/sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ stretch-backports main\" >> /etc/apt/sources.list\n"
 "apt-get update"
 
 #. type: Content of: <article><section><section><para>
@@ -6344,41 +5683,33 @@
 "<emphasis>tuxtype</emphasis> :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "apt-get install -t jessie-backports tuxtype"
+#, no-wrap
 msgid "apt-get install -t stretch-backports tuxtype"
-msgstr "apt-get install -t jessie-backports tuxtype"
+msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Like the normal archive, backports has three sections: main, contrib and "
-#| "non-free."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
-"Tout comme l'archive principale, l'archive des paquets rétroportés comporte "
-"trois sections : main, contrib et non-free."
+"Les paquets rétroportés, s'ils sont disponibles, sont automatiquement mis à "
+"jour, comme n'importe quel autre paquet. Tout comme l'archive principale, "
+"l'archive des paquets rétroportés comporte trois sections : main, contrib et "
+"non-free."
 
 #. type: Content of: <article><section><section><title>
 msgid "Upgrading with a CD or similar image"
 msgstr "Mettre à jour avec un CD ou une image similaire"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you want to upgrade from one version to another (for example from "
-#| "Jessie 8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, "
-#| "only physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Stretch "
 "9.1+edu0 to 9.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Si vous voulez mettre à jour d'une version à une autre (par exemple de "
-"Jessie 8.1~alpha+edu0 à 8.3+edu1) mais que vous ne possédez pas de connexion "
+"Stretch 9.1+edu0 à 9.3+edu1) mais que vous ne possédez pas de connexion "
 "Internet, mais seulement un support physique, suivez ces étapes :"
 
 #. type: Content of: <article><section><section><para>
@@ -6403,11 +5734,6 @@
 msgstr "D'après la page de manuel d'apt-cdrom(8) :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
-#| "apt-cdrom takes care of determining the structure of the disc as well as "
-#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
 "apt-cdrom is used to add a new CD-ROM to APTs list of available sources. apt-"
 "cdrom takes care of determining the structure of the disc as well as "
@@ -6419,11 +5745,6 @@
 "fichiers d'index."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
-#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
-#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
 "done by hand. Furthermore each disk in a multi-CD set must be inserted and "
@@ -6452,12 +5773,6 @@
 msgstr "Nettoyage automatique des processus résiduels"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
-#| "of background jobs. Background jobs are defined as processes that belong "
-#| "to users who are not currently logged into the machine. It's run by cron "
-#| "job once an hour."
 msgid ""
 "<computeroutput>killer</computeroutput> is a perl script that gets rid of "
 "background jobs. Background jobs are defined as processes that belong to "
@@ -6485,14 +5800,6 @@
 msgstr "Installation automatique des mises à jour de sécurité"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
-#| "which will install security (and other) updates automatically. If you "
-#| "plan to use it, you should have some means to monitor your systems, such "
-#| "as installing the <computeroutput>apt-listchanges</computeroutput> "
-#| "package and configuring it to send you emails about updates. And there is "
-#| "always <computeroutput>/var/log/dpkg.log</computeroutput>."
 msgid ""
 "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
 "which will install security (and other) upgrades automatically. The package "
@@ -6502,12 +5809,12 @@
 "computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
 msgstr ""
 "<computeroutput>unattended-upgrades</computeroutput> est un paquet Debian "
-"qui installera (entre autres) les mises à jour de sécurité automatiquement. "
-"Si vous envisagez de l'utiliser, vous devriez surveiller vos systèmes, par "
-"exemple en installant le paquet <computeroutput>apt-listchanges</"
-"computeroutput> et en le configurant pour vous envoyer des courriers "
-"électroniques au sujet des mises à jour. Il y a toujours le journal "
-"<computeroutput>/var/log/dpkg.log</computeroutput>."
+"qui installera (entre autres) les mises à niveau de sécurité "
+"automatiquement. Le paquet est installé par défaut et pré-configuré pour "
+"pour installer les mises à niveau de sécurité. Les journaux sont disponibles "
+"dans <computeroutput>/var/log/unattended-upgrades/</computeroutput> ; il y a "
+"également toujours les journaux <computeroutput>/var/log/dpkg.log</"
+"computeroutput> et <computeroutput>/var/log/apt/</computeroutput>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Automatic shutdown of machines during the night"
@@ -6775,10 +6082,8 @@
 "\"/>"
 
 #. type: Content of: <article><section><title>
-#, fuzzy
-#| msgid "Advanced administration"
 msgid "Advanced administration howto"
-msgstr "Administration avancée"
+msgstr "Manuel d'administration avancée"
 
 #. type: Content of: <article><section><para>
 msgid "In this chapter advanced administration tasks are described."
@@ -6793,11 +6098,6 @@
 msgstr "Création d'utilisateurs dans des groupes par année"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "In this example we want to create users in year groups, with common home "
-#| "directories for each group (home0/2014, home0/2015, etc.) We want to "
-#| "create the users by csv import."
 msgid ""
 "In this example we want to create users in year groups, with common home "
 "directories for each group (home0/2014, home0/2015, etc). We want to create "
@@ -6809,10 +6109,9 @@
 "CSV."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "<emphasis>(as root on Tjener) </emphasis>"
 msgid "<emphasis>(as root on the main server) </emphasis>"
-msgstr "<emphasis>(en tant que superutilisateur sur Tjener)</emphasis>"
+msgstr ""
+"<emphasis>(en tant que superutilisateur sur le serveur principal)</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Make the necessary year group directories"
@@ -6868,17 +6167,6 @@
 msgstr "Modèle"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Choose 'users' from the main menu. Change to 'Students' in the Base "
-#| "field. An Entry <computeroutput>'NewStudent'</computeroutput> should show "
-#| "up, click it. This is the 'students' template, not a real user. As you'll "
-#| "have to create such a template (to be able to use csv import for your "
-#| "structure) based on this one, notice all entries showing up in the "
-#| "Generic, POSIX and Samba tabs, maybe take screenshots. Now change to /"
-#| "Students/2014 in the Base field; choose Create/Template and start to fill "
-#| "in your desired values, first the Generic tab (add your new 2014 group "
-#| "under Group Membership, too), then add POSIX and Samba account."
 msgid ""
 "Choose 'users' from the main menu. Change to 'Students' in the Base field. "
 "An Entry <computeroutput>NewStudent</computeroutput> should show up, click "
@@ -6889,17 +6177,14 @@
 "template."
 msgstr ""
 "Choisissez « Utilisateurs » dans le menu principal. Changez le champ "
-"« Base » en « Students ». Une entrée <computeroutput>« NewStudent »</"
+"« Base » en « Students ». Une entrée <computeroutput>NewStudent</"
 "computeroutput> devrait s'afficher. Cliquez dessus. Il s'agit du modèle pour "
 "les étudiants et non d'un vrai utilisateur. Comme vous devez créer un tel "
 "modèle (afin de pouvoir importer au format CSV les données pour votre "
 "structure) en se basant sur celui-ci, notez bien les entrées affichées dans "
 "les onglets « Informations », « POSIX » et « Samba ». Faites même des "
-"captures d'écran. Maintenant changez le champ Base en /Students/2014. "
-"Choisissez « Créer », « Modèle » et commencez à remplir les valeurs "
-"choisies, d'abord dans l'onglet « Informations » (ajoutez aussi votre "
-"nouveau groupe 2014 dans le champ « Appartenance au groupe »), puis ajouter "
-"les comptes POSIX et Samba."
+"captures d'écran pour avoir des informations disponibles pour le nouveau "
+"modèle."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -6907,16 +6192,16 @@
 "start to fill in your desired values, first the Generic tab (add your new "
 "2014 group under Group Membership, too), then add POSIX and Samba account."
 msgstr ""
+"Maintenant changez le champ Base en /Students/2014. Choisissez « Créer », "
+"« Modèle » et commencez à remplir les valeurs choisies, d'abord dans "
+"l'onglet « Informations » (ajoutez aussi votre nouveau groupe 2014 dans le "
+"champ « Appartenance au groupe »), puis ajouter les comptes POSIX et Samba."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Importation des utilisateurs"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Choose your new template when doing csv import; testing it with a few "
-#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
 "is recommended."
@@ -6997,17 +6282,10 @@
 " echo \"Le nombre de répertoires créés est $dossiers_crees.\""
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Easy access to USB drives and CDROMs/DVDs"
 msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "Accès facile aux disques USB et aux CD et DVD"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When users insert a USB drive or a DVD / CDROM into a (diskless) "
-#| "workstation, a popup window appears asking what to do with it, just like "
-#| "in any other normal installation."
 msgid ""
 "When users insert a USB drive or a DVD / CD-ROM into a (diskless) "
 "workstation, a popup window appears asking what to do with it, just like in "
@@ -7018,13 +6296,6 @@
 "faire avec, comme dans toute autre installation."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When users insert a USB drive or a DVD / CDROM into a thin client there "
-#| "is only a notify-window showing up for a few seconds. The media is "
-#| "automatically mounted and it is possible to access it browsing to the /"
-#| "media/$user folder. This is quite difficult for many non experienced "
-#| "users."
 msgid ""
 "When users insert a USB drive or a DVD / CD-ROM into a thin client there is "
 "only a notify-window showing up for a few seconds. The media is "
@@ -7055,13 +6326,6 @@
 "utilisé, des icônes seront placés sur le bureau permettant un accès facile)."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "In addition the following script could be used to create the symlink "
-#| "\"media\" for all users in their home folder for easy access to USB "
-#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
-#| "This might come in handy if users want to edit files directly on their "
-#| "plugged in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
 "\" for all users in their home folder for easy access to USB drives, CD-"
@@ -7143,19 +6407,14 @@
 "stockage des répertoires personnels et éventuellement d'autres données."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Add a new system of type server using GOsa² as outlined in the <link "
-#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
-#| "started</link> chapter of this manual."
 msgid ""
 "Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
 "as outlined in the <link linkend=\"GettingStarted--"
 "Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
 "manual."
 msgstr ""
-"Ajoutez un nouveau système de type serveur depuis GOsa², comme indiqué dans "
-"le chapitre <link linkend=\"GettingStarted--"
+"Ajoutez un nouveau système de type <computeroutput>server</computeroutput> "
+"depuis GOsa², comme indiqué dans le chapitre <link linkend=\"GettingStarted--"
 "Machine_Management_with_GOsa.2BALI-\">Démarrage rapide</link> de ce manuel."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -7274,11 +6533,6 @@
 "tjener.intern n'utilise pas automount, pour éviter les boucles de montage :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Create the mount directories using <computeroutput>mkdir</"
-#| "computeroutput>, edit '/etc/fstab' as adequate and run "
-#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
 "Create the mount point directories using <computeroutput>mkdir</"
 "computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
@@ -7294,31 +6548,35 @@
 "Enable access in case diskless workstations are used. This is a special "
 "case, because sshfs is used instead of NFS and automount:"
 msgstr ""
+"Si des stations de travail sans disque sont utilisées, activez-en l'accès. "
+"C'est un cas spécial car sshfs est utilisé au lieu de NFS et automount :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Create the mount point directories in the LTSP diskless client's root "
 "(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
 msgstr ""
+"Créez également les répertoires de point de montage à la racine du client "
+"LTSP sans disque (par défaut <computeroutput>/opt/ltsp/i386/</"
+"computeroutput>)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
 "opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
 msgstr ""
+"Ajoutez une ligne contenant « LOCAL_APPS_EXTRAMOUNTS=/storage » à "
+"<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput> (exemple)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Create a link in each user's home dir like 'ln -s /storage Storage' to help "
 "users find the resources."
 msgstr ""
+"Créez un lien dans le répertoire home de chaque utilisateur « ln -s /storage "
+"Storage » pour aider les utilisateurs à trouver les ressources."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Now users should be able to access the files on 'nas-server.intern' "
-#| "directly by just visiting the '/tjener/nas-server/storage/' directory "
-#| "using any application on any workstation, LTSP client or LTSP server."
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
@@ -7328,7 +6586,8 @@
 "Maintenant les utilisateurs devraient être capables d'accéder aux fichiers "
 "sur « serveur-nas.intern » directement, juste en visitant le répertoire « /"
 "tjener/nas-server/storage/ » avec n'importe quelle application, depuis une "
-"station de travail, un client LTSP ou un serveur LTSP."
+"station de travail, un client léger LTSP ou un serveur LTSP, et en visitant "
+"~/Storage en cas d'utilisation d'un client LTSP sans disque."
 
 #. type: Content of: <article><section><section><title>
 msgid "Restrict ssh login access"
@@ -7363,17 +6622,12 @@
 msgstr "Gérer cette situation avec GOsa est assez simple :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
-#| "level (where already other system management related groups like "
-#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
 "Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
-"créez un groupe <computeroutput>sshusers</computeroutput> au niveau racine "
+"créez un groupe <computeroutput>sshusers</computeroutput> au niveau de base "
 "(où apparaissent déjà tous les autres groupes de gestion du système tels que "
 "<computeroutput>gosa-admins</computeroutput>)."
 
@@ -7437,12 +6691,6 @@
 "#"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
-#| "dropped to disable internal ssh login access. Note: someone pluging in "
-#| "his box into the dedicated LTSP client network(s) will gain ssh access to "
-#| "the LTSP server(s) as well."
 msgid ""
 "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
 "dropped to disable internal ssh login access. Note: someone connecting his "
@@ -7452,7 +6700,7 @@
 "Si uniquement des serveurs LTSP dédiés sont utilisés, le réseau 10.0.0.0/8 "
 "peut être oublié pour désactiver la connexion par SSH en interne. Remarque : "
 "quelqu'un qui connecterait son ordinateur sur le réseau dédié aux clients "
-"légers obtiendrait la possibilité de se connecter aussi par SSH au serveur "
+"LTSP obtiendrait la possibilité de se connecter aussi par SSH au serveur "
 "LTSP."
 
 #. type: Content of: <article><section><section><section><title>
@@ -7460,13 +6708,6 @@
 msgstr "Une remarque pour les configurations plus complexes"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
-#| "server or LTSP cluster setup) things would be even more complicated and "
-#| "maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-#| "identifier together with apropriate PAM configuration would allow to "
-#| "disable internal ssh login."
 msgid ""
 "If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
 "server or LTSP cluster setup) things would be even more complicated and "
@@ -7486,21 +6727,15 @@
 msgstr "Manuels pour le bureau"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgid "Using KDE Plasma, GNOME, LXDE, Xfce and/or MATE together"
-msgstr "Utiliser KDE « Plasma », GNOME, LXDE, Xfce et/ou MATE ensemble"
+msgstr "Utiliser KDE Plasma, GNOME, LXDE, Xfce et/ou MATE ensemble"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To install other desktop environments after installation, simply use apt-"
-#| "get:"
 msgid ""
 "To install other desktop environments after installation, simply use apt:"
 msgstr ""
 "Pour installer d'autres environnements de bureau après l'installation, "
-"utilisez simplement apt-get :"
+"utilisez simplement apt :"
 
 #. type: CDATA
 #, no-wrap
@@ -7508,13 +6743,10 @@
 "apt update\n"
 " apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
 msgstr ""
+"apt update\n"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
 
 #. 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 "
@@ -7524,72 +6756,51 @@
 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."
+"pouvez toujours décider de laisser moins de choix. Gardez à l'esprit qu'il y "
+"aura plusieurs programmes pour la même tâche (comme les gestionnaires de "
+"fichiers, les éditeurs, les lecteurs PDF…) si plus d’un environnement de "
+"bureau est installé. Cela peut perturber les utilisateurs."
 
 #. 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 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. "
+"L'utilisation de LXDE par défaut sur les clients LTSP peut être imposée. "
 "Consultez la section <link linkend=\"NetworkClients\">clients en réseau</"
 "link> pour plus d'informations."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you don't want to do installations with the default desktop KDE "
-#| "\"Plasma\", you can also <link linkend=\"Installation--"
-#| "The_installation_process\">install with one of the four alternative "
-#| "desktops, GNOME, LXDE, Xfce or MATE</link> directly."
 msgid ""
 "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"
-"\">l'installation avec l'un des quatre autres bureaux, GNOME, LXDE, Xfce ou "
-"Mate</link> directement."
+"Si vous ne souhaitez pas installer le bureau par défaut KDE Plasma, vous "
+"pouvez procéder à <link linkend=\"Installation--"
+"Installation_types_and_options\">l'installation avec l'un des quatre autres "
+"bureaux, GNOME, LXDE, Xfce ou MATE</link> directement."
 
 #. type: Content of: <article><section><section><title>
 msgid "Flash"
 msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "While the free software flash-player <computeroutput>gnash</"
-#| "computeroutput> is <emphasis>not</emphasis> installed by default anymore, "
-#| "as it has been removed from Jessie, installing a non-free flash player is "
-#| "still an option. Please note that upgrading is special in this case."
 msgid ""
 "The free software flash-player <computeroutput>gnash</computeroutput> is "
 "installed by default. Please note that Firefox ESR will drop Flash support "
 "early 2018."
 msgstr ""
-"Alors que le logiciel libre <computeroutput>gnash</computeroutput> pour lire "
-"le flash <emphasis>n'est plus</emphasis> installé par défaut, car il a été "
-"retiré de Jessie, il est toujours possible d'installer un lecteur flash non "
-"libre. Veuillez noter que la mise à niveau est particulière dans ce cas."
+"Le lecteur flash libre <computeroutput>gnash</computeroutput> est installé "
+"par défaut. Veuillez noter que Firefox ESR abandonne la prise en charge de "
+"Flash début 2018."
 
 #. type: Content of: <article><section><section><title>
 msgid "Playing DVDs"
 msgstr "Lire des DVD"
 
 #. 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 "
@@ -7600,28 +6811,27 @@
 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 "
-"la loi vous y autorise, vous pouvez utiliser les paquets présents sur debian-"
-"multimedia.org. Ajoutez le dépôt multimedia (en suivant les instructions "
-"dans la section suivante) et installez les bibliothèques nécessaires :"
+"la loi vous y autorise, vous pouvez construire vos propres paquets locaux "
+"avec le paquet Debian <computeroutput>libdvd-pkg</computeroutput> ; assurez-"
+"vous que <computeroutput>contrib</computeroutput> est activé dans "
+"<computeroutput>/etc/apt/sources.list</computeroutput>."
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
+#, no-wrap
 msgid ""
 "apt update\n"
 "apt install libdvd-pkg"
-msgstr "apt-get install gnome lxde xfce4 mate-desktop"
+msgstr ""
+"apt update\n"
+"apt install libdvd-pkg"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
 "Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
 "libdvd-pkg</computeroutput>."
 msgstr ""
-"Ajoutez les utilisateurs au nouveau groupe <computeroutput>sshusers</"
-"computeroutput>."
+"Répondez aux questions de debconf, puis exécutez <computeroutput>dpkg-"
+"reconfigure libdvd-pkg</computeroutput>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Handwriting fonts"
@@ -7668,11 +6878,11 @@
 "boots from a diskette or directly from the server using network-PROM (or "
 "PXE) without using a local client hard drive."
 msgstr ""
-"La configuration en client léger permet à un PC ordinaire de fonctionner en "
-"terminal (ou terminal X), tous les logiciels étant exécutés sur le serveur "
-"LTSP. Cela signifie que cette machine s'amorce depuis une disquette ou "
-"directement depuis le serveur à l'aide d'une PROM réseau (ou PXE) sans "
-"utiliser le disque dur local du client."
+"La configuration en client léger permet à un PC ordinaire de fonctionner en  "
+"terminal(-X), tous les logiciels étant exécutés sur le serveur LTSP. Cela "
+"signifie que cette machine s'amorce depuis une disquette ou directement "
+"depuis le serveur à l'aide d'une PROM réseau (ou PXE) sans utiliser le "
+"disque dur local du client."
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -7699,19 +6909,6 @@
 "récent avec le même coût réduit de maintenance que les clients légers."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
-#| "workstations. If the amount of RAM is less, the machine will boot as thin "
-#| "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
-#| "computeroutput> with the default value 300. So if (for example) the "
-#| "clients should only boot as diskless workstations if they have 1 GB RAM "
-#| "add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf "
-#| "(or set this in LDAP). Unlike workstations, diskless workstations run "
-#| "without any need to add them with GOsa², cause LDM is used to login and "
-#| "connect to the LTSP server.  The home directory is by default mounted "
-#| "using sshfs, and not automount and NFS.  This causes shared directories "
-#| "available via NFS to not be available on diskless workstations."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
@@ -7726,29 +6923,20 @@
 "LTSP définit à 320 Mo la quantité minimale de mémoire vive nécessaire pour "
 "une station de travail sans disque. Si la quantité de mémoire vive est "
 "inférieure, la machine démarrera comme un client réseau. Le paramètre LTSP "
-"correspond est <computeroutput>FAT_RAM_THRESHOLD</computeroutput> avec une "
-"valeur par défaut de 300. Si par exemple les clients doivent démarrer "
+"correspondant est <computeroutput>FAT_RAM_THRESHOLD</computeroutput> avec "
+"une valeur par défaut de 300. Si par exemple les clients doivent démarrer "
 "seulement comme stations sans disque s'ils ont 1 Go de mémoire vive, ajoutez "
-"<computeroutput>FAT_RAM_THRESHOLD</computeroutput> au fichier lts.conf (ou "
-"faites ce réglage dans LDAP). Contrairement aux stations de travail, les "
+"<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> au fichier lts.conf "
+"(ou faites ce réglage dans LDAP). Contrairement aux stations de travail, les "
 "stations de travail sans disque fonctionnent sans avoir besoin de les "
 "ajouter à GOsa², car LDM est utilisé pour s'authentifier et se connecter au "
-"serveur LTSP. Le répertoire personnel est monté par défaut en utilisant "
-"sshfs, et non automount et NFS. Cela implique que les répertoires partagés "
-"par NFS ne sont pas disponibles sur les stations de travail sans disque."
+"serveur LTSP."
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role=\"strong\">microprogramme des clients légers</emphasis>"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "LTSP client boot will fail if the client's network card requires a non-"
-#| "free firmware. A PXE installation can be used for troubleshooting "
-#| "problems with netbooting a machine; if the Debian Installer complains "
-#| "about a missing XXX.bin file then non-free firmware has to be added to "
-#| "the initrd used by LTSP clients."
 msgid ""
 "LTSP client boot will fail if the client's network interface requires a non-"
 "free firmware. A PXE installation can be used for troubleshooting problems "
@@ -7756,8 +6944,8 @@
 "XXX.bin file then non-free firmware has to be added to the initrd used by "
 "LTSP clients."
 msgstr ""
-"L'amorçage du client LTSP échouera si la carte réseau du client nécessite un "
-"microprogramme (« firmware ») non libre. Une installation PXE peut être "
+"L'amorçage du client LTSP échouera si l'interface réseau du client nécessite "
+"un microprogramme (« firmware ») non libre. Une installation PXE peut être "
 "utilisée pour diagnostiquer les problèmes d'amorçage par réseau d'une "
 "machine. Si l'installateur Debian se plaint d'un fichier XXX.bin manquant, "
 "alors un microprogramme non libre doit être ajouté à l'image initiale "
@@ -7768,19 +6956,7 @@
 msgstr "Dans ce cas, exécutez les commandes suivantes sur le serveur LTSP."
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "# First get information about firmware packages\n"
-#| "apt-get update && apt-cache search ^firmware-\n"
-#| "\n"
-#| "# Decide which package has to be installed for the network card(s). \n"
-#| "# Most probably this will be firmware-linux-nonfree.\n"
-#| "# Things have to take effect in the LTSP chroot for architecture i386.\n"
-#| "ltsp-chroot -a i386 apt-get update\n"
-#| "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
-#| "\n"
-#| "# copy the new initrd to the server's tftpboot directory\n"
-#| "ltsp-update-kernels"
+#, no-wrap
 msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -7798,14 +6974,16 @@
 "# D'abord renseignez-vous sur les paquets contenant les microprogrammes\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Décidez quel est le paquet à installer pour la carte réseau. \n"
+"# Décidez quel est le paquet à installer pour l'interface réseau. \n"
 "# Ce sera certainement firmware-linux-nonfree\n"
-"# Cela doit se passer dans le chroot LTSP pour l'architecture i386\n"
+"# Cela doit se passer dans le chroot LTSP pour l'architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
-"ltsp-chroot -d -a i386 apt-get -y -q install <nom_paquet>\n"
+"ltsp-chroot -d -a i386 apt-get -y -q install <nom de paquet>\n"
 "\n"
-"# Copiez la nouvelle image initiale (« initrd ») dans le répertoire tftpboot du serveur\n"
-"ltsp-update-kernels"
+"# Copiez la nouvelle image initiale (« initrd ») dans le répertoire tftpboot du \n"
+"# serveur et mettez à jour l'image NBD.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -7826,22 +7004,16 @@
 msgstr "Sélection du type de client léger"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Each LTSP server has two ethernet cards: one configured in the main "
-#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
-#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
-#| "server)."
 msgid ""
 "Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
 msgstr ""
-"Chaque serveur LTSP possède deux cartes réseau, une est configurée dans le "
-"sous-réseau 10.0.0.0/8 (partagé avec le serveur principal), et l'autre forme "
-"un sous-réseau 192.168.0.0/24 local (ce sous-réseau est séparé pour chaque "
-"serveur LTSP)."
+"Chaque serveur LTSP possède deux interfaces réseau, une est configurée dans "
+"le sous-réseau 10.0.0.0/8 (partagé avec le serveur principal), et l'autre "
+"forme un sous-réseau 192.168.0.0/24 local (ce sous-réseau est distinct pour "
+"chaque serveur LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7869,15 +7041,7 @@
 "suivantes sont nécessaires."
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
-#| "and replace the line\n"
-#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
-#| "with\n"
-#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
-#| "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-#| "(3)Execute 'ltsp-update-kernels'"
+#, no-wrap
 msgid ""
 "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
@@ -7893,7 +7057,7 @@
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
 "par CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2) exécuter 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3) exécuter 'ltsp-update-kernels'"
+"(3) exécuter 'ltsp-update-kernels'(4) exécuter 'ltsp-update-image'"
 
 #. type: Content of: <article><section><section><title>
 msgid "Configuring the PXE menu"
@@ -8093,24 +7257,15 @@
 "LTSP."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-#| "network, when tjener is not a combined server, follow these steps:"
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
 "network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 "Pour que ltspserver00 serve des stations de travail sans disque dur sur le "
-"réseau principal (10.0.0.0/8) lorsque tjener n'est pas un serveur combiné, "
-"vous devez suivre ces étapes :"
+"réseau principal (10.0.0.0/8) lorsque le serveur principal n'est pas un "
+"serveur combiné, vous devez suivre ces étapes :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "copy the <computeroutput>ltsp</computeroutput> directory from "
-#| "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-#| "same directory on tjener."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
@@ -8118,19 +7273,15 @@
 msgstr ""
 "Copiez le répertoire <computeroutput>ltsp</computeroutput> depuis "
 "<computeroutput>/var/lib/tftpboot</computeroutput> sur ltspserver00 vers le "
-"même répertoire sur tjener."
+"même répertoire sur le serveur principal."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-#| "computeroutput> to the same directory on tjener."
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> to the same directory on the main server."
 msgstr ""
 "Copiez <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> dans le même répertoire sur tjener."
+"computeroutput> dans le même répertoire sur le serveur principal."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -8149,19 +7300,14 @@
 msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-#| "debian-edu/default-diskless.cfg</computeroutput>."
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
 "computeroutput> on the main server to point to <computeroutput>/var/lib/"
 "tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 "Modifiez le lien symbolique <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> sur tjener pour pointer vers <computeroutput>/var/lib/"
-"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> sur le serveur principal pour pointer vers <computeroutput>/"
+"var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8177,16 +7323,6 @@
 msgstr "Utiliser un réseau différent pour les clients légers"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "192.168.0.0/24 is the default LTSP client network if a machine is "
-#| "installed using the Thin-Client-Server profile. If lots of LTSP clients "
-#| "are used or if different LTSP servers should serve both i386 and amd64 "
-#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
-#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
-#| "computeroutput> and adjust the eth1 settings accordingly. Use "
-#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
-#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
 "using the LTSP profile. If lots of LTSP clients are used or if different "
@@ -8197,14 +7333,14 @@
 "other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 "192.168.0.0/24 est par défaut le réseau des clients légers si une machine "
-"est installée en utilisant le profil serveur client léger. Si une quantité "
-"importante de clients légers est utilisée ou si différents serveurs doivent "
-"servir des chroot i386 et amd64 simultanément, le deuxième réseau "
-"préconfiguré 192.168.1.0/24 peut être aussi utilisé. Éditez le fichier "
-"<computeroutput>/etc/network/interfaces</computeroutput> et ajustez les "
-"réglages de l'interface eth1 en conséquence. Utilisez "
-"<computeroutput>ldapvi</computeroutput> ou un autre éditeur LDAP pour "
-"vérifier la configuration DNS et DHCP."
+"est installée en utilisant le profil LTSP. Si une quantité importante de "
+"clients LTSP sont utilisés ou si différents serveurs LTSP doivent servir des "
+"chroot i386 et amd64 simultanément, le deuxième réseau préconfiguré "
+"192.168.1.0/24 peut être aussi utilisé. Éditez le fichier <computeroutput>/"
+"etc/network/interfaces</computeroutput> et ajustez les réglages de "
+"l'interface eth1 en conséquence. Utilisez <computeroutput>ldapvi</"
+"computeroutput> ou un autre éditeur LDAP pour vérifier la configuration DNS "
+"et DHCP."
 
 #. type: Content of: <article><section><section><title>
 msgid "Changing network settings"
@@ -8265,11 +7401,6 @@
 msgstr "Configuration des clients légers dans LDAP (et lts.conf)"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To configure specific thin clients with particular features, you can add "
-#| "settings in LDAP or edit the file <computeroutput>/opt/ltsp/i386/etc/lts."
-#| "conf</computeroutput>."
 msgid ""
 "To configure specific thin clients with particular features, you can add "
 "settings in LDAP or edit the file <computeroutput>/opt/ltsp/i386/etc/lts."
@@ -8280,7 +7411,11 @@
 msgstr ""
 "Afin de configurer certains clients légers avec des fonctionnalités "
 "spécifiques, vous pouvez ajouter des paramètres dans LDAP ou éditer le "
-"fichier <computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>."
+"fichier <computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>. "
+"Veuillez noter que <computeroutput>ltsp-update-image</computeroutput> doit "
+"être exécuté après chaque modification de lts.conf. La mise à jour de "
+"l'image n'est pas nécessaire si lts.conf est copié dans le répertoire /var/"
+"lib/tftpboot/ltsp/i386/."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8313,21 +7448,15 @@
 "à un hôte particulier."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Install the package <computeroutput>ltsp-docs</computeroutput> and run "
-#| "\"man lts.conf\" to have a look at available configuration options (see "
-#| "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-#| "detailed information about LTSP)."
 msgid ""
 "Run <computeroutput>man lts.conf</computeroutput> to have a look at "
 "available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
 "LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
-" Installez le paquet <computeroutput>ltsp-docs</computeroutput> et exécutez "
-"« man lts.conf » pour connaître les options de configuration disponibles "
-"(consultez <computeroutput>/usr/share/doc/ltsp/LTSPManual.html</"
-"computeroutput> pour plus d'informations sur LTSP)."
+"Exécutez <computeroutput>man lts.conf</computeroutput> pour avoir un aperçu "
+"sur les options de configuration disponibles (consultez <computeroutput>/usr/"
+"share/doc/ltsp/LTSPManual.html</computeroutput> pour plus d'informations sur "
+"LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8367,15 +7496,11 @@
 msgstr "quelque part sous les réglages par défaut."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To force usage of a specific xserver on an LTSP client, set the "
-#| "<computeroutput>XSERVER</computeroutput> variable. For example:"
 msgid ""
 "To force the use of a specific xserver on an LTSP client, set the "
 "<computeroutput>XSERVER</computeroutput> variable. For example:"
 msgstr ""
-"Pour forcer l'utilisation d'un serveur X particulier sur un client léger, "
+"Pour forcer l'utilisation d'un serveur X particulier sur un client LTSP, "
 "positionnez la variable <computeroutput>XSERVER</computeroutput>. Par "
 "exemple :"
 
@@ -8393,6 +7518,8 @@
 "If a thin client comes up with a black screen the use of a specific color "
 "depth might help. For example:"
 msgstr ""
+"Si un client léger démarre avec un écran noir, l'utilisation d'une "
+"profondeur de couleur particulière pourrait aider. Par exemple :"
 
 #. type: CDATA
 #, no-wrap
@@ -8400,6 +7527,8 @@
 "[192.168.0.12]\n"
 "X_COLOR_DEPTH=16"
 msgstr ""
+"[192.168.0.12]\n"
+"X_COLOR_DEPTH=16"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8428,26 +7557,22 @@
 "par défaut"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Make sure that LXDE is installed on the thin client server; then add a "
-#| "line like this below <computeroutput>[default]</computeroutput> in \"lts."
-#| "conf\":"
 msgid ""
 "Make sure that LXDE is installed on the LTSP server; then add these lines "
 "below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
-"Assurez-vous que LXDE est installé sur le serveur de clients léger. Ensuite "
-"ajouter une ligne comme celle-ci sous <computeroutput>[default]</"
-"computeroutput> dans « lts.conf » :"
+"Assurez-vous que LXDE est installé sur le serveur LTSP. Ensuite ajouter des "
+"lignes comme celles-ci sous <computeroutput>[default]</computeroutput> dans "
+"« lts.conf » :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "LDM_SESSION=/usr/bin/startlxde"
+#, no-wrap
 msgid ""
 "LDM_SESSION=LXDE\n"
 "LDM_FORCE_SESSION=true"
-msgstr "LDM_SESSION=/usr/bin/startlxde"
+msgstr ""
+"LDM_SESSION=LXDE\n"
+"LDM_FORCE_SESSION=true"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Load-balancing LTSP servers"
@@ -8473,13 +7598,6 @@
 "chaque serveur."
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "First of all, you must choose one LTSP server to be the load-balancing "
-#| "server. All the clients will PXE-boot from this server and load the "
-#| "Skolelinux image. After the image is loaded, LDM chooses which server to "
-#| "connect to by using the \"get_hosts\" script. How this is done you decide "
-#| "later on."
 msgid ""
 "First of all, you must choose one LTSP server to be the load-balancing "
 "server. All the clients will PXE-boot from this server and load the "
@@ -8494,18 +7612,6 @@
 "vous de décider plus tard comment le faire."
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The load-balancing server must be announced to the clients as the \"next-"
-#| "server\" via DHCP. As DHCP configuration is in LDAP, modifications have "
-#| "to be done there. Use <computeroutput>ldapvi --ldap-conf -ZD "
-#| "'(cn=admin)'</computeroutput> to edit the appropriate entry in LDAP. "
-#| "(Enter the main server's root password at the prompt; if VISUAL isn't "
-#| "set, the default editor will be nano.) Search for a line reading "
-#| "<computeroutput>dhcpStatements: next-server tjener</computeroutput> Next-"
-#| "server should be the IP address or hostname of the server you chose to be "
-#| "the load-balancing server. If you use hostname you must have a working "
-#| "DNS. Remember to restart the DHCP service."
 msgid ""
 "The load-balancing server must be announced to the clients as the \"next-"
 "server\" via DHCP. As DHCP configuration is in LDAP, modifications have to "
@@ -8554,13 +7660,6 @@
 msgstr "Partie 2"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Now you have to make a \"get_hosts\" script that prints a server for LDM "
-#| "to connect to. The parameter LDM_SERVER overrides this script. In "
-#| "consequence, this parameter must not be defined if the get_hosts is going "
-#| "to be used. The get_hosts script writes on the standard output each "
-#| "server IP address or host name, in random order."
 msgid ""
 "Now you have to make a \"get_hosts\" script which generates a list of server "
 "names for LDM to connect to. The parameter LDM_SERVER overrides this script. "
@@ -8568,11 +7667,11 @@
 "to be used. The get_hosts script writes on the standard output each server "
 "IP address or host name, in random order."
 msgstr ""
-"Maintenant vous devez écrire un script « get_hosts » qui affiche un serveur "
-"auquel LDM se connectera. Le paramètre LDM_SERVER écrase ce script. Ce "
-"paramètre ne doit donc pas être défini si vous utilisez get_hosts. Ce script "
-"affiche sur la sortie standard l'adresse IP ou le nom d'hôte de chaque "
-"serveur, sans ordre."
+"Maintenant vous devez écrire un script « get_hosts » qui crée une liste de "
+"noms de serveur auxquels LDM se connectera. Le paramètre LDM_SERVER écrase "
+"ce script. Ce paramètre ne doit donc pas être défini si vous utilisez "
+"get_hosts. Ce script affiche sur la sortie standard l'adresse IP ou le nom "
+"d'hôte de chaque serveur, sans ordre."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid "Edit \"/opt/ltsp/i386/etc/lts.conf\" and add something like this:"
@@ -8695,18 +7794,16 @@
 "LTSP thin clients use networked audio to pass audio from the server to the "
 "clients."
 msgstr ""
+"Les clients légers LTSP utilisent un réseau audio pour transmettre l'audio "
+"du serveur aux clients."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "LTSP diskless workstations run without any configuration."
 msgid "LTSP diskless workstations handle audio locally."
-msgstr "Les stations de travail sans disque fonctionnent sans configuration."
+msgstr "Les stations de travail LTSP sans disque gèrent l'audio localement."
 
 #. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Use printers attachted to LTSP clients"
 msgid "Use printers attached to LTSP clients"
-msgstr "Utilisation des imprimantes attachés aux clients LTSP"
+msgstr "Utilisation des imprimantes attachées aux clients LTSP"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -8717,12 +7814,6 @@
 "parallèle sont prises en charge)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Configure this machine to run a printer in lts.conf (default location: "
-#| "<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>, see the "
-#| "LTSP manual <computeroutput>/usr/share/doc/ltsp/LTSPManual.html#printer</"
-#| "computeroutput> for details."
 msgid ""
 "Configure this machine to run a printer in lts.conf (default location: "
 "<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>), see the LTSP "
@@ -8735,13 +7826,6 @@
 "doc/ltsp/LTSPManual.html#printer</computeroutput> pour les détails."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Configure the printer using the web interface <computeroutput>https://"
-#| "www:631</computeroutput> on tjener; choose network printer type "
-#| "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
-#| "regardless of brand or model) and set <computeroutput>socket://&lt;LTSP "
-#| "client ip&gt;:9100</computeroutput> as connection URI."
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
 "www:631</computeroutput> on the main server; choose network printer type "
@@ -8750,11 +7834,11 @@
 "client ip&gt;:9100</computeroutput> as connection URI."
 msgstr ""
 "Configurez l'imprimante en utilisant l'interface web <computeroutput>https://"
-"www:631</computeroutput> sur tjener. Choisissez le type d'imprimante réseau "
-"<computeroutput>AppSocket/HP JetDirect</computeroutput> (pour toutes les "
-"imprimantes, quels que soient la marque et le modèle) et entrez "
-"<computeroutput>socket://&lt;client LTSP&gt;:9100</computeroutput> comme URI "
-"de connexion."
+"www:631</computeroutput> sur le serveur principal. Choisissez le type "
+"d'imprimante réseau <computeroutput>AppSocket/HP JetDirect</computeroutput> "
+"(pour toutes les imprimantes, quels que soient la marque et le modèle) et "
+"entrez <computeroutput>socket://&lt;LTSP client IP&gt;:9100</computeroutput> "
+"comme URI de connexion."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Upgrading the LTSP environment"
@@ -8772,13 +7856,7 @@
 "commandes en tant que superutilisateur sur chaque serveur LTSP :"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-#| "aptitude update\n"
-#| "aptitude upgrade\n"
-#| "aptitude dist-upgrade\n"
-#| "exit"
+#, no-wrap
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
 "apt update\n"
@@ -8788,10 +7866,11 @@
 "ltsp-update-image"
 msgstr ""
 "ltsp-chroot -a i386  # cela fait un « chroot /opt/ltsp/i386 » et plus, comme par exemple empêcher le démarrage des démons\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
-"exit"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
+"exit\n"
+"ltsp-update-image"
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "Installing additional software in the LTSP environment"
@@ -8806,14 +7885,7 @@
 "l'installation doit se faire à l'intérieur du chroot du serveur LTSP."
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "ltsp-chroot -a i386\n"
-#| "## optionally, edit the sources.list:\n"
-#| "#editor /etc/apt/sources.list\n"
-#| "aptitude update\n"
-#| "aptitude install $new_package\n"
-#| "exit"
+#, no-wrap
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
@@ -8823,28 +7895,19 @@
 "exit\n"
 "ltsp-update-image"
 msgstr ""
-"ltsp-chroot\n"
+"ltsp-chroot -a i386\n"
 "## si besoin, éditez sources.list :\n"
-"#vim /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $nouveau_paquet\n"
-"exit"
+"#éditeur /etc/apt/sources.list\n"
+"apt update\n"
+"apt install $nouveau_paquet\n"
+"exit\n"
+"ltsp-update-image"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Slow login and security"
 msgstr "Connexion lente et sécurité"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Skolelinux has added several security features on the client network "
-#| "preventing unauthorised superuser access, password sniffing, and other "
-#| "tricks which may be used on a local network. One such security measure is "
-#| "secure login using SSH, which is the default with LDM. This can slow down "
-#| "some client machines which are more than about ten years old, with as "
-#| "little as a 160 MHz processor and 32 MB RAM. Although it's not "
-#| "recommended, you can add the value \"True\" in the <computeroutput>/opt/"
-#| "ltsp/i386/etc/lts.conf</computeroutput> file on the server:"
 msgid ""
 "Skolelinux has added several security features on the client network "
 "preventing unauthorised superuser access, password sniffing, and other "
@@ -8860,10 +7923,10 @@
 "recherche des mots de passe, et autres techniques qui peuvent être utilisées "
 "sur un réseau local. Une de ces mesures est que les connexions sont "
 "maintenant sécurisées par SSH par défaut avec LDM. Cela peut ralentir "
-"certains ordinateurs clients qui sont âgés de plus de 10 ans, et n'ayant pas "
+"certains ordinateurs clients qui sont âgés de plus de 15 ans, et n'ayant pas "
 "plus qu'un processeur de 160 MHz et 32 Mo de RAM. Même si ce n'est pas "
-"recommandé, vous pouvez ajouter la valeur « True » dans le fichier "
-"<computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput> sur le serveur :"
+"recommandé, vous pouvez ajouter une ligne dans le fichier <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> contenant :"
 
 #. type: CDATA
 #, no-wrap
@@ -8883,13 +7946,6 @@
 "réseau, comme tout le reste, d'ailleurs."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Note: Since such ten-year-old thin clients may also have trouble running "
-#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
-#| "issues, you may consider running thin clients with at least 128 MB RAM, "
-#| "or upgrade the hardware, which will also give you the benefit of being "
-#| "able to use them as diskless workstations."
 msgid ""
 "Note: Since such fifteen-year-old thin clients may also have trouble running "
 "newer versions of LibreOffice and Firefox due to pixmap caching issues, you "
@@ -8898,8 +7954,8 @@
 "diskless workstations."
 msgstr ""
 "Note : ces vieux clients légers pourraient également avoir des problèmes à "
-"exécuter les versions récentes de LibreOffice et Firefox/Iceweasel à cause "
-"de problèmes de mise en cache de pixmap. Vous devriez utiliser des clients "
+"exécuter les versions récentes de LibreOffice et Firefox à cause de "
+"problèmes de mise en cache de pixmap. Vous devriez utiliser des clients "
 "légers avec au moins 128 Mo de RAM ou mettre à jour le matériel, ce qui vous "
 "permettra également de les utiliser comme stations de travail sans disque "
 "dur."
@@ -8913,12 +7969,6 @@
 msgstr "Rejoindre un domaine"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-#| "joined. A special service called Samba, installed on the main-server "
-#| "tjener, enables Windows clients to store profiles and user data, and also "
-#| "authenticates the users during the login."
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
 "joined. A special service called Samba, installed on the main server, "
@@ -8926,32 +7976,20 @@
 "authenticates the users during the login."
 msgstr ""
 "Les clients Windows peuvent rejoindre le domaine Windows « SKOLELINUX ». Un "
-"service spécial, nommé Samba, installé sur le serveur principal tjener, "
-"permet aux clients Windows d'enregistrer des profils et des données "
-"utilisateur et authentifie les utilisateurs durant la phase de connexion."
+"service spécial, nommé Samba, installé sur le serveur principal, permet aux "
+"clients Windows d'enregistrer des profils et des données utilisateur et "
+"authentifie les utilisateurs durant la phase de connexion."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Joining a domain with a Windows client requires the steps described in "
-#| "the <link linkend=\"Samba\">Debian Edu Jessie Samba Howto</link>."
 msgid ""
 "Joining a domain with a Windows client requires the steps described in the "
 "<link linkend=\"Samba\">Debian Edu Stretch Samba Howto</link>."
 msgstr ""
 "Rejoindre un domaine avec un client Windows nécessite de suivre les étapes "
 "décrites dans le <link linkend=\"Samba\">manuel Samba pour Debian Edu "
-"Jessie</link>."
+"Stretch</link>."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Windows will sync the profiles of domain users on every Windows login and "
-#| "logout. Depending on how much data is stored in the profile, this could "
-#| "take some time. To minimise the time needed, deactivate things like local "
-#| "cache in browsers (you can use the Squid proxy cache installed on tjener "
-#| "instead) and save files into the H: volume rather than under \"My "
-#| "Documents\"."
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
@@ -8966,20 +8004,14 @@
 "réduire le temps nécessaire à cette opération, il est conseillé de "
 "désactiver certaines fonctionnalités, comme le cache local des navigateurs "
 "(à la place, vous pouvez utiliser le cache du mandataire Squid installé sur "
-"tjener) et sauvegarder les fichiers dans le volume H: à la place de « Mes "
-"Documents »."
+"le serveur principal) et sauvegarder les fichiers dans le volume H: à la "
+"place de « Mes Documents »."
 
 #. type: Content of: <article><section><section><section><section><title>
 msgid "User groups in Windows"
 msgstr "Groupes utilisateurs dans Windows"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you want to check user groups on Windows, you need to download the "
-#| "tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then "
-#| "you can use this for example in the logon script which resides on tjener "
-#| "in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
@@ -8989,20 +8021,14 @@
 "Si vous voulez vérifier les groupes d'utilisateurs sous Windows, vous devez "
 "télécharger l'outil <computeroutput>IFMEMBER.EXE</computeroutput> à partir "
 "du site de Microsoft. Vous pouvez alors l'utiliser dans le script de "
-"connexion disponible sur tjener dans <computeroutput>/etc/samba/netlogon/"
-"LOGON.BAT</computeroutput>."
+"connexion disponible sur le serveur principal dans <computeroutput>/etc/"
+"samba/netlogon/LOGON.BAT</computeroutput>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "XP home"
 msgstr "XP home"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Users bringing in their XP laptops from home can still connect to tjener "
-#| "using their skolelinux credentials, provided the workgroup is set to "
-#| "SKOLELINUX. However, they may need to disable the Windows firewall before "
-#| "tjener will appear in Network Neighbourhood (or whatever it's called now)."
 msgid ""
 "Users bringing in their XP laptops from home can still connect to the main "
 "server using their skolelinux credentials, provided the workgroup is set to "
@@ -9010,11 +8036,11 @@
 "the main server will appear in Network Neighbourhood (or whatever it's "
 "called now)."
 msgstr ""
-"Les utilisateurs dont le portable est sous XP home peuvent toujours se "
-"connecter à tjener en utilisant leur compte Skolelinux, à condition que le "
-"groupe de travail soit SKOLELINUX. Cependant, ils devront peut-être "
-"désactiver le pare-feu de Windows pour que tjener apparaisse dans le "
-"voisinage réseau (ou quel que soit son nom)."
+"Les utilisateurs amenant de chez eux leur portable sous XP peuvent toujours "
+"se connecter au serveur principal en utilisant leur compte Skolelinux, à "
+"condition que le groupe de travail soit SKOLELINUX. Cependant, ils devront "
+"peut-être désactiver le pare-feu de Windows pour que le serveur principal "
+"apparaisse dans le voisinage réseau (ou quel que soit son nom)."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Managing roaming profiles"
@@ -9105,16 +8131,6 @@
 "depuis que Kerberos dans Wheezy est aussi configuré pour Samba !"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "You should hopefully find an example smb.conf in your preferred language "
-#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
-#| "debian-edu-config/examples/</computeroutput>. The source file is in "
-#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
-#| "computeroutput>; look for a file with the appropriate code in the "
-#| "filename (the German translation, for example, will be named "
-#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
-#| "the config file are a lot of explanations which you should have a look at."
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
 "the installation on the main server under <computeroutput>/usr/share/doc/"
@@ -9126,9 +8142,9 @@
 "which you should have a look at."
 msgstr ""
 "Vous devriez trouver un exemple de fichier smb.conf (éventuellement traduit "
-"dans votre langue), fourni lors de l'installation sur tjener dans "
-"<computeroutput>/usr/share/debian-edu-config/examples</computeroutput>. Le "
-"fichier source est en anglais et s'appelle <computeroutput>smb-roaming-"
+"dans votre langue), fourni lors de l'installation sur le serveur principal "
+"dans <computeroutput>/usr/share/debian-edu-config/examples</computeroutput>. "
+"Le fichier source est en anglais et s'appelle <computeroutput>smb-roaming-"
 "profiles-en.conf</computeroutput>. S'il est traduit en français par exemple, "
 "il s'appellera <computeroutput>smb-roaming-profiles-fr.conf</"
 "computeroutput>. Si vous cherchez un fichier traduit dans votre langue, "
@@ -9216,12 +8232,6 @@
 msgstr "Stratégies globales pour les profils itinérants"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
-#| "computeroutput>), you can can create a Policy file (NTConfig.pol) and put "
-#| "it in your netlogon share on tjener. This has the advantage of working "
-#| "almost instantly on all Windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can create a Policy file (NTConfig.pol) and put it in "
@@ -9230,9 +8240,9 @@
 msgstr ""
 "En utilisant l'éditeur de stratégies standard de Windows "
 "(<computeroutput>poledit.exe</computeroutput>), vous pouvez créer un fichier "
-"de stratégies (NTConfig.pol) et le placer dans votre partage netlogon sur "
-"tjener. Cela a l'avantage de fonctionner presque immédiatement pour toutes "
-"les machines Windows."
+"de stratégies (NTConfig.pol) et le placer dans votre partage netlogon sur le "
+"serveur principal. Cela a l'avantage de fonctionner presque immédiatement "
+"pour toutes les machines Windows."
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -9244,13 +8254,6 @@
 "outils ORK."
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "With <computeroutput>poledit.exe</computeroutput> you can create .pol "
-#| "files. If you put such a file on tjener as <computeroutput>/etc/samba/"
-#| "netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
-#| "Windows machines and temporarily overwrite the registry, thus applying "
-#| "the changes."
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
 "If you put such a file on the main server as <computeroutput>/etc/samba/"
@@ -9259,7 +8262,7 @@
 "changes."
 msgstr ""
 "Avec <computeroutput>poledit.exe</computeroutput> vous pouvez créer des "
-"fichiers .pol. Si vous déposez un tel fichier sur tjener nommé "
+"fichiers .pol. Si vous déposez un tel fichier sur le serveur principal nommé "
 "<computeroutput>/etc/samba/netlogon/NTLOGON.POL</computeroutput>, il sera lu "
 "par la machine Windows automatiquement et écrasera de façon temporaire le "
 "registre, appliquant ainsi les changements."
@@ -9502,13 +8505,6 @@
 msgstr "Désactiver les profils itinérants dans smb.conf"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If, perhaps, everyone has their own dedicated machine, and nobody else is "
-#| "allowed to touch it, editing the Samba configuration will let you disable "
-#| "roaming profiles for the entire network. You can alter the "
-#| "<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-#| "\"logon path\" and \"logon home\" variables, then restart samba."
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
@@ -9519,9 +8515,9 @@
 "Si tout le monde a une machine dédiée et que personne d'autre n'est autorisé "
 "à y toucher, l'édition de la configuration de Samba peut vous permettre de "
 "désactiver les profils itinérants pour le réseau entier. Vous pouvez "
-"modifier le fichier <computeroutput>tjener</computeroutput> sur tjener, "
-"supprimer les variables « logon path » et « logon home », puis redémarrez "
-"Samba."
+"modifier le fichier <computeroutput>smb.conf</computeroutput> sur le serveur "
+"principal, supprimer les variables « logon path » et « logon home », puis "
+"redémarrez Samba."
 
 #. type: CDATA
 #, no-wrap
@@ -9541,14 +8537,6 @@
 msgstr "Service de Bureaux distants"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Beginning with this release, choosing the thin client server profile or "
-#| "the combined server profile installs xrdp, a package which uses the "
-#| "Remote Desktop Protocol to present a graphical login to a remote client. "
-#| "Microsoft Windows users can connect to the thin client server running "
-#| "xrdp without installing additional software - they simply start a Remote "
-#| "Desktop Connection on their Windows machine and connect."
 msgid ""
 "Choosing the LTSP server profile or the combined server profile also "
 "installs xrdp, a package which uses the Remote Desktop Protocol to present a "
@@ -9557,14 +8545,13 @@
 "simply start a Remote Desktop Connection on their Windows machine and "
 "connect."
 msgstr ""
-"À partir de cette version, le choix du profil de serveur de clients légers "
-"ou de serveur combiné conduit à l'installation de xrdp, un paquet qui "
-"utilise le protocole de bureau distant (« Remote Desktop Protocol » ou "
-"« RDP ») pour présenter une interface de connexion graphique à un client "
-"distant. Les utilisateurs de Microsoft Windows peuvent se connecter à un "
-"serveur de clients légers faisant fonctionner xrdp sans logiciel "
-"supplémentaire : ils peuvent simplement démarrer une connexion à un bureau "
-"distant depuis leur machine Windows, et se connecter."
+"Le choix du profil de serveur LTSP ou de serveur combiné conduit à "
+"l'installation de xrdp, un paquet qui utilise le protocole de bureau distant "
+"(« Remote Desktop Protocol » ou « RDP ») pour présenter une interface de "
+"connexion graphique à un client distant. Les utilisateurs de Microsoft "
+"Windows peuvent se connecter à un serveur LTSP faisant fonctionner xrdp sans "
+"logiciel supplémentaire : ils peuvent simplement démarrer une connexion à un "
+"bureau distant depuis leur machine Windows, et se connecter."
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Additionally, xrdp can connect to a VNC server or another RDP server."
@@ -9586,6 +8573,8 @@
 "Xrdp comes without sound support; to compile the required modules this "
 "script could be used."
 msgstr ""
+"Xrdp est installé sans prise en charge du son ; le script suivant peut être "
+"utilisé pour compiler les modules requis."
 
 #. type: CDATA
 #, no-wrap
@@ -9630,16 +8619,52 @@
 " # Restart xrdp, now with sound enabled.\n"
 " sudo service xrdp restart"
 msgstr ""
+"#!/bin/bash\n"
+" # Script pour compiler/recompiler les modules PulseAudio de xrdp.\n"
+" # L'appelant doit être superutilisateur ou membre du groupe sudo.\n"
+" # Aussi, /etc/apt/sources.list doit fournir une ligne deb-src valable.\n"
+" set -e\n"
+"  if [[ $UID -ne 0 ]] ; then  \n"
+"     if ! groups | egrep -q sudo ; then\n"
+"         echo \"ERROR: You need to be root or a sudo group member.\"\n"
+"         exit 1\n"
+"     fi\n"
+" fi\n"
+" if ! egrep -q  ^deb-src /etc/apt/sources.list ; then\n"
+"     echo \"ERROR: Make sure /etc/apt/sources.list contains a deb-src line.\"\n"
+"     exit 1\n"
+" fi\n"
+" TMP=$(mktemp -d)\n"
+" PULSE_UPSTREAM_VERSION=\"$(dpkg-query -W -f='${source:Upstream-Version}' pulseaudio)\"\n"
+" XRDP_UPSTREAM_VERSION=\"$(dpkg-query -W -f='${source:Upstream-Version}' xrdp)\"\n"
+" sudo apt -q update\n"
+" # Récupérer les sources et construire les dépendances :\n"
+" sudo apt -q install dpkg-dev\n"
+" cd $TMP\n"
+" apt -q source pulseaudio xrdp\n"
+" sudo apt -q build-dep pulseaudio xrdp\n"
+" # For pulseaudio 'configure' is all what is needed:\n"
+" cd pulseaudio-$PULSE_UPSTREAM_VERSION/\n"
+" ./configure\n"
+" # Adapter le Makefile des modules pulseaudio (chemin absolu requis)\n"
+" # et construire les modules pulseaudio.\n"
+" cd $TMP/xrdp-$XRDP_UPSTREAM_VERSION/sesman/chansrv/pulse/\n"
+" sed -i 's/^PULSE/#PULSE/' Makefile\n"
+" sed -i \"/#PULSE_DIR/a \\\n"
+" PULSE_DIR = $TMP/pulseaudio-$PULSE_UPSTREAM_VERSION\" Makefile\n"
+" make\n"
+" # Copier les modules dans le répertoire de modules Pulseaudio, adapter\n"
+" # les droits.\n"
+" sudo cp *.so /usr/lib/pulse-$PULSE_UPSTREAM_VERSION/modules/\n"
+" sudo chmod 644 /usr/lib/pulse-$PULSE_UPSTREAM_VERSION/modules/module-xrdp*\n"
+" # Redémarrer xrdp, maintenant avec le son activé.\n"
+" sudo service xrdp restart"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Available Remote Desktop clients"
 msgstr "Clients de bureaux distants disponibles"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>freerdp-x11</computeroutput> is installed by default and "
-#| "is captable of RDP and VNC."
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default and is "
 "capable of RDP and VNC."
@@ -9701,36 +8726,42 @@
 "consider updating this chapter if you know how to configure Samba for Debian "
 "Edu."
 msgstr ""
+"Les informations de ce chapitre sont dépassées. Veuillez consulter les "
+"informations fournies dans le wiki de Samba à propos des versions de Windows "
+"prises en charge, des corrections de registre nécessaires et des autres "
+"procédures. Un ligne contenant <computeroutput>server max protocol = NT1</"
+"computeroutput> doit être probablement ajoutée à la section "
+"<computeroutput>[global]</computeroutput> de <computeroutput>/etc/samba/smb-"
+"debian-edu.conf</computeroutput> sur le serveur principal. Vous pouvez "
+"envisager de mettre à jour ce chapitre si vous savez comment configurer "
+"Samba pour Debian Edu."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "<ulink url=\"https://wiki.samba.org/index.php/"
 "Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
 msgstr ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
 
 #. type: Content of: <article><section><para>
 msgid ""
 "<ulink url=\"https://wiki.samba.org/index.php/"
 "Required_Settings_for_Samba_NT4_Domains\"/>"
 msgstr ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Samba (v3), since Debian Edu Wheezy (the previous release), has been "
-#| "fully prepared for use as an NT4-style domain controller with Windows XP, "
-#| "Windows Vista and Windows 7 as clients. After a machine has joined the "
-#| "domain, this machine can be fully managed with GOsa²."
 msgid ""
 "Samba has been fully prepared for use as an NT4-style domain controller with "
 "Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
 "joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
-"La version 3 de Samba, depuis Debian Edu Wheezy (la version précédente), a "
-"été préparée pour être utilisée comme un contrôleur de domaine dans le style "
-"de NT4 avec Windows XP, Windows Vista et Windows 7 comme clients. Après "
-"qu'une machine a rejoint le domaine, elle peut être complètement gérée avec "
-"GOsa²."
+"Samba a été préparée pour être utilisée comme un contrôleur de domaine dans "
+"le style de NT4 avec Windows XP, Windows Vista et Windows 7 comme clients. "
+"Après qu'une machine a rejoint le domaine, elle peut être complètement gérée "
+"avec GOsa²."
 
 #. type: Content of: <article><section><section><title>
 msgid "Getting Started"
@@ -9876,7 +8907,11 @@
 "The password of SKOLELINUX\\Administrator has been preconfigured during the "
 "main server's installation. Please use the system's root account when "
 "authenticating as SKOLELINUX\\Administrator."
-msgstr "Le mot de passe de SKOLELINUX\\Administrator"
+msgstr ""
+"Le mot de passe de SKOLELINUX\\Administrator a été préconfiguré pendant "
+"l'installation du serveur principal. Veuillez utilisez le compte de "
+"superutilisateur du système lors de l'authentification en tant que SKOLELINUX"
+"\\Administrator."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -9978,11 +9013,6 @@
 "pour que les changements soient pris en compte. Appuyez sur « Ok »."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "After the reboot, when you login the first time, click on the \"Options "
-#| "&gt;&gt;\" button and select the domain SKOLELINUX instead of the local "
-#| "domain (\"this computer\")"
 msgid ""
 "After the reboot, when you login the first time, click on the \"Options &gt;"
 "&gt;\" button and select the domain SKOLELINUX instead of the local domain "
@@ -10111,26 +9141,17 @@
 msgstr "Manuels pour enseigner et apprendre"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "All the Debian packages on this page can be installed by running either "
-#| "<computeroutput>aptitude install &lt;package&gt;</computeroutput> or "
-#| "<computeroutput>apt-get install &lt;package&gt;</computeroutput> (as "
-#| "root)."
 msgid ""
 "All Debian packages mentioned in this section can be installed by running "
 "<computeroutput>apt install &lt;package&gt;</computeroutput> (as root)."
 msgstr ""
-"Tous les paquets Debian sur cette page peuvent être installés en exécutant "
-"en tant que superutilisateur la commande <computeroutput>aptitude install "
-"&lt;paquet&gt;</computeroutput> ou bien <computeroutput>apt-get install &lt;"
-"paquet&gt;</computeroutput>."
+"Tous les paquets Debian dans cette partie peuvent être installés en "
+"exécutant en tant que superutilisateur la commande <computeroutput>apt "
+"install &lt;paquet&gt;</computeroutput>."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Teaching Prolog"
 msgid "Teaching Programming"
-msgstr "Enseigner Prolog"
+msgstr "Enseigner la programmation"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -10141,6 +9162,13 @@
 "packages), see the <ulink url=\"https://blends.debian.org/edu/tasks/"
 "development\">Debian Edu Development packages</ulink> page."
 msgstr ""
+"<ulink url=\"https://packages.debian.org/stable/education-development#"
+"\">stable/education-development</ulink> est un méta-paquet qui dépend de "
+"nombreux outils de programmation. Veuillez noter que presque 2 Gio d'espace "
+"disque sont nécessaires lorsque ce paquet est installé. Pour plus de détails "
+"(notamment pour n'installer que quelques paquets), consultez la page <ulink "
+"url=\"https://blends.debian.org/edu/tasks/development\">Paquets de "
+"développement de Debian Edu</ulink>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Monitoring pupils"
@@ -10157,15 +9185,6 @@
 "informatique d'utilisateurs."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Some schools use control tools like <ulink url=\"https://packages.debian."
-#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://"
-#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
-#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
-#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
-#| "documentation in bug <ulink url=\"https://bugs.debian.org/511387#"
-#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/epoptes#\">Epoptes</ulink> or <ulink url=\"https://packages.debian."
@@ -10174,16 +9193,17 @@
 "<ulink url=\"http://italc.sourceforge.net/home.php\">iTALC Homepage</ulink>."
 msgstr ""
 "Certains établissements utilisent des outils de contrôle tels que <ulink url="
-"\"https://packages.debian.org/stable/controlaula#\">Controlaula</ulink> ou "
-"<ulink url=\"https://packages.debian.org/stable/italc-master#\">iTALC</"
-"ulink> pour superviser leurs étudiants. Consultez aussi <ulink url=\"http://"
-"sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page\">le wiki "
-"d'iTALC </ulink> (et la documentation dans le bogue nº <ulink url=\"https://"
-"bugs.debian.org/511387#\">511387</ulink>)."
+"\"https://packages.debian.org/stable/epoptes#\">Epoptes</ulink> ou <ulink "
+"url=\"https://packages.debian.org/stable/italc-master#\">iTALC</ulink> pour "
+"superviser leurs étudiants. Consultez aussi les pages d'accueil de <ulink "
+"url=\"http://www.epoptes.org\">Epoptes</ulink> et de <ulink url=\"http://"
+"italc.sourceforge.net/home.php\">iTALC</ulink>."
 
 #. type: Content of: <article><section><section><para>
 msgid "To get full Epoptes support, these steps are required."
 msgstr ""
+"Pour obtenir une prise en charge totale d'Epoptes, il faut suivre les étapes "
+"suivantes."
 
 #. type: CDATA
 #, no-wrap
@@ -10199,6 +9219,16 @@
 "# If diskspace matters, use 'ltsp-update-image -n' instead.\n"
 "ltsp-update-image"
 msgstr ""
+"# Exécuter sur un serveur combiné (et sur chaque serveur LTSP supplémentaire) :\n"
+"apt update\n"
+"apt install epoptes\n"
+"ltsp-chroot -m --arch i386 apt update\n"
+"ltsp-chroot -m --arch i386 apt install epoptes-client\n"
+"ltsp-chroot -m --arch i386 apt install ssvnc\n"
+"ltsp-chroot -m --arch i386 sed -i 's/test -f/#test -f/' /etc/init.d/epoptes-client \n"
+"ltsp-chroot -m --arch i386 sed -i 's/grep -qs/#grep -qs/' /etc/init.d/epoptes-client \n"
+"# S'il y a un problème d'espace disque, utilisez plutôt 'ltsp-update-image -n'.\n"
+"ltsp-update-image"
 
 #. type: Content of: <article><section><section><title>
 msgid "Restricting pupils' network access"
@@ -10256,11 +9286,6 @@
 "www/gosa/</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Using GOsa² to change the password ensures that Kerberos "
-#| "(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
-#| "sambaLMPassword) passwords are the same."
 msgid ""
 "Using GOsa² to change the password ensures that passwords for Kerberos "
 "(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
@@ -10271,23 +9296,17 @@
 "sambaLMPassword) sont identiques."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-#| "but this will only update the Kerberos password, and not the Samba and "
-#| "GOsa² (LDAP) password. So after you changed your password at the login "
-#| "prompt, you really should also change it using GOsa²."
 msgid ""
 "Changing passwords using PAM is working also at the GDM login prompt, but "
 "this will only update the Kerberos password, and not the Samba and GOsa² "
 "(LDAP) password. So after you changed your password at the login prompt, you "
 "really should also change it using GOsa²."
 msgstr ""
-"Le changement de mot de passe en utilisant PAM fonctionne (c'est-à-dire à "
-"l'écran de connexion KDM/GDM). Mais seul le mot de passe Kerberos sera mis à "
-"jour. Ceux de Samba et GOsa² (LDAP) resteront inchangés. Donc après avoir "
-"changé votre mot de passe à l'invite de connexion, vous devriez vraiment le "
-"changer aussi avec GOsa²."
+"Le changement de mot de passe en utilisant PAM fonctionne aussi à l'écran de "
+"connexion GDM. Mais seul le mot de passe Kerberos sera mis à jour. Ceux de "
+"Samba et GOsa² (LDAP) resteront inchangés. Donc, après avoir changé votre "
+"mot de passe à l'invite de connexion, vous devriez vraiment le changer aussi "
+"avec GOsa²."
 
 #. type: Content of: <article><section><section><title>
 msgid "Java"
@@ -10310,29 +9329,19 @@
 msgstr "Exécuter des applications Java dans le navigateur Internet"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Running Java applets in the browser are supported out of the box by the "
-#| "OpenJDK Java runtime."
 msgid ""
 "Running Java applets is supported in the Firefox ESR browser by the OpenJDK "
 "Java runtime. Please note that this support will end early 2018."
 msgstr ""
-"L'exécution d'applications Java dans le navigateur est prise en charge par "
-"défaut par l'environnement d'exécution Java OpenJDK."
+"L'exécution d'applications Java dans le navigateur Firefox ESR est prise en "
+"charge par l'environnement d'exécution Java OpenJDK. Veuillez noter que "
+"cette prise en charge se termine début 2018."
 
 #. type: Content of: <article><section><section><title>
 msgid "Using email"
 msgstr "Utilisation du courrier électronique"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "All users can send and receive mails within the internal network. To "
-#| "allow mail outside the internal network, the adminstrator needs to "
-#| "configure the mailserver <computeroutput>exim4</computeroutput> to suit "
-#| "the local situation, starting with <computeroutput>dpkg-reconfigure exim4-"
-#| "config</computeroutput>."
 msgid ""
 "All users can send and receive mails within the internal network; self-"
 "signed certificates are provided to allow TLS secured connections. To allow "
@@ -10342,36 +9351,32 @@
 "computeroutput>."
 msgstr ""
 "Tous les utilisateurs peuvent recevoir et envoyer des courriers "
-"électroniques sur le réseau local. Pour autoriser l'envoi et la réception de "
-"courriers électroniques à l'extérieur du réseau local, l'administrateur doit "
-"configurer le serveur de courrier <computeroutput>exim4</computeroutput> "
-"selon les besoins. <computeroutput>dpkg-reconfigure exim4-config</"
-"computeroutput> est la première étape dans cette direction."
+"électroniques sur le réseau local ; des certificats auto-signés sont fournis "
+"pour permettre des connexions TLS sécurisées. Pour autoriser l'envoi et la "
+"réception de courriers électroniques à l'extérieur du réseau local, "
+"l'administrateur doit configurer le serveur de courrier "
+"<computeroutput>exim4</computeroutput> selon les besoins. "
+"<computeroutput>dpkg-reconfigure exim4-config</computeroutput> est la "
+"première étape dans cette direction."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Every user who wants to use KMail (or Icedove, not installed by default) "
-#| "needs to configure it as follows. For a user with username jdoe the "
-#| "internal email address is <ulink url=\"mailto:jdoe@postoffice.intern"
-#| "\">jdoe@postoffice.intern</ulink>."
 msgid ""
 "Every user who wants to use Thunderbird needs to configure it as follows. "
 "For a user with username jdoe the internal email address is <ulink url="
 "\"mailto:jdoe@postoffice.intern\">jdoe@postoffice.intern</ulink>."
 msgstr ""
-"Tout utilisateur qui souhaiterait utiliser KMail (ou Icedove, non installé "
-"par défaut) doit le configurer comme indiqué ci-dessous. Pour un utilisateur "
-"avec le login jdoe, l'adresse email interne est <ulink url=\"mailto:"
-"jdoe@postoffice.intern\">jdoepostoffice.intern</ulink>."
+"Tout utilisateur qui souhaiterait utiliser Thunderbird doit le configurer "
+"comme indiqué ci-dessous. Pour un utilisateur avec le login toto, l'adresse "
+"email interne est <ulink url=\"mailto:toto@postoffice.intern"
+"\">totopostoffice.intern</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Start Thunderbird"
-msgstr ""
+msgstr "Lancer Thunderbird"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
@@ -10400,22 +9405,21 @@
 "For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
 "GSSAPI'; adjust if not detected automatically"
 msgstr ""
+"Pour à la fois IMAP et SMTP, les réglages devraient être « STARTTLS » et "
+"« Kerberos/GSSAPI » – à ajuster si non détectés automatiquement"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Done'"
 msgstr "Cliquez sur « Terminé »"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "First time accessing the inbox click 'Confirm Security Exception' to "
-#| "accept the certificate"
 msgid ""
 "First time accessing the inbox click 'Confirm Security Exception' to accept "
 "the certificate; same applies if sending mail for the first time."
 msgstr ""
 "La première fois que vous accédez à la boîte de réception, cliquez sur "
-"« Confirmez l'exception de sécurité » pour accepter le certificat"
+"« Confirmez l'exception de sécurité » pour accepter le certificat ; la même "
+"chose s'applique pour le premier envoi d'un courriel."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -10521,20 +9525,15 @@
 "ArchivePolicy\"/>."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A good way to learn what is happening in the development of Debian Edu is "
-#| "to subscribe to the <ulink url=\"http://lists.alioth.debian.org/mailman/"
-#| "listinfo/debian-edu-commits\">commit mailinglist</ulink>."
 msgid ""
 "A good way to learn what is happening in the development of Debian Edu is to "
 "subscribe to the <ulink url=\"https://alioth-lists.debian.net/cgi-bin/"
 "mailman/listinfo/debian-edu-commits\">commit mailinglist</ulink>."
 msgstr ""
 "Une bonne façon d'apprendre ce qui se passe dans le développement de Debian "
-"Edu consiste à s'inscrire à la <ulink url=\"http://lists.alioth.debian.org/"
-"mailman/listinfo/debian-edu-commits\">liste de diffusion des modifications</"
-"ulink>."
+"Edu consiste à s'inscrire à la <ulink url=\"https://alioth-lists.debian.net/"
+"cgi-bin/mailman/listinfo/debian-edu-commits\">liste de diffusion des "
+"modifications</ulink>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Documentation writers and translators"
@@ -10553,13 +9552,6 @@
 "partager vos connaissances."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The source of the text is a wiki and can be edited with a simple "
-#| "webbrowser. Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Jessie/\"/> and you can contribute easily. Note: a user "
-#| "account is needed to edit the pages; you need to <ulink url=\"http://wiki."
-#| "debian.org/UserPreferences\">create a wiki user</ulink> first."
 msgid ""
 "The source of the text is a wiki and can be edited with a simple webbrowser. "
 "Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
@@ -10568,8 +9560,8 @@
 "UserPreferences\">create a wiki user</ulink> first."
 msgstr ""
 "Le source du texte est un wiki et peut être édité avec un simple navigateur "
-"web. Faites le pointer sur <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Jessie/\"/> et vous pourrez contribuer facilement. Note : un "
+"web. Faites le pointer sur <ulink url=\"https://wiki.debian.org/DebianEdu/"
+"Documentation/Stretch/\"/> et vous pourrez contribuer facilement. Note : un "
 "compte utilisateur est requis pour modifier les pages, vous devez d'abord "
 "<ulink url=\"http://wiki.debian.org/UserPreferences\">créer un utilisateur "
 "sur le wiki</ulink>."
@@ -10605,23 +9597,19 @@
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-#| "discuss\"/> - support mailing list"
 msgid ""
 "<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
 "support mailing list"
 msgstr ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> — assistance par liste de diffusion"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> "
+"— assistance par liste de diffusion"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "#debian-edu on irc.debian.org - IRC channel, mostly development related; do "
 "not expect real time support even though it frequently happens"
 msgstr ""
-"#debian-edu sur irc.debian.org — canal IRC, centré principalement sur le "
+"#debian-edu sur irc.debian.org — canal IRC, centré principalement sur le "
 "développement, n'attendez pas une aide en temps réel même si cela arrive "
 "souvent"
 
@@ -10630,35 +9618,26 @@
 msgstr "en norvégien"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
-#| "\"/> - support mailing list"
 msgid ""
 "<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
 "mailing list"
 msgstr ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> — assistance par liste de diffusion"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> — assistance "
+"par liste de diffusion"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-#| "linuxiskolen\"/> - mailing list for the development member organisation "
-#| "in Norway (FRISK)"
 msgid ""
 "<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
 "mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> — liste de diffusion pour l'organisation des membres du "
-"développement en Norvège (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> — liste "
+"de diffusion pour l'organisation des membres du développement en Norvège "
+"(FRISK)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "#skolelinux on irc.debian.org - IRC channel to support Norwegian users"
 msgstr ""
-"#skolelinux sur irc.debian.org — canal IRC pour l'assistance des "
+"#skolelinux sur irc.debian.org — canal IRC pour l'assistance des "
 "utilisateurs norvégiens"
 
 #. type: Content of: <article><section><section><section><title>
@@ -10670,20 +9649,20 @@
 "<ulink url=\"http://lists.debian.org/debian-edu-german\"/> - support mailing "
 "list"
 msgstr ""
-"<ulink url=\"http://lists.debian.org/debian-edu-german\"/> — assistance par "
+"<ulink url=\"http://lists.debian.org/debian-edu-german\"/> — assistance par "
 "liste de diffusion"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "<ulink url=\"http://wiki.skolelinux.de\"/> - wiki with lots of HowTos etc."
 msgstr ""
-"<ulink url=\"http://wiki.skolelinux.de\"/> — wiki avec de nombreux "
+"<ulink url=\"http://wiki.skolelinux.de\"/> — wiki avec de nombreux "
 "manuels, etc."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "#skolelinux.de on irc.debian.org - IRC channel to support German users"
 msgstr ""
-"#skolelinux.de sur irc.debian.org — canal IRC pour l'assistance des "
+"#skolelinux.de sur irc.debian.org — canal IRC pour l'assistance des "
 "utilisateurs allemands"
 
 #. type: Content of: <article><section><section><section><title>
@@ -10695,7 +9674,7 @@
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - support mailing "
 "list"
 msgstr ""
-"<ulink url=\"http://lists.debian.org/debian-edu-french\"/> — assistance par "
+"<ulink url=\"http://lists.debian.org/debian-edu-french\"/> — assistance par "
 "liste de diffusion"
 
 #. type: Content of: <article><section><section><title>
@@ -10712,57 +9691,44 @@
 "ProfessionalHelp\"/>."
 
 #. type: Content of: <article><section><title>
-#, fuzzy
-#| msgid "New features in Debian Edu Jessie"
 msgid "New features in Debian Edu Stretch"
-msgstr "Nouvelles fonctionnalités dans Debian Edu Jessie"
+msgstr "Nouvelles fonctionnalités dans Debian Edu Stretch"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "New features for Debian Edu 8+edu0 Codename Jessie"
 msgid "New features for Debian Edu 9+edu0 Codename Stretch"
-msgstr "Manuel de Debian Edu 8+edu0 nom de code Jessie"
+msgstr "Nouvelles fonctionnalités pour Debian Edu 9+edu0 nom de code Stretch"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Known issues"
 msgstr "Problèmes connus"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Jessie\"/> is a wiki and updated frequently."
 msgid ""
 "see <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Stretch#\">the "
 "Debian Edu Stretch status page</ulink>."
 msgstr ""
-"La version disponible depuis <ulink url=\"http://wiki.debian.org/DebianEdu/"
-"Documentation/Jessie\"/> est un wiki fréquemment mis à jour."
+"Consultez la <ulink url=\"https://wiki.debian.org/DebianEdu/Status/Stretch#"
+"\">page d'état de Debian Edu Stretch</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation changes"
 msgstr "Changements dans l'installation"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "New version of debian-installer from Debian Squeeze, see <ulink url="
-#| "\"http://www.debian.org/releases/squeeze/installmanual\">installation "
-#| "manual</ulink> for more details."
 msgid ""
 "New version of debian-installer from Debian Stretch, see its <ulink url="
 "\"http://www.debian.org/releases/stretch/installmanual\">installation "
 "manual</ulink> for more details."
 msgstr ""
-"Nouvelle version de l'installateur Debian de Squeeze. Consultez le <ulink "
-"url=\"http://www.debian.org/releases/squeeze/installmanual\">manuel "
+"Nouvelle version de l'installateur Debian de Stretch. Consultez le <ulink "
+"url=\"http://www.debian.org/releases/stretch/installmanual\">manuel "
 "d'installation</ulink> pour plus de détails."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
 "profile."
-msgstr ""
+msgstr "Le profil « Thin-Client-Server » a été renommé profil « LTSP-Server »."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -10770,34 +9736,29 @@
 "Themes/softWaves#\">\"soft Waves\" theme</ulink>, the default artwork for "
 "Debian 9 Stretch."
 msgstr ""
+"Nouveau thème graphique basé sur le <ulink url=\"https://wiki.debian.org/"
+"DebianArt/Themes/softWaves#\">thème « soft Waves »</ulink>, le thème "
+"graphique par défaut de Debian 9 Stretch."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "Mises à jour des logiciels"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Everything which is new in Debian 8 Jessie, eg:"
 msgid "Everything which is new in Debian 9 Stretch, eg:"
-msgstr "Toutes les nouveautés de Debian Jessie 8, comme par exemple :"
+msgstr "Toutes les nouveautés de Debian Stretch 9, comme :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Linux kernel 3.2.x"
 msgid "Linux kernel 4.9"
-msgstr "Noyau Linux version 3.2.x"
+msgstr "Noyau Linux version 4.9"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Desktop environments KDE Plasma Workspace 4.11.13, GNOME 3.14, Xfce 4.10, "
-#| "LXDE 0.5.6"
 msgid ""
 "Desktop environments KDE Plasma Workspace 5.8, GNOME 3.22, Xfce 4.12, LXDE "
 "0.99.2, MATE 1.16"
 msgstr ""
-"Environnements de bureau KDE Plasma 4.11.13, GNOME 3.14, Xfce 4.10, "
-"LXDE 0.5.6"
+"Environnements de bureau KDE Plasma 5.8, GNOME 3.22, Xfce 4.12, LXDE 0.99.2, "
+"MATE 1.16"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -10808,73 +9769,56 @@
 "autres, consultez ce manuel."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "the browsers Iceweasel 31 ESR and Chromium 41"
 msgid "Firefox 45.9 ESR and Chromium 59"
-msgstr "Navigateurs web Iceweasel 31 ESR et Chromium 41"
+msgstr "Firefox 45.9 ESR et Chromium 59"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Iceweasel has been re-renamed to Firefox!"
-msgstr ""
+msgstr "Iceweasel a été à nouveau renommé Firefox !"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Icedove has been re-renamed to Thunderbird and is now installed by default."
 msgstr ""
+"Icedove a été à nouveau renommé Thunderbird et est maintenant installé par "
+"défaut."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "LibreOffice 4.3.3"
 msgid "LibreOffice 5.2.6"
-msgstr "LibreOffice 4.3.3"
+msgstr "LibreOffice 5.2.6"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Educational toolbox GCompris 14.12"
 msgid "Educational toolbox GCompris 15.10"
-msgstr "Boîte à outils éducative GCompris 14.12"
+msgstr "Boîte à outils éducative GCompris 15.10"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Music creator Rosegarden 14.02"
 msgid "Music creator Rosegarden 16.06"
-msgstr "Créateur de musique Rosegarden 14.02"
+msgstr "Créateur de musique Rosegarden 16.06"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "GOsa 2.7.4"
 msgstr "GOsa 2.7.4"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "LTSP 5.5.4"
 msgid "LTSP 5.5.9"
-msgstr "LSTP 5.5.4"
+msgstr "LTSP 5.5.9"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Debian Jessie includes about 42000 packages available for installation."
 msgid ""
 "Debian Stretch includes more than 50000 packages available for installation."
-msgstr "Debian Jessie contient environ 42 000 paquets prêts à être installés."
+msgstr "Debian Stretch contient plus de 50 000 paquets prêts à être installés."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "More information about Debian 8 Jessie is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/jessie/"
-#| "installmanual\">installation manual</ulink>."
 msgid ""
 "More information about Debian 9 Stretch is provided in the <ulink url="
 "\"http://www.debian.org/releases/stretch/releasenotes\">release notes</"
 "ulink> and the <ulink url=\"http://www.debian.org/releases/stretch/"
 "installmanual\">installation manual</ulink>."
 msgstr ""
-"Des informations supplémentaires sur Debian Jessie 8 sont disponibles dans "
-"les <ulink url=\"http://www.debian.org/releases/jessie/releasenotes\">notes "
+"Des informations supplémentaires sur Debian Stretch 9 sont disponibles dans "
+"les <ulink url=\"http://www.debian.org/releases/stretch/releasenotes\">notes "
 "de publication</ulink> et le <ulink url=\"http://www.debian.org/releases/"
-"jessie/installmanual\">manuel d'installation</ulink>."
+"stretch/installmanual\">manuel d'installation</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Documentation and translation updates"
@@ -10889,24 +9833,21 @@
 "Ces chaînes sont maintenant disponibles en 29 langues."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "The Debian Edu Jessie Manual is fully translated to German, French, "
-#| "Italian, Danish, Dutch and Norwegian Bokmål. A partly translated version "
-#| "exists for Spanish."
 msgid ""
 "The Debian Edu Stretch Manual is fully translated to German, French, "
 "Italian, Danish, Dutch, Norwegian Bokmål and Japanese. The Japanese "
 "translation was newly added for Stretch."
 msgstr ""
-"Le manuel de Debian Edu Jessie est traduit entièrement en allemand, "
-"français, italien, danois, néerlandais et norvégien Bokmål. Une traduction "
-"partielle existe en espagnol."
+"Le manuel de Debian Edu Stretch est traduit entièrement en allemand, "
+"français, italien, danois, néerlandais, norvégien Bokmål et japonais. La "
+"traduction japonaise a été ajoutée récemment pour Stretch."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
 "Partly translated versions exist for Spanish, Polish and Simplified Chinese."
 msgstr ""
+"Des traductions partielles existent en espagnol, polonais et chinois "
+"simplifié."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Other changes compared to the previous release"
@@ -10914,15 +9855,15 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Icinga replaces Nagios as monitoring tool."
-msgstr ""
+msgstr "Icinga remplace Nagios comme outil de supervision."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
-msgstr ""
+msgstr "kde-spectacle remplace ksnapshot comme outil de capture d'écran."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "The free flash player gnash is back again."
-msgstr ""
+msgstr "Le lecteur Flash libre gnash est de retour."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -10930,6 +9871,9 @@
 "and 'Minimal' profiles; pressing ESC allows to view boot and shutdown "
 "messages."
 msgstr ""
+"Plymouth est installé et activé par défaut sauf pour les profils « Serveur "
+"Principal » et « Minimal » ; appuyer ESC permet de voir les messages de "
+"démarrage et d'arrêt."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -10937,6 +9881,9 @@
 "value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
 "LDAP editor."
 msgstr ""
+"Lors de la mise à niveau à partir de Jessie, la base de données de LDAP doit "
+"être adaptée. La valeur de sudoHost « tjener » doit être remplacée par "
+"« tjener.intern » avec GOsa² ou un éditeur de LDAP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -10944,6 +9891,10 @@
 "covers a plain i586 processor. The new baseline is the i686, although some "
 "i586 processors (e.g. the \"AMD Geode\") will remain supported."
 msgstr ""
+"La prise en charge de PC 32 bits (connus comme l'architecture Debian i386) "
+"ne gère plus les processeurs i586. La référence de départ est i686 bien que "
+"certains processeurs i586 (par exemple le processeur « AMD Geode ») "
+"demeurent pris en charge."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -10951,6 +9902,10 @@
 "new installations. This might cause a delay of about 15 minutes if a system "
 "with a low uptime value is powered off."
 msgstr ""
+"Debian 9 active par défaut les mises à jour automatisées (pour les mises à "
+"jour de sécurité) dans les installations neuves. Cela peut provoquer une "
+"attente d'une quinzaine de minutes lors de l'extinction d'un système avec "
+"une faible valeur de mise à disposition."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -10959,32 +9914,24 @@
 "(<computeroutput>ltsp-update-image</computeroutput>) for the changes to take "
 "effect."
 msgstr ""
+"LTSP utilise désormais NBD à la place de NFS pour le système de fichiers "
+"racine. Après chaque modification d'un chroot LTSP, l'image NBD liée doit "
+"être recréée (<computeroutput>ltsp-update-image</computeroutput>) pour que "
+"les modifications soient prises en compte."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Concurrent logins of the same user on LTSP server and LTSP thin client are "
 "no longer allowed."
 msgstr ""
+"Les connexions simultanées du même utilisateur sur un serveur LTSP et un "
+"client léger LTSP sont maintenant interdites."
 
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr "Droits d'auteur et auteurs"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016), Petter Reinholdtsen "
-#| "(2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß "
-#| "(2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter "
-#| "(2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne "
-#| "Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez "
-#| "(2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009, "
-#| "2010, 2011, 2012, 2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), "
-#| "Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian "
-#| "(2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), "
-#| "Wolfgang Schweer (2012, 2013, 2014, 2015), Bernhard Hammes (2012) and Joe "
-#| "Hansen (2015) and is released under the GPL2 or any later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018), Petter Reinholdtsen "
@@ -11000,17 +9947,18 @@
 "(2015) and is released under the GPL2 or any later version. Enjoy!"
 msgstr ""
 "Ce document a été écrit (droits d'auteur) par Holger Levsen (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016), Petter Reinholdtsen (2001, "
-"2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), "
-"Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), "
-"Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
-"2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
-"(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, "
-"2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
-"Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), "
-"Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, "
-"2014, 2015), Bernhard Hammes (2012) et Joe Hansen (2015) et est distribué "
-"sous GPL2 ou toute version ultérieure. Profitez-en !"
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018), Petter "
+"Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), "
+"Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf "
+"Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), "
+"Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez "
+"(2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009, "
+"2010, 2011, 2012, 2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), "
+"Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), "
+"Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang "
+"Schweer (2012, 2013, 2014, 2015, 2016, 2017, 2018), Bernhard Hammes (2012) "
+"et Joe Hansen (2015) et est distribué sous GPL2 ou toute version ultérieure. "
+"Profitez-en !"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -11040,15 +9988,6 @@
 "ultérieure."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-#| "2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
-#| "Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid "
-#| "Yrvin (2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin "
-#| "(2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and "
-#| "Ragnar Wisløff (2014) and is released under the GPL v2 or any later "
-#| "version."
 msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017, 2018), Håvard Korsvoll (2007-2009), Tore Skogly "
@@ -11059,23 +9998,15 @@
 "and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduction norvégienne Bokmål, dont les droits d'auteur appartiennent à "
-"Petter Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), "
-"Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-"
-"Erik Yrvin (2014), Ingrid Yrvin (2014, 2015), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
-"Lauridsen (2014) et Ragnar Wisløff (2014), est distribuée sous GPL v2 ou "
-"toute version ultérieure."
+"Petter Reinholdtsen (2007, 2012, 2014, 2015, 2016, 2017, 2018), Håvard "
+"Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders Andreassen (2010), Jan "
+"Roar Rød (2010), Ole-Erik Yrvin (2014, 2016, 2017), Ingrid Yrvin (2014, "
+"2015, 2016, 2017), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014), Ragnar Wisløff "
+"(2014) et Allan Nordhøy (2018), est distribuée sous GPL v2 ou toute version "
+"ultérieure."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
-#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
-#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
-#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
-#| "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and "
-#| "Wolfgang Schweer (2012, 2013, 2014, 2015) and is released under the GPL "
-#| "v2 or any later version."
 msgid ""
 "The German translation is copyrighted by Holger Levsen (2007), Patrick "
 "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -11090,50 +10021,42 @@
 "Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, "
 "2014), Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), "
 "Franziska Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) "
-"et Wolfgang Schweer (2012, 2013, 2014, 2015), est distribuée sous GPL v2 ou "
-"toute version ultérieure."
+"et Wolfgang Schweer (2012, 2013, 2014, 2015, 2016, 2017, 2018), est "
+"distribuée sous GPL v2 ou toute version ultérieure."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
-#| "2014) and is released under the GPL v2 or any later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
 "2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018) and Beatrice "
 "Torracca (2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduction italienne, dont les droits d'auteur appartiennent à Claudio "
-"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) et "
-"Beatrice Torracca (2013, 2014), est distribuée sous GPL v2 ou toute version "
-"ultérieure."
+"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, "
+"2017, 2018) et Beatrice Torracca (2013, 2014), est distribuée sous GPL v2 ou "
+"toute version ultérieure."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 "La traduction française, dont les droits d'auteur appartiennent à Christophe "
 "Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, "
 "2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent "
-"(2012) et l'équipe française de localisation (2009, 2010, 2012), est "
-"distribuée sous GPL v2 ou toute version ultérieure."
+"(2012), Jean-Pierre Giraud (2019) et l'équipe française de localisation "
+"(2009, 2010, 2012, 2019), est distribuée sous GPL v2 ou toute version "
+"ultérieure."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
-#| "2015) and is released under the GPL v2 or any later version."
 msgid ""
 "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
 "2016) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
-"(2012, 2013, 2014, 2015), est distribuée sous GPL v2 ou toute version "
+"(2012, 2013, 2014, 2015, 2016), est distribuée sous GPL v2 ou toute version "
 "ultérieure."
 
 #. type: Content of: <article><section><para>
@@ -11141,61 +10064,43 @@
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
 "2016, 2017, 2018) and is released under the GPL v2 or any later version."
 msgstr ""
-"La traduction danoise, dont les droits d'auteur appartiennent à Frans "
+"La traduction néerlandaise, dont les droits d'auteur appartiennent à Frans "
 "Spiesschaert (2014, 2015, 2016, 2017, 2018) est distribuée sous GPL v2 ou "
 "toute version ultérieure."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
-#| "and is released under the GPL v2 or any later version."
 msgid ""
 "The Japanese translation is copyrighted by victory (2016, 2017) and is "
 "released under the GPL v2 or any later version."
 msgstr ""
-"La traduction danoise, dont les droits d'auteur appartiennent à Frans "
-"Spiesschaert (2014, 2015) est distribuée sous GPL v2 ou toute version "
-"ultérieure."
+"La traduction japonaise, dont les droits d'auteur appartiennent à victory "
+"(2016, 2017), est distribuée sous GPL v2 ou toute version ultérieure."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
-#| "and is released under the GPL v2 or any later version."
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
-"La traduction danoise, dont les droits d'auteur appartiennent à Frans "
-"Spiesschaert (2014, 2015) est distribuée sous GPL v2 ou toute version "
-"ultérieure."
+"La traduction polonaise, dont les droits d'auteur appartiennent à Stanisław "
+"Krukowski (2016, 2017) et Wiktor Wandachowicz (2019), est distribuée sous "
+"GPL v2 ou toute version ultérieure."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
-#| "and is released under the GPL v2 or any later version."
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
-"La traduction danoise, dont les droits d'auteur appartiennent à Frans "
-"Spiesschaert (2014, 2015) est distribuée sous GPL v2 ou toute version "
-"ultérieure."
+"La traduction en chinois simplifié, dont les droits d'auteur appartiennent à "
+"Ma Yong (2016, 2017, 2018, 2019), Boyuan Yang (2017) et Roy Zhang (2017), "
+"est distribuée sous GPL v2 ou toute version ultérieure."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
 msgstr "Traductions de ce document"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Versions of this document fully translated into German, Italian, French, "
-#| "Danish, Dutch and Norwegian Bokmål are available. An incomplete "
-#| "translation exists for Spanish. This is an <ulink url=\"http://maintainer."
-#| "skolelinux.org/debian-edu-doc/\">online overview of all languages</ulink>."
 msgid ""
 "Versions of this document translated into German, Italian, French, Danish, "
 "Dutch, Norwegian Bokmål and Japanese are available. Incomplete translations "
@@ -11204,10 +10109,11 @@
 "of shipped translations</ulink>."
 msgstr ""
 "Des versions complètement traduites de ce document sont disponibles en "
-"allemand, italien, français, danois, néerlandais et norvégien Bokmål. Une "
-"version incomplète en espagnol existe. Vous pouvez consulter la <ulink url="
-"\"http://maintainer.skolelinux.org/debian-edu-doc/\">vue en ligne des "
-"langues disponibles</ulink>."
+"allemand, italien, français, danois, néerlandais, norvégien Bokmål et "
+"japonais. Des versions incomplètes en espagnol, polonais et chinois "
+"simplifié existent. Vous pouvez consulter la <ulink url=\"https://jenkins."
+"debian.net/userContent/debian-edu-doc/\">vue en ligne des langues "
+"disponibles</ulink>."
 
 #. type: Content of: <article><section><section><title>
 msgid "HowTo translate this document"
@@ -11215,19 +10121,9 @@
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Translate using PO files"
-msgstr ""
+msgstr "Traduire en utilisant des fichiers PO"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "As in many free software projects, translations of this document are kept "
-#| "in PO files. More information about the process can be found in "
-#| "<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-jessie-"
-#| "manual-translations</computeroutput>. The Git repository (see below) "
-#| "contains this file too. Take a look there and at the <ulink url=\"https://"
-#| "wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">language "
-#| "specific conventions</ulink> if you want to help translating this "
-#| "document."
 msgid ""
 "As in many free software projects, translations of this document are kept in "
 "PO files. More information about the process can be found in "
@@ -11239,7 +10135,7 @@
 msgstr ""
 "Les traductions de ce document sont conservées dans des fichiers PO comme "
 "pour de nombreux projets de logiciels libres, lisez <computeroutput>/usr/"
-"share/doc/debian-edu-doc/README.debian-edu-jessie-manual-translations</"
+"share/doc/debian-edu-doc/README.debian-edu-stretch-manual-translations</"
 "computeroutput> pour plus d'informations à ce propos. Le dépôt Git (voir ci-"
 "dessous) contient également ce fichier. Jetez-y un œil, ainsi qu'à la page "
 "traitant des <ulink url=\"https://wiki.debian.org/DebianEdu/Contribute/"
@@ -11251,31 +10147,20 @@
 "To commit your translations you need to be a member of the Salsa project "
 "<computeroutput>debian-edu</computeroutput>."
 msgstr ""
+"Pour soumettre vos traductions, il faut être membre du projet Salsa "
+"<computeroutput>debian-edu</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
 "using ssh access: <computeroutput>git clone git@salsa.debian.org:debian-edu/"
 "debian-edu-doc.git</computeroutput>"
 msgstr ""
 "Puis récupérez les sources de <computeroutput>debian-edu-doc</"
-"computeroutput> avec un accès SSH : <computeroutput>git clone git+ssh://git."
-"debian.org/git/debian-edu/debian-edu-doc.git</computeroutput>"
+"computeroutput> avec un accès SSH : <computeroutput>git clone git@salsa."
+"debian.org:debian-edu/debian-edu-doc.git</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you only want to translate, you just need to check out some files from "
-#| "Git (which can be done anonymously) and create patches. Please file a bug "
-#| "against the debian-edu-doc package and attach the PO file to the <ulink "
-#| "url=\"http://bugs.debian.org/debian-edu-doc\">bugreport</ulink>. You can "
-#| "find some <ulink url=\"http://bugs.debian.org\">instructions on how to "
-#| "submit bugs</ulink> here."
 msgid ""
 "If you only want to translate, you need to check out only a few files from "
 "Git (which can be done anonymously). Please file a bug against the debian-"
@@ -11284,11 +10169,11 @@
 "debian.org\">instructions on how to submit bugs</ulink> for more information."
 msgstr ""
 "Si vous souhaitez uniquement traduire, vous pouvez ne récupérer que quelques "
-"fichiers du dépôt Git (ce qui peut se faire de façon anonyme) et créer des "
-"correctifs (patches). Envoyez ensuite un <ulink url=\"http://bugs.debian.org/"
-"debian-edu-doc\">rapport de bogue</ulink> sur le paquet debian-edu-doc et "
-"joignez le fichier PO. Vous trouverez <ulink url=\"http://bugs.debian.org"
-"\">ici</ulink> des explications sur comment soumettre des rapports de bogues."
+"fichiers du dépôt Git (ce qui peut se faire de façon anonyme). Envoyez "
+"ensuite un <ulink url=\"http://bugs.debian.org/debian-edu-doc\">rapport de "
+"bogue</ulink> sur le paquet debian-edu-doc et joignez le fichier PO. "
+"Consultez les <ulink url=\"http://bugs.debian.org\">explications sur comment "
+"soumettre des rapports de bogues</ulink> pour davantage d'informations."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -11301,32 +10186,22 @@
 "avoir installé le paquet <computeroutput>git</computeroutput> pour cela) :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-"
-#| "doc.git</computeroutput>"
 msgid ""
 "<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 msgstr ""
-"<computeroutput>git clone git://anonscm.debian.org/debian-edu/debian-edu-doc."
+"<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Then edit the file <computeroutput>documentation/debian-edu-jessie/debian-"
-#| "edu-jessie-manual.$CC.po</computeroutput> (replacing $CC with your "
-#| "language code). There are many tools for translating available; we "
-#| "suggest using <computeroutput>lokalize</computeroutput>."
 msgid ""
 "Then edit the file <computeroutput>documentation/debian-edu-stretch/debian-"
 "edu-stretch-manual.$CC.po</computeroutput> (replacing $CC with your language "
 "code). There are many tools for translating available; we suggest using "
 "<computeroutput>lokalize</computeroutput>."
 msgstr ""
-"Ensuite éditez le fichier <computeroutput>documentation/debian-edu-jessie/"
-"debian-edu-jessie-manual.$CC.po</computeroutput> (où vous remplacez $CC par "
+"Ensuite éditez le fichier <computeroutput>documentation/debian-edu-stretch/"
+"debian-edu-stretch-manual.$CC.po</computeroutput> (où vous remplacez $CC par "
 "votre code de langue). Il existe de nombreux outils de traduction "
 "disponibles, nous vous suggérons d'utiliser <computeroutput>lokalize</"
 "computeroutput>."
@@ -11353,17 +10228,12 @@
 msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Read /usr/share/doc/debian-edu-doc/README.debian-edu-jessie-manual-"
-#| "translations to find information how to create a new PO file for your "
-#| "language if there isn't one yet, and how to update translations."
 msgid ""
 "Read /usr/share/doc/debian-edu-doc/README.debian-edu-stretch-manual-"
 "translations to find information how to create a new PO file for your "
 "language if there isn't one yet, and how to update translations."
 msgstr ""
-"Lisez /usr/share/doc/debian-edu-doc/README.debian-edu-jessie-manual-"
+"Lisez /usr/share/doc/debian-edu-doc/README.debian-edu-stretch-manual-"
 "translations pour apprendre comment créer un nouveau fichier PO pour votre "
 "langue s'il n'existe pas déjà et comment mettre à jour les traductions."
 
@@ -11378,18 +10248,13 @@
 "traduisez aucune chaîne comportant « FIXME »."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Basic information about Alioth (the host where our Git repository is "
-#| "located) and Git is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Git\"/>."
 msgid ""
 "Basic information about Salsa (the host where our Git repository is located) "
 "and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
 msgstr ""
-"Des informations de base à propos de Alioth (la machine hébergeant notre "
+"Des informations de base à propos de Salsa (la machine hébergeant notre "
 "dépôt Git) et de Git sont disponibles à <ulink url=\"http://wiki.debian.org/"
-"Alioth/Git\"/>."
+"Salsa\"/>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -11408,7 +10273,7 @@
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Translate online using a web browser"
-msgstr ""
+msgstr "Traduction en ligne avec un navigateur web"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -11416,6 +10281,9 @@
 "\"https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-"
 "stretch/\"/> for more information."
 msgstr ""
+"Certaines équipes de traduction ont décidé de traduire avec Weblate. Voir "
+"<ulink url=\"https://hosted.weblate.org/projects/debian-edu-documentation/"
+"debian-edu-stretch/\"/> pour plus d'informations."
 
 #. type: Content of: <article><section><section><section><para>
 msgid "Please report any problems."
@@ -11430,22 +10298,16 @@
 msgid ""
 "Note to translators: there is no need to translate the GPL license text.\n"
 "Translations are available at https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
-msgstr ""
+msgstr "Note aux traducteurs : il est inutile de traduire le texte de la licence GPL. Des traductions sont disponibles à l'adresse https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Copyright (C) 2007-2016 Holger Levsen &lt; <ulink url=\"mailto:"
-#| "holger@layer-acht.org\">holger@layer-acht.org</ulink> &gt; and others, "
-#| "see the <link linkend=\"CopyRight\">Copyright chapter</link> for the full "
-#| "list of copyright owners."
 msgid ""
 "Copyright (C) 2007-2018 Holger Levsen &lt; <ulink url=\"mailto:holger@layer-"
 "acht.org\">holger@layer-acht.org</ulink> &gt; and others, see the <link "
 "linkend=\"CopyRight\">Copyright chapter</link> for the full list of "
 "copyright owners."
 msgstr ""
-"Droits d'auteur (C) 2007-2016 à Holger Levsen &lt; <ulink url=\"mailto:"
+"Droits d'auteur (C) 2007-2018 à Holger Levsen &lt; <ulink url=\"mailto:"
 "holger@layer-acht.org\">holger@layer-acht.org</ulink> &gt; et autres, "
 "consulter le chapitre <link linkend=\"CopyRight\">Droits d'auteur</link> "
 "pour la liste complète des détenteurs des droits d'auteur."
@@ -12011,20 +10873,16 @@
 msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
 #. type: Content of: <article><section><title>
-#, fuzzy
-#| msgid "Appendix B - no Debian Edu Live CD/DVDs for Jessie yet"
 msgid "Appendix B - no Debian Edu Live CD/DVDs for Stretch yet"
-msgstr "Annexe B — À propos des CD/DVD d'installation autonome Debian Edu"
+msgstr ""
+"Annexe B — Pas encore de CD/DVD d'installation autonome Debian Edu pour "
+"Stretch"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "Debian Edu Live CD/DVDs for Jessie are not available at the moment, but "
-#| "are being worked on..."
 msgid "Debian Edu Live CD/DVDs for Stretch are not available at the moment."
 msgstr ""
-"Les CD et DVD d'installation autonome Debian Edu pour Jessie ne sont pas "
-"disponibles actuellement, mais sont en cours d'élaboration."
+"Les CD et DVD d'installation autonome Debian Edu pour Stretch ne sont pas "
+"disponibles actuellement."
 
 #. type: Content of: <article><section><section><title>
 msgid "Features of the Standalone image"
@@ -12032,7 +10890,7 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "XFCE desktop"
-msgstr "Bureau XFCE"
+msgstr "bureau XFCE"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "All packages from the Standalone profile"
@@ -12180,8 +11038,6 @@
 msgstr "Choses à savoir"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "The password for the user is \"user\"; root has no passwd set."
 msgid "The password for the user is \"user\"; root has no password set."
 msgstr ""
 "Le mot de passe pour l'utilisateur est « user », le superutilisateur n'a pas "
@@ -12192,10 +11048,8 @@
 msgstr "Problèmes connus avec l'image"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "There are no jessie images yet"
 msgid "There are no images yet"
-msgstr "Il n'existe pas encore d'images pour Jessie."
+msgstr "Il n'existe pas encore d'images"
 
 #. type: Attribute 'fileref' of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/sad.png"
@@ -12210,13 +11064,6 @@
 msgstr "Téléchargement"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The image is 1.2 GiB and would be (but currently isn't) available via "
-#| "<ulink url=\"ftp://ftp.skolelinux.org/cd-jessie-live/\">FTP</ulink>, "
-#| "<ulink url=\"http://ftp.skolelinux.org/cd-jessie-live/\">HTTP</ulink> or "
-#| "rsync from <computeroutput>ftp.skolelinux.org</computeroutput> under "
-#| "<computeroutput>cd-jessie-live/</computeroutput>."
 msgid ""
 "The image would be (but currently isn't) available via <ulink url=\"ftp://"
 "ftp.skolelinux.org/cd-stretch-live/\">FTP</ulink>, <ulink url=\"http://ftp."
@@ -12224,25 +11071,21 @@
 "<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
 "stretch-live/</computeroutput>."
 msgstr ""
-"L'image, de taille 1.2 Gio, devrait être disponible (mais pas pour "
-"l'instant) en utilisant <ulink url=\"ftp://ftp.skolelinux.org/cd-jessie-live/"
-"\">FTP</ulink>, <ulink url=\"http://ftp.skolelinux.org/cd-jessie-live/"
-"\">HTTP</ulink> ou rsync depuis <computeroutput>ftp.skolelinux.org</"
-"computeroutput> à <computeroutput>cd-jessie-live/</computeroutput>."
+"L'image devrait être disponible (mais pas pour l'instant) en utilisant "
+"<ulink url=\"ftp://ftp.skolelinux.org/cd-stretch-live/\">FTP</ulink>, <ulink "
+"url=\"http://ftp.skolelinux.org/cd-stretch-live/\">HTTP</ulink> ou rsync "
+"depuis <computeroutput>ftp.skolelinux.org</computeroutput> à "
+"<computeroutput>cd-stretch-live/</computeroutput>."
 
 #. type: Content of: <article><section><title>
 msgid "Appendix C - Features in older releases"
 msgstr "Annexe C — Fonctionnalités dans les publications précédentes"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "New features for Debian Edu 8.0+edu0~b1 Codename Jessie released "
-#| "2015-04-25"
 msgid "New features for Debian Edu 8+edu0 Codename Jessie released 2016-07-02"
 msgstr ""
-"Nouvelles fonctionnalités de Debian Edu 8.0+edu0~b1 Jessie, publiée le "
-"25 avril 2015"
+"Nouvelles fonctionnalités de Debian Edu 8.0+edu0 nom de code Jessie, publiée "
+"le 2 juillet 2016"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -12250,6 +11093,9 @@
 "debian.org/News/2016/20160702.en.html\">Debian Edu / Skolelinux Jessie — a "
 "complete Linux solution for your school</ulink>."
 msgstr ""
+"lire l'annonce de publication sur www.debian.org: <ulink url=\"https://www."
+"debian.org/News/2016/20160702.fr.html\">Debian Edu/Skolelinux Jessie — une "
+"solution Linux complète pour votre école</ulink>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -12279,7 +11125,7 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "new optional desktop environment: MATE 1.8"
-msgstr "nouvel environnement de bureau proposé en option : MATE 1.8"
+msgstr "Nouvel environnement de bureau proposé en option : MATE 1.8"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "the browsers Iceweasel 31 ESR and Chromium 41"
@@ -12299,7 +11145,7 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LTSP 5.5.4"
-msgstr "LSTP 5.5.4"
+msgstr "LTSP 5.5.4"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -12459,7 +11305,7 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LTSP 5.4.2"
-msgstr "LSTP 5.4.2"
+msgstr "LTSP 5.4.2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "CUPS print system 1.5.3"
@@ -12543,16 +11389,11 @@
 msgstr "Les stations de travail sans disque fonctionnent sans configuration."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "On the dedicated client network of thin client servers (default "
-#| "192.168.0.0/24), machines run by default as diskless workstations if they "
-#| "are powerful enough."
 msgid ""
 "On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
 "machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
-"Sur le réseau dédié aux clients des serveurs de clients légers (par défaut "
+"Sur le réseau dédié aux clients des serveurs LTSP (par défaut "
 "192.168.0.0/24), les machines fonctionnent par défaut comme des stations de "
 "travail sans disque si elles sont assez puissantes."
 
@@ -12583,82 +11424,58 @@
 "problème : utilisez Iceweasel ou configurez le mandataire manuellement."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "More information on even older releases"
 msgid "Historic information about older releases"
-msgstr "Davantage d'informations sur les versions plus anciennes"
+msgstr "Historique des versions plus anciennes"
 
 #. type: Content of: <article><section><section><para>
 msgid "The following Debian Edu releases were made further in the past:"
-msgstr ""
+msgstr "Les versions suivantes de Debian Edu ont été publiées précédemment :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Changes for Debian Edu 6.0.7+r1 Codename \"Squeeze\" released 2013-03-03"
 msgid "Debian Edu 6.0.7+r1 Codename \"Squeeze\", released 2013-03-03."
-msgstr ""
-"Modifications de Debian Edu 6.0.7+r1 « Squeeze », publiée le 3 mars 2013"
+msgstr "Debian Edu 6.0.7+r1 « Squeeze », publiée le 3 mars 2013"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "New features in Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
-#| "2012-03-11"
 msgid "Debian Edu 6.0.4+r0 Codename \"Squeeze\", released 2012-03-11."
-msgstr ""
-"Nouvelles fonctionnalités de Debian Edu 6.0.4+r0 « Squeeze », publiée le "
-"11 mars 2012"
+msgstr "Debian Edu 6.0.4+r0 nom de code « Squeeze », publiée le 11 mars 2012"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "New in Debian Edu 5.0.6+edu1 Codename \"Lenny\" released 2010-10-05"
 msgid "Debian Edu 5.0.6+edu1 Codename \"Lenny\", released 2010-10-05."
 msgstr ""
-"Nouveautés de Debian Edu Lenny 5.0.6+edu1, nom de code « Lenny », publiée le "
-"5 octobre 2010"
+"Debian Edu 5.0.6+edu1, nom de code « Lenny », publiée le 5 octobre 2010"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "New features in Debian Edu 5.0.4+edu0 Codename \"Lenny\" released "
-#| "2010-02-08"
 msgid "Debian Edu 5.0.4+edu0 Codename \"Lenny\", released 2010-02-08."
 msgstr ""
-"Nouvelles fonctionnalités de Debian Edu 5.0.4+edu0, nom de code « Lenny », "
-"publiée le 8 février 2010"
+"Debian Edu 5.0.4+edu0, nom de code « Lenny », publiée le 8 février 2010"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
 msgid "Debian Edu \"3.0r1 Terra\", released 2007-12-05."
-msgstr ""
-"Nouvelles fonctionnalités de la version « 3.0r1 Terra », publiée le "
-"5 décembre 2007"
+msgstr "Debian Edu « 3.0r1 Terra », publiée le 5 décembre 2007"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Based on Debian 4.0 Etch released 2007-04-08."
 msgid ""
 "Debian Edu \"3.0r0 Terra\" released 2007-07-22. Based on Debian 4.0 Etch "
 "released 2007-04-08."
-msgstr "Basée sur Debian 4.0 Etch, publiée le 8 avril 2008."
+msgstr ""
+"Debian Edu « 3.0r1 Terra », publiée le 22 juillet 2007. Basée sur Debian 4.0 "
+"Etch, publiée le 8 avril 2007."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Based on Debian 3.1 Sarge released 2005-06-06."
 msgid ""
 "Debian Edu 2.0, released 2006-03-14. Based on Debian 3.1 Sarge released "
 "2005-06-06."
-msgstr "Basée sur Debian 3.1 Sarge, publiée le 6 juin 2005."
+msgstr ""
+"Debian Edu 2.0, publiée le 14 mars 2006. Basée sur Debian 3.1 Sarge, publiée "
+"le 6 juin 2005."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Based on Debian 3.0 Woody released 2002-07-19."
 msgid ""
 "Debian Edu \"1.0 Venus\" release 2004-06-20. Based on Debian 3.0 Woody "
 "released 2002-07-19."
-msgstr "Basée sur Debian 3.0 Woody, publiée le 19 juillet 2002."
+msgstr ""
+"Debian Edu « 1.0 Venus », publiée le 20 juin 2004. Basée sur Debian 3.0 "
+"Woody, publiée le 19 juillet 2002."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -12668,6 +11485,12 @@
 "manuals on the <ulink url=\"https://wiki.debian.org/DebianEdu/Documentation"
 "\">release manuals page</ulink>."
 msgstr ""
+"Un aperçu détaillé et complet des versions plus anciennes est fourni dans "
+"l'<ulink url=\"https://wiki.debian.org/DebianEdu/Documentation/Jessie/"
+"AppendixC\">Annexe C du manuel de Jessie</ulink> ; vous pouvez aussi "
+"consulter les manuels des versions concernées sur la page des <ulink url="
+"\"https://wiki.debian.org/DebianEdu/Documentation\">manuels de publication</"
+"ulink>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "More information on even older releases"
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
 "PO-Revision-Date: 2018-05-30 17:30+0200\n"
 "Last-Translator: Wolfgang Schweer <wschweer@arcor.de>\n"
 "Language-Team: Italian <debian-l10n-italian@list.debian.org>\n"
@@ -22,10 +22,8 @@
 msgstr "it"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
-msgstr "Manuale di Debian Edu / Skolelinux Stretch 9+edu0"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
+msgstr "Manuale 2019-05-01 di Debian Edu / Skolelinux Stretch 9+edu0"
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
@@ -9333,19 +9331,14 @@
 "<ulink url=\"http://wiki.debian.org/DebianEdu/ArchivePolicy\"/>."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A good way to learn what is happening in the development of Debian Edu is "
-#| "to subscribe to the <ulink url=\"http://lists.alioth.debian.org/mailman/"
-#| "listinfo/debian-edu-commits\">commit mailinglist</ulink>."
 msgid ""
 "A good way to learn what is happening in the development of Debian Edu is to "
 "subscribe to the <ulink url=\"https://alioth-lists.debian.net/cgi-bin/"
 "mailman/listinfo/debian-edu-commits\">commit mailinglist</ulink>."
 msgstr ""
 "Un buon modo per sapere ciò che sta accadendo nello sviluppo di Debian Edu è "
-"iscriversi alla mailing list <ulink url=\"http://lists.alioth.debian.org/"
-"mailman/listinfo/debian-edu-commits\">commit</ulink>."
+"iscriversi alla mailing list <ulink url=\"https://alioth-lists.debian.net/"
+"cgi-bin/mailman/listinfo/debian-edu-commits\">commit</ulink>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Documentation writers and translators"
@@ -9846,15 +9839,15 @@
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 "La traduzione francese è protetta da copyright di Christophe Masson "
 "Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, "
 "2013, 2014, 2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas "
-"Vincent (2012) and the French l10n team (2009, 2010, 2012), rilasciata sotto "
-"licenza GPL v2 o successiva."
+"Vincent (2012), Jean-Pierre Giraud (2019) and the French l10n team (2009, "
+"2010, 2012, 2019), rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9884,20 +9877,22 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
-"La traduzione in polacco  è protetta da copyright da Stanisław Krukowski "
-"(2016, 2017) e rilasciata sotto licenza GPL v2 o successiva."
+"La traduzione in polacco è protetta da copyright da Stanisław Krukowski "
+"(2016, 2017) e Wiktor Wandachowicz (2019) e rilasciata sotto licenza GPL v2 "
+"o successiva."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 "La traduzione in cinese semplificato  è protetta da copyright da Ma Yong "
-"(2016, 2017, 2018), Boyuan Yang (2017) e Roy Zhang (2017), rilasciata sotto "
-"licenza GPL v2 o successiva."
+"(2016, 2017, 2018, 2019), Boyuan Yang (2017) e Roy Zhang (2017), rilasciata "
+"sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po	2019-05-01 12:19:14.000000000 +0200
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
 "PO-Revision-Date: 2017-10-09 05:36+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -24,7 +24,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux Stretch 9+edu0 マニュアル"
 
 #. type: Content of: <article><section><section><title>
@@ -9419,9 +9419,9 @@
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -9445,14 +9445,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po	2019-05-01 12:19:14.000000000 +0200
@@ -21,8 +21,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
-"PO-Revision-Date: 2019-01-25 16:04+0000\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
+"PO-Revision-Date: 2019-04-27 14:47+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
 "edu-documentation/debian-edu-stretch/nb_NO/>\n"
@@ -31,17 +31,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.4\n"
+"X-Generator: Weblate 3.6.1\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
 msgstr "nb"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-01-20"
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
-msgstr "Debian Edu / Skolelinux Stretch 9+edu0 Utgivelseshåndbok 20.01.2019"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
+msgstr "Debian Edu / Skolelinux Stretch 9+edu0 Utgivelseshåndbok 01.05.2019"
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
@@ -9647,8 +9645,8 @@
 "Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), "
 "Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang "
 "Schweer (2012, 2013, 2014, 2015, 2016, 2017, 2018), Bernhard Hammes (2012) "
-"og Joe Hansen (2015), og er utgitt under GPL2 eller alle senere versjoner. "
-"Nyt!"
+"og Joe Hansen (2015), og er utgitt under GPL v2, eller enhver senere "
+"versjon. Velbekomme!"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9657,10 +9655,10 @@
 "Then add your name here and release it under the \"GPL v2 or any later "
 "version\" licence."
 msgstr ""
-"Hvis du legger til innhold,  <emphasis role=\"strong\">så bare gjør det hvis "
+"Hvis du legger til innhold, <emphasis role=\"strong\">så bare gjør det hvis "
 "du er forfatteren av innholdet og planlegger å gi det ut under samme "
-"betingelser</emphasis>! Så legger du navnet ditt til her,  og gir det ut "
-"under GPLv2 eller senere versjoner."
+"betingelser</emphasis>! Så legger du navnet ditt til her, og gir det ut i "
+"henhold til GPL v2 eller enhver senere versjon."
 
 #. type: Content of: <article><section><title>
 msgid "Translation copyright and authors"
@@ -9692,7 +9690,7 @@
 "(2010), Ole-Erik Yrvin (2014, 2016, 2017), Ingrid Yrvin (2014, 2015, 2016), "
 "Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), FourFire Le'bard "
 "(2014), Stefan Mitchell-Lauridsen (2014), Ragnar Wisløff (2014) og Allan "
-"Nordhøy (2018), og er utgitt under GPL v2 eller en senere versjon."
+"Nordhøy (2018), og er utgitt under GPL v2, eller enhver senere versjon."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9710,7 +9708,7 @@
 "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
 "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) og "
 "Wolfgang Schweer (2012, 2013, 2014, 2015, 2016, 2017, 2018), og er utgitt "
-"under GPL2 eller en senere versjon."
+"under GPL v2, eller enhver senere versjon."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9720,22 +9718,22 @@
 msgstr ""
 "Opphavsretten til den italienske oversettelsen tilhører Claudio Carboncini "
 "(2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018) og "
-"Beatrice Torracca (2013-2014), og er gitt ut i henhold til GPL  v2 eller en "
-"senere utgave."
+"Beatrice Torracca (2013-2014), og er gitt ut i henhold til GPL v2, eller "
+"enhver senere versjon."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
-"Den franske oversettelsen er rettighetsbeskyttet av  Christophe Masson "
+"Den franske oversettelsen er rettighetsbeskyttet av Christophe Masson "
 "(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), "
-"Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), og "
-"det franske l10n team (2009, 2010, 2012), og er utgitt under GPL v2 eller en "
-"senere versjon."
+"Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), "
+"Jean-Pierre Giraud (2019) og det franske l10n-laget (2009, 2010, 2012, "
+"2019), og er utgitt under GPL v2, eller enhver senere versjon."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9743,7 +9741,8 @@
 "2016) and is released under the GPL v2 or any later version."
 msgstr ""
 "Opphavsretten til den danske oversettelsen tilhører Joe Hansen (2012, 2013, "
-"2014, 2015, 2016) og er gitt ut i henhold til GPL  v2 eller en senere utgave."
+"2014, 2015, 2016) og er gitt ut i henhold til GPL v2, eller enhver senere "
+"utgave."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9751,8 +9750,8 @@
 "2016, 2017, 2018) and is released under the GPL v2 or any later version."
 msgstr ""
 "Opphavsretten for den nederlandske oversettelsen tilhører Frans Spiesschaert "
-"(2014, 2015, 2016, 2017, 2018), og er utgitt under GPL  v2 eller en senere "
-"versjon."
+"(2014, 2015, 2016, 2017, 2018), og er utgitt under GPL v2, eller enhver "
+"senere versjon."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9760,25 +9759,28 @@
 "released under the GPL v2 or any later version."
 msgstr ""
 "Opphavsretten for den japanske oversettelsen tilhører Victory (2016, 2017), "
-"og er utgitt under GPL  v2 eller en senere versjon."
+"og er utgitt under GPL v2, eller enhver senere versjon."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "Opphavsretten til den polske oversettelsen tilhører Stanisław Krukowski "
-"(2016, 2017) og er utgitt under GPL  v2 eller senere versjoner."
+"(2016, 2017) og er utgitt under GPL v2, eller enhver senere versjon."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 "Opphavsretten for oversettelsen på forenklet kinesisk tilhører Ma Yong "
 "(2016, 2017, 2018), Boyuan Yang (2017) og Roy Zhang (2017) og er gjort "
-"tilgjengelig med vilkårene til GPL  v2 eller en senere versjon."
+"tilgjengelig med vilkårene til GPL v2, eller enhver senere versjon."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc@packages.debian.org\n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
-"PO-Revision-Date: 2019-03-17 12:53+0100\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
+"PO-Revision-Date: 2019-04-10 21:20+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -22,10 +22,8 @@
 msgstr "nl"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-02-28"
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
-msgstr "Handleiding Debian Edu/Skolelinux Stretch 9+edu0, 28-02-2019"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
+msgstr "Handleiding Debian Edu/Skolelinux Stretch 9+edu0, 01-05-2019"
 
 #. type: Content of: <article><section><section><title>
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
@@ -10166,15 +10164,15 @@
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de Franse vertaling berusten bij Christophe Masson "
 "(2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), "
-"Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) en "
-"het Franse l10n-team (2009, 2010, 2012). De vertaling is vrijgegeven onder "
-"de licentie GPL v2 of een latere versie."
+"Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), "
+"Jean-Pierre Giraud (2019) en het Franse l10n-team (2009, 2010, 2012, 2019). "
+"De vertaling is vrijgegeven onder de licentie GPL v2 of een latere versie."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -10206,21 +10204,23 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 "De auteursrechten van de Poolse vertaling berusten bij Stanisław Krukowski "
-"(2016, 2017). De vertaling is vrijgegeven onder de licentie GPL v2 of een "
-"latere versie."
+"(2016, 2017) en Wiktor Wandachowicz (2019). De vertaling is vrijgegeven "
+"onder de licentie GPL v2 of een latere versie."
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten "
-"bij Ma Yong (2016, 2017, 2018), Boyuan Yang (2017) en Roy Zhang (2017). De "
-"vertaling is vrijgegeven onder de licentie GPL v2 of een latere versie."
+"bij Ma Yong (2016, 2017, 2018, 2019), Boyuan Yang (2017) en Roy Zhang "
+"(2017). De vertaling is vrijgegeven onder de licentie GPL v2 of een latere "
+"versie."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po	2019-05-01 12:19:14.000000000 +0200
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
-"PO-Revision-Date: 2017-06-05 08:57+0000\n"
-"Last-Translator: Stanisław Krukowski <stdf021@riseup.net>\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
+"PO-Revision-Date: 2019-03-27 08:04+0000\n"
+"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
 "documentation/debian-edu-stretch/pl/>\n"
 "Language: pl\n"
@@ -12,7 +12,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.15-dev\n"
+"X-Generator: Weblate 3.6-dev\n"
 
 # type: Attribute 'lang' of: <article>
 #. type: Attribute 'lang' of: <article>
@@ -21,8 +21,7 @@
 
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
-#| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
 msgstr "Podręcznik Debian Edu / Skolelinux Stretch 9+edu0"
 
 #. type: Content of: <article><section><section><title>
@@ -714,14 +713,6 @@
 "maszynach."
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP "
-#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
-#| "network traffic of the thin clients doesn't interfere with the rest of "
-#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. All "
 "types of clients can be connected to the private 10.0.0.0/8 subnet and will "
@@ -731,11 +722,12 @@
 "the rest of the network services)."
 msgstr ""
 "Konfiguracja sieci komputerowej dla klientów jest wykonywana automatycznie "
-"za pomocą DHCP. Zwykłe klienty mają adresy IP  przydzielane w prywatnej "
-"podsieci 10.0.0.0/8, natomiast cienkie klienty są podłączane do "
-"odpowiadającego im serwera LTSP poprzez oddzielną podsieć 192.168.0.0/24 (ma "
-"to zapewnić sytuację, w której ruch sieciowy cienkich klientów nie będzie "
-"kolidował z resztą usług sieci komputerowej)."
+"za pomocą DHCP. Wszystkie rodzaje klientów mogą być podłączane do prywatnej "
+"podsieci 10.0.0.0/8, w której dostaną odpowiednie adresy IP. Z kolei klienty "
+"LTSP powinny być podłączane do odpowiadającego im serwera LTSP poprzez "
+"oddzielną podsieć 192.168.0.0/24 (ma to zapewnić sytuację, w której ruch "
+"sieciowy cienkich klientów nie będzie kolidował z resztą usług sieci "
+"komputerowej)."
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
@@ -1228,9 +1220,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-#| "recommended for the main and LTSP server profiles."
 msgid ""
 "At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
 "clients are recommended for the main and LTSP server profiles."
@@ -1240,10 +1229,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-#| "possible, though 256 MiB RAM or more and faster processors are "
-#| "recommended."
 msgid ""
 "Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
 "and faster processors are recommended."
@@ -1275,10 +1260,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "For workstations, diskless workstations and standalone systems, 800 MHz "
-#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
-#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgid ""
 "For workstations, diskless workstations and standalone systems, 1000 MHz and "
 "512 MiB RAM are the absolute minimum requirements. For running modern "
@@ -7753,9 +7734,9 @@
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -7779,14 +7760,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot	2019-05-01 12:19:14.000000000 +0200
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -7211,9 +7211,9 @@
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -7237,14 +7237,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml	2019-04-01 17:26:12.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml	2019-05-01 12:16:15.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01</title></articleinfo>
+<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01</title></articleinfo>
 <section id="AboutDebianEdu">
 <title>Manual for Debian Edu 9+edu0 Codename Stretch
 </title>
@@ -3377,7 +3377,7 @@
 </para>
 <para>The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018) and Beatrice Torracca (2013, 2014) and is released under the GPL v2 or any later version. 
 </para>
-<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version. 
+<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is released under the GPL v2 or any later version. 
 </para>
 <para>The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later version. 
 </para>
@@ -3385,9 +3385,9 @@
 </para>
 <para>The Japanese translation is copyrighted by victory (2016, 2017) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) and is released under the GPL v2 or any later version. 
+<para>The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, 2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or any later version. 
+<para>The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, 2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or any later version. 
 </para>
 </section>
 
diff -Nru debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
--- debian-edu-doc-2.10.15/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,17 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2019-03-31 08:27+0000\n"
-"PO-Revision-Date: 2018-06-08 00:36+0000\n"
+"POT-Creation-Date: 2019-04-22 23:29+0200\n"
+"PO-Revision-Date: 2019-04-30 14:31+0000\n"
 "Last-Translator: Ma Yong <debuser@yeah.net>\n"
-"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
-"documentation/debian-edu-stretch/zh/>\n"
+"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
+"debian-edu-documentation/debian-edu-stretch/zh_Hans/>\n"
 "Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.0\n"
+"X-Generator: Weblate 3.6.1\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
@@ -24,8 +24,7 @@
 
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
-#| msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
-msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux Stretch 9+edu0 手册"
 
 #. type: Content of: <article><section><section><title>
@@ -232,11 +231,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This is designed to be modified - that is, you can have the NFS-root in "
-#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
-#| "option (stored in LDAP) to have clients directly boot via PXE from the "
-#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
 "syslinux pointing to one of the LTSP servers or change the DHCP next-server "
@@ -282,18 +276,6 @@
 msgstr "运行在主服务器上的服务"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "With the exception of the control of the thin-clients, all services are "
-#| "initially set up on one central computer (the main server). For "
-#| "performance reasons, the thin-client-server should be a separate machine "
-#| "(though it is possible to install both the main server and thin-client "
-#| "server profiles on the same machine). All services are allocated a "
-#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
-#| "DNS name makes it easy to move individual services from the main-server "
-#| "to a different machine, by simply stopping the service on the main-"
-#| "server, and changing the DNS configuration to point to the new location "
-#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin clients, all services are "
 "initially set up on one central computer (the main server). For performance "
@@ -306,12 +288,12 @@
 "location of the service (which should be set up on that machine first, of "
 "course)."
 msgstr ""
-"以瘦客户端管理为例外，所有服务最初设置在一个中央计算机（主服务器）上。由于性"
-"能的原因，瘦客户端服务器会是一台独立的机器（不过在同一机器上既能安装主服务器"
-"也能安装瘦客户端服务器profile）。所有服务分配一个专用 DNS 名称并提供唯一通过 "
-"IPv4 传送。分配 DNS 名称使之从主服务器迁移个别的服务到不同的机器，仅以停止主"
-"服务器上的该服务，并改变 DNS 配置指向该服务的新位置（当然，首先要设置那台机"
-"器）。"
+"除了瘦客户机的管理之外，所有的服务最初设置在一台中央计算机上（主服务器）。为"
+"了性能的原因，LTSP 服务器将要分开来（不过在同一机器上可以安装主服务器和 LTSP "
+"服务器两者的配置文件）。所有服务分配了专用 DNS 名称并且只在 IPv4 上提供。分配"
+"的 DNS 名称使其容易地从主服务器迁移单独的服务到不同的机器，简单地在主服务器上"
+"关闭该服务，而后变更 DNS 配置指向该服务的新位置（当然，首先要在这台机器上设"
+"置）。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -565,15 +547,6 @@
 "通过 NFS 的 Unix 客户端，SMB 的 Windows 和 Macintosh 客户端提供存取通路。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "By default email is set up for local delivery (i.e. within the school) "
-#| "only, though email delivery to the wider Internet may be set up if the "
-#| "school has a permanent Internet connection. Mailing lists are set up "
-#| "based on the user database, giving each class their own mailing list. "
-#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
-#| "users can <link linkend=\"Users--Using_email\">access their personal "
-#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
@@ -581,10 +554,10 @@
 "server (using 'smarthost'), and users can <link linkend=\"Users--Using_email"
 "\">access their personal mail</link> through IMAP."
 msgstr ""
-"缺省电子邮件设置仅为本地投递（即学校内），不过若学校有固定互联网连接可以设置"
-"电子邮件投递到更宽广的互联网。设置基于用户数据库的邮件列表，给予每个班级他们"
-"自己的邮件列表。设置客户端投递邮件到服务器（使用 'smarthost'），而用户可以通"
-"过 IMAP <link linkend=\"Users--Using_email\">存取他们的个人邮件</link>。"
+"只预设电子邮件本地投递设置（如在学校内），但如果学校有固定互联网连接那么可以"
+"设置投递电子邮件到更广的互联网。客户端设置为投递电子邮件到服务器（使"
+"用‘smarthost’），而用户可以通过 IMAP <link linkend=\"Users--Using_email\">读"
+"取他们的个人邮件</link>。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -604,14 +577,6 @@
 "器上一同做路由上限制的 web 流量与互联网访问的控制。"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP "
-#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
-#| "network traffic of the thin clients doesn't interfere with the rest of "
-#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. All "
 "types of clients can be connected to the private 10.0.0.0/8 subnet and will "
@@ -620,9 +585,10 @@
 "ensure that the network traffic of the LTSP clients doesn't interfere with "
 "the rest of the network services)."
 msgstr ""
-"在客户端的网络配置使用 DHCP 自动完成。常规客户端在私有子网 10.0.0.0/8 分配 "
-"IP 地址，而瘦客户端通过分开的子网 192.168.0.0/24 连接到相符的 LTSP 服务器（这"
-"是保证瘦客户端的网络流量不阻碍其他的网络服务）。"
+"客户端的网络配置是使用 DHCP 自动完成的。所有类型的客户端可以连接到私有的 "
+"10.0.0.0/8 子网并且将获得协商 IP 地址；LTSP 客户机将会通过独立的 "
+"192.168.0.0/24 子网（这是保证 LTSP 客户机的网络流量不干扰到其他的网络服务）连"
+"接到相配合的 LTSP 服务器。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -714,17 +680,13 @@
 msgstr "LTSP 服务器"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (also called thin client "
-#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
 "selecting the LTSP Server profile."
 msgstr ""
-"一个 Skolelinux 网络上可以有许多 LTSP 服务器（亦称瘦客户端服务器），是由选择"
-"瘦客户端服务器profile而安装。"
+"一个 Skolelinux 网络上可以有许多 LTSP 服务器（在 Stretch 之前的发行中称之"
+"为“瘦客户机服务器”），是由选择了 LTSP 服务器配置文件而安装的。"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -765,16 +727,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Thin clients are a good way to make use of older, weaker machines as they "
-#| "effectively run all programs on the LTSP server. This works as follows: "
-#| "the service uses DHCP and TFTP to connect to the network and boot from "
-#| "the network. Next, the file system is mounted via NFS from the LTSP "
-#| "server, and finally the X Window System is started. The display manager "
-#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
-#| "data is encrypted on the network. For very old thin clients which are too "
-#| "slow for the encryption this can be set to the behavior from former "
-#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
@@ -854,11 +806,6 @@
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "All the Linux machines that are installed with the Skolelinux installer "
-#| "will be administrable from a central computer, most likely the server. It "
-#| "will be possible to log in to all machines via SSH (root not allowed by "
-#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
@@ -1040,16 +987,12 @@
 "陈旧被支持的处理器是 686 级）或者 64 位（Debian 架构 'amd64'）x86 处理器。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-#| "recommended for the main and LTSP server profiles."
 msgid ""
 "At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
 "clients are recommended for the main and LTSP server profiles."
 msgstr ""
-"建议主服务器和 LTSP 服务器的配置对于 30 客户端至少 2 GiB 而 50-60 客户端为 4 "
-"GiB。"
+"建议用于 30 瘦客户机的主服务器和 LTSP 服务器配置至少 12 GiB 的内存而对于 "
+"50-60 瘦客户机则为 20 GiB。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1079,10 +1022,6 @@
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "For workstations, diskless workstations and standalone systems, 800 MHz "
-#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
-#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
 msgid ""
 "For workstations, diskless workstations and standalone systems, 1000 MHz and "
 "512 MiB RAM are the absolute minimum requirements. For running modern "
@@ -1325,14 +1264,6 @@
 " #apt install wondershaper"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you need something for an embedded router or accesspoint we recommend "
-#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
-#| "you can also use the original firmware. Using the original firmware is "
-#| "easier; using OpenWRT gives you more choices and control. Check the "
-#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
-#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
@@ -1341,10 +1272,10 @@
 "webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
-"如果你需要固定路由或访问点的某事我们建议使用 <ulink url=\"http://openwrt.org"
-"\">OpenWRT</ulink>，当然你也可以使用新颖的固件。使用新颖固件很容易；使用 "
-"OpenWRT 给你更多选择和控制权。检索 OpenWRT 网页的 <ulink url=\"http://wiki."
-"openwrt.org/TableOfHardware\">supported hardware</ulink> 列表。"
+"如果你需要嵌入式路由器或访问点的设备我们建议使用 <ulink url=\"http://openwrt."
+"org\">OpenWRT</ulink>，当然你也可以使用原先的固件。使用原先的固件很容易；使"
+"用 OpenWRT 给你更多选择和控制权。检索 OpenWRT 网页的<ulink url=\"http://wiki."
+"openwrt.org/toh/start\">支持的硬件</ulink>列表。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1448,12 +1379,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. Like the netinstall image it can "
-#| "be installed on USB flash drives or disk media of sufficient size. Please "
-#| "note that internet access during installation is needed. Like the others "
-#| "it can be downloaded over FTP, HTTP or rsync via:"
 msgid ""
 "The multi-architecture ISO image is 5.5 GiB large and can be used for "
 "installation of amd64 and i386 machines. Like the netinstall image it can be "
@@ -1495,21 +1420,15 @@
 msgstr "以邮件请求 CD / DVD"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "For those without a fast Internet connection, we can offer a CD or DVD "
-#| "sent for the cost of the CD or DVD and shipping. Just send an email to "
-#| "<ulink url=\"mailto:cd@skolelinux.no\">cd@skolelinux.no</ulink> and we "
-#| "will discuss the payment details (for shipping and media)"
 msgid ""
 "For those without a fast Internet connection, we can offer a CD or DVD sent "
 "for the cost of the CD or DVD and shipping. Just send an email to <ulink url="
 "\"mailto:cd@skolelinux.no\">cd@skolelinux.no</ulink> and we will discuss the "
 "payment details (for shipping and media)."
 msgstr ""
-"对于没有快速互联网连接，我们能以 CD 或 DVD 及运输费用发送 CD 或 DVD。直接发送"
-"电子邮件 <ulink url=\"mailto:cd@skolelinux.no\">cd@skolelinux.no</ulink> 而我"
-"们会商议支付细节（运输和媒体介质）"
+"对于那些没有快速互联网连接，我们可以按 CD 或 DVD 以及运输的费用提供 CD 或 "
+"DVD 的发送。只要发送电子邮件到 <ulink url=\"mailto:cd@skolelinux.no"
+"\">cd@skolelinux.no</ulink> 我们就会商量支付细节（运输和媒体）。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1688,15 +1607,13 @@
 msgstr "<emphasis>Add or change boot parameters for installations</emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
-#| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu; the screenshot shows the command line for <emphasis role=\"strong"
 "\">Graphical install</emphasis>."
-msgstr "在 i386/amd64 中，以在引导菜单中按 TAB 键可以编辑引导选项。"
+msgstr ""
+"在这两种情况中，在引导菜单中按 TAB 键可以编辑引导选项；屏幕显示 <emphasis "
+"role=\"strong\">Graphical install</emphasis> 的命令行。"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/BD_command_line.png"
@@ -1728,11 +1645,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
@@ -1744,10 +1656,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
@@ -1807,13 +1715,6 @@
 msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "This is the main server (tjener) for your school providing all services "
-#| "pre-configured to work out of the box. You must only install one main "
-#| "server per school! This profile does not include a graphical user "
-#| "interface. If you want a graphical user interface, then select "
-#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must install only one main server per "
@@ -1821,9 +1722,9 @@
 "want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
-"这是为你的学校提供所有服务的预配置开箱即可工作的主服务器 (tjener)。每一个学校"
-"只可安装一台主服务器！这个profile不包括图形用户界面。如果你需要图形用户界面，"
-"也选择工作站或者瘦客户端服务器加入其中。"
+"这是为学校提供所有服务的预配置“开箱即可工作”的主服务器（tjener）。每一个学校"
+"只可安装一台主服务器！这个预配置不包括图形用户界面。如果需要图形用户界面，此"
+"时在这里选择工作站或 LTSP 服务器。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Workstation</emphasis>"
@@ -1860,16 +1761,6 @@
 msgstr "<emphasis role=\"strong\">LTSP 服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "A thin client (and diskless workstation) server, also called a LTSP "
-#| "server. Clients without hard drives boot and run software from this "
-#| "server. This computer needs two network cards, a lot of memory, and "
-#| "ideally more than one processor or core. See the chapter about <link "
-#| "linkend=\"NetworkClients\">networked clients</link> for more information "
-#| "on this subject. Choosing this profile also enables the workstation "
-#| "profile (even if it is not selected) - a thin client server can always be "
-#| "used as a workstation, too."
 msgid ""
 "A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
@@ -1880,11 +1771,11 @@
 "it is not selected) - an LTSP server can always be used as a workstation, "
 "too."
 msgstr ""
-"一个瘦客户（和无盘工作站）服务器，也称为 LTSP 服务器。客户端没有硬盘驱动器而"
-"是从服务器引导和运行软件。这台计算机需要两个网卡，大量的内存，适合更多的处理"
-"器或多核心。对这个主题更多的信息参看<link linkend=\"NetworkClients"
-"\">networked clients</link>一章。选择这个profile也启用工作站profile（甚至在没"
-"有选择） - 瘦客户端服务器也总是可以作为工作站使用。"
+"瘦客户机（和无盘工作站）服务器，也称为 LTSP 服务器。客户端没有硬盘驱动器而是"
+"从服务器引导和运行软件。这台计算机需要两个网卡，大量的内存，适合更多的处理器"
+"或多核心。这个主题更多的信息参阅关于<link linkend=\"NetworkClients\">网络客户"
+"端</link>的章节。选择这个配置也启用了工作站配置（甚至并没有选择） - LTSP 服务"
+"器也总是可以作为工作站使用。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "<emphasis role=\"strong\">Standalone</emphasis>"
@@ -1912,21 +1803,6 @@
 "用。它用作从主服务器手工移出单一服务的平台。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
-#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
-#| "Client Server</emphasis> profiles are preselected. These profiles can be "
-#| "installed on one machine together if you want to install a so called "
-#| "<emphasis>combined main server</emphasis>. This means the main server "
-#| "will be a thin client server and also be used as a workstation. This is "
-#| "the default choice, since we assume most people will install <link "
-#| "linkend=\"Installation--"
-#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
-#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
-#| "cards installed in a machine which is going to be installed as a combined "
-#| "main server or as a thin client server to become usefull after the "
-#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
 "\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP Server</"
@@ -1940,14 +1816,14 @@
 "installed in a machine which is going to be installed as a combined main "
 "server or as an LTSP server to become useful after the installation."
 msgstr ""
-"<emphasis role=\"strong\">主服务器</emphasis>，<emphasis role=\"strong\">工作"
-"站</emphasis>和<emphasis role=\"strong\">瘦客户端服务器</emphasis>profiles已"
-"是预先选择。如果你想安装称为<emphasis>组合主服务器</emphasis>这些profile可以"
-"一同安装到一台机器上。这意味这台主服务器会是瘦客户端服务器也用作工作站。这是"
-"缺省选择，因为我们设想大多数人其后会<link linkend=\"Installation--"
+"预先选择了<emphasis role=\"strong\">主服务器</emphasis>，<emphasis role="
+"\"strong\">工作站</emphasis>和 <emphasis role=\"strong\">LTSP 服务器</"
+"emphasis>配置。如果想要这些配置能一起安装在一台机器里那就称作<emphasis>组合主"
+"服务器</emphasis>。这意味着这台主服务器会是 LTSP 服务器并且也用作工作站。这是"
+"默认选择，因为我们设想大多数人以后会<link linkend=\"Installation--"
 "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">通过 "
-"PXE</link> 安装。清注意在所安装的机器上必需有两个网卡在安装之后被安装成有用的"
-"组合主服务器或作为瘦客户端服务器。"
+"PXE</link> 安装。请注意必须安装了两块网卡的机器作为组合主服务器或者作为 LTSP "
+"服务器被安装之后变为实用。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1971,18 +1847,13 @@
 "方法。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Wait. If the selected profiles include Thin-client-server then the "
-#| "installer will spend quite some time at the end, \"Finishing the "
-#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
 "Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
-"等待。如果你选择的profile包含瘦客户端服务器其后安装程序在最后会用相当的时"
-"间，“完成安装 - 运行 debian-edu-profile-udeb...”"
+"等待。如果所选配置包含 LTSP 服务器而后安装程序在最后会花相当的时间，“完成安"
+"装 - 运行 debian-edu-profile-udeb...”"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -2079,21 +1950,15 @@
 msgstr "仅用于瘦客户端的 LTSP 服务器安装的注意事项"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-#| "client</computeroutput> makes it possible to skip the step which converts "
-#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
-#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
 "client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
-"提供内核引导参数的 <computeroutput>edu-skip-ltsp-make-client</"
-"computeroutput> 使之能够略过 LTSP chroot 从瘦客户端 chroot 转变成组合瘦客户"
-"端/无盘工作站 chroot 这一步。"
+"提供的内核引导参数 <computeroutput>edu-skip-ltsp-make-client</"
+"computeroutput> 可以跳过将 LTSP chroot 从瘦客户机 chroot 转换成组合瘦客户机/"
+"无盘工作站 chroot 的这个步骤。"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
@@ -2180,18 +2045,13 @@
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
 "Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
-"这是有<emphasis role=\"strong\">主服务器</emphasis>和<emphasis role=\"strong"
-"\">瘦客户端服务器</emphasis> profile PXE 菜单的样子："
+"具有<emphasis role=\"strong\">主服务器</emphasis>和 <emphasis role=\"strong"
+"\">LTSP 服务器</emphasis>配置的 PXE 菜单看上去是这样的："
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
@@ -2353,20 +2213,15 @@
 "然看着最宜人并且更新颖。除非用图形方式硬件有困难，那没有理由不使用它。"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "So here is a screenshot tour through a graphical Main-Server + "
-#| "Workstation + Thin Client Server installation and how it looks at the "
-#| "first boot of the tjener, a PXE boot on the workstation network and on "
-#| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
 "the main server, a PXE boot on the workstation network and on the LTSP "
 "client network:"
 msgstr ""
-"那么这里是自始至终的主服务器 + 工作站 + 瘦客户端服务器的图形安装以及所看到的 "
-"tjener 第一次引导，在工作站网络和瘦客户端网络上 PXE 引导的屏幕快照观览："
+"那么这里贯穿了一个 64-bit 主服务器 + 工作站 + LTSP 服务器图形安装过程的屏幕快"
+"照观览以及在主服务器第一次引导所看到的，处于工作站网络和 LTSP 客户机网络上 "
+"PXE 引导是怎样的："
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "01-Installer_64bit_boot_menu.png"
@@ -5992,9 +5847,6 @@
 
 #. 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 use of LXDE as default on thin clients can be forced; see <link linkend="
 "\"NetworkClients\">networked clients</link> for details."
@@ -8333,9 +8185,9 @@
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
 "Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
-"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
-"l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
-"version."
+"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012), Jean-Pierre "
+"Giraud (2019) and the French l10n team (2009, 2010, 2012, 2019) and is "
+"released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -8359,14 +8211,15 @@
 #. type: Content of: <article><section><para>
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017) "
-"and is released under the GPL v2 or any later version."
+"and Wiktor Wandachowicz (2019) and is released under the GPL v2 or any later "
+"version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Simplified Chinese translation is copyrighted by Ma Yong (2016, 2017, "
-"2018), Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL "
-"v2 or any later version."
+"2018, 2019), Boyuan Yang (2017) and Roy Zhang (2017) and is released under "
+"the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -8413,10 +8266,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
-#| "using ssh access: <computeroutput>git clone git+ssh://git.debian.org/git/"
-#| "debian-edu/debian-edu-doc.git</computeroutput>"
 msgid ""
 "Then check out the <computeroutput>debian-edu-doc</computeroutput> source "
 "using ssh access: <computeroutput>git clone git@salsa.debian.org:debian-edu/"
@@ -8450,9 +8299,6 @@
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-9+edu0-CD.iso ./debian-edu-9+edu0-CD.iso </computeroutput>"
 msgid ""
 "<computeroutput>git clone https://salsa.debian.org/debian-edu/debian-edu-doc."
 "git</computeroutput>"
@@ -8504,10 +8350,6 @@
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Basic information about Alioth (the host where our Git repository is "
-#| "located) and Git is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Git\"/>."
 msgid ""
 "Basic information about Salsa (the host where our Git repository is located) "
 "and Git is available at <ulink url=\"https://wiki.debian.org/Salsa\"/>."
@@ -9444,20 +9286,15 @@
 "更旧发行版本相关的更多信息可以在 <ulink url=\"http://developer.skolelinux.no/"
 "info/cdbygging/news.html\"/> 找到。"
 
-#, fuzzy
-#~| msgid ""
-#~| "If you are looking for a router firewall solution capable of running on "
-#~| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</"
-#~| "ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 #~ msgid ""
 #~ "In case you are looking for a complete router firewall solution capable "
 #~ "of running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
 #~ "\">IPCop</ulink> or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</"
 #~ "ulink>."
 #~ msgstr ""
-#~ "如果你寻找一个能够运行在旧个人电脑上的路由防火墙方案，我们推荐 <ulink url="
-#~ "\"http://www.ipcop.org\">IPCop</ulink> 或 <ulink url=\"http://www.zelow."
-#~ "no/floppyfw\">floppyfw</ulink>。"
+#~ "如果你正寻找一个能够运行在旧个人电脑上的完善的路由防火墙方案，我们推荐 "
+#~ "<ulink url=\"http://www.ipcop.org\">IPCop</ulink> 或 <ulink url=\"http://"
+#~ "www.zelow.no/floppyfw\">floppyfw</ulink>。"
 
 #~ msgid "Let us know you exist"
 #~ msgstr "让我们知道你的存在"
diff -Nru debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.es.po debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.es.po
--- debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.es.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.es.po	2019-05-01 12:19:14.000000000 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Rosegarden Manual Debian Edu\n"
 "Report-Msgid-Bugs-To: tato@debian.org.sv\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-01 16:48+0000\n"
 "PO-Revision-Date: 2012-01-10 10:33-0600\n"
 "Last-Translator: Rafael Ernesto Rivas <tato@debian.org.sv>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -25,7 +25,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Rosegarden manual"
-msgid "Debian Edu / Skolelinux Rosegarden manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Rosegarden manual 2019-05-01"
 msgstr "Manual Rosegarden Debian Edu / Skolelinux"
 
 #. type: Content of: <article><section><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.fr.po debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.fr.po
--- debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.fr.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.fr.po	2019-05-01 12:19:14.000000000 +0200
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-01 16:48+0000\n"
 "PO-Revision-Date: 2014-10-11 20:37+0200\n"
 "Last-Translator: Thomas Vincent <thomas@vinc-net.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -23,7 +23,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Rosegarden manual"
-msgid "Debian Edu / Skolelinux Rosegarden manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Rosegarden manual 2019-05-01"
 msgstr "Manuel de Debian Edu/Skolelinux Rosegarden"
 
 #. type: Content of: <article><section><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.nb.po debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.nb.po
--- debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.nb.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.nb.po	2019-05-01 12:19:14.000000000 +0200
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
-"PO-Revision-Date: 2019-01-25 16:04+0000\n"
+"POT-Creation-Date: 2019-04-01 16:48+0000\n"
+"PO-Revision-Date: 2019-04-24 12:47+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
 "edu-documentation/rosegarden/nb_NO/>\n"
@@ -23,17 +23,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.4\n"
+"X-Generator: Weblate 3.7-dev\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
 msgstr "nb"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Rosegarden manual 2019-01-20"
-msgid "Debian Edu / Skolelinux Rosegarden manual 2019-04-01"
-msgstr "Debian Edu / Skolelinux, håndbok for Rosegarden 20.01.2019"
+msgid "Debian Edu / Skolelinux Rosegarden manual 2019-05-01"
+msgstr "Debian Edu / Skolelinux, håndbok for Rosegarden 01.05.2019"
 
 #. type: Content of: <article><section><section><title>
 msgid "Rosegarden manual"
@@ -3431,15 +3429,12 @@
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and is "
-#| "released under the GPL v2 or any later version."
 msgid ""
 "The Traditional Chinese translation is copyrighted by Louies (2019) and is "
 "released under the GPL v2 or any later version."
 msgstr ""
-"Oversettelsen til kinesisk (forenklet kinesisk) er gjort av 杨玉印 (2018). "
-"Den er utgitt under GPL v2 eller senere versjon av lisensen."
+"Rettighetene for den kinesiske oversettelsen tilhører Louies (2019), utgitt "
+"med lisensen GPL v2 eller enhver senere versjon."
 
 #. type: Content of: <article><section><title>
 msgid "Translations of this document"
diff -Nru debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.nl.po debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.nl.po
--- debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.nl.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.nl.po	2019-05-01 12:19:14.000000000 +0200
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rosegarden-manual.nl\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
-"PO-Revision-Date: 2019-03-17 12:51+0100\n"
+"POT-Creation-Date: 2019-04-01 16:48+0000\n"
+"PO-Revision-Date: 2019-04-10 21:23+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -21,10 +21,9 @@
 msgstr "nl"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
 #| msgid "Debian Edu / Skolelinux Rosegarden manual 2019-02-28"
-msgid "Debian Edu / Skolelinux Rosegarden manual 2019-04-01"
-msgstr "Handleiding van Debian Edu / Skolelinux voor Rosegarden, 28-02-2019 "
+msgid "Debian Edu / Skolelinux Rosegarden manual 2019-05-01"
+msgstr "Handleiding van Debian Edu / Skolelinux voor Rosegarden, 01-05-2019 "
 
 #. type: Content of: <article><section><section><title>
 msgid "Rosegarden manual"
diff -Nru debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.pl.po debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.pl.po
--- debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.pl.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.pl.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-01 16:48+0000\n"
 "PO-Revision-Date: 2018-08-13 14:42+0000\n"
 "Last-Translator: WaldiS <admin@sto.ugu.pl>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -26,7 +26,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Rosegarden manual"
-msgid "Debian Edu / Skolelinux Rosegarden manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Rosegarden manual 2019-05-01"
 msgstr "Podręcznik Debian Edu / Skolelinux Rosegarden"
 
 #. type: Content of: <article><section><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.pot debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.pot
--- debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.pot	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.pot	2019-05-01 12:19:14.000000000 +0200
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-01 16:48+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Rosegarden manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Rosegarden manual 2019-05-01"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.xml debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.xml
--- debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.xml	2019-04-01 17:26:51.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.xml	2019-05-01 12:17:14.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Rosegarden manual 2019-04-01</title></articleinfo>
+<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Rosegarden manual 2019-05-01</title></articleinfo>
 <section id="About">
 <title>Rosegarden manual
 </title>
diff -Nru debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.zh_Hant.po debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.zh_Hant.po
--- debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.zh_Hant.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.zh_Hant.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-01 16:48+0000\n"
 "PO-Revision-Date: 2019-01-26 19:04+0000\n"
 "Last-Translator: Louies <louies0623@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -25,7 +25,7 @@
 #. type: Content of: <article><articleinfo><title>
 #, fuzzy
 #| msgid "Debian Edu / Skolelinux Rosegarden manual 2019-01-20"
-msgid "Debian Edu / Skolelinux Rosegarden manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Rosegarden manual 2019-05-01"
 msgstr "Debian Edu / Skolelinux Rosegarden 手冊 2019-01-20"
 
 #. type: Content of: <article><section><section><title>
diff -Nru debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.zh.po debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.zh.po
--- debian-edu-doc-2.10.15/documentation/rosegarden/rosegarden-manual.zh.po	2019-04-01 17:27:38.000000000 +0200
+++ debian-edu-doc-2.10.16/documentation/rosegarden/rosegarden-manual.zh.po	2019-05-01 12:19:14.000000000 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-31 08:28+0000\n"
+"POT-Creation-Date: 2019-04-01 16:48+0000\n"
 "PO-Revision-Date: 2018-10-14 05:24+0000\n"
 "Last-Translator: Ma Yong <debuser@yeah.net>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -23,7 +23,7 @@
 msgstr "zh-cn"
 
 #. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Rosegarden manual 2019-04-01"
+msgid "Debian Edu / Skolelinux Rosegarden manual 2019-05-01"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
