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

Holger Levsen holger at layer-acht.org
Tue Mar 21 10:39:37 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 bed6fe782ff1a875ffa8675888bad681f197d0c5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Mar 21 11:39:14 2017 +0100

    Update Debian Edu Stretch 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                |  11 +-
 .../debian-edu-stretch-manual.de.po                |  15 +-
 .../debian-edu-stretch-manual.es.po                |   6 +-
 .../debian-edu-stretch-manual.fr.po                |  11 +-
 .../debian-edu-stretch-manual.it.po                | 278 +--------------------
 .../debian-edu-stretch-manual.ja.po                |   6 +-
 .../debian-edu-stretch-manual.nb.po                |  11 +-
 .../debian-edu-stretch-manual.nl.po                |  31 +--
 .../debian-edu-stretch-manual.pl.po                |   6 +-
 .../debian-edu-stretch-manual.pot                  |   6 +-
 .../debian-edu-stretch-manual.xml                  |   2 +-
 .../debian-edu-stretch-manual.zh.po                |   6 +-
 13 files changed, 68 insertions(+), 323 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 444de14..77aac88 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -259,7 +259,7 @@ Copyright: 2007 Holger Levsen
 License: GPL-2+
 
 Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
-Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Claudio Carboncini
+Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Claudio Carboncini
   2013, 2014 Beatrice Torracca
 License: GPL-2+
 
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 db445cf..0b41148 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+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"
@@ -10738,10 +10738,15 @@ msgstr ""
 "2 eller enhver senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
+#| "2014) and is released under the GPL v2 or any later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 "Den italiensk oversættelse Claudio Carboncini (2007, 2008, 2009, 2010, 2011, "
 "2012, 2013, 2014, 2015) og Beatrice Torracca (2013, 2014) og er udgivet "
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 70f9464..7a4418e 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+0000\n"
 "PO-Revision-Date: 2017-03-15 11:55+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -9950,10 +9950,15 @@ msgstr ""
 "einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
+#| "2014) and is released under the GPL v2 or any later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 "Die italienische Übersetzung wurde erstellt und ist Copyright von Claudio "
 "Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) und "
@@ -10170,8 +10175,8 @@ msgstr ""
 "translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre "
 "Sprache anlegen und wie Übersetzungen aktualisiert werden."
 
-#. <remark>
-#. status ignore</remark>
+#.  <remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index 0421bd5..32da520 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+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"
@@ -9145,8 +9145,8 @@ msgstr ""
 #. 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."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
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 b5c74b5..4c79d76 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+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"
@@ -11148,10 +11148,15 @@ msgstr ""
 "toute version ultérieure."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
+#| "2014) and is released under the GPL v2 or any later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduction italienne, dont les droits d'auteur appartiennent à Claudio "
 "Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) et "
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 05f1871..b5eb4e7 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+0000\n"
 "PO-Revision-Date: 2017-03-21 00:16+0100\n"
 "Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -22,17 +22,14 @@ msgid "en"
 msgstr "it"
 
 #. type: Content of: <article><articleinfo><title>
-#| msgid "Debian Edu / Skolelinux Jessie 8+edu0 Manual"
 msgid "Debian Edu / Skolelinux Stretch 9+edu0 Manual"
 msgstr "Manuale di Debian Edu / Skolelinux Stretch 9+edu0"
 
 #. type: Content of: <article><section><section><title>
-#| msgid "Manual for Debian Edu 8+edu0 Codename Jessie"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Manuale per Debian Edu 9+edu0 Nome in codice Stretch"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
 msgid "./images/23-Tjener-Login.png"
 msgstr "./images/23-Tjener-Login.png"
 
@@ -41,14 +38,10 @@ msgid "Debian Edu login"
 msgstr "Login di Debian Edu"
 
 #. type: Content of: <article><section><para>
-#| msgid "This is the manual for the Debian Edu Jessie 8+edu0 release."
 msgid "This is the manual for the Debian Edu Stretch 9+edu0 release."
 msgstr "Questa è il manuale per la versione Stretch 9+edu0 di Debian Edu."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/"
-#| "Documentation/Jessie\"/> is a wiki and updated frequently."
 msgid ""
 "The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch\"/> is a wiki and updated frequently."
@@ -83,18 +76,6 @@ msgstr ""
 "configurata per una scuola."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "Directly after installation of a school server all services needed for a "
-#| "school network are set up (see the next chapter <link linkend="
-#| "\"Architecture\">details of the architecture of this setup</link>) and "
-#| "the system is ready to be used. Only users and machines need to be added "
-#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
-#| "environment using PXE has also been prepared, so after initial "
-#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
-#| "all other machines can be installed via the network, this includes "
-#| "\"roaming workstations\" (ones that can be taken away from the school "
-#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
-#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -160,12 +141,6 @@ msgstr ""
 "completamente configurata per la scuola."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
-#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
-#| "both projects are united, but both names stayed. \"Skole\" and "
-#| "(Debian-)\"Education\" are just two well understood terms in these "
-#| "regions."
 msgid ""
 "The Skolelinux project in Norway was founded on July 2nd 2001 and about the "
 "same time Raphaël Hertzog started Debian-Edu in France. Since 2003 both "
@@ -204,7 +179,6 @@ msgid "Network"
 msgstr "La rete"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/Debian_Edu_Network_Jessie.png"
 msgid "./images/Debian_Edu_Network_Stretch.png"
 msgstr "./images/Debian_Edu_Network_Stretch.png"
 
@@ -213,16 +187,6 @@ msgid "The Debian Edu network topology"
 msgstr "La topologia della rete Debian Edu"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The figure is a sketch of the assumed network topology. The default setup "
-#| "of a Skolelinux network assumes that there is one (and only one) main-"
-#| "server, while allowing the inclusion of both normal workstations and thin-"
-#| "client-servers (with associated thin-clients and/or diskless "
-#| "workstations). The number of workstations can be as large or small as you "
-#| "want (starting from none to a lot). The same goes for the thin-client "
-#| "servers, each of which is on a separate network so that the traffic "
-#| "between the clients and the thin-client server doesn't affect the rest of "
-#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main server, "
@@ -243,13 +207,6 @@ msgstr ""
 "resto dei servizi di rete."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The reason that there can only be one main server in each school network "
-#| "is that the main server provides DHCP, and there can be only one machine "
-#| "doing so in each network. It is possible to move services from the main "
-#| "server to other machines by setting up the service on another machine, "
-#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
-#| "for that service to the right computer."
 msgid ""
 "The reason that there can only be one main server in each school network is "
 "that the main server provides DHCP, and there can be only one machine doing "
@@ -297,11 +254,6 @@ msgstr ""
 "memtest o avviare dall'hard disk locale."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "This is designed to be modified - that is, you can have the NFS-root in "
-#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
-#| "option (stored in LDAP) to have clients directly boot via PXE from the "
-#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
 "syslinux pointing to one of the LTSP servers or change the DHCP next-server "
@@ -332,12 +284,6 @@ msgid "Main server (tjener)"
 msgstr "Server principale (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A Skolelinux network needs one main server (also called \"tjener\" which "
-#| "is Norwegian and means \"server\") which per default has the IP address "
-#| "10.0.2.2 and is installed by selecting the main server profile. It's "
-#| "possible (but not required) to also select and install the thin-client-"
-#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
@@ -357,17 +303,6 @@ msgid "Services running on the main server"
 msgstr "Servizi attivi sul server principale"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "With the exception of the control of the thin-clients, all services are "
-#| "initially set up on one central computer (the main server). For "
-#| "performance reasons, the thin-client-server should be a separate machine "
-#| "(though it is possible to install both the main server and thin-client "
-#| "server profiles on the same machine). All services are allocated a "
-#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
-#| "DNS name makes it easy to move individual services from the main-server "
-#| "to a different machine, by simply stopping the service on the main-"
-#| "server, and changing the DNS configuration to point to the new location "
-#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin clients, all services are "
 "initially set up on one central computer (the main server). For performance "
@@ -601,7 +536,6 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "Web Server"
 msgid "LTSP Server/s"
 msgstr "LTSP Server"
 
@@ -618,7 +552,6 @@ msgid "Network Block Device Server"
 msgstr "Network Block Device Server"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "TBD"
 msgid "NBD"
 msgstr "NBD"
 
@@ -632,12 +565,10 @@ msgstr ""
 "elettronica"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "munin, nagios and site-summary"
 msgid "Munin, Icinga and Sitesummary"
 msgstr "Munin, Icinga e Sitesummary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "Sitesummary"
 msgid "sitesummary"
 msgstr "sitesummary"
 
@@ -657,14 +588,6 @@ msgstr ""
 "Macintosh."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "By default email is set up for local delivery (i.e. within the school) "
-#| "only, though email delivery to the wider Internet may be set up if the "
-#| "school has a permanent Internet connection. Mailing lists are set up "
-#| "based on the user database, giving each class their own mailing list. "
-#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
-#| "users can <link linkend=\"Users--Using_email\">access their personal "
-#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
@@ -700,13 +623,6 @@ msgstr ""
 "singole macchine."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding thin-"
-#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
-#| "that the network traffic of the thin clients doesn't interfere with the "
-#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
@@ -809,12 +725,6 @@ msgstr ""
 "assicurare che l'intera rete abbia l'ora esatta."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Printers are connected where convenient, either directly onto the main "
-#| "network, or connected to a server, workstation or thin-client-server. "
-#| "Access to printers can be controlled for individual users according to "
-#| "the groups they belong to; this will be achieved by using quota and "
-#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
 "network, or connected to a server, workstation or LTSP server. Access to "
@@ -833,9 +743,6 @@ msgid "LTSP server(s)"
 msgstr "LTSP server"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (also called thin client "
-#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
@@ -846,9 +753,6 @@ msgstr ""
 "selezionando il profilo LTSP Server."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The thin client servers are set up to receive syslog from the thin "
-#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
 "The LTSP servers are set up to receive syslog from thin clients and "
 "workstations, and forward these messages to the central syslog recipient."
@@ -890,16 +794,6 @@ msgstr ""
 "Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Thin clients are a good way to make use of older, weaker machines as they "
-#| "effectively run all programs on the LTSP server. This works as follows: "
-#| "the service uses DHCP and TFTP to connect to the network and boot from "
-#| "the network. Next, the file system is mounted via NFS from the LTSP "
-#| "server, and finally the X Window System is started. The display manager "
-#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
-#| "data is encrypted on the network. For very old thin clients which are too "
-#| "slow for the encryption this can be set to the behavior from former "
-#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
@@ -988,11 +882,6 @@ msgid "Administration"
 msgstr "Amministrazione"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "All the Linux machines that are installed with the Skolelinux installer "
-#| "will be administrable from a central computer, most likely the server. It "
-#| "will be possible to log in to all machines via SSH (root not allowed by "
-#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
@@ -1030,9 +919,6 @@ msgstr ""
 "tipi possono essere avviati anche da penna USB. "
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The aim is to be able to install a server from any type medium once, and "
-#| "install all other clients over the network by booting from the network."
 msgid ""
 "The aim is to be able to install a server from any type of medium once, and "
 "install all other clients over the network by booting from the network."
@@ -1049,13 +935,6 @@ msgstr ""
 "l'installazione."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The installation should not ask any questions, with the exception of "
-#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
-#| "profile (server, workstation, thin client server). All other "
-#| "configuration will be set up automatically with reasonable values, to be "
-#| "changed from a central location by the system administrator subsequent to "
-#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
@@ -1200,11 +1079,6 @@ msgstr ""
 "\"Architecture\">architettura della rete</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The computers running Debian Edu / Skolelinux must have either 32 bit "
-#| "(Debian architecture 'i386', oldest supported processors are Intel "
-#| "Pentium and AMD K5) or 64 bit (Debian architecture 'amd64') x86 "
-#| "processors."
 msgid ""
 "The computers running Debian Edu / Skolelinux must have either 32 bit "
 "(Debian architecture 'i386', oldest supported processors are 686 class ones) "
@@ -1216,9 +1090,6 @@ msgstr ""
 "processori x86."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
 "recommended for the main and LTSP server profiles."
@@ -1284,9 +1155,6 @@ msgstr ""
 "installato:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "main server + thin client server: 60 GiB. As usual with disk space on a "
-#| "main server, \"the bigger the better\"."
 msgid ""
 "combined main server + LTSP server: 70 GiB. As usual with disk space on a "
 "main server, \"the bigger the better\"."
@@ -1295,7 +1163,6 @@ msgstr ""
 "disco sul server principale, \"più grande è meglio\"."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "thin client server: 40 GiB."
 msgid "LTSP server: 50 GiB."
 msgstr "LTSP server: 50 GiB."
 
@@ -1304,9 +1171,6 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "workstation o standalone: 30 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Thin client servers need two network cards when using the default network "
-#| "architecture:"
 msgid ""
 "LTSP servers need two network cards when using the default network "
 "architecture:"
@@ -1319,10 +1183,6 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 connessa alla rete principale (10.0.0.0/8)"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
-#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
-#| "\">others are possible</link>."
 msgid ""
 "eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
@@ -1466,7 +1326,6 @@ msgstr ""
 "trasformato in un gateway se il profilo Debian Edu 'Minimal' è installato."
 
 #. type: Content of: <article><section><section><para>
-#| msgid "Configuring the PXE installation"
 msgid "After the installation:"
 msgstr "Dopo l'installazione:"
 
@@ -1532,10 +1391,6 @@ msgstr ""
 " #apt install wondershaper"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If you are looking for a router firewall solution capable of running on "
-#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
-#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
 "In case you are looking for a complete router firewall solution capable of "
 "running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
@@ -1548,13 +1403,6 @@ msgstr ""
 "\">floppyfw</ulink>."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If you need something for an embedded router or accesspoint we recommend "
-#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
-#| "you can also use the original firmware. Using the original firmware is "
-#| "easier; using OpenWRT gives you more choices and control. Check the "
-#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
-#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
@@ -1594,11 +1442,6 @@ msgid "Where to find additional information"
 msgstr "Dove trovare maggiori informazioni"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "We recommend that you read or at least take a look at the <ulink url="
-#| "\"http://www.debian.org/releases/jessie/releasenotes\">release notes for "
-#| "Debian Jessie</ulink> before you start installing a system for production "
-#| "use. Please give Debian Edu/Skolelinux a try, it should just work."
 msgid ""
 "We recommend that you read or at least take a look at the <ulink url="
 "\"http://www.debian.org/releases/stretch/releasenotes\">release notes for "
@@ -1633,10 +1476,6 @@ msgstr ""
 "volta."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Even more information about the Debian Jessie release is available in its "
-#| "<ulink url=\"http://www.debian.org/releases/jessie/installmanual"
-#| "\">installation manual</ulink>."
 msgid ""
 "Even more information about the Debian Stretch release is available in its "
 "<ulink url=\"http://www.debian.org/releases/stretch/installmanual"
@@ -1647,8 +1486,6 @@ msgstr ""
 "d'installazione</ulink>."
 
 #. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "Download the installation media for Debian Edu 8+edu0 Codename \"Jessie\""
 msgid "Download the installation media for Debian Edu 9+edu0 Codename Stretch"
 msgstr ""
 "Scaricare il supporto di installazione per Debian Edu 9+edu0 nome in codice "
@@ -1670,9 +1507,6 @@ msgstr ""
 "Si può scaricare da:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
-#| "iso\">debian-edu-8+edu0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
@@ -1681,9 +1515,6 @@ msgstr ""
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
 msgid ""
 "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-9+edu0~a0-CD.iso ./debian-edu-9+edu0~a0-CD.iso </computeroutput>"
@@ -1692,16 +1523,10 @@ msgstr ""
 "edu-9+edu0~a0-CD.iso ./debian-edu-9+edu0~a0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgid "USB drive ISO image for i386 and amd64"
 msgstr "immagine ISO su USB drive ISO per i386 e amd64"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. Please note that internet access "
-#| "during installation is needed. Like the others it can be downloaded over "
-#| "FTP, HTTP or rsync via:"
 msgid ""
 "The multi-architecture ISO image is 5.5 GiB large and can be used for "
 "installation of amd64 and i386 machines. Like the netinstall image it can be "
@@ -1718,9 +1543,6 @@ msgstr ""
 "tramite FTP, HTTP o rsync tramite:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-#| "USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
 "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
@@ -1729,9 +1551,6 @@ msgstr ""
 "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8+edu0-USB.iso ./debian-edu-8+edu0-USB.iso </computeroutput>"
 msgid ""
 "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-9+edu0~a0-USB.iso ./debian-edu-9+edu0~a0-USB.iso </computeroutput>"
@@ -1778,13 +1597,6 @@ msgid "Installing Debian Edu"
 msgstr "Installare Debian Edu"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "When you do a Debian Edu installation, you have a few options to choose "
-#| "from. Don't be afraid; there aren't many. We have done a good job of "
-#| "hiding the complexity of Debian during the installation and beyond. "
-#| "However, Debian Edu is Debian, and if you want there are more than 42,000 "
-#| "packages to choose from and a billion configuration options. For the "
-#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
@@ -1802,23 +1614,19 @@ msgstr ""
 "dovrebbero andar bene."
 
 #. type: Content of: <article><section><section><section><title>
-#| msgid "Installation and download options"
 msgid "Installation types and options"
 msgstr "Tipi di installazione e opzioni"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "Installer boot menu"
 msgid "<emphasis>Installer boot menu on 64-bit Hardware</emphasis>"
 msgstr ""
 "<emphasis>Menu di avvio dell'installatore su hardware a 64-bit</emphasis>"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/01-Installer_boot_menu.png"
 msgid "./images/01-Installer_64bit_boot_menu.png"
 msgstr "./images/01-Installer_64bit_boot_menu.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Installer boot menu"
 msgid "64-bit Installer boot menu"
 msgstr "Menu di avvio dell'installazione 64-bit"
 
@@ -1831,16 +1639,10 @@ msgstr ""
 "l'installatore GTK in cui si può usare il mouse."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
-#| "mode install."
 msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
-#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose."
@@ -1849,9 +1651,6 @@ msgstr ""
 "menu con maggiori opzioni da scegliere"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-#| "installation on i386 and amd64."
 msgid ""
 "<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
 "bit installation on 64-bit hardware."
@@ -1860,9 +1659,6 @@ msgstr ""
 "una installazione a 32 bit su hardware a 64 bit."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer; see screenshot below."
@@ -1871,27 +1667,20 @@ msgstr ""
 "sull'utilizzo dell'installazione; vedere gli screenshot sotto. "
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/Installer_advanced_options_a.png"
 msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "./images/01a-Installer_64bit_advanced_options.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Installer advanced options screen 1"
 msgid "64-bit Installer advanced options screen 1"
 msgstr "Schermata 1 delle opzioni avanzate dell'installazione a 64 bit"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr ""
 "<emphasis role=\"strong\">Back..</emphasis> riporta al menu principale."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
-#| "access to all available questions in graphical mode."
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
 "to all available questions, mouse usable."
@@ -1900,9 +1689,6 @@ msgstr ""
 "tutte le domande disponibili in modalità grafica."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
-#| "medium become a rescue disk for emergency tasks."
 msgid ""
 "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
 "install medium become a rescue disk for emergency tasks."
@@ -1928,9 +1714,6 @@ msgstr ""
 "domande disponibili in modalità testuale."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
-#| "medium become a rescue disk for emergency tasks."
 msgid ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
 "install medium become a rescue disk for emergency tasks."
@@ -1940,9 +1723,6 @@ msgstr ""
 "attività di emergenza."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
-#| "file."
 msgid ""
 "<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
@@ -1951,18 +1731,15 @@ msgstr ""
 "bisogno di un file di preconfigurazione."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "Installer boot menu"
 msgid "<emphasis>Installer boot menu on 32-bit Hardware</emphasis>"
 msgstr ""
 "<emphasis>menu di avvio dell'installazione su hardware a 32 bit</emphasis>"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/01-Installer_boot_menu.png"
 msgid "./images/01b-Installer_32bit_boot_menu.png"
 msgstr "./images/01b-Installer_32bit_boot_menu.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "Installer boot menu"
 msgid "32-bit Installer boot menu"
 msgstr "Menu di avvio dell'installazione a 32 bit"
 
@@ -1971,12 +1748,10 @@ msgid "Explanations are similar to those for 64-bit hardware."
 msgstr "Le spiegazioni sono simili a quelle per l'hardware a 64 bit."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "<emphasis>(as superuser in Gosa)</emphasis>"
 msgid "<emphasis>Help screen</emphasis>"
 msgstr "<emphasis>Schermate di aiuto</emphasis>"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/01-Installer_boot_menu.png"
 msgid "./images/01c-Installer_help.png"
 msgstr "./images/01c-Installer_help.png"
 
@@ -1985,9 +1760,6 @@ msgid "Installer help screen"
 msgstr "Schermata di aiuto dell'installatore"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "This Help screen is self explaining and enables the <F>-keys on the "
-#| "keyboard for getting more detailed help on the topics described."
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
@@ -1997,16 +1769,12 @@ msgstr ""
 "descritti."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid "Additional boot parameters for installations"
 msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr ""
 "<emphasis>Aggiungere o modificare i parametri di avvio per le installazioni</"
 "emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
-#| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu; the screenshot shows the command line for <emphasis role=\"strong"
@@ -2017,7 +1785,6 @@ msgstr ""
 "l'<emphasis role=\"strong\">installazione grafica</emphasis>."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/smile.png"
 msgid "./images/BD_command_line.png"
 msgstr "./images/BD_command_line.png"
 
@@ -2048,11 +1815,6 @@ msgstr ""
 "utilizzerà automaticamente il proxy del server principale."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
-#| "of the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
-#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
@@ -2064,10 +1826,6 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
@@ -2078,10 +1836,6 @@ msgstr ""
 "utilizzare LTSP)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "use <computeroutput>desktop=xfce</computeroutput>."
@@ -2090,10 +1844,6 @@ msgstr ""
 "<computeroutput>desktop=xfce</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
-#| "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
-#| "boot parameters."
 msgid ""
 "And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
 "instead, use <computeroutput>desktop=mate</computeroutput>."
@@ -2106,11 +1856,6 @@ msgid "The installation process"
 msgstr "Il processo d'installazione"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-#| "Jessie/Requirements\">system requirements</ulink> and make sure you have "
-#| "at least two network cards (NICs) if you plan on setting up a thin client "
-#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
@@ -2121,7 +1866,6 @@ msgstr ""
 "almeno due schede di rete (NIC) se si si desidera installare un server LTSP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Choose a language (for the installation and the installed system)"
 msgid "Choose a language (for the installation and the installed system)."
 msgstr "Scegliere una lingua (per l'installazione e per il sistema da usare)."
 
@@ -2131,7 +1875,6 @@ msgstr ""
 "Scegliere un posto che normalmente dovrebbe essere il luogo in cui si vive."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
 msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "Scegliere una disposizione di tastiera (in genere quella predefinita per il "
@@ -2142,17 +1885,10 @@ msgid "Choose profile(s) from the following list:"
 msgstr "Scegliere il profilo dal seguente elenco:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Main Server</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "This is the main server (tjener) for your school providing all services "
-#| "pre-configured to work out of the box. You must only install one main "
-#| "server per school! This profile does not include a graphical user "
-#| "interface. If you want a graphical user interface, then select "
-#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must install only one main server per "
@@ -2202,7 +1938,6 @@ msgstr ""
 "suggerito nei precedenti rilasci."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP Server</emphasis>"
 
@@ -10903,10 +10638,15 @@ msgstr ""
 "successiva."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
+#| "2014) and is released under the GPL v2 or any later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduzione italiana è protetta da copyright di Claudio Carboncini (2007, "
 "2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) e Beatrice Torracca (2013, "
@@ -11172,7 +10912,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 "
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 5b3d63c..5114ef2 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+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"
@@ -9417,8 +9417,8 @@ msgstr ""
 #. 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."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
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 72bde07..dd7c3f6 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-21 10:27+0000\n"
 "PO-Revision-Date: 2017-03-02 20:18+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -10538,10 +10538,15 @@ msgstr ""
 "eller en senere versjon."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
+#| "2014) and is released under the GPL v2 or any later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 "Opphavsretten til den italienske oversettelsen tilhører Claudio Carboncini "
 "(2007-2015) og Beatrice Torracca (2013-2014), og er gitt ut i henhold til "
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 e05ac1a..afe1735 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+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"
@@ -1359,9 +1359,6 @@ msgstr ""
 "draaien, al is dit niet nodig. Hij zal trouwens niet gebruikt worden."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "A system with two network interfaces could be turned into a gateway if "
-#| "the Debian Edu 'Minimal' profile is installed."
 msgid ""
 "In case you already have a router but are unable to configure it like needed "
 "(not allowed to, technical reasons), a system with two network interfaces "
@@ -1440,10 +1437,6 @@ msgstr ""
 " #apt install wondershaper"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If you are looking for a router firewall solution capable of running on "
-#| "an old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
-#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
 "In case you are looking for a complete router firewall solution capable of "
 "running on an old PC, we recommend <ulink url=\"http://www.ipcop.org"
@@ -9873,9 +9866,6 @@ msgid "Linux kernel 4.9"
 msgstr "Linux kernel versie 4.9"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE Plasma Workspace 5, GNOME 3.20, Xfce 4.12, LXDE "
-#| "0.99.2, MATE 1.16"
 msgid ""
 "Desktop environments KDE Plasma Workspace 5.8, GNOME 3.22, Xfce 4.12, LXDE "
 "0.99.2, MATE 1.16"
@@ -9892,7 +9882,6 @@ msgstr ""
 "handleiding om een van de andere te kiezen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Firefox 45.7 ESR and Chromium 56"
 msgid "Firefox 45.8 ESR and Chromium 57"
 msgstr "Firefox 45.8 ESR en Chromium 57"
 
@@ -9905,7 +9894,6 @@ 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.1.3"
 msgid "LibreOffice 5.2.5"
 msgstr "LibreOffice 5.2.5"
 
@@ -9914,7 +9902,6 @@ msgid "Educational toolbox GCompris 15.10"
 msgstr "Gereedschapskist voor het onderwijs GCompris versie 15.10"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Music creator Rosegarden 16.02"
 msgid "Music creator Rosegarden 16.06"
 msgstr "Programma voor muziekcreatie Rosegarden 16.06"
 
@@ -10022,10 +10009,6 @@ msgstr ""
 "Geode\") wel nog ondersteund blijven."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Debian 9 enables unattended upgrades by default for new installations. "
-#| "This might cause a delay of about 15 minutes if a system with a low "
-#| "uptime value is powered off."
 msgid ""
 "Debian 9 enables unattended upgrades (for security updates) by default for "
 "new installations. This might cause a delay of about 15 minutes if a system "
@@ -10154,10 +10137,15 @@ msgstr ""
 "vrijgegeven onder de licentie GPL v2 of een latere versie."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
+#| "2014) and is released under the GPL v2 or any later version."
 msgid ""
 "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, 2014) "
-"and is released under the GPL v2 or any later version."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de Italiaanse vertaling berusten bij Claudio "
 "Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) en "
@@ -10215,9 +10203,6 @@ msgstr ""
 "latere versie."
 
 #. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Simplified Chinese translation is copyrighted by Ma Yong (2016) and "
-#| "Boyuan Yang (2017) 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 "
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 10bfc09..454a27e 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+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-"
@@ -7638,8 +7638,8 @@ msgstr ""
 #. 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."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index bcbcd8f..c2bd7c5 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+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"
@@ -7193,8 +7193,8 @@ msgstr ""
 #. 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."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 358eade..2da94d4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -3307,7 +3307,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </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>
-<para>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. 
+<para>The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca (2013, 2014) and is released under the GPL v2 or any later version. 
 </para>
 <para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version. 
 </para>
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 eed6288..521e78a 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-14 21:46+0000\n"
+"POT-Creation-Date: 2017-03-21 10:27+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-"
@@ -7951,8 +7951,8 @@ msgstr ""
 #. 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."
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
+"(2013, 2014) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>

-- 
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