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

Holger Levsen holger at layer-acht.org
Fri Mar 24 18:30:59 UTC 2017


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

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

commit d267f869d2ad12f922dd111306c481cf242094ab
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Mar 24 19:00:03 2017 +0100

    Update Debian Edu Stretch manual and debian/copyright from the wiki.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/copyright                                   |   2 +-
 .../debian-edu-stretch-manual.da.po                |   8 +-
 .../debian-edu-stretch-manual.de.po                |  19 +-
 .../debian-edu-stretch-manual.es.po                |   8 +-
 .../debian-edu-stretch-manual.fr.po                |   8 +-
 .../debian-edu-stretch-manual.it.po                | 839 +--------------------
 .../debian-edu-stretch-manual.ja.po                |  10 +-
 .../debian-edu-stretch-manual.nb.po                | 100 ++-
 .../debian-edu-stretch-manual.nl.po                |  19 +-
 .../debian-edu-stretch-manual.pl.po                |   8 +-
 .../debian-edu-stretch-manual.pot                  |   8 +-
 .../debian-edu-stretch-manual.xml                  |   4 +-
 .../debian-edu-stretch-manual.zh.po                |   8 +-
 13 files changed, 126 insertions(+), 915 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 77aac88..f824627 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -235,7 +235,7 @@ Copyright: 2007, 2012, 2014, 2015, 2016, 2017 Petter Reinholdtsen
   2010 Ole-Anders Andreassen
   2010 Jan Roar Rød
   2014, 2016, 2017 Ole-Erik Yrvin
-  2014, 2015, 2016 Ingrid Yrvin
+  2014, 2015, 2016, 2017 Ingrid Yrvin
   2014 Hans Arthur Kielland Aanesen
   2014 Knut Yrvin
   2014 FourFire Le'bard
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index 0b41148..8938186 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2016-10-06 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -10474,7 +10474,7 @@ msgstr "ja, Iceweasel er blevet omdøbt tilbage til Firefox igen!"
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "LibreOffice 5.1.3"
-msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr "LibreOffice 5.1.3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -10698,8 +10698,8 @@ msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index b2be22f..d51ed01 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2017-03-23 19:05+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -9709,7 +9709,9 @@ msgid "Icedove has been re-renamed to Thunderbird."
 msgstr "Icedove wurde wieder umbenannt in Thunderbird!"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "LibreOffice 5.2.5"
+#, fuzzy
+#| msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr "LibreOffice 5.2.5"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9914,12 +9916,21 @@ msgstr ""
 "lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+#| "2014, 2015, 2016, 2017), 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), 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), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index 32da520..2c65178 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -8959,7 +8959,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "OpenOffice.org 1.1."
-msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr "OpenOffice versión 1.1."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9125,8 +9125,8 @@ msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index 4c79d76..06e5e81 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -10879,7 +10879,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "LibreOffice 4.3.3"
-msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr "LibreOffice 4.3.3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -11107,8 +11107,8 @@ msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index e3bd692..0add48b 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2017-03-23 19:01+0100\n"
 "Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1942,15 +1942,6 @@ msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP Server</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "A thin client (and diskless workstation) server, also called a LTSP "
-#| "server. Clients without hard drives boot and run software from this "
-#| "server. This computer needs two network cards, a lot of memory, and "
-#| "ideally more than one processor or core. See the chapter about <link "
-#| "linkend=\"NetworkClients\">networked clients</link> for more information "
-#| "on this subject. Choosing this profile also enables the workstation "
-#| "profile (even if it is not selected) - a thin client server can always be "
-#| "used as a workstation, too."
 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 "
@@ -1999,20 +1990,6 @@ msgstr ""
 "manualmente dal server principale."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
-#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
-#| "Client Server</emphasis> profiles are preselected. These profiles can be "
-#| "installed on one machine together if you want to install a so called "
-#| "<emphasis>combined main server</emphasis>. This means the main server "
-#| "will be a thin client server and also be used as a workstation. This is "
-#| "the default choice, since we assume most people will install <link "
-#| "linkend=\"Installation--"
-#| "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</"
@@ -2065,10 +2042,6 @@ msgstr ""
 "obbligatorio, ma è un modo semplice per aiutarci."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Wait. If the selected profiles include Thin-client-server then the "
-#| "installer will spend quite some time at the end, \"Finishing the "
-#| "installation - 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 "
@@ -2183,16 +2156,10 @@ msgstr ""
 "lo stesso pacchetto dalla rete più volte."
 
 #. type: Content of: <article><section><section><section><section><title>
-#| msgid "A note on thin-client-server installations"
 msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr "Note sull'installazione del server LTSP che usa solo thin client"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-#| "client</computeroutput> makes it possible to skip the step which converts "
-#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
-#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
 "client</computeroutput> makes it possible to skip one step which converts "
@@ -2290,7 +2257,6 @@ msgstr ""
 "Server</emphasis>:"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/smile.png"
 msgid "./images/pxe-tjener.png"
 msgstr "./images/pxe-tjener.png"
 
@@ -2299,10 +2265,6 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
 "Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
@@ -2393,10 +2355,6 @@ msgstr ""
 "pxeinstall</computeroutput> per aggiornare i file generati."
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "Further information can be found in the <ulink url=\"http://www.debian."
-#| "org/releases/jessie/installmanual\">manual of the Debian Installer</"
-#| "ulink>."
 msgid ""
 "Further information can be found in the <ulink url=\"http://www.debian.org/"
 "releases/stretch/installmanual\">manual of the Debian Installer</ulink>."
@@ -2491,11 +2449,6 @@ msgstr ""
 "con l'hardware, non vi è alcun motivo per non usare la modalità grafica. "
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "So here is a screenshot tour through a graphical Main-Server + "
-#| "Workstation + Thin Client Server installation and how it looks at the "
-#| "first boot of the 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 "
@@ -2508,7 +2461,6 @@ msgstr ""
 "LTSP:"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "./images/01-Installer_boot_menu.png"
 msgid "01-Installer_64bit_boot_menu.png"
 msgstr "01-Installer_64bit_boot_menu.png"
 
@@ -2517,7 +2469,6 @@ msgid "./images/02-select_a_language.png"
 msgstr "./images/02-select_a_language.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "./images/02-select_a_language.png"
 msgid "02-select_a_language.png"
 msgstr "02-select_a_language.png"
 
@@ -2526,7 +2477,6 @@ msgid "./images/03-select_your_location.png"
 msgstr "./images/03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "./images/03-select_your_location.png"
 msgid "03-select_your_location.png"
 msgstr "03-select_your_location.png"
 
@@ -2535,7 +2485,6 @@ msgid "./images/04-Configure_the_keyboard.png"
 msgstr "./images/04-Configure_the_keyboard.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "./images/04-Configure_the_keyboard.png"
 msgid "04-Configure_the_keyboard.png"
 msgstr "04-Configure_the_keyboard.png"
 
@@ -2544,7 +2493,6 @@ 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>
-#| msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr "05-Detect_and_mount_CD-ROM.png"
 
@@ -2553,7 +2501,6 @@ 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>
-#| msgid "./images/06-Load_installer_components_from_CD.png"
 msgid "06-Load_installer_components_from_CD.png"
 msgstr "06-Load_installer_components_from_CD.png"
 
@@ -2562,7 +2509,6 @@ msgid "./images/07-Detect_network_hardware.png"
 msgstr "./images/07-Detect_network_hardware.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "./images/07-Detect_network_hardware.png"
 msgid "07-Detect_network_hardware.png"
 msgstr "07-Detect_network_hardware.png"
 
@@ -2571,7 +2517,6 @@ 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>
-#| msgid "./images/08-Choose_Debian_Edu_profile.png"
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr "08-Choose_Debian_Edu_profile.png"
 
@@ -2580,7 +2525,6 @@ 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>
-#| msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
@@ -2589,7 +2533,6 @@ 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>
-#| msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
@@ -2598,7 +2541,6 @@ 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>
-#| msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr "11-Participate_in_the_package_usage_survey.png"
 
@@ -2607,7 +2549,6 @@ 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>
-#| msgid "./images/12-Set_up_users_and_passwords.png"
 msgid "12-Set_up_users_and_passwords.png"
 msgstr "12-Set_up_users_and_passwords.png"
 
@@ -2616,7 +2557,6 @@ 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>
-#| msgid "./images/12a-Set_up_users_and_passwords.png"
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "12a-Set_up_users_and_passwords.png"
 
@@ -2625,7 +2565,6 @@ 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>
-#| msgid "./images/12b-Set_up_users_and_passwords.png"
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "12b-Set_up_users_and_passwords.png"
 
@@ -2634,7 +2573,6 @@ 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>
-#| msgid "./images/12c-Set_up_users_and_passwords.png"
 msgid "12c-Set_up_users_and_passwords.png"
 msgstr "12c-Set_up_users_and_passwords.png"
 
@@ -2643,7 +2581,6 @@ 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>
-#| msgid "./images/12d-Setting-up-the-partitioner.png"
 msgid "12d-Setting-up-the-partitioner.png"
 msgstr "12d-Setting-up-the-partitioner.png"
 
@@ -2652,7 +2589,6 @@ 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>
-#| msgid "13-Install the base system.png"
 msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
@@ -2661,7 +2597,6 @@ msgid "./images/14-Select_and_install_software.png"
 msgstr "./images/14-Select_and_install_software.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "./images/14-Select_and_install_software.png"
 msgid "14-Select_and_install_software.png"
 msgstr "14-Select_and_install_software.png"
 
@@ -2670,7 +2605,6 @@ 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>
-#| msgid "./images/17-Select_and_install_software.png"
 msgid "17-Select_and_install_software.png"
 msgstr "17-Select_and_install_software.png"
 
@@ -2679,7 +2613,6 @@ msgid "./images/18-Build+LTSP+chroot.png"
 msgstr "./images/18-Build+LTSP+chroot.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "./images/18-Build+LTSP+chroot.png"
 msgid "18-Build LTSP chroot.png"
 msgstr "18-Build LTSP chroot.png"
 
@@ -2688,7 +2621,6 @@ 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>
-#| 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 "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
@@ -2697,7 +2629,6 @@ msgid "./images/20-Finish_the_Installation.png"
 msgstr "./images/20-Finish_the_Installation.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "./images/20-Finish_the_Installation.png"
 msgid "20-Finish_the_Installation.png"
 msgstr "20-Finish_the_Installation.png"
 
@@ -2706,17 +2637,14 @@ 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>
-#| msgid "./images/21-Finish_the_Installation-Installation_complete.png"
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "22-Tjener_GRUB_boot_menu.png"
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "22-Tjener_GRUB_boot_menu.png"
 msgid "22-Tjener_GRUB_boot_menu.png"
 msgstr "22-Tjener_GRUB_boot_menu.png"
 
@@ -2725,7 +2653,6 @@ msgid "tjener KDM Login"
 msgstr "Login KDM su tjener"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
@@ -2734,7 +2661,6 @@ msgid "KDE and Browser"
 msgstr "KDE e il browser"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/27-Tjener-KDE_Desktop.png"
 msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
@@ -2743,12 +2669,10 @@ msgid "KDE Desktop"
 msgstr "Desktop KDE"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgid "./images/29-Diskless-WS-LDM_Login.png"
 msgstr "./images/29-Diskless-WS-LDM_Login.png"
 
@@ -2757,12 +2681,10 @@ msgid "Diskless Workstation Login"
 msgstr "Login su workstation senza dischi"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| 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>
-#| msgid "KDE Desktop"
 msgid "KDE Desktop and Menu"
 msgstr "Desktop e menu KDE"
 
@@ -2830,11 +2752,6 @@ msgstr ""
 "dischi possono essere usate direttamente senza questo passaggio."
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
@@ -2846,12 +2763,6 @@ msgstr ""
 "probabilmente tutti dovrebbero prendere in considerazione."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "There is additional information available elsewhere in this manual: the "
-#| "<link linkend=\"Features\">New features in Jessie</link> chapter should "
-#| "be read by everyone who is 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 "
@@ -2887,7 +2798,6 @@ msgstr ""
 "accorgimenti e trucchi e alcune risposte alle domande frequenti."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Debian Edu KDE desktop"
 msgid "Debian Edu KDE desktop"
 msgstr "Desktop KDE di Debian Edu"
 
@@ -2936,15 +2846,6 @@ msgid "DHCP Administration"
 msgstr "Amministrazione DHCP"
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
@@ -2971,9 +2872,6 @@ msgstr ""
 "l'accesso a GOsa², collegandosi come primo utente."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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."
@@ -3004,7 +2902,6 @@ msgid "GOsa² Login plus Overview"
 msgstr "Accesso a GOsa² e pagina iniziale"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/smile.png"
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
 
@@ -3030,14 +2927,6 @@ msgstr ""
 "visibile su tutte le pagine di amministrazione di GOsa²."
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -3072,18 +2961,6 @@ msgstr ""
 "del server principale di Debian Edu. "
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -3242,7 +3119,6 @@ msgid "Search, modify and delete users"
 msgstr "Cercare, modificare e cancellare utenti"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/smile.png"
 msgid "./images/filterbox.png"
 msgstr "./images/filterbox.png"
 
@@ -3291,7 +3167,6 @@ msgstr ""
 "la lista dei gruppi ai quali appartiene."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/smile.png"
 msgid "./images/edit_user.png"
 msgstr "./images/edit_user.png"
 
@@ -3350,7 +3225,6 @@ msgstr ""
 "propria scelta"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/change_password_administratively.png"
 msgid "./images/change_password_administratively.png"
 msgstr "./images/change_password_administratively.png"
 
@@ -3470,7 +3344,6 @@ msgid "Group Management with GOsa²"
 msgstr "Gestione dei gruppi con GOsa²"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/alert.png"
 msgid "./images/create_group.png"
 msgstr "./images/create_group.png"
 
@@ -3479,7 +3352,6 @@ msgid "create group"
 msgstr "creare il gruppo"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/alert.png"
 msgid "./images/list_groups.png"
 msgstr "./images/list_groups.png"
 
@@ -3577,11 +3449,6 @@ msgstr ""
 "\"Architecture\">architettura</link> di questo manuale."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Diskless workstations and thin-clients work out-of-the-box when connected "
-#| "to the main network. Only workstations with disks <emphasis role=\"strong"
-#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
-#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
@@ -3634,18 +3501,6 @@ msgstr ""
 "sistemi saranno visualizzati con un'icona."
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
@@ -3694,7 +3549,6 @@ msgstr ""
 "enter password:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/gosa_systems_list.png"
 msgid "./images/gosa_systems_list.png"
 msgstr "./images/gosa_systems_list.png"
 
@@ -3703,7 +3557,6 @@ msgid "GOsa² systems listing"
 msgstr "Elenco dei sistemi di GOsa²"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/gosa_systems_host_details.png"
 msgid "./images/gosa_systems_host_details.png"
 msgstr "./images/gosa_systems_host_details.png"
 
@@ -3712,7 +3565,6 @@ msgid "Host details"
 msgstr "Dettagli dell'host"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/gosa_systems_edit_host.png"
 msgid "./images/gosa_systems_edit_host.png"
 msgstr "./images/gosa_systems_edit_host.png"
 
@@ -3721,7 +3573,6 @@ msgid "Modify host"
 msgstr "Modificare host"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/gosa_systems_add_netgroup.png"
 msgid "./images/gosa_systems_add_netgroup.png"
 msgstr "./images/gosa_systems_add_netgroup.png"
 
@@ -3866,11 +3717,6 @@ msgstr ""
 "indirizzo statico da LDAP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
-#| "or your users won't be able to access their home directories. Diskless "
-#| "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 "
@@ -3919,10 +3765,6 @@ msgstr ""
 "notte e riattiveranno ogni coda di stampa disabilitata ogni ora."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Debian Edu machines in this group will only be allowed to connect to "
-#| "machines on the local network.  Combined with web proxy restrictions this "
-#| "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 "
@@ -4118,7 +3960,6 @@ msgstr ""
 "di LTSP."
 
 #. type: Content of: <article><section><section><para>
-#| msgid "run <computeroutput>apt-get update</computeroutput>"
 msgid ""
 "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
 "NBD image(s)."
@@ -4151,12 +3992,6 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Automatic installation of updates can be done easily if desired, it just "
-#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
-#| "be installed and configured as described on <ulink url=\"https://wiki."
-#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
-#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
@@ -4213,13 +4048,6 @@ msgid "Backup Management"
 msgstr "Gestione dei backup"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "For backup management point your browser to <ulink url=\"https://www/"
-#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
-#| "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, "
@@ -4314,7 +4142,6 @@ msgstr ""
 "della pagina di backup e selezionare l'istantanea più vecchia da conservare:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/slbackup-php_maintenance.png"
 msgid "./images/slbackup-php_maintenance.png"
 msgstr "./images/slbackup-php_maintenance.png"
 
@@ -4344,16 +4171,6 @@ msgstr ""
 "bottiglia e per l'origine dei problemi del sistema."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The list of machines being monitored using Munin is generated "
-#| "automatically, based on the list of hosts reporting to sitesummary.  All "
-#| "hosts with the 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 "
@@ -4375,12 +4192,6 @@ msgstr ""
 "il file <computeroutput>/etc/munin/munin.conf</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The set of measurements being collected is automatically generated on "
-#| "each machine using the <computeroutput>munin-node-configure</"
-#| "computeroutput> program, which probes the plugins available from "
-#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
-#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
@@ -4395,9 +4206,6 @@ msgstr ""
 "rilevanti in <computeroutput>/etc/munin/plugins/</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
-#| 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/\"/>."
@@ -4410,15 +4218,6 @@ msgid "Icinga"
 msgstr "Icinga"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Nagios system and service monitoring is available from <ulink url="
-#| "\"https://www/nagios3/\"/>. The set of machines and services being "
-#| "monitored is automatically generated using information collected by the "
-#| "sitesummary system. The machines with the profile Main-server and Thin-"
-#| "client-server receive full monitoring, while workstations and thin "
-#| "clients receive simple monitoring. To enable full monitoring on a "
-#| "workstation, install the <computeroutput>nagios-nrpe-server</"
-#| "computeroutput> package on the workstation."
 msgid ""
 "Icinga system and service monitoring is available from <ulink url=\"https://"
 "www/icinga/\"/>. The set of machines and services being monitored is "
@@ -4439,11 +4238,6 @@ msgstr ""
 "computeroutput> sulla workstation."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The username is <computeroutput>nagiosadmin</computeroutput> and the "
-#| "default password is <computeroutput>skolelinux</computeroutput>. For "
-#| "security reasons, avoid using the same password as root. To change the "
-#| "password you can run the following command as root:"
 msgid ""
 "The username is <computeroutput>icingaadmin</computeroutput> and the default "
 "password is <computeroutput>skolelinux</computeroutput>. For security "
@@ -4457,18 +4251,10 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-#| msgid "htpasswd /etc/nagios3/htpasswd.users nagiosadmin"
 msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
 msgstr "htpasswd /etc/icinga/htpasswd.users icingaadmin"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "By default Nagios does not send email. This can be changed by replacing "
-#| "<computeroutput>notify-by-nothing</computeroutput> with "
-#| "<computeroutput>host-notify-by-email</computeroutput> and "
-#| "<computeroutput>notify-by-email</computeroutput> in the file "
-#| "<computeroutput>/etc/nagios3/sitesummary-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-"
@@ -4483,11 +4269,6 @@ msgstr ""
 "etc/icinga/sitesummary-template-contacts.cfg</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
-#| "sitesummary.cfg</computeroutput>.  The sitesummary cron job generates "
-#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
-#| "computeroutput> with the list of hosts and services to monitor."
 msgid ""
 "The Icinga configuration file used is <computeroutput>/etc/icinga/"
 "sitesummary.cfg</computeroutput>.  The sitesummary cron job generates "
@@ -4500,10 +4281,6 @@ msgstr ""
 "con la lista delle macchine e dei servizi controllati."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
-#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
-#| "included in the generated file."
 msgid ""
 "Extra Icinga checks can be put in the file <computeroutput>/var/lib/"
 "sitesummary/icinga-generated.cfg.post</computeroutput> to get them included "
@@ -4514,9 +4291,6 @@ msgstr ""
 "includerli nel file prodotto. "
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Information about Nagios is available from <ulink url=\"http://www.nagios."
-#| "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
 msgid ""
 "Information about Icinga is available from <ulink url=\"https://www.icinga."
 "com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
@@ -4526,13 +4300,10 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><section><section><title>
-#| msgid "Common Nagios warnings and how to handle them"
 msgid "Common Icinga warnings and how to handle them"
 msgstr "Avvisi comuni di Icinga e come gestirli"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "Here are instructions on how to handle the most common Nagios warnings."
 msgid "Here are instructions on how to handle the most common Icinga warnings."
 msgstr ""
 "Ecco le istruzioni su come gestire gli avvertimenti più comuni di Icinga."
@@ -4568,13 +4339,6 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#| msgid ""
-#| "New package are available for upgrades.  The critical ones are normally "
-#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-#| "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 && 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 && apt-get dist-"
@@ -4730,10 +4494,6 @@ msgstr ""
 "SENZA GARANZIA, secondo l'uso di legge.</emphasis>"
 
 #. type: Content of: <article><section><para>
-#| 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 "
@@ -4817,14 +4577,10 @@ msgstr ""
 "supporto per Oldstable</ulink>, anche Debian Edu farà altrettanto."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Upgrades from Debian Edu Wheezy"
 msgid "Upgrades from Debian Edu Jessie"
 msgstr "Aggiornamento da Debian Edu Jessie"
 
 #. type: Content of: <article><section><section><para>
-#| 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."
@@ -4833,12 +4589,6 @@ msgstr ""
 "in un ambiente di test o avere il backup per poter tornare indietro."
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
@@ -4852,11 +4602,6 @@ msgstr ""
 "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. 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 ""
 "Don't use X, use a virtual console, log in as root. Read all debconf "
 "information carefully, choose 'keep your currently-installed version'; in "
@@ -4892,10 +4637,6 @@ msgstr "Effettuare l'aggiornamento vero e proprio."
 
 #. type: CDATA
 #, no-wrap
-#| msgid ""
-#| "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
-#| "apt-get update\n"
-#| "apt-get -y dist-upgrade"
 msgid ""
 "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
 "apt-get update\n"
@@ -4952,15 +4693,6 @@ msgstr "Aggiornare LTSP chroot (default arch i386)"
 
 #. type: CDATA
 #, 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"
 msgid ""
 "ltsp-chroot -m -a i386 apt-get update\n"
 "ltsp-chroot -m -a i386 apt-get -y upgrade\n"
@@ -5003,9 +4735,6 @@ msgstr "Aggiornare il supporto LTSP la server."
 
 #. type: CDATA
 #, no-wrap
-#| msgid ""
-#| "ltsp-update-kernels\n"
-#| "ltsp-update-sshkeys"
 msgid ""
 "ltsp-update-kernels\n"
 "ltsp-update-sshkeys\n"
@@ -5050,8 +4779,6 @@ msgstr ""
 "computeroutput>) come root."
 
 #. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "Upgrades from older Debian Edu / Skolelinux installations (before Wheezy)"
 msgid ""
 "Upgrades from older Debian Edu / Skolelinux installations (before Jessie)"
 msgstr ""
@@ -5059,15 +4786,6 @@ msgstr ""
 "Jessie)"
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
@@ -5395,11 +5113,6 @@ msgstr ""
 
 #. type: CDATA
 #, 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"
 msgid ""
 "$ sudo apt-get update\n"
 "  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
@@ -5526,10 +5239,6 @@ msgstr ""
 "wiki.debian.org/StableUpdates\">stable-updates suite</ulink>."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "While you can use stable-updates directly, you don't have to: stable-"
-#| "updates are pushed into the stable suite regularily when stable point "
-#| "releases are 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 "
@@ -5541,7 +5250,6 @@ msgstr ""
 "cosa che avviene circa ogni due mesi."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Using backports.debian.org to install newer software"
 msgid "Using backports to install newer software"
 msgstr "Usare backports.debian.org per installare software recente"
 
@@ -5578,9 +5286,6 @@ msgstr "Usare i backport è semplice:"
 
 #. type: CDATA
 #, no-wrap
-#| msgid ""
-#| "echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt sources.list\n"
-#| "apt-get update"
 msgid ""
 "echo \"deb http://ftp.debian.org/debian/ stretch-backports main\" >> /etc/apt sources.list\n"
 "apt-get update"
@@ -5598,14 +5303,10 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-#| msgid "apt-get install -t jessie-backports tuxtype"
 msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
-#| 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-"
@@ -5620,10 +5321,6 @@ msgid "Upgrading with a CD or similar image"
 msgstr "Aggiornamento da CD o immagine simile"
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
@@ -5655,10 +5352,6 @@ msgid "To quote the apt-cdrom(8) man page:"
 msgstr "Citando la pagina di manuale apt-cdrom(8):"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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 "
@@ -5670,10 +5363,6 @@ msgstr ""
 "verificare i file indice."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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 "
@@ -5702,11 +5391,6 @@ msgid "Automatic cleanup of leftover processes"
 msgstr "Pulitura automatica dei processi pendenti"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
-#| "of background jobs. Background jobs are defined as processes that belong "
-#| "to 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 "
@@ -6021,7 +5705,6 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-#| msgid "Advanced administration"
 msgid "Advanced administration howto"
 msgstr "Howto di amministrazione avanzata"
 
@@ -6039,10 +5722,6 @@ msgid "Create Users in Year Groups"
 msgstr "Creare utenti in gruppi per ogni anno"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -6053,7 +5732,6 @@ msgstr ""
 "saranno creati importando un file csv."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "<emphasis>(as root on Tjener) </emphasis>"
 msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis>(come root sul server principale) </emphasis>"
 
@@ -6110,16 +5788,6 @@ msgid "Template"
 msgstr "Modello di desktop"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Choose 'users' from the main menu. Change to 'Students' in the Base "
-#| "field. An Entry <computeroutput>'NewStudent'</computeroutput> should show "
-#| "up, click it. This is the 'students' template, not a real user. As you'll "
-#| "have to 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 "
@@ -6153,9 +5821,6 @@ msgid "Import users"
 msgstr "Importare utenti"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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."
@@ -6236,15 +5901,10 @@ msgstr ""
 " echo \"$created_dir folders have been created\""
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Easy access to USB drives and CDROMs/DVDs"
 msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "Accesso facile a drive USB e CDROM/DVD"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -6255,12 +5915,6 @@ msgstr ""
 "vuole fare, come in ogni altra normale installazione."
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -6290,12 +5944,6 @@ msgstr ""
 "facilitato.)"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "In addition the following script could be used to create the symlink "
-#| "\"media\" for all users in their home folder for easy access to USB "
-#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
-#| "This might come in handy if users want to edit files directly on their "
-#| "plugged in media."
 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-"
@@ -6375,10 +6023,6 @@ msgstr ""
 "directory utente e per altri dati."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Add a new system of type server using GOsa² as outlined in the <link "
-#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
-#| "started</link> chapter of this manual."
 msgid ""
 "Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
 "as outlined in the <link linkend=\"GettingStarted--"
@@ -6504,10 +6148,6 @@ msgstr ""
 "evitare loop di montaggio, tjener.intern non usa automount:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Create the mount directories using <computeroutput>mkdir</"
-#| "computeroutput>, edit '/etc/fstab' as adequate and run "
-#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
 "Create the mount point directories using <computeroutput>mkdir</"
 "computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
@@ -6551,10 +6191,6 @@ msgstr ""
 "storage Storage' per aiutare gli utenti a trovare le risorse."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Now users should be able to access the files on 'nas-server.intern' "
-#| "directly by just visiting the '/tjener/nas-server/storage/' directory "
-#| "using any 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 "
@@ -6600,10 +6236,6 @@ msgid "Managing this case with GOsa is quite simple:"
 msgstr "La gestione di questo caso con GOsa è abbastanza semplice:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
-#| "level (where already other system management related groups like "
-#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
 "Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
@@ -6670,11 +6302,6 @@ msgstr ""
 "#"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -6708,14 +6335,10 @@ msgid "HowTos for the desktop"
 msgstr "HowTo per il desktop"
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
 msgid "Using KDE Plasma, GNOME, LXDE, Xfce and/or MATE together"
 msgstr "Usare insieme KDE \"Plasma\", GNOME, LXDE, Xfce e/o MATE"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "To install other desktop environments after installation, simply use apt-"
-#| "get:"
 msgid ""
 "To install other desktop environments after installation, simply use apt:"
 msgstr ""
@@ -6732,10 +6355,6 @@ msgstr ""
 " apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Users will then be able to choose any of the five desktop environment via "
-#| "the login manager before logging in. Of course, you can also choose to "
-#| "give less choices."
 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 "
@@ -6751,9 +6370,6 @@ msgstr ""
 "potrebbe confondere gli utenti."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The usage of LXDE as default on thin clients can be forced; see <link "
-#| "linkend=\"NetworkClients\">networked clients</link> for details."
 msgid ""
 "The use of LXDE as default on thin clients can be forced; see <link linkend="
 "\"NetworkClients\">networked clients</link> for details."
@@ -6762,11 +6378,6 @@ msgstr ""
 "per i dettagli <link linkend=\"NetworkClients\">client di rete</link>."
 
 #. type: Content of: <article><section><section><para>
-#| 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"
@@ -6783,11 +6394,6 @@ msgid "Flash"
 msgstr "Flash"
 
 #. type: Content of: <article><section><section><para>
-#| 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. Installing a non-free flash player is an option. "
@@ -6851,12 +6457,6 @@ msgid "Playing DVDs"
 msgstr "Riprodurre DVD"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "libdvdcss is needed for playing most commercial DVDs. For legal reasons "
-#| "it's not included in Debian (Edu).  If you are legally allowed to use it, "
-#| "you can use the packages from deb-multimedia.org. Add the multimedia "
-#| "repository (as described in the following section) and install the "
-#| "required libraries:"
 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 "
@@ -6874,7 +6474,6 @@ msgstr ""
 
 #. type: CDATA
 #, no-wrap
-#| msgid "apt-get install gnome lxde xfce4 mate-desktop"
 msgid ""
 "apt update\n"
 "apt install libdvd-pkg"
@@ -6883,8 +6482,6 @@ msgstr ""
 "apt install libdvd-pkg"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
 "Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
 "libdvd-pkg</computeroutput>."
@@ -6967,18 +6564,6 @@ msgstr ""
 "client."
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
@@ -7006,12 +6591,6 @@ msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role=\"strong\">Firmware del client LTSP</emphasis>"
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
@@ -7031,18 +6610,6 @@ msgstr "In questo caso eseguire i seguenti comandi su un server LTSP."
 
 #. type: CDATA
 #, 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"
 msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -7088,11 +6655,6 @@ msgid "LTSP client type selection"
 msgstr "Selezione del tipo di client LTSP"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -7130,14 +6692,6 @@ msgstr ""
 
 #. type: CDATA
 #, 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'"
 msgid ""
 "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
@@ -7352,9 +6906,6 @@ msgstr ""
 "principale come server LTSP. "
 
 #. type: Content of: <article><section><section><section><para>
-#| 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:"
@@ -7364,10 +6915,6 @@ msgstr ""
 "combinato, occorre seguire i seguenti passaggi:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "copy the <computeroutput>ltsp</computeroutput> directory from "
-#| "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-#| "same directory on tjener."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
@@ -7378,9 +6925,6 @@ msgstr ""
 "stessa directory sul server principale."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-#| "computeroutput> to the same directory on tjener."
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> to the same directory on the main server."
@@ -7405,10 +6949,6 @@ msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/
 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>
-#| 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/"
@@ -7433,15 +6973,6 @@ msgid "Use a different LTSP client network"
 msgstr "Utilizzare una diversa rete per client LTSP"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -7555,11 +7086,6 @@ msgstr ""
 "computeroutput>. Si possono anche aggiungere voci specifiche di host in LDAP."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Install the package <computeroutput>ltsp-docs</computeroutput> and run "
-#| "\"man lts.conf\" to have a look at available configuration options (see "
-#| "<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/"
@@ -7608,9 +7134,6 @@ msgid "somewhere below the default settings."
 msgstr "da qualche parte sotto alle impostazioni predefinite."
 
 #. type: Content of: <article><section><section><section><para>
-#| 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:"
@@ -7652,10 +7175,6 @@ msgid "Force all thin clients to use LXDE as default desktop environment"
 msgstr "Forzare tutti i thin-client ad usare come ambiente desktop LXDE"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 a line like "
 "this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
@@ -7699,12 +7218,6 @@ msgstr ""
 "chroot LTSP una chiave host SSH per ognuno dei server."
 
 #. type: Content of: <article><section><section><section><section><para>
-#| 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 "
@@ -7719,17 +7232,6 @@ msgstr ""
 "potrà decidere in seguito come farlo."
 
 #. type: Content of: <article><section><section><section><section><para>
-#| 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 "
@@ -7776,12 +7278,6 @@ msgid "Part 2"
 msgstr "Seconda parte"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| 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. "
@@ -7911,15 +7407,6 @@ msgid "Sound with LTSP clients"
 msgstr "Suono nei client LTSP"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "LTSP thin clients support three different audio systems for applications: "
-#| "ESD, PulseAudio and ALSA.  ESD and PulseAudio support networked audio and "
-#| "are used to pass audio from the server to the clients.  ALSA is "
-#| "configured to redirect its sound via PulseAudio.  For selected "
-#| "applications only supporting the OSS audio system, a wrapper is created "
-#| "by <computeroutput>/usr/sbin/debian-edu-ltsp-audiodivert</computeroutput> "
-#| "to redirect their sound to PulseAudio.  Run this script without arguments "
-#| "to get a list of applications with such redirection enabled."
 msgid ""
 "LTSP thin clients support three different audio systems for applications: "
 "ESD, PulseAudio and ALSA.  ESD and PulseAudio support networked audio and "
@@ -7949,7 +7436,6 @@ msgstr ""
 "c'è bisogno delle configurazioni necessarie per l'audio di rete."
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Use printers attachted to LTSP clients"
 msgid "Use printers attached to LTSP clients"
 msgstr "Utilizzare stampanti collegate ai client LTSP"
 
@@ -7962,11 +7448,6 @@ msgstr ""
 "supportate)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| 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 "
@@ -7979,12 +7460,6 @@ msgstr ""
 "ltsp/LTSPManual.html#printer</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| 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://<LTSP "
-#| "client ip>: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 "
@@ -8016,12 +7491,6 @@ msgstr ""
 
 #. type: CDATA
 #, 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"
 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"
@@ -8051,13 +7520,6 @@ msgstr ""
 
 #. type: CDATA
 #, 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"
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
@@ -8080,15 +7542,6 @@ msgid "Slow login and security"
 msgstr "Accesso lento e sicurezza"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -8127,12 +7580,6 @@ msgstr ""
 "informazione."
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -8155,11 +7602,6 @@ msgid "Joining a domain"
 msgstr "Collegarsi al dominio"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-#| "joined. A special service called Samba, installed on the main-server "
-#| "tjener, enables Windows clients to store profiles and user data, and also "
-#| "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, "
@@ -8172,9 +7614,6 @@ msgstr ""
 "utenti e autenticare gli utenti attraverso il login."
 
 #. type: Content of: <article><section><section><section><para>
-#| 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>."
@@ -8183,13 +7622,6 @@ msgstr ""
 "nell'<link linkend=\"Samba\">HowTo per Samba di Debian Edu Stretch</link>."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Windows will sync the profiles of domain users on every Windows login and "
-#| "logout. Depending on how much data is stored in the profile, this could "
-#| "take some time. To minimise the time needed, deactivate things like local "
-#| "cache 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 "
@@ -8245,11 +7677,6 @@ msgstr ""
 "with GOsa² (and then show an example for the command line)"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| 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 "
@@ -8266,11 +7693,6 @@ msgid "XP home"
 msgstr "XP home"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -8370,15 +7792,6 @@ msgstr ""
 "in wheezy anche kerberos è stato configurato per samba!"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "You should hopefully find an example smb.conf in your preferred language "
-#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
-#| "debian-edu-config/examples/</computeroutput>. The source file is in "
-#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
-#| "computeroutput>; look for a file with the appropriate code in the "
-#| "filename (the German translation, for example, will be named "
-#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
-#| "the config file are a lot of explanations which you should have a look at."
 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/"
@@ -8478,11 +7891,6 @@ msgid "Global policies for roaming profiles"
 msgstr "Politiche globali per i profili mobili"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
-#| "computeroutput>), you can can create a Policy file (NTConfig.pol) and put "
-#| "it in your netlogon share on tjener. This has the advantage of working "
-#| "almost instantly on all Windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can create a Policy file (NTConfig.pol) and put it in "
@@ -8503,12 +7911,6 @@ msgstr ""
 "Microsoft, ma è ancora disponibile come parte degli strumenti ORK."
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "With <computeroutput>poledit.exe</computeroutput> you can create .pol "
-#| "files. If you put such a file on tjener as <computeroutput>/etc/samba/"
-#| "netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
-#| "Windows machines and temporarily overwrite the registry, thus applying "
-#| "the changes."
 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/"
@@ -8757,12 +8159,6 @@ msgid "Disabling roaming in smb.conf"
 msgstr "Disabilitare i profili mobili in smb.conf"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| 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 "
@@ -8795,13 +8191,6 @@ msgid "Remote Desktop Service"
 msgstr "Servizio di desktop remoto"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -8836,9 +8225,6 @@ msgid "Available Remote Desktop clients"
 msgstr "Client disponibili per il desktop remoto"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>freerdp-x11</computeroutput> is installed by default and "
-#| "is captable of RDP and VNC."
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default and is "
 "capable of RDP and VNC."
@@ -8954,11 +8340,6 @@ msgstr ""
 "Required_Settings_for_Samba_NT4_Domains\"/>"
 
 #. type: Content of: <article><section><para>
-#| 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 "
@@ -9340,11 +8721,6 @@ msgid "HowTos for teaching and learning"
 msgstr "HowTo per insegnare e imparare"
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "All the Debian packages on this page can be installed by running either "
-#| "<computeroutput>aptitude install <package></computeroutput> or "
-#| "<computeroutput>apt-get install <package></computeroutput> (as "
-#| "root)."
 msgid ""
 "All Debian packages mentioned in this section can be installed by running "
 "<computeroutput>apt install <package></computeroutput> (as root)."
@@ -9412,14 +8788,6 @@ msgid "Monitoring pupils"
 msgstr "Monitorare gli allievi"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Some schools use control tools like <ulink url=\"https://packages.debian."
-#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://"
-#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
-#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
-#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
-#| "documentation in bug <ulink url=\"https://bugs.debian.org/511387#"
-#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
@@ -9482,7 +8850,6 @@ msgstr ""
 "e studenti possono prepararsi per la lezione su ogni computer: "
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Providing the repository on tjener"
 msgid "Providing the repository on the main server"
 msgstr "Fornire il repository sul server principale"
 
@@ -9572,9 +8939,6 @@ msgid "The following instructions are for updating LTSP chroots."
 msgstr "Le istruzioni che seguono sono per l'aggiornamento di chroot di LTSP."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Using an editor add the following lines to <computeroutput>/etc/apt/"
-#| "sources.list</computeroutput> in the chroot:"
 msgid ""
 "Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
@@ -9661,10 +9025,6 @@ msgstr ""
 "gosa/</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
-#| 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 "
@@ -9675,11 +9035,6 @@ msgstr ""
 "e sambaLMPassword) siano le stesse."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Changing passwords using PAM is working (ie at the KDM/GDM login prompt), "
-#| "but this will only update the Kerberos password, and not the Samba and "
-#| "GOsa² (LDAP) password. So after you changed your password at the login "
-#| "prompt, you really should also change it using GOsa²."
 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² "
@@ -9724,12 +9079,6 @@ msgid "Using email"
 msgstr "Usare la posta elettronica"
 
 #. type: Content of: <article><section><section><para>
-#| 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. To allow "
 "mail outside the internal network, the administrator needs to configure the "
@@ -9744,11 +9093,6 @@ msgstr ""
 "eseguendo <computeroutput>dpkg-reconfigure exim4-config</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
-#| 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 at postoffice.intern"
-#| "\">jdoe at 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="
@@ -9977,12 +9321,6 @@ msgstr ""
 "considerate l'idea di condividere la vostra conoscenza con noi."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The source of the text is a wiki and can be edited with a simple "
-#| "webbrowser. Just go to <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Jessie/\"/> and you can contribute easily. Note: a user "
-#| "account is needed to edit the pages; you need to <ulink url=\"http://wiki."
-#| "debian.org/UserPreferences\">create a wiki user</ulink> first."
 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/"
@@ -10028,9 +9366,6 @@ msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| 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"
@@ -10052,9 +9387,6 @@ msgid "in Norwegian"
 msgstr "in norvegese"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
-#| "\"/> - support mailing list"
 msgid ""
 "<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
 "mailing list"
@@ -10063,10 +9395,6 @@ msgstr ""
 "di supporto"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-#| "linuxiskolen\"/> - mailing list for the development member organisation "
-#| "in Norway (FRISK)"
 msgid ""
 "<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
 "mailing list for the development member organisation in Norway (FRISK)"
@@ -10128,20 +9456,14 @@ msgstr ""
 "<ulink url=\"http://wiki.debian.org/DebianEdu/Help/ProfessionalHelp\"/>."
 
 #. type: Content of: <article><section><title>
-#| msgid "New features in Debian Edu Jessie"
 msgid "New features in Debian Edu Stretch"
 msgstr "Nuove caratteristiche in Debian Edu Stretch"
 
 #. type: Content of: <article><section><section><title>
-#| msgid "New features for Debian Edu 8+edu0 Codename Jessie"
 msgid "New features for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Nuove caratteristiche per Debian Edu 9+edu0 Codename Stretch"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This is the first release of Debian Edu 8+edu0. Please report feedback to "
-#| "<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian."
-#| "org</ulink>!"
 msgid ""
 "This is a <emphasis role=\"strong\">ALPHA</emphasis> release of Debian Edu "
 "9+edu0. <emphasis role=\"strong\">Do not use in production yet.</emphasis> "
@@ -10158,9 +9480,6 @@ msgid "Known issues"
 msgstr "Problemi noti"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| 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>."
@@ -10173,10 +9492,6 @@ msgid "Installation changes"
 msgstr "Cambiamenti nell'installazione"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "New version of debian-installer from Debian Squeeze, see <ulink url="
-#| "\"http://www.debian.org/releases/squeeze/installmanual\">installation "
-#| "manual</ulink> for more details."
 msgid ""
 "New version of debian-installer from Debian Stretch, see its <ulink url="
 "\"http://www.debian.org/releases/stretch/installmanual\">installation "
@@ -10209,19 +9524,14 @@ msgid "Software updates"
 msgstr "Aggiornamenti software"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Everything which is new in Debian 8 Jessie, eg:"
 msgid "Everything which is new in Debian 9 Stretch, eg:"
 msgstr "Tutto ciò che è nuovo in Debian 9 Stretch, ad esempio:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Linux kernel 3.2.x"
 msgid "Linux kernel 4.9"
 msgstr "Linux kernel 4.9"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| 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"
@@ -10238,7 +9548,6 @@ msgstr ""
 "sceglierne un altro."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "the browsers Iceweasel 31 ESR and Chromium 41"
 msgid "Firefox 45.8 ESR and Chromium 57"
 msgstr "Firefox 45.8 ESR e Chromium 57"
 
@@ -10251,17 +9560,16 @@ msgid "Icedove has been re-renamed to Thunderbird."
 msgstr "Icedove è stato rinominato come Thunderbird."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LibreOffice 4.3.3"
-msgid "LibreOffice 5.2.5"
+#, fuzzy
+#| msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr "LibreOffice 5.2.5"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Educational toolbox GCompris 14.12"
 msgid "Educational toolbox GCompris 15.10"
 msgstr "Software educativo GCompris 15.10"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Music creator Rosegarden 14.02"
 msgid "Music creator Rosegarden 16.06"
 msgstr "Editor musicale Rosegarden 16.06"
 
@@ -10270,13 +9578,10 @@ msgid "GOsa 2.7.4"
 msgstr "GOsa 2.7.4"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LTSP 5.5.4"
 msgid "LTSP 5.5.9"
 msgstr "LTSP 5.5.9"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Debian Jessie includes about 42000 packages available for installation."
 msgid ""
 "Debian Stretch includes more than 50000 packages available for installation."
 msgstr ""
@@ -10284,11 +9589,6 @@ msgstr ""
 "l'installazione."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| 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</"
@@ -10313,10 +9613,6 @@ msgstr ""
 "modelli sono disponibili in 29 lingue."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The Debian Edu Jessie Manual is fully translated to German, French, "
-#| "Italian, Danish, Dutch and Norwegian Bokmål. A partly translated version "
-#| "exists for Spanish."
 msgid ""
 "The Debian Edu Stretch Manual is fully translated to German, French, "
 "Italian, Danish, Dutch, Norwegian Bokmål and Japanese. The Japanese "
@@ -10415,19 +9711,6 @@ msgid "Copyright and authors"
 msgstr "Copyright e autori"
 
 #. type: Content of: <article><section><para>
-#| 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), Petter Reinholdtsen (2001, "
@@ -10482,20 +9765,21 @@ msgstr ""
 "2012, 2013) rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
 #| msgid ""
 #| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-#| "2014, 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."
+#| "2014, 2015, 2016, 2017), 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), 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), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
@@ -10508,14 +9792,6 @@ msgstr ""
 "licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
-#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
-#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
-#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
-#| "Teichert (2009), 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, "
@@ -10534,10 +9810,6 @@ msgstr ""
 "licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
-#| 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) and Beatrice Torracca "
@@ -10562,9 +9834,6 @@ msgstr ""
 "licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
-#| 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."
@@ -10573,9 +9842,6 @@ msgstr ""
 "2014, 2015, 2016) e rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
-#| "and is released under the GPL v2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
 "2016, 2017) and is released under the GPL v2 or any later version."
@@ -10584,9 +9850,6 @@ msgstr ""
 "(2014, 2015, 2016, 2017) e rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
-#| 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."
@@ -10595,9 +9858,6 @@ msgstr ""
 "e rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
-#| 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."
@@ -10606,9 +9866,6 @@ msgstr ""
 "(2016, 2017) e rilasciata sotto licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
-#| 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), "
 "Boyuan Yang (2017) and Roy Zhang (2017) and is released under the GPL v2 or "
@@ -10643,15 +9900,6 @@ msgid "Translate using PO files"
 msgstr "Tradurre utilizzando i file PO"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "As in many free software projects, translations of this document are kept "
-#| "in PO files. More information about the process can be found in "
-#| "<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 "
@@ -10671,11 +9919,6 @@ msgstr ""
 "specifiche convenzioni per le lingue</ulink>."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "To commit your translations you need to be a member of the Alioth project "
-#| "<computeroutput>debian-edu</computeroutput>. If your Alioth username "
-#| "differs from your local one, create or edit <computeroutput>~/.ssh/"
-#| "config</computeroutput>. There should be an entry like:"
 msgid ""
 "To commit your translations you need to be a member of the Alioth project "
 "<computeroutput>debian-edu</computeroutput>. If your Alioth username differs "
@@ -10708,13 +9951,6 @@ msgstr ""
 "debian-edu/debian-edu-doc.git</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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-"
@@ -10748,11 +9984,6 @@ msgstr ""
 "git</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -10785,10 +10016,6 @@ msgid "<computeroutput>git pull</computeroutput>"
 msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><section><para>
-#| 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 "
@@ -10799,7 +10026,7 @@ msgstr ""
 "lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
 
 #.  <remark>
-#. status ignore</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 "
@@ -10861,11 +10088,6 @@ msgid "Note to translators: there is no need to translate the GPL license text.
 msgstr "Nota per i traduttori: non c'è bisogno di tradurre il testo della licenza GPL. Le traduzioni sono disponibili presso https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Copyright (C) 2007-2016 Holger Levsen < <ulink url=\"mailto:"
-#| "holger at layer-acht.org\">holger at layer-acht.org</ulink> > and others, "
-#| "see the <link linkend=\"CopyRight\">Copyright chapter</link> for the full "
-#| "list of copyright owners."
 msgid ""
 "Copyright (C) 2007-2017 Holger Levsen < <ulink url=\"mailto:holger at layer-"
 "acht.org\">holger at layer-acht.org</ulink> > and others, see the <link "
@@ -11438,14 +10660,10 @@ msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
 #. type: Content of: <article><section><title>
-#| 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 "Appendix B - non ci sono ancora CD/DVD Live per Debian Edu Stretch"
 
 #. type: Content of: <article><section><para>
-#| 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, but are "
 "being worked on..."
@@ -11606,7 +10824,6 @@ msgid "Stuff to know"
 msgstr "Accorgimenti da conoscere"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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 ""
 "La password per l'utente è \"user\", root non ha una password selezionata."
@@ -11616,7 +10833,6 @@ msgid "Known issues with the image"
 msgstr "Problemi noti con l'immagine"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid "There are no jessie images yet"
 msgid "There are no images yet"
 msgstr "Non ci sono ancora immagini"
 
@@ -11633,12 +10849,6 @@ msgid "Download"
 msgstr "Download"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The image 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."
@@ -11657,9 +10867,6 @@ msgid "Appendix C - Features in older releases"
 msgstr "Appendice C - Caratteristiche dei rilasci più vecchi"
 
 #. type: Content of: <article><section><section><title>
-#| 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 ""
 "Nuove caratteristiche in Debian Edu 8.0+edu0 nome in codice Jessie "
@@ -11972,10 +11179,6 @@ msgstr ""
 "Le workstation senza dischi LTSP funzionano senza alcuna configurazione."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "On the dedicated client network of thin client servers (default "
-#| "192.168.0.0/24), machines run by default as diskless workstations if they "
-#| "are powerful enough."
 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."
@@ -12010,7 +11213,6 @@ msgstr ""
 "dat. Soluzione: usare Iceweasel o configurare manualmente il proxy."
 
 #. type: Content of: <article><section><section><title>
-#| msgid "More information on even older releases"
 msgid "Historic information about older releases"
 msgstr "Informazioni storiche sulle versioni ancora più vecchie"
 
@@ -12019,40 +11221,29 @@ msgid "The following Debian Edu releases were made further in the past:"
 msgstr "Le seguenti versioni Debian Edu sono ancora più vecchie:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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 "Debian Edu 6.0.7+r1 nome in codice \"Squeeze\" rilasciata il 3-3-2013"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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 ""
 "Debian Edu 6.0.4+r0 nome in codice \"Squeeze\" rilasciata  l'11-03-2012."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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 ""
 "Debian Edu 5.0.6+edu1 nome in codice \"Lenny\" rilasciata il 5-10-2010."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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 ""
 "Debian Edu 5.0.4+edu0 nome in codice \"Lenny\" rilasciata  l'8-02-2010."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid "New features in the \"3.0r1 Terra\" release 2007-12-05"
 msgid "Debian Edu \"3.0r1 Terra\", released 2007-12-05."
 msgstr "Debian Edu \"3.0r1 Terra\", rilasciata il 5-12-2007."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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."
@@ -12061,7 +11252,6 @@ msgstr ""
 "Etch rilasciata l'8-04-2007."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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."
@@ -12070,7 +11260,6 @@ msgstr ""
 "rilasciata il 6-06-2005."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| 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."
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index 5114ef2..c9ba7a4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2017-02-24 06:55+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -9223,7 +9223,9 @@ msgid "Icedove has been re-renamed to Thunderbird."
 msgstr "Icedove の名前はまたまた Thunderbird に変わりました!"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "LibreOffice 5.2.5"
+#, fuzzy
+#| msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr "LibreOffice 5.2.5"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9397,8 +9399,8 @@ msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index 6175cee..8958af2 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-03-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2017-03-24 05:40+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -75,8 +75,8 @@ msgid ""
 msgstr ""
 "<link linkend=\"Translations\">Oversettelser</link> er en del av pakken "
 "<computeroutput>debian-edu-doc</computeroutput>, som kan installeres på en "
-"nettjener, og er tilgjengelig på <ulink url='http://maintainer.skolelinux.no"
-"/debian-edu-doc/'>online</ulink>."
+"nettjener, og er tilgjengelig på <ulink url='http://maintainer.skolelinux.no/"
+"debian-edu-doc/'>online</ulink>."
 
 #. type: Content of: <article><section><title>
 msgid "About Debian Edu and Skolelinux"
@@ -104,8 +104,8 @@ msgid ""
 "PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "Alle tjenester som trengs for et skolenettverk blir satt opp rett etter "
-"installasjonen av en skoletjener (se neste kapittel <link linkend=\""
-"Architecture\"> for detaljer om arkitektur og oppsett</link>), og systemet "
+"installasjonen av en skoletjener (se neste kapittel <link linkend="
+"\"Architecture\"> for detaljer om arkitektur og oppsett</link>), og systemet "
 "er klart til bruk. Bare brukere og maskiner må legges til via GOsa², et "
 "komfortabelt Web-brukergrensesnitt, eller med en hvilken som helst annen "
 "LDAP-redigerer. Et oppstartmiljø som bruker PXE er også forberedt, så etter "
@@ -139,10 +139,10 @@ msgid ""
 "subproject."
 msgstr ""
 "<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> er en Linux-"
-"distribusjon som er laget av prosjektet Debian Edu. Som en <ulink url=\""
-"http://wiki.debian.org/DebianPureBlends\">ren Debian tilpasset</ulink>-"
-"distribusjon er den et offisielt underprosjekt i <ulink url=\""
-"http://www.debian.org\">Debian</ulink>."
+"distribusjon som er laget av prosjektet Debian Edu. Som en <ulink url="
+"\"http://wiki.debian.org/DebianPureBlends\">ren Debian tilpasset</ulink>-"
+"distribusjon er den et offisielt underprosjekt i <ulink url=\"http://www."
+"debian.org\">Debian</ulink>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -282,8 +282,8 @@ msgid ""
 "terminal server."
 msgstr ""
 "Denne er laget for å modifiseres - det vil si, du kan la NFS-root i Syslinux "
-"peke til en av LTSP-tjenerne, eller endre valget av neste DHCP-tjener ("
-"lagret i LDAP) til å la klienter starte opp direkte via PXE fra "
+"peke til en av LTSP-tjenerne, eller endre valget av neste DHCP-tjener "
+"(lagret i LDAP) til å la klienter starte opp direkte via PXE fra "
 "terminaltjeneren."
 
 #. type: Content of: <article><section><section><section><para>
@@ -853,12 +853,12 @@ msgid ""
 "is to use a direct X connection via XDMCP."
 msgstr ""
 "Tynnklienter er en bra måte å bruke gamle, trege datamaskiner siden de "
-"egentlig kjører alle programmene på LTSP-tjeneren. Dette fungerer som følger:"
-" Tjenesten bruker DHCP og TFTP for å kople seg til nettverket og starte opp "
-"fra nettverket. Det neste er at filsystemet blir tilknyttet (mounted) fra "
-"LTSP-tjeneren ved å bruke NBD. Til slutt startes X Windows-systemet. "
-"Skjermnåndtereren  (LDM) kopler seg til LTSP-tjeneren via SSH med X-"
-"forwarding. På denne måte blir all data kryptert i nettverket. Ved bruk av "
+"egentlig kjører alle programmene på LTSP-tjeneren. Dette fungerer som "
+"følger: Tjenesten bruker DHCP og TFTP for å kople seg til nettverket og "
+"starte opp fra nettverket. Det neste er at filsystemet blir tilknyttet "
+"(mounted) fra LTSP-tjeneren ved å bruke NBD. Til slutt startes X Windows-"
+"systemet. Skjermnåndtereren  (LDM) kopler seg til LTSP-tjeneren via SSH med "
+"X-forwarding. På denne måte blir all data kryptert i nettverket. Ved bruk av "
 "gammel maskinvare til tynnklienter, som er for svake til krypteringen, så "
 "kan man sette opp direkte X-forbindelse via XDMCP fra tidligere versjoner."
 
@@ -937,8 +937,8 @@ msgid ""
 msgstr ""
 "Alle linuxmaskinene som er installert ved hjelp av en Skolelinux-installer "
 "vil være satt opp til å administreres fra en sentral maskin, mest trolig "
-"tjeneren. Det vil være mulig å logge inn på alle maskiner ved hjelp av SSH ("
-"som standard tillates ikke «root» å logge inn med passord), og dermed ha "
+"tjeneren. Det vil være mulig å logge inn på alle maskiner ved hjelp av SSH "
+"(som standard tillates ikke «root» å logge inn med passord), og dermed ha "
 "full tilgang til maskinene."
 
 #. type: Content of: <article><section><section><para>
@@ -1221,8 +1221,8 @@ msgid ""
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
-"eth1 brukes for å betjene LTSP-tjenere (192.168.0.0/24 som standard), men <"
-"link linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">andre "
+"eth1 brukes for å betjene LTSP-tjenere (192.168.0.0/24 som standard), men "
+"<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">andre "
 "er mulig</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1432,9 +1432,8 @@ msgid ""
 "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>."
+"en gammel PC, vil vi anbefale <ulink url=\"http://www.ipcop.org\"> IPCop</"
+"ulink> eller <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1449,8 +1448,8 @@ msgstr ""
 "<ulink url=\"http://openwrt.org\">OpenWRT</ulink>, selv om du selvsagt kan "
 "bruke standard firmware (fastvare). Bruk av standard firmware er enklere, "
 "mens bruk av OpenWRT gir deg flere valgmuligheter og bedre kontroll. Sjekk "
-"OpenWRTs nettsider for en oversikt over <ulink url=\""
-"http://wiki.openwrt.org/toh/start\">støttet maskinvare</ulink>."
+"OpenWRTs nettsider for en oversikt over <ulink url=\"http://wiki.openwrt.org/"
+"toh/start\">støttet maskinvare</ulink>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -1799,8 +1798,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr ""
-"<emphasis>Legge til eller endre oppstartsparametre for "
-"installasjoner</emphasis>"
+"<emphasis>Legge til eller endre oppstartsparametre for installasjoner</"
+"emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2843,10 +2842,10 @@ msgid ""
 "Architecture#File_system_access_configuration\">file system access "
 "configuration</ulink> before adding users."
 msgstr ""
-"Se informasjonen om Debian Edu spesifikke <ulink url=\""
-"https://wiki.debian.org/DebianEdu/Documentation/Stretch//Architecture#"
-"File_system_access_configuration\">file system access configuration</ulink> "
-"før brukere legges til."
+"Se informasjonen om Debian Edu spesifikke <ulink url=\"https://wiki.debian."
+"org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> før brukere legges til."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6702,8 +6701,7 @@ msgid ""
 " 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"
+" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
@@ -8899,10 +8897,10 @@ msgstr ""
 "Samba wiki om støttede Windows-versjoner, om registeroppdateringer som "
 "trengs og andre prosedyrer. Sannsynligvis trenges en linje som inneholder "
 "<computeroutput>server max protocol = NT1</computeroutput> å bli lagt til "
-"<computeroutput>[global]</computeroutput>-seksjonen til "
-"<computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> på "
-"hovedtjeneren. Vennligst vurder å oppdatere dette kapittelet hvis du vet "
-"hvordan man konfigurerer Samba for Debian Edu."
+"<computeroutput>[global]</computeroutput>-seksjonen til <computeroutput>/etc/"
+"samba/smb-debian-edu.conf</computeroutput> på hovedtjeneren. Vennligst "
+"vurder å oppdatere dette kapittelet hvis du vet hvordan man konfigurerer "
+"Samba for Debian Edu."
 
 #. type: Content of: <article><section><para>
 #, fuzzy
@@ -10225,7 +10223,7 @@ msgstr "jepp, Iceweasel har byttet navn til Firefox!"
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "LibreOffice 5.1.3"
-msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr "LibreOffice 5.1.3"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -10324,9 +10322,9 @@ msgid ""
 "and 'Minimal' profiles; pressing ESC allows to view boot and shutdown "
 "messages."
 msgstr ""
-"Plymouth er installert og aktivert som standard, med unntak for \"Main "
-"Server\"- og \"Minimal\"-profilene; å trykke ESC gjør det mulig å vise "
-"oppstarts- og avslutnings-meldinger."
+"Plymouth er installert og aktivert som standard, med unntak for \"Main Server"
+"\"- og \"Minimal\"-profilene; å trykke ESC gjør det mulig å vise oppstarts- "
+"og avslutnings-meldinger."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -10465,8 +10463,8 @@ msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
@@ -10825,8 +10823,8 @@ msgid ""
 "\"https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-"
 "stretch/\"/> for more information."
 msgstr ""
-"Noen språk-lag har bestemt seg for å oversette via Weblate. Se <ulink url=\""
-"https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-"
+"Noen språk-lag har bestemt seg for å oversette via Weblate. Se <ulink url="
+"\"https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-"
 "stretch/\"/> for mer informasjon."
 
 #. type: Content of: <article><section><section><section><para>
@@ -12047,11 +12045,11 @@ msgid ""
 "manuals on the <ulink url=\"https://wiki.debian.org/DebianEdu/Documentation"
 "\">release manuals page</ulink>."
 msgstr ""
-"En komplett og detaljert oversikt om eldre utgivelser finnes i <ulink url=\""
-"https://wiki.debian.org/DebianEdu/Documentation/Jessie/AppendixC\">Appendix "
-"C of the Jessie manual</ulink>; Eller se de relaterte håndbokutgivelser på <"
-"ulink url=\"https://wiki.debian.org/DebianEdu/Documentation\">release "
-"manuals page</ulink>."
+"En komplett og detaljert oversikt om eldre utgivelser finnes i <ulink url="
+"\"https://wiki.debian.org/DebianEdu/Documentation/Jessie/AppendixC"
+"\">Appendix C of the Jessie manual</ulink>; Eller se de relaterte "
+"håndbokutgivelser på <ulink url=\"https://wiki.debian.org/DebianEdu/"
+"Documentation\">release manuals page</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "More information on even older releases"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index afe1735..de396ff 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2017-03-18 10:57+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -9894,7 +9894,9 @@ msgid "Icedove has been re-renamed to Thunderbird."
 msgstr "De naam van Icedove werd opnieuw veranderd naar Thunderbird."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "LibreOffice 5.2.5"
+#, fuzzy
+#| msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr "LibreOffice 5.2.5"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -10101,12 +10103,21 @@ msgstr ""
 "v2 of een latere versie."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
+#| "2014, 2015, 2016, 2017), 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), 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), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index 454a27e..93743c4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2017-02-28 18:20+0000\n"
 "Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -7462,7 +7462,7 @@ msgid "Icedove has been re-renamed to Thunderbird."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -7618,8 +7618,8 @@ msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index c2bd7c5..8108c9f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -7017,7 +7017,7 @@ msgid "Icedove has been re-renamed to Thunderbird."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -7173,8 +7173,8 @@ msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 2da94d4..2505175 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -3214,7 +3214,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>Icedove has been re-renamed to Thunderbird. 
 </para></listitem>
 <listitem>
-<para>LibreOffice 5.2.5 
+<para>LibreOffice 5.2.6 
 </para></listitem>
 <listitem>
 <para>Educational toolbox GCompris 15.10 
@@ -3303,7 +3303,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </title>
 <para>The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), Rafael Rivas (2009, 2010, 2011, 2012, 2015) and Norman Garcia (2010, 2012, 2013) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, 2014, 2015, 2016, 2017), 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), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released under the GPL v2 or any later version. 
+<para>The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, 2014, 2015, 2016, 2017), 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) and Ragnar Wisløff (2014) and is released under the GPL v2 or any later version. 
 </para>
 <para>The German translation is copyrighted by Holger Levsen (2007), Patrick Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert (2009), Philipp Hübner (2009),  Andreas Mundt (2009, 2010) and Wolfgang Schweer (2012, 2013, 2014, 2015, 2016, 2017) and is released under the GPL v2 or any later version. 
 </para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
index 521e78a..deb11d1 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-03-21 10:27+0000\n"
+"POT-Creation-Date: 2017-03-24 17:49+0000\n"
 "PO-Revision-Date: 2017-03-05 03:41+0000\n"
 "Last-Translator: Ma Yong <c2edd3c2 at 163.com>\n"
 "Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -7775,7 +7775,7 @@ msgid "Icedove has been re-renamed to Thunderbird."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "LibreOffice 5.2.5"
+msgid "LibreOffice 5.2.6"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -7931,8 +7931,8 @@ msgid ""
 "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
 "2014, 2015, 2016, 2017), 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), Hans Arthur Kielland Aanesen "
-"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
+"2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), 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."
 msgstr ""

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



More information about the debian-edu-commits mailing list