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

Holger Levsen holger at layer-acht.org
Sun Feb 19 12:17:58 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 65dcac395412dbeffea76b564ac82f1fcdc80556
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Feb 19 12:14:29 2017 +0000

    Update Debian Edu Stretch manual from the wiki.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                                   |    5 +-
 .../debian-edu-stretch-manual.da.po                |  776 +++++++++++----
 .../debian-edu-stretch-manual.de.po                |  952 +++++++++++++++----
 .../debian-edu-stretch-manual.es.po                |  665 +++++++++----
 .../debian-edu-stretch-manual.fr.po                |  787 +++++++++++----
 .../debian-edu-stretch-manual.it.po                |  787 +++++++++++----
 .../debian-edu-stretch-manual.ja.po                |  919 ++++++++++++++----
 .../debian-edu-stretch-manual.nb.po                |  876 ++++++++++++-----
 .../debian-edu-stretch-manual.nl.po                | 1000 +++++++++++++++-----
 .../debian-edu-stretch-manual.pl.po                |  672 ++++++++-----
 .../debian-edu-stretch-manual.pot                  |  424 +++++----
 .../debian-edu-stretch-manual.xml                  |  224 +++--
 .../debian-edu-stretch-manual.zh.po                |  611 ++++++++----
 .../images/26-Tjener-KDE_Desktop_Browser.png       |  Bin 0 -> 186147 bytes
 .../images/27-Tjener-KDE_Desktop.png               |  Bin 0 -> 337899 bytes
 .../images/31-ThinClient-KDE_Desktop.png           |  Bin 0 -> 282068 bytes
 .../debian-edu-stretch/images/BD_command_line.png  |  Bin 0 -> 14529 bytes
 17 files changed, 6353 insertions(+), 2345 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a50f2e9..8f19e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-edu-doc (1.917~20170213) UNRELEASED; urgency=medium
+debian-edu-doc (1.917~20170226) UNRELEASED; urgency=medium
 
   [ Stretch Manual translation updates ]
   * Norwegian Bokmål: Petter Reinholdtsen and Ole-Erik Yrvin.
@@ -22,6 +22,9 @@ debian-edu-doc (1.917~20170213) UNRELEASED; urgency=medium
   * Norwegian Bokmål: Petter Reinholdtsen.
   * Polish: Stanisław Krukowski.
 
+  [ Holger Levsen ]
+  * Update Debian Edu Stretch manual from the wiki.
+
  -- Holger Levsen <holger at debian.org>  Mon, 13 Feb 2017 18:34:14 +0100
 
 debian-edu-doc (1.916~20170125) unstable; urgency=medium
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 f2c58ae..63467c8 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+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"
@@ -78,6 +78,19 @@ msgstr ""
 "tilbyder et ud af boksen-miljø for et fuldstændig konfigureret skolenetværk."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Directly after installation of a school server all services needed for a "
+#| "school network are set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>) and "
+#| "the system is ready to be used. Only users and machines need to be added "
+#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
+#| "environment using PXE has also been prepared, so after initial "
+#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
+#| "all other machines can be installed via the network, this includes "
+#| "\"roaming workstations\" (ones that can be taken away from the school "
+#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
+#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -88,7 +101,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "Umiddelbart efter installationen af en skoleserver - der kører alle "
 "tjenester krævet for et skolenetværk - sættes dette netværk op (se det næste "
@@ -141,8 +154,15 @@ msgstr ""
 "tilbyder et ud af boksen-miljø for et fuldstændig konfigureret skolenetværk."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
 msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+"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 "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -200,9 +220,9 @@ msgstr "Debian Edu-netværkstopologi"
 #| "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, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -219,12 +239,20 @@ msgstr ""
 "netværkstjenesterne."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "Årsagen til, at der kun kan være en hovedserver i hvert skolenetværk er at "
@@ -265,9 +293,15 @@ msgstr ""
 "køres hukommelsestest (memtest), eller startes op fra den lokale harddisk."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -305,9 +339,9 @@ msgstr "Hovedserver (tjener)"
 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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Et netværk for Skolelinux kræver en hovedserver (også kaldt for »tjener« som "
 "er norsk og betyder »server«), der som standard har IP-adressen 10.0.2.2 og "
@@ -333,14 +367,14 @@ msgstr "Tjenester der kører på hovedserveren"
 #| "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 "
+"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 LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -578,6 +612,14 @@ msgid "ltsp"
 msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "NBD"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -588,13 +630,13 @@ msgstr ""
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "munin, nagios and site-summary"
-msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin, nagios og sideoversigt"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "Sitesummary"
-msgid "site-summary"
+msgid "sitesummary"
 msgstr "Sitesummary"
 
 #. type: Content of: <article><section><section><section><para>
@@ -612,13 +654,21 @@ msgstr ""
 "for Windows- og Macintoshklienter."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "Som standard sættes posten kun op for lokal levering (dvs. indenfor skolen), "
 "dog kan e-post-levering til det større internet sættes op, hvis skolen har "
@@ -660,7 +710,7 @@ msgstr ""
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -766,7 +816,7 @@ msgstr ""
 #| "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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -789,7 +839,7 @@ msgstr ""
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
 "Et netværk for Skolelinux kan have mange LTSP-servere (også kaldt for "
 "servere for tynde klienter), som installeres ved at vælge profilen for tynd "
@@ -807,6 +857,16 @@ msgstr ""
 "Serverne for de tynde klienter sættes op til at modtage syslog fra de tynde "
 "klienter, og videresende disse beskeder til den centrale syslog-modtager."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "Tynde klienter"
@@ -825,16 +885,27 @@ msgstr ""
 "Linux Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted via NFS from the LTSP "
+#| "server, and finally the X Window System is started. The display manager "
+#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
+#| "data is encrypted on the network. For very old thin clients which are too "
+#| "slow for the encryption this can be set to the behavior from former "
+#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "Tynde klienter er en god måde at gøre brug af ældre, svagere maskiner, da de "
 "effektivt kører alle programmer på LTSP-serveren. Dette virker på følgende "
@@ -914,11 +985,17 @@ msgid "Administration"
 msgstr "Administration"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (root not allowed by "
+#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 "Alle Linuxmaskinerne, som er installeret via Skolelinux-"
 "installationsprogrammet, vil kunne administreres fra en central computer, "
@@ -928,18 +1005,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"Vi bruger cfengine til at redigere konfigurationsfiler. Disse filer "
-"opdateres fra serveren til klienterne. For at ændre klientkonfigurationen, "
-"er det nok at redigere serverkonfigurationen og lade automatiseringen "
-"distribuere ændringerne."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -962,8 +1027,12 @@ msgstr ""
 "flerarkitektur USB-drev. Begge aftryk kan også indlæses fra USB-drev."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "Formålet er at være i stand til at installere en server fra et medie en gang "
@@ -1242,8 +1311,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 er forbundet til hovednetværket (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
+#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
+#| "\">others are possible</link>."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1365,6 +1439,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Configuring the PXE installation"
+msgid "After the installation:"
+msgstr "Konfiguration af PXE-installationen"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1382,12 +1508,20 @@ msgstr ""
 "ulink> eller <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you need something for an embedded router or accesspoint we recommend "
+#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
+#| "you can also use the original firmware. Using the original firmware is "
+#| "easier; using OpenWRT gives you more choices and control. Check the "
+#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
+#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 "Hvis du skal bruge noget for en indlejret router eller adgangspunkt så "
@@ -1486,14 +1620,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0-a0-CD."
-"iso\">debian-edu-9+edu0-a0-CD.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
 msgstr ""
@@ -1513,12 +1639,20 @@ msgid "USB drive ISO image for i386 and amd64"
 msgstr "USB-drev ISO-aftryk for i386 og amd64"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Like the netinstall image it can "
+#| "be installed on USB flash drives or disk media of sufficient size. Please "
+#| "note that internet access during installation is needed. Like the others "
+#| "it can be downloaded over FTP, HTTP or rsync via:"
 msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 "ISO-aftrykket for flere arkitekturer er på 5,2 GiB og kan bruges for "
 "installation på amd64- og i386-maskiner. Som aftrykket netinstall kan det "
@@ -1528,14 +1662,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
 "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
 msgstr ""
@@ -1587,11 +1713,19 @@ msgid "Installing Debian Edu"
 msgstr "Installation af Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 42,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
 "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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1818,7 +1952,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid "Additional boot parameters for installations"
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr "Yderligere opstartsparametre for installationer"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1828,11 +1962,22 @@ msgstr "Yderligere opstartsparametre for installationer"
 #| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
-"boot menu."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
 msgstr ""
 "På i386/amd64 kan opstartsindstillinger redigeres ved at trykke på TAB-"
 "tasten i opstartsmenuen."
 
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
@@ -1864,8 +2009,8 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "For at installere <emphasis role=\"strong\">GNOME</emphasis>-skrivebordet i "
 "stedet for <emphasis role=\"strong\">KDE »Plasma«</emphasis>-skrivebordet så "
@@ -1873,20 +2018,29 @@ msgstr ""
 "kerneopstartsparametrene."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 "For at installere <emphasis role=\"strong\">LXDE</emphasis>-skrivebordet i "
 "stedet for så tilføj <computeroutput>desktop=lxde</computeroutput> til "
 "kerneopstartsparametrene."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "For at installere <emphasis role=\"strong\">Xfce</emphasis>-skrivebordet i "
 "stedet for så tilføj <computeroutput>desktop=lxde</computeroutput> til "
@@ -1899,9 +2053,8 @@ msgstr ""
 #| "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 #| "boot parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "For at installere <emphasis role=\"strong\">MATE</emphasis>-skrivebordet i "
 "stedet for så tilføj <computeroutput>desktop=mate</computeroutput> til "
@@ -1928,7 +2081,9 @@ msgstr ""
 "netværkskort (NIC'er) hvis du planlægger at opsætte en tynd klientserver."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a language (for the installation and the installed system)"
+#, fuzzy
+#| msgid "Choose a language (for the installation and the installed system)"
+msgid "Choose a language (for the installation and the installed system)."
 msgstr "Vælg et sprog (for installationen og det installerede system)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1936,7 +2091,9 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr "Vælg en placering som normalt er der hvor du bor."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a keyboard keymap (the country's default is usually fine)"
+#, fuzzy
+#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
+msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr "Vælg et tastaturlayout (landets standard er normalt et okay valg)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1944,7 +2101,9 @@ msgid "Choose profile(s) from the following list:"
 msgstr "Vælg profiler fra den følgende liste:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Hovedserver</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1957,9 +2116,9 @@ msgstr "<emphasis role=\"strong\">Hovedserver</emphasis>"
 #| "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 only install one main server per "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 "Dette er hovedserveren (tjener) for din skole, der tilbyder alle tjenester "
@@ -2005,7 +2164,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Hovedserver</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -2022,11 +2181,12 @@ msgstr "<emphasis role=\"strong\">Hovedserver</emphasis>"
 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 "Server for tynde klienter (og diskløse arbejdsstationer) også kaldt for en "
 "LTSP-server. Klienter uden harddiske starter op og kører programmer fra "
@@ -2092,7 +2252,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 "Profilerne <emphasis role=\"strong\">Hovedserver</emphasis>, <emphasis role="
 "\"strong\">Arbejdsstation</emphasis> og <emphasis role=\"strong\">Server for "
@@ -2108,22 +2268,6 @@ msgstr ""
 "hovedserver eller som en server for tynde klinter for at være brugbar efter "
 "installationen."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
-msgstr ""
-"Rækkefølgen for netværkskort efter installationen kan være forskellige fra "
-"rækkefølgen under installationen. Den ønskede rækkefølge kan opnås ved at "
-"redigere <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>: Du vil normalt, <emphasis>hvis dette sker</emphasis>, ønske "
-"at erstatte eth0 med eth1 og eth1 med eth0; en genstart er krævet for at "
-"ændringerne træder i kraft."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2155,7 +2299,7 @@ msgstr ""
 #| "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 "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -2267,7 +2411,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
 #| msgid "A note on thin-client-server installations"
-msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr "En bemærkning om installationer af servere for tynde klienter"
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2391,8 +2535,8 @@ msgstr ""
 #| "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> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 "Sådan ser PXE-menuen ud med profilerne for <emphasis role=\"strong"
@@ -2407,6 +2551,12 @@ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2576,10 +2726,10 @@ msgstr ""
 #| "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 + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 "Så her er en visning af skærmbillederne for en hovedserver + arbejdsstation "
 "+ server for tynde klinter under installationen og hvordan det ser ud ved "
@@ -2875,7 +3025,7 @@ msgstr ""
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2885,7 +3035,7 @@ msgstr ""
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
-msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "{{attachment:27-Tjener-KDE_Desktop.png}}"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2915,9 +3065,15 @@ msgstr "Diskløse arbejdsstationer"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "{{attachment:31-ThinClient-KDE_Desktop.png}}"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "XFCE desktop"
+msgid "KDE Desktop and Menu"
+msgstr "XFCE-skrivebord"
+
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr "Kom i gang"
@@ -2945,6 +3101,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 "Efter installationen er den første ting, du skal udføre, som første bruger:"
@@ -2969,10 +3133,16 @@ msgstr ""
 "kan bruges direkte uden dette trin."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Adding users and workstations is described in detail below, so please "
+#| "read this chapter completely. It covers how to perform these minumum "
+#| "steps correctly as well, as other stuff that everybody will probably need "
+#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
-"this chapter completely. It covers how to perform these minumum steps "
-"correctly as well, as other stuff that everybody will probably need to do."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 "Tilføjelse af brugere og arbejdsstationer er beskrevet i detaljer nedenfor, "
 "så læs venligst dette kapitel helt færdigt. Det dækker hvordan "
@@ -3014,8 +3184,10 @@ msgstr ""
 "nogle ofte stillede spørgsmål."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu MATE desktop"
-msgstr ""
+#, fuzzy
+#| msgid "XFCE desktop"
+msgid "Debian Edu KDE desktop"
+msgstr "XFCE-skrivebord"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -3073,11 +3245,11 @@ msgstr "DHCP-administration"
 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 + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 "For GOsa²-adgang skal du have Skolelinux' hovedserveren og et (klient) "
 "system med en internetbrowser installeret, som kan være selve hovedserveren, "
@@ -3164,10 +3336,9 @@ 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 LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 "I Debian Edu gemmes konto-, gruppe- og systeminformation i en LDAP-mappe. "
 "Disse data bruges ikke kun af hovedserveren, men også af (diskløse) "
@@ -3676,10 +3847,16 @@ msgstr ""
 "i denne manual."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis role=\"strong"
+#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
-"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
 "Diskløse arbejdsstationer og tynde klienter kan direkte startes op fra "
@@ -3749,9 +3926,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 "Hvis maskinerne er opstartet som tynde klienter/diskløse arbejdsstationer "
@@ -3948,8 +4125,14 @@ msgstr ""
 "statiske IP-adresser fra LDAP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
+#| "or your users won't be able to access their home directories. Diskless "
+#| "workstations and thin clients don't use NFS, so they don't need to be "
+#| "configured."
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -3997,10 +4180,15 @@ msgstr ""
 "hver time."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian Edu machines in this group will only be allowed to connect to "
+#| "machines on the local network.  Combined with web proxy restrictions this "
+#| "might be used during exams."
 msgid ""
-"Debian Edu machines in this group will only be allowed to connect to "
-"machines on the local network.  Combined with web proxy restrictions this "
-"might be used during exams."
+"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 "
+"be used during exams."
 msgstr ""
 "Debian Edu-maskiner i denne gruppe vil kun få tilladelse til at forbinde til "
 "maskiner på det lokale netværk. Kombineret med begrænsninger for "
@@ -4192,6 +4380,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
 "send mail to an address you are reading."
@@ -4215,11 +4409,19 @@ msgstr ""
 "upgrade</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed and configured as described on <ulink url=\"https://wiki."
+#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
+#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed and configured as described on <ulink url=\"https://wiki.debian."
-"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 "Automatisk installation af opdateringer kan nemt udføres, det kræver bare at "
 "pakken <computeroutput>unattended-upgrades</computeroutput> installeres og "
@@ -4267,12 +4469,21 @@ msgid "Backup Management"
 msgstr "Sikkerhedshåndtering"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail. Note: the site will only work "
+#| "if you temporarily allow ssh root login on the backup server (tjener by "
+#| "default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 "For sikkerhedshåndtering så peg din browser på <ulink url=\"https://www/"
 "slbackup-php\"/>. Bemærk venligst at du skal tilgå denne side via SSL, da du "
@@ -4388,6 +4599,17 @@ msgstr ""
 "systemproblemer."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The list of machines being monitored using Munin is generated "
+#| "automatically, based on the list of hosts reporting to sitesummary.  All "
+#| "hosts with the package munin-node installed are registered for Munin "
+#| "monitoring.  It will normally take one day from a machine being installed "
+#| "until Munin monitoring starts, because of the order the cron jobs are "
+#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
+#| "update-munin</computeroutput> as root on the sitesummary server (normally "
+#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
+#| "conf</computeroutput> file."
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -4395,7 +4617,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 "Listen over maskiner der overvåges med Munin oprettes automatisk, baseret på "
@@ -4409,10 +4631,17 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The set of measurements being collected is automatically generated on "
+#| "each machine using the <computeroutput>munin-node-configure</"
+#| "computeroutput> program, which probes the plugins available from "
+#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
+#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from <computeroutput>/usr/share/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
@@ -4424,9 +4653,13 @@ msgstr ""
 
 # engelsk fejl mellemrum.
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Munin is available from <ulink url=\"http://munin."
+#| "projects.linpro.no/\"/> ."
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 "Information om Munin er tilgængelig fra <ulink url=\"http://munin.projects."
 "linpro.no/\"/>."
@@ -5380,10 +5613,15 @@ msgstr ""
 "hovedserverens installation (første bruger):"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ sudo apt-get update\n"
+#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+#| "  # after installation, start a graphical session for the first user \n"
+#| "  $ startx"
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -5506,9 +5744,14 @@ msgstr ""
 "StableUpdates\">stable-updates-programpakken </ulink>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "While you can use stable-updates directly, you don't have to: stable-"
+#| "updates are pushed into the stable suite regularily when stable point "
+#| "releases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
-"are pushed into the stable suite regularily when stable point releases are "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 "Selvom du kan bruge stable-updates direkte, så er det ikke et krav: stable-"
@@ -5516,7 +5759,9 @@ msgstr ""
 "punktudgivelserne er klar, hvilket sker cirka hver anden måned."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+#, fuzzy
+#| msgid "Using backports.debian.org to install newer software"
+msgid "Using backports to install newer software"
 msgstr "Brug af backports.debian.org til at installere nyere programmer"
 
 #. type: Content of: <article><section><section><para>
@@ -5574,11 +5819,19 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Backports are automatically updated (if available) just like other "
+#| "packages. (Previously, extra configuration was needed to achieve this, "
+#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#| "anymore]."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 "Backports bliver automatisk opdateret (hvis tilgængelige) ligesom andre "
 "pakker. (Tidligere var ekstra konfiguration krævet, men siden 2011 [[<ulink "
@@ -5627,8 +5880,13 @@ msgid "To quote the apt-cdrom(8) man page:"
 msgstr "For at citere manualsiden apt-cdrom(8):"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
+#| "apt-cdrom takes care of determining the structure of the disc as well as "
+#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
-"apt-cdrom is used to add a new CDROM to APTs list of available sources. apt-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -5637,9 +5895,14 @@ msgstr ""
 "korrektion af flere mulige fejlbrændinger og verificering af indeksfilerne."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
+#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
+#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
-"done by hand. Furthermore each disk in a multi-cd set must be inserted and "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 "Det er nødvendigt at bruge apt-cdrom til at tilføje cd'er til APT-systemet, "
@@ -5665,8 +5928,14 @@ msgid "Automatic cleanup of leftover processes"
 msgstr "Automatisk oprydning af tilbageværende processer"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
+#| "of background jobs. Background jobs are defined as processes that belong "
+#| "to users who are not currently logged into the machine. It's run by cron "
+#| "job once an hour."
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -5980,7 +6249,9 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
+#, fuzzy
+#| msgid "Advanced administration"
+msgid "Advanced administration howto"
 msgstr "Avanceret administration"
 
 #. type: Content of: <article><section><para>
@@ -5996,9 +6267,14 @@ msgid "Create Users in Year Groups"
 msgstr "Opret brugere i årsgrupper"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In this example we want to create users in year groups, with common home "
+#| "directories for each group (home0/2014, home0/2015, etc.) We want to "
+#| "create the users by csv import."
 msgid ""
 "In this example we want to create users in year groups, with common home "
-"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 "I dette eksempel ønsker vi at oprette brugere i årsgrupper, med fælles "
@@ -6006,7 +6282,9 @@ msgstr ""
 "oprette brugerne med csv-import."
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
+#, fuzzy
+#| msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis>(som root på Tjener) </emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6060,16 +6338,25 @@ msgid "Template"
 msgstr "Skabelon"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose 'users' from the main menu. Change to 'Students' in the Base "
+#| "field. An Entry <computeroutput>'NewStudent'</computeroutput> should show "
+#| "up, click it. This is the 'students' template, not a real user. As you'll "
+#| "have to create such a template (to be able to use csv import for your "
+#| "structure) based on this one, notice all entries showing up in the "
+#| "Generic, POSIX and Samba tabs, maybe take screenshots. Now change to /"
+#| "Students/2014 in the Base field; choose Create/Template and start to fill "
+#| "in your desired values, first the Generic tab (add your new 2014 group "
+#| "under Group Membership, too), then add POSIX and Samba account."
 msgid ""
 "Choose 'users' from the main menu. Change to 'Students' in the Base field. "
-"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
 msgstr ""
 "Vælg »brugere« fra hovedmenuen. Ændr til »Students« i basisfeltet. En post "
 "<computeroutput>»NewStudent«</computeroutput> skal vise sig, klik på den. "
@@ -6081,14 +6368,25 @@ msgstr ""
 "faneblad (tilføj også din nye 2014-gruppe under Group Membership,), tilføj "
 "så POSIX- og Sambakonto."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Importbrugere"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose your new template when doing csv import; testing it with a few "
+#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 "vælg din nye skabelon under udførelse af csv-import; det anbefales at teste "
 "den med nogle få brugere."
@@ -6166,12 +6464,19 @@ msgstr ""
 " echo \"$created_dir mapper er blevet oprettet\""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
+#, fuzzy
+#| msgid "Easy access to USB drives and CDROMs/DVDs"
+msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "Nem adgang til USB-drev og cd-rom'er/dvd'er"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a (diskless) "
+#| "workstation, a popup window appears asking what to do with it, just like "
+#| "in any other normal installation."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
@@ -6180,8 +6485,15 @@ msgstr ""
 "normal installation."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a thin client there "
+#| "is only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -6208,11 +6520,18 @@ msgstr ""
 "enhedsikoner blive placeret på skrivebordet hvilket giver nem adgang)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
+#| "This might come in handy if users want to edit files directly on their "
+#| "plugged in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 "Derudover kan det følgende skript bruges til at oprette den symbolske "
 "henvisning »media« for alle brugere i deres hjemmemappe for nem adgang til "
@@ -6273,14 +6592,6 @@ msgstr ""
 "Hvis eksterne brugere accepterer pop op'en eller bruger pmount fra "
 "konsollen, så kan de endda montere de flytbare enheder og tilgå filerne."
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Dette spores som <ulink url=\"http://bugs.skolelinux.org/1376\">Debian Edu "
-"bug #1376</ulink>."
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr "Brug en dedikeret lagerserver"
@@ -6294,10 +6605,16 @@ msgstr ""
 "hjemmemappe og muligvis andre data."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Add a new system of type server using GOsa² as outlined in the <link "
+#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
+#| "started</link> chapter of this manual."
 msgid ""
-"Add a new system of type server using GOsa² as outlined in the <link linkend="
-"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
-"link> chapter of this manual."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 "Tilføj et nyt system af servere med GOsa² som beskrevet i kapitlet <link "
 "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Kom i gang</"
@@ -6416,10 +6733,15 @@ msgstr ""
 "ikke bruger automount til at undgå monteringsloop:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create the mount directories using <computeroutput>mkdir</"
+#| "computeroutput>, edit '/etc/fstab' as adequate and run "
+#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
-"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
-"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
-"computeroutput> to mount the new resources."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 "Opret monteringsmapperne med <computeroutput>mkdir</computeroutput>, rediger "
 "»/etc/fstab« på passende vis og kør <computeroutput>mount -a</"
@@ -6466,8 +6788,13 @@ msgid "Managing this case with GOsa is quite simple:"
 msgstr "Håndtering af denne opsætning med GOsa er meget simpel:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
+#| "level (where already other system management related groups like "
+#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -6532,11 +6859,17 @@ msgstr ""
 "#"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
+#| "dropped to disable internal ssh login access. Note: someone pluging in "
+#| "his box into the dedicated LTSP client network(s) will gain ssh access to "
+#| "the LTSP server(s) as well."
 msgid ""
 "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
-"dropped to disable internal ssh login access. Note: someone pluging in his "
-"box into the dedicated LTSP client network(s) will gain ssh access to the "
-"LTSP server(s) as well."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 "Hvis kun dedikerede LTSP-servere anvendes, kan 10.0.0.0/8-netværket droppes "
 "for at deaktivere intern ssh-logindadgang. Bemærk: En person som tilslutter "
@@ -10117,10 +10450,10 @@ 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), 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."
+"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."
 msgstr ""
 "Oversættelsen til bokmål er underlagt ophavsretten af Petter Reinholdtsen "
 "(2007, 2012, 2014, 2015), Håvard Korsvoll (2007, 2008), Tore Skogly (2008), "
@@ -10181,17 +10514,25 @@ msgstr ""
 "eller enhver senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015) and is released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 "Den danske oversættelse er underlagt ophavsretten af Joe Hansen (2012, 2013, "
 "2014, 2015) og er udgivet under GPL version 2 eller enhver senere version."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+#| "2016) and is released under the GPL v2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 "Den hollandske oversættelse er underlagt ophavsretten af Frans Spiesschaert "
 "(2014, 2015, 2016) og er udgivet under GPL version 2 eller enhver senere "
@@ -12866,6 +13207,53 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "Vi bruger cfengine til at redigere konfigurationsfiler. Disse filer "
+#~ "opdateres fra serveren til klienterne. For at ændre "
+#~ "klientkonfigurationen, er det nok at redigere serverkonfigurationen og "
+#~ "lade automatiseringen distribuere ændringerne."
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0-a0-"
+#~ "CD.iso\">debian-edu-9+edu0-a0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "The ordering of the network cards after installation might differ from "
+#~ "the ordering during installation. The wanted ordering can be achieved by "
+#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
+#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
+#~ "the changes to take effect."
+#~ msgstr ""
+#~ "Rækkefølgen for netværkskort efter installationen kan være forskellige "
+#~ "fra rækkefølgen under installationen. Den ønskede rækkefølge kan opnås "
+#~ "ved at redigere <computeroutput>/etc/udev/rules.d/70-persistent-net."
+#~ "rules</computeroutput>: Du vil normalt, <emphasis>hvis dette sker</"
+#~ "emphasis>, ønske at erstatte eth0 med eth1 og eth1 med eth0; en genstart "
+#~ "er krævet for at ændringerne træder i kraft."
+
+#~ msgid ""
+#~ "This is being tracked as <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian Edu bug #1376</ulink>."
+#~ msgstr ""
+#~ "Dette spores som <ulink url=\"http://bugs.skolelinux.org/1376\">Debian "
+#~ "Edu bug #1376</ulink>."
+
 #~ msgid "Nagios"
 #~ msgstr "Nagios"
 
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 6ea06f1..85b9ae1 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+0000\n"
 "PO-Revision-Date: 2017-01-21 13:46+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -87,6 +87,19 @@ msgstr ""
 "konfiguriertes Schulnetzwerk bereit stellt."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Directly after installation of a school server all services needed for a "
+#| "school network are set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>) and "
+#| "the system is ready to be used. Only users and machines need to be added "
+#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
+#| "environment using PXE has also been prepared, so after initial "
+#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
+#| "all other machines can be installed via the network, this includes "
+#| "\"roaming workstations\" (ones that can be taken away from the school "
+#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
+#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -97,7 +110,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "Unmittelbar nach der Installation eines Schulservers stehen alle für ein "
 "Schulnetzwerk notwendigen Dienste zur Verfügung (siehe Details dazu im "
@@ -155,8 +168,15 @@ msgstr ""
 "bietet."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
 msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+"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 "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -203,11 +223,21 @@ msgid "The Debian Edu network topology"
 msgstr "Die Struktur des Debian-Edu-Netzwerks"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and LTSP-"
+#| "servers (with associated thin-clients and/or diskless workstations). The "
+#| "number of workstations can be as large or small as you want (starting "
+#| "from none to a lot). The same goes for the LTSP servers, each of which is "
+#| "on a separate network so that the traffic between the clients and the "
+#| "LTSP server doesn't affect the rest of the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
-"a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -224,12 +254,20 @@ msgstr ""
 "nicht stört."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "Der Grund für nur einen Hauptserver in jedem Schulnetzwerk ist, dass der "
@@ -271,9 +309,15 @@ msgstr ""
 "(Memtest) ausgeführt oder von der lokalen Festplatte gestartet werden soll."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -302,12 +346,19 @@ msgid "Main server (tjener)"
 msgstr "Hauptserver (»tjener«)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the LTSP-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 "
-"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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Ein Skolelinux-Netzwerk benötigt einen Hauptserver, der auch »tjener« "
 "genannt wird, was norwegisch ist und »Server« heißt. Dieser »tjener« hat die "
@@ -321,15 +372,27 @@ msgid "Services running on the main server"
 msgstr "Dienste des Hauptservers"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"With the exception of the control of the thin-clients, all services are "
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the LTSP-server(s) should be separate (though it is "
+#| "possible to install both the main server and LTSP 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 "
-"reasons, the LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -563,6 +626,14 @@ msgid "ltsp"
 msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "NBD"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -571,11 +642,15 @@ msgstr ""
 "(Web-Schnittstelle). Benachrichtigung per E-Mail im Fehlerfall."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, icinga and site-summary"
+#, fuzzy
+#| msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin, icinga und site-summary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "site-summary"
+#, fuzzy
+#| msgid "site-summary"
+msgid "sitesummary"
 msgstr "site-summary"
 
 #. type: Content of: <article><section><section><section><para>
@@ -594,13 +669,21 @@ msgstr ""
 "bedient."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "Das E-Mail-System ist nur zur lokalen Auslieferung vorkonfiguriert (d.h. "
 "innerhalb der Schule). Die E-Mail-Zustellung kann aber, sofern die Schule "
@@ -634,10 +717,18 @@ msgstr ""
 "den Internetzugriff einzelner Maschinen."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Network configuration on the clients is done automatically using DHCP. "
+#| "Normal clients are allocated IP addresses in the private subnet "
+#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP-"
+#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
+#| "network traffic of the thin clients doesn't interfere with the rest of "
+#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -738,9 +829,16 @@ msgstr ""
 "sicherzustellen, dass das ganze Netzwerk die korrekte Zeit hat."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or LTSP-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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -756,10 +854,15 @@ msgid "LTSP server(s)"
 msgstr "LTSP-Server"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (which we called \"thin "
+#| "client servers\" in releases before Stretch), which are installed by "
+#| "selecting the LTSP server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
 "Ein Skolelinux-Netzwerk kann mehrere LTSP-Server (in Releases vor Stretch "
 "»Terminal-Server« genannt) enthalten; die Installation erfolgt durch Auswahl "
@@ -774,6 +877,16 @@ msgstr ""
 "der Thin Clients empfängt und an den zentralen Systemmeldungsdienst des "
 "Hauptservers weiterleitet."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "Thin Clients"
@@ -792,16 +905,27 @@ msgstr ""
 "Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted via NFS from the LTSP "
+#| "server, and finally the X Window System is started. The display manager "
+#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
+#| "data is encrypted on the network. For very old thin clients which are too "
+#| "slow for the encryption this can be set to the behavior from former "
+#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "Thin Clients sind ein guter Weg, um alte und leistungsschwache Rechner zu "
 "verwenden, da alle Programme effektiv auf dem LTSP-Server ausgeführt werden. "
@@ -882,11 +1006,17 @@ msgid "Administration"
 msgstr "Administration"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (root not allowed by "
+#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 "Alle Linux-Rechner, die mittels Skolelinux-Installer installiert wurden, "
 "können von einem zentralen Computer, üblicherweise dem Hauptserver, "
@@ -896,18 +1026,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"Cfengine wird benutzt, um Konfigurationsdateien zu editieren. Diese Dateien "
-"werden durch den Server auf den Clients aktualisiert. Um die Konfiguration "
-"der Clients zu ändern, genügt es, die Serverkonfiguration anzupassen. Diese "
-"wird dann automatisch auf die Clients übertragen."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -930,8 +1048,12 @@ msgstr ""
 "»Multiarch-USB-Stick«. Alle können auch von einem USB-Stick gebootet werden. "
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "Die Absicht ist, einmalig einen Server von irgendeinem Medium und danach "
@@ -1195,8 +1317,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 ist verbunden mit dem Hauptnetzwerk (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
+#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
+#| "\">others are possible</link>."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1325,6 +1452,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Configuring the PXE installation"
+msgid "After the installation:"
+msgstr "Konfiguration der PXE-Installation"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1342,12 +1521,20 @@ msgstr ""
 "\"http://www.zelow.no/floppyfw\">floppyfw</ulink> zu empfehlen."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you need something for an embedded router or accesspoint we recommend "
+#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
+#| "you can also use the original firmware. Using the original firmware is "
+#| "easier; using OpenWRT gives you more choices and control. Check the "
+#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
+#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 "Für Hardwarerouter und Accesspoints kann <ulink url=\"http://openwrt.org"
@@ -1449,14 +1636,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
 msgstr ""
@@ -1476,12 +1655,20 @@ msgid "USB drive ISO image for i386 and amd64"
 msgstr "USB-Stick ISO-Image für i386 und amd64"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Like the netinstall image it can "
+#| "be installed on USB flash drives or disk media of sufficient size. Please "
+#| "note that internet access during installation is needed. Like the others "
+#| "it can be downloaded over FTP, HTTP or rsync via:"
 msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 "Das für i386- und amd64-Prozessorarchitektur geeignete Multi-Arch-ISO-Image "
 "ist 5,2 GiB groß. Es kann wie das Netinstall-Image auf einen USB-Stick oder "
@@ -1491,14 +1678,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
 "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
 msgstr ""
@@ -1549,11 +1728,19 @@ msgid "Installing Debian Edu"
 msgstr "Die Installation von Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 42,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
 "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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1716,17 +1903,34 @@ msgstr ""
 "Sie weitergehende Informationen zu den angegebenen Themen bekommen."
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+#, fuzzy
+#| msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr "<emphasis>Zusätzliche Boot-Parameter für die Installation</emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In both cases, 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."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
 msgstr ""
 "In beiden Fällen können die Boot-Optionen eingegeben werden, wenn im Boot-"
 "Menü die Tabulator-Taste gedrückt wird."
 
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
@@ -1750,10 +1954,16 @@ msgstr ""
 "der Proxy des Hauptservers benutzt wird."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">MATE</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 <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "Um den <emphasis role=\"strong\">GNOME</emphasis>-Desktop anstatt des "
 "<emphasis role=\"strong\">MATE</emphasis>-Desktops zu installieren, "
@@ -1761,30 +1971,43 @@ msgstr ""
 "zusätzlichen Kernel-Boot-Parameter."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 "Um alternativ den <emphasis role=\"strong\">LXDE</emphasis>-Desktop zu "
 "installieren, verwenden Sie <computeroutput>desktop=lxde</computeroutput> "
 "als zusätzlichen Kernel-Boot-Parameter."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "Um alternativ den <emphasis role=\"strong\">Xfce</emphasis>-Desktop zu "
 "installieren, verwenden Sie <computeroutput>desktop=xfce</computeroutput> "
 "als zusätzlichen Kernel-Boot-Parameter."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> "
+#| "desktop instead, add <computeroutput>desktop=kde</computeroutput> to the "
+#| "kernel boot parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "Und um alternativ den <emphasis role=\"strong\">KDE-Plasma</emphasis>-"
 "Desktop zu installieren, verwenden Sie <computeroutput>desktop=kde</"
@@ -1806,7 +2029,9 @@ msgstr ""
 "Sie einen LTSP-Server einrichten wollen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a language (for the installation and the installed system)"
+#, fuzzy
+#| msgid "Choose a language (for the installation and the installed system)"
+msgid "Choose a language (for the installation and the installed system)."
 msgstr ""
 "Wählen Sie eine Sprache (sowohl für die Installation als auch für das zu "
 "installierende System)."
@@ -1817,7 +2042,9 @@ msgstr ""
 "Wählen Sie ein Land, welches im Regelfall dasjenige ist, in dem Sie leben."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a keyboard keymap (the country's default is usually fine)"
+#, fuzzy
+#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
+msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "Wählen Sie eine Tastaturbelegung (üblicherweise ist die jeweilige "
 "Ländereinstellung das Beste)."
@@ -1827,15 +2054,24 @@ msgid "Choose profile(s) from the following list:"
 msgstr "Wählen Sie ein Profil (oder mehrere) von dieser Liste."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Hauptserver</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This is the main server (tjener) for your school providing all services "
+#| "pre-configured to work out of the box. You must only install one main "
+#| "server per school! This profile does not include a graphical user "
+#| "interface. If you want a graphical user interface, then select "
+#| "Workstation or LTSP-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 only install one main server per "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 "Dies ist der Hauptserver (tjener) für Ihre Schule, bei dem alle Dienste "
@@ -1880,18 +2116,31 @@ msgstr ""
 "»Einzelplatzrechner« gewählt werden"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+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>
+#, fuzzy
+#| 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 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) - an LTSP 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 "Ein Server für Thin Clients (und Diskless Workstations) wird LTSP-Server "
 "genannt. Rechner ohne Festplatte erhalten die Software zum Booten und ihre "
@@ -1933,6 +2182,20 @@ msgstr ""
 "Dienste manuell vom Server auf diesen Rechner zu verlagern."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
+#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP "
+#| "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 an LTSP 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 an LTSP 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</"
@@ -1944,7 +2207,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 "Die Profile <emphasis role=\"strong\">Hauptserver</emphasis>, <emphasis role="
 "\"strong\">Arbeitsplatzrechner</emphasis> und <emphasis role=\"strong"
@@ -1960,22 +2223,6 @@ msgstr ""
 "oder als »LTSP-Server« dienen soll, muss zwei Netzwerkkarten haben, damit "
 "sie dem Zweck entsprechend genutzt werden kann."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
-msgstr ""
-"Nach der Installation könnte die Reihenfolge der Netzwerkkarten anders sein "
-"als während der Installation. Die gewünschte Reihenfolge kann durch "
-"Editieren der Datei <computeroutput>/etc/udev/rules.d/70-persistent-net."
-"rules</computeroutput> erreicht werden: <emphasis>Wenn dies vorkommt</"
-"emphasis>, wird normalerweise eth0 durch eth1 und eth1 durch eth0 ersetzt; "
-"ein Neustart ist erforderlich, damit die Änderungen wirksam werden."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2001,8 +2248,13 @@ msgstr ""
 "Sie auf einfache Art helfen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include LTSP-server then the installer "
+#| "will spend quite some time at the end, \"Finishing the installation - "
+#| "Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include LTSP-server then the installer will "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -2115,7 +2367,9 @@ msgstr ""
 "mehrfache Herunterladen desselben Pakets aus dem Netz zu vermeiden."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on LTSP-server installations using only Thin-Clients"
+#, fuzzy
+#| msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr ""
 "Bemerkung zu LTSP-Server-Installationen, die ausschließlich Thin Clients "
 "bedienen"
@@ -2228,9 +2482,14 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">LTSP-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> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 "So sieht das PXE-Menü mit dem <emphasis role=\"strong\">Hauptserver</"
@@ -2243,6 +2502,12 @@ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2406,11 +2671,17 @@ msgstr ""
 "verwenden."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "So here is a screenshot tour through a graphical 64-bit Main-Server + "
+#| "Workstation + LTSP Server installation and how it looks at the first boot "
+#| "of the 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 + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 "Hier folgt nun eine Serie von Screenshots einer graphischen Installation "
 "(Hauptserver + Arbeitsplatzrechner + LTSP-Server-Server, 64-Bit); gefolgt "
@@ -2610,7 +2881,9 @@ msgid "tjener KDM Login"
 msgstr "KDM-Login von tjener"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+#, fuzzy
+#| msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-MATE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2618,7 +2891,9 @@ msgid "KDE and Browser"
 msgstr "KDE und Browser"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-MATE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2638,9 +2913,17 @@ msgid "Diskless Workstation Login"
 msgstr "Diskless Workstation Login"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-MATE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Desktop and Menu"
+msgstr "KDE-Desktop"
+
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr "Erste Schritte"
@@ -2669,6 +2952,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 "Nach der Installation müssen vom Erstbenutzer zuerst folgende Dinge erledigt "
@@ -2692,10 +2983,16 @@ msgstr ""
 "können ohne diesen Schritt sofort verwendet werden."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Adding users and workstations is described in detail below, so please "
+#| "read this chapter completely. It covers how to perform these minumum "
+#| "steps correctly as well, as other stuff that everybody will probably need "
+#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
-"this chapter completely. It covers how to perform these minumum steps "
-"correctly as well, as other stuff that everybody will probably need to do."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 "Das Hinzufügen von Benutzern und Arbeitsplatzrechnern wird im Folgenden "
 "beschrieben; bitte lesen Sie deshalb das Kapitel vollständig. Es beschreibt "
@@ -2739,7 +3036,9 @@ msgstr ""
 "Tricks, sowie Antworten auf häufig gestellte Fragen."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu MATE desktop"
+#, fuzzy
+#| msgid "Debian Edu MATE desktop"
+msgid "Debian Edu KDE desktop"
 msgstr "Debian-Edu MATE-Desktop"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2787,14 +3086,24 @@ msgid "DHCP Administration"
 msgstr "DHCP-Verwaltung"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For GOsa² access you need the Skolelinux main server and a (client) "
+#| "system with a web browser installed which can be the main server itself "
+#| "if it was installed as a so called combined server (main server + LTSP "
+#| "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 "
-"installed as a so called combined server (main server + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 "Um auf GOsa² zugreifen zu können, benötigen Sie den Skolelinux-Hauptserver "
 "und ein (Client-)System mit installiertem Webbrowser; dabei kann es sich um "
@@ -2870,14 +3179,22 @@ msgstr ""
 "Administrationsseiten von GOsa² sichtbar bleibt."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In Debian Edu, account, group, and system information is stored in an "
+#| "LDAP directory. This data is used not only by the main server, but also "
+#| "by the (diskless) workstations, the LTSP 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 "
 "(diskless) workstations, the LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 "In Debian Edu werden die Daten von Benutzern, Gruppen und Systemen in einem "
 "LDAP-Verzeichnis gespeichert. Darauf greifen nicht nur der Hauptserver, "
@@ -3400,10 +3717,16 @@ msgstr ""
 "linkend=\"Architecture\">Kapitel über die Netzwerkstruktur</link> zu finden."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis role=\"strong"
+#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
-"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
 "Diskless Workstations und Thin Clients arbeiten unmittelbar, wenn sie mit "
@@ -3454,6 +3777,20 @@ msgstr ""
 "Systeme ein entsprechendes Icon angezeigt."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If the machines have booted as thin clients/diskless workstations or have "
+#| "been installed using any of the networked profiles, the "
+#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
+#| "to automatically add machines to GOsa². For simple machines it will work "
+#| "out of the box, for machines with more than one mac address the actually "
+#| "used one has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</"
+#| "computeroutput> shows usage information. Please note, that the IP "
+#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+#| "computeroutput> belong to the dynamic IP range. These systems can then be "
+#| "modified 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 "
@@ -3463,9 +3800,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 "Wenn die Maschinen als Thin Clients bzw. Diskless Workstations gestartet "
@@ -3671,8 +4008,14 @@ msgstr ""
 "statische IP-Adressen in LDAP festzulegen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+#, fuzzy
+#| msgid ""
+#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
+#| "or your users won't be able to access their home directories. Diskless "
+#| "workstations and thin clients don't use NFS, so they don't need to be "
+#| "configured."
+msgid ""
+"Remember to configure workstations and LTSP servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
 "workstations and thin clients don't use NFS, so they don't need to be "
 "configured."
@@ -3720,10 +4063,15 @@ msgstr ""
 "wiederhergestellt."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian Edu machines in this group will only be allowed to connect to "
+#| "machines on the local network.  Combined with web proxy restrictions this "
+#| "might be used during exams."
 msgid ""
-"Debian Edu machines in this group will only be allowed to connect to "
-"machines on the local network.  Combined with web proxy restrictions this "
-"might be used during exams."
+"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 "
+"be used during exams."
 msgstr ""
 "Die Debian-Edu-Maschinen dieser Gruppe werden nur mit Maschinen im lokalen "
 "Netzwerk Verbindung aufnehmen können. Kombiniert mit Einschränkungen durch "
@@ -3921,6 +4269,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
 "send mail to an address you are reading."
@@ -3944,11 +4298,19 @@ msgstr ""
 "get upgrade</computeroutput> ausführen."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed and configured as described on <ulink url=\"https://wiki."
+#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
+#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed and configured as described on <ulink url=\"https://wiki.debian."
-"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 "Falls gewünscht, können Aktualisierungen automatisch installiert werden. "
 "Dazu muss lediglich das Paket <computeroutput>unattended-upgrades</"
@@ -3997,12 +4359,21 @@ msgid "Backup Management"
 msgstr "Verwaltung von Backups"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail. Note: the site will only work "
+#| "if you temporarily allow ssh root login on the backup server (tjener by "
+#| "default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 "Um Backups zu verwalten, gehen Sie mit Ihrem Browser auf <ulink url="
 "\"https://www/slbackup-php\"/>. Diese Seite müssen Sie mit SSL aufrufen, da "
@@ -4120,6 +4491,17 @@ msgstr ""
 "Systemprobleme aufzuspüren."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The list of machines being monitored using Munin is generated "
+#| "automatically, based on the list of hosts reporting to sitesummary.  All "
+#| "hosts with the package munin-node installed are registered for Munin "
+#| "monitoring.  It will normally take one day from a machine being installed "
+#| "until Munin monitoring starts, because of the order the cron jobs are "
+#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
+#| "update-munin</computeroutput> as root on the sitesummary server (normally "
+#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
+#| "conf</computeroutput> file."
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -4127,7 +4509,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 "Die Liste der von Munin überwachten Computer wird automatisch von den an "
@@ -4141,10 +4523,17 @@ msgstr ""
 "läuft (dies ist normalerweise der Hauptserver)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The set of measurements being collected is automatically generated on "
+#| "each machine using the <computeroutput>munin-node-configure</"
+#| "computeroutput> program, which probes the plugins available from "
+#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
+#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from <computeroutput>/usr/share/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
@@ -4156,9 +4545,13 @@ msgstr ""
 "computeroutput> setzt."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Munin is available from <ulink url=\"http://munin."
+#| "projects.linpro.no/\"/> ."
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 "Weitere Informationen über Munin gibt es unter <ulink url=\"http://munin."
 "projects.linpro.no/\"/>."
@@ -5079,10 +5472,15 @@ msgstr ""
 "angelegt wurde (Erstbenutzer):"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ sudo apt-get update\n"
+#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+#| "  # after installation, start a graphical session for the first user \n"
+#| "  $ startx"
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -5207,9 +5605,14 @@ msgstr ""
 "wiki.debian.org/StableUpdates\">stable-updates</ulink> bereit."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "While you can use stable-updates directly, you don't have to: stable-"
+#| "updates are pushed into the stable suite regularily when stable point "
+#| "releases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
-"are pushed into the stable suite regularily when stable point releases are "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 "Es ist möglich, aber nicht notwendig, stable-updates direkt zu verwenden: "
@@ -5217,7 +5620,9 @@ msgstr ""
 "Veröffentlichung von Stable-Pointreleases in die Stable-Suite übernommen."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+#, fuzzy
+#| msgid "Using backports.debian.org to install newer software"
+msgid "Using backports to install newer software"
 msgstr "Mittels backports.debian.org neuere Software installieren"
 
 #. type: Content of: <article><section><section><para>
@@ -5275,11 +5680,19 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Backports are automatically updated (if available) just like other "
+#| "packages. (Previously, extra configuration was needed to achieve this, "
+#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#| "anymore]."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 "Backports werden automatisch aktualisiert (falls verfügbar) - genauso wie "
 "andere Pakete. (Früher war eine zusätzliche Konfiguration erforderlich, um "
@@ -5333,8 +5746,13 @@ msgid "To quote the apt-cdrom(8) man page:"
 msgstr "Zitat aus der Handbuchseite von apt-cdrom(8)"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
+#| "apt-cdrom takes care of determining the structure of the disc as well as "
+#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
-"apt-cdrom is used to add a new CDROM to APTs list of available sources. apt-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -5344,9 +5762,14 @@ msgstr ""
 "Fehlbrennungen und prüft die Indexdateien. "
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
+#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
+#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
-"done by hand. Furthermore each disk in a multi-cd set must be inserted and "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 "Es ist notwendig, apt-cdrom zu benutzen, um CDs zum APT-System hinzuzufügen; "
@@ -5372,8 +5795,14 @@ msgid "Automatic cleanup of leftover processes"
 msgstr "Automatisches Aufräumen übrig gebliebener Prozesse"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
+#| "of background jobs. Background jobs are defined as processes that belong "
+#| "to users who are not currently logged into the machine. It's run by cron "
+#| "job once an hour."
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -5690,7 +6119,9 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
+#, fuzzy
+#| msgid "Advanced administration"
+msgid "Advanced administration howto"
 msgstr "Fortgeschrittene Administration"
 
 #. type: Content of: <article><section><para>
@@ -5708,9 +6139,14 @@ msgid "Create Users in Year Groups"
 msgstr "Anlegen von Benutzerkonten in Jahrgangsgruppen"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In this example we want to create users in year groups, with common home "
+#| "directories for each group (home0/2014, home0/2015, etc.) We want to "
+#| "create the users by csv import."
 msgid ""
 "In this example we want to create users in year groups, with common home "
-"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 "In diesem Beispiel sollen Benutzerkonten in Jahrgangsgruppen angelegt "
@@ -5719,7 +6155,9 @@ msgstr ""
 "werden."
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
+#, fuzzy
+#| msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis role=\"strong\">(als Root auf »tjener«)</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5775,16 +6213,25 @@ msgid "Template"
 msgstr "Vorlage"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose 'users' from the main menu. Change to 'Students' in the Base "
+#| "field. An Entry <computeroutput>'NewStudent'</computeroutput> should show "
+#| "up, click it. This is the 'students' template, not a real user. As you'll "
+#| "have to create such a template (to be able to use csv import for your "
+#| "structure) based on this one, notice all entries showing up in the "
+#| "Generic, POSIX and Samba tabs, maybe take screenshots. Now change to /"
+#| "Students/2014 in the Base field; choose Create/Template and start to fill "
+#| "in your desired values, first the Generic tab (add your new 2014 group "
+#| "under Group Membership, too), then add POSIX and Samba account."
 msgid ""
 "Choose 'users' from the main menu. Change to 'Students' in the Base field. "
-"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
 msgstr ""
 "Wählen Sie aus dem Hauptmenü »Benutzer«. Wechseln Sie im Basis-Feld zu »/"
 "Students«. Es sollte dort ein Eintrag <computeroutput>'NewStudent'</"
@@ -5799,14 +6246,25 @@ msgstr ""
 "(unter »POSIX« zusätzlich die neu erstellte Gruppe »2014« unter "
 "»Gruppenmitgliedschaft« hinzufügen)."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Benutzerdaten importieren"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose your new template when doing csv import; testing it with a few "
+#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 "Wählen Sie beim CSV-Import die neue Vorlage aus; ein Test mit einigen "
 "Benutzern ist zu empfehlen."
@@ -5886,12 +6344,19 @@ msgstr ""
 " echo \"$created_dir Verzeichnisse wurden angelegt\""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
+#, fuzzy
+#| msgid "Easy access to USB drives and CDROMs/DVDs"
+msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "Einfacher Zugriff auf USB-Laufwerke und CD-ROMs/DVDs"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a (diskless) "
+#| "workstation, a popup window appears asking what to do with it, just like "
+#| "in any other normal installation."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
@@ -5901,8 +6366,15 @@ msgstr ""
 "normalen Installation."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a thin client there "
+#| "is only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -5931,11 +6403,18 @@ msgstr ""
 "Arbeitsfläche erscheinen, wodurch ein einfacher Zugriff gegeben ist.)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
+#| "This might come in handy if users want to edit files directly on their "
+#| "plugged in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 "Mit dem folgenden Skript wird ein symbolischer Verweis »media« für alle "
 "Nutzer im Home-Verzeichnis angelegt. Dieser ermöglicht den einfachen Zugriff "
@@ -5998,14 +6477,6 @@ msgstr ""
 "der Konsole pmount verwendet, kann er sogar das Gerät einhängen und hat "
 "Zugriff auf die Dateien."
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Dieser Fehler wird unter <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian-Edu-Fehler #1376</ulink> verfolgt."
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr "Einen speziellen Dateiserver benutzen"
@@ -6020,10 +6491,16 @@ msgstr ""
 "- einzurichten."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Add a new system of type server using GOsa² as outlined in the <link "
+#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
+#| "started</link> chapter of this manual."
 msgid ""
-"Add a new system of type server using GOsa² as outlined in the <link linkend="
-"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
-"link> chapter of this manual."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 "Verwenden Sie GOsa², um ein neues System vom Typ »server« einzurichten - wie "
 "im Kapitel <link linkend=\"GettingStarted--"
@@ -6146,10 +6623,15 @@ msgstr ""
 "»automount« verwendet."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create the mount directories using <computeroutput>mkdir</"
+#| "computeroutput>, edit '/etc/fstab' as adequate and run "
+#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
-"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
-"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
-"computeroutput> to mount the new resources."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 "Legen Sie die Einhängeverzeichnisse mittels <computeroutput>mkdir</"
 "computeroutput> an, editieren Sie '/etc/fstab' entsprechend und führen Sie "
@@ -6201,8 +6683,13 @@ msgid "Managing this case with GOsa is quite simple:"
 msgstr "Dieser Fall kann mit GOsa² ziemlich einfach erledigt werden:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
+#| "level (where already other system management related groups like "
+#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -6271,11 +6758,17 @@ msgstr ""
 "#"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
+#| "dropped to disable internal ssh login access. Note: someone pluging in "
+#| "his box into the dedicated LTSP client network(s) will gain ssh access to "
+#| "the LTSP server(s) as well."
 msgid ""
 "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
-"dropped to disable internal ssh login access. Note: someone pluging in his "
-"box into the dedicated LTSP client network(s) will gain ssh access to the "
-"LTSP server(s) as well."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 "Das Netzwerk 10.0.0.0/8 könnte aus der Liste entfernt und damit der interne "
 "ssh-Zugang verhindert werden, falls dedizierte LTSP-Server Verwendung "
@@ -9872,14 +10365,23 @@ 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), 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), 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."
+"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."
 msgstr ""
 "Das Copyright der norwegischen Bokmål-Übersetzung liegt bei Petter "
 "Reinholdtsen (2007, 2012, 2014, 2015, 2016, 2017), Håvard Korsvoll "
@@ -9933,17 +10435,25 @@ msgstr ""
 "oder einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015) and is released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 "Die dänische Übersetzung wurde verfasst von Joe Hansen (2012, 2013, 2014, "
 "2015) und ist unter der GPL v2 oder einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+#| "2016) and is released under the GPL v2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 "Die niederländische Übersetzung wurde verfasst von Frans Spiesschaert (2014, "
 "2015, 2016) und ist unter der GPL v2 oder einer späteren Version lizenziert."
@@ -10123,8 +10633,8 @@ msgstr ""
 "translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
 "Übersetzungen aktualisieren wollen."
 
-#. <remark>
-#. status ignore</remark>
+#.  <remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -12636,5 +13146,53 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "Cfengine wird benutzt, um Konfigurationsdateien zu editieren. Diese "
+#~ "Dateien werden durch den Server auf den Clients aktualisiert. Um die "
+#~ "Konfiguration der Clients zu ändern, genügt es, die Serverkonfiguration "
+#~ "anzupassen. Diese wird dann automatisch auf die Clients übertragen."
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "The ordering of the network cards after installation might differ from "
+#~ "the ordering during installation. The wanted ordering can be achieved by "
+#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
+#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
+#~ "the changes to take effect."
+#~ msgstr ""
+#~ "Nach der Installation könnte die Reihenfolge der Netzwerkkarten anders "
+#~ "sein als während der Installation. Die gewünschte Reihenfolge kann durch "
+#~ "Editieren der Datei <computeroutput>/etc/udev/rules.d/70-persistent-net."
+#~ "rules</computeroutput> erreicht werden: <emphasis>Wenn dies vorkommt</"
+#~ "emphasis>, wird normalerweise eth0 durch eth1 und eth1 durch eth0 "
+#~ "ersetzt; ein Neustart ist erforderlich, damit die Änderungen wirksam "
+#~ "werden."
+
+#~ msgid ""
+#~ "This is being tracked as <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian Edu bug #1376</ulink>."
+#~ msgstr ""
+#~ "Dieser Fehler wird unter <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian-Edu-Fehler #1376</ulink> verfolgt."
+
 #~ msgid "Nagios"
 #~ msgstr "Nagios"
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 a316b8d..bb82aa5 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+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"
@@ -114,7 +114,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "Inmediatamente después de la instalación, el servidor de la escuela "
 "ejecutará todos los servicios necesarios para que la red escolar sea "
@@ -169,8 +169,15 @@ msgstr ""
 "configurada."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
 msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+"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 "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -232,9 +239,9 @@ msgstr "La Topología de red de Debian Edu"
 #| "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, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -251,12 +258,20 @@ msgstr ""
 "de red."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "La razón por la que sólo puede haber un servidor principal en cada red es "
@@ -298,9 +313,15 @@ msgstr ""
 "sin disco, prueba de memoria o iniciar desde disco local. "
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -338,9 +359,9 @@ msgstr "Servidor principal (tjener)"
 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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Una red Skolelinux necesita un servidor principal (también llamado \"tjener"
 "\" que significa \"servidor\" en Noruego) que por defecto tenga la dirección "
@@ -367,14 +388,14 @@ msgstr "Servicios que corren en el servidor principal"
 #| "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 "
+"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 LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -616,6 +637,14 @@ msgid "ltsp"
 msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "NBD"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -626,13 +655,13 @@ msgstr ""
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "munin, nagios and site-summary"
-msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin, nagios y site-summary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "Sitesummary"
-msgid "site-summary"
+msgid "sitesummary"
 msgstr "Sitesummary"
 
 #. type: Content of: <article><section><section><section><para>
@@ -650,13 +679,21 @@ msgstr ""
 "tanto NFS para clientes UNIX, como SMB para Windows y clientes Macintosh."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "Por defecto, el correo está configurado para envío local (dentro de la "
 "escuela), aunque se puede configurar el envío a todo Internet si la escuela "
@@ -698,7 +735,7 @@ msgstr ""
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -805,7 +842,7 @@ msgstr ""
 #| "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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -828,7 +865,7 @@ msgstr ""
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
 "Una red Skolelinux puede tener muchos servidores LTSP (también llamado "
 "servidor de clientes ligeros), que pueden ser instalados seleccionando el "
@@ -846,6 +883,16 @@ msgstr ""
 "EL servidor de clientes ligeros está configurado para recibir los registros "
 "de los clientes ligeros y reenviarlos al servidor central."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "Clientes ligeros"
@@ -864,16 +911,27 @@ msgstr ""
 "Linux Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted via NFS from the LTSP "
+#| "server, and finally the X Window System is started. The display manager "
+#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
+#| "data is encrypted on the network. For very old thin clients which are too "
+#| "slow for the encryption this can be set to the behavior from former "
+#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "Los clientes delgados son una buena forma de usar máquinas viejas, de poca "
 "capacidad, ya que los programas se ejecutan en el servidor LTSP. Funciona "
@@ -960,11 +1018,17 @@ msgid "Administration"
 msgstr "Administración"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (root not allowed by "
+#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 "Todas las máquinas Linux que se instalan con el instalador de Skolelinux se "
 "pueden administrar desde una computadora central, es decir el servidor. Se "
@@ -973,18 +1037,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"Usamos cfengine para editar los archivos de configuración. Estos archivos se "
-"actualizan desde el servidor a los clientes. Para cambiar la configuración "
-"del cliente, es suficiente editar la configuración en el servidor y dejar "
-"que la automatización distribuya los cambios."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -1008,8 +1060,12 @@ msgstr ""
 "ser cargados desde memorias USB."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "La idea es poder instalar un servidor desde cualquier medio una sola vez e "
@@ -1273,8 +1329,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 conectada a la red principal (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
+#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
+#| "\">others are possible</link>."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1399,6 +1460,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Configuring the PXE installation"
+msgid "After the installation:"
+msgstr "Configurar la instalación de PXE"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1416,12 +1529,20 @@ msgstr ""
 "\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you need something for an embedded router or accesspoint we recommend "
+#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
+#| "you can also use the original firmware. Using the original firmware is "
+#| "easier; using OpenWRT gives you more choices and control. Check the "
+#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
+#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 "Si necesita algo para un enrutador empotrado, o un punto de acceso le "
@@ -1534,18 +1655,6 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-CD."
-"iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
 #| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
 msgid ""
@@ -1582,11 +1691,12 @@ msgstr ""
 #| "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.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 "La imágen ISO de multi-arquitectura tiene un tamaño de 5.2 Gb y puede ser "
 "utilizado para la intalación de computadoras amd64, así como de i386. "
@@ -1596,18 +1706,6 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-USB."
-"iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
 #| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
 msgid ""
@@ -1674,7 +1772,7 @@ 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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1896,7 +1994,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid "Additional boot parameters for installations"
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr "Parámetros adicionales de carga para instalaciones"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1906,11 +2004,22 @@ msgstr "Parámetros adicionales de carga para instalaciones"
 #| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
-"boot menu."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
 msgstr ""
 "Para equipos i386/amd64, las opciones de inicio pueden ser editadas "
 "presionando la tecla TAB en el menú de inicio."
 
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
@@ -1942,8 +2051,8 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "Para instalar el escritorio <emphasis role=\"strong\">GNOME</emphasis> en "
 "lugar del escritorio <emphasis role=\"strong\">KDE Plasma</emphasis>, "
@@ -1951,20 +2060,29 @@ msgstr ""
 "carga del kernel."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 "Para instalar el escritorio <emphasis role=\"strong\">LXDE</emphasis>, "
 "agregue  <computeroutput>desktop=lxde</computeroutput> a los parámetros de "
 "carga del kernel."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "Para instalar el escritorio <emphasis role=\"strong\">Xfce</emphasis>, "
 "agregue <computeroutput>desktop=xfce</computeroutput> a los parámetros de "
@@ -1977,9 +2095,8 @@ msgstr ""
 #| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
 #| "parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "Para instalar el escritorio <emphasis role=\"strong\">LXDE</emphasis>, "
 "agregue  <computeroutput>desktop=lxde</computeroutput> a los parámetros de "
@@ -2007,7 +2124,9 @@ msgstr ""
 "clientes ligeros. "
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a language (for the installation and the installed system)"
+#, fuzzy
+#| msgid "Choose a language (for the installation and the installed system)"
+msgid "Choose a language (for the installation and the installed system)."
 msgstr "Elige el idioma (para la instalación y el sistema instalado)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2015,7 +2134,9 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr "Elige un lugar que normalmente sería el lugar donde vives."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a keyboard keymap (the country's default is usually fine)"
+#, fuzzy
+#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
+msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "Seleccione una disposición de teclado (la predeterminada para su país es la "
 "mejor opción)"
@@ -2025,8 +2146,10 @@ msgid "Choose profile(s) from the following list:"
 msgstr "Elige el(los) perfil(es) de la siguiente lista:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
-msgstr ""
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
+msgid "<emphasis role=\"strong\">Main Server</emphasis>"
+msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
@@ -2038,9 +2161,9 @@ msgstr ""
 #| "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 only install one main server per "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 "Este es el servidor principal (tjener) para su escuela, el cual provee todos "
@@ -2082,7 +2205,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -2099,11 +2222,12 @@ msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 "Un servidor para clientes ligeros (y estaciones sin disco), también suele "
 "ser llamado servidor LTSP. Clientes sin disco duro, inician y utilizan "
@@ -2170,7 +2294,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 "Los perfiles  <emphasis role=\"strong\">Main Server</emphasis>, <emphasis "
 "role=\"strong\">Workstation</emphasis> y <emphasis role=\"strong\">Thin "
@@ -2187,22 +2311,6 @@ msgstr ""
 "servidor de clientes ligeros para que pueda ser útil después de su "
 "instalación."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
-msgstr ""
-"El orden de las tarjetas de red después de la instalación puede cambiar del "
-"orden durante la instalación. El orden deseado puede conseguirse editando el "
-"archivo <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>: Usualmente, <emphasis>si esto pasa</emphasis>, querrá "
-"reemplazar eth0 con eth1 y eth1 con eth0; un reinicio del equipo es "
-"necesario para que los cambios tengan efecto."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2234,7 +2342,7 @@ msgstr ""
 #| "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 "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -2340,7 +2448,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
 #| msgid "A note on thin-client-server installations"
-msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr "Nota sobre la instalación de servidores de clientes ligeros"
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2453,8 +2561,8 @@ 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\">LTSP-Server</emphasis> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 
@@ -2464,6 +2572,12 @@ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2644,10 +2758,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"So here is a screenshot tour through a graphical 64-bit Main-Server + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2939,7 +3053,7 @@ msgstr "Inicio de sesión KDM en tjener"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2949,7 +3063,7 @@ msgstr "KDE y el navegador"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2975,9 +3089,15 @@ msgstr "Inicio de sesión de estaciones sin disco"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Desktop and Menu"
+msgstr "Escritorio KDE"
+
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr "Iniciando"
@@ -3005,6 +3125,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 "Después de la instalación, las primeras cosas que necesita hacer como "
@@ -3030,10 +3158,16 @@ msgstr ""
 "trabajo sin disco pueden ser usados directamente sin ser agregados."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Adding users and workstations is described in detail below, so please "
+#| "read this chapter completely. It covers how to perform these minumum "
+#| "steps correctly as well, as other stuff that everybody will probably need "
+#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
-"this chapter completely. It covers how to perform these minumum steps "
-"correctly as well, as other stuff that everybody will probably need to do."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 "Como agregar usuarios y estaciones de trabajo es descrito con más detalle a "
 "continuación. Por favor, lea este capítulo completamente. Abarca como "
@@ -3068,7 +3202,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "Debian Edu login"
-msgid "Debian Edu MATE desktop"
+msgid "Debian Edu KDE desktop"
 msgstr "Inicio de sesión de Debian Edu"
 
 #. type: Content of: <article><section><section><section><para>
@@ -3127,11 +3261,11 @@ msgstr "Administración DHCP"
 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 + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 "Para acceder a GOsa², necesita el servidor principal Skolelinux y una "
 "computadora con un navegador web, puede ser el mismo servidor principal si "
@@ -3220,10 +3354,9 @@ 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 LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 "En Debian Edu, la información del sistema, grupos y cuentas de usuario es "
 "guardada en un directorio de LDAP. Esta información es utilizada no solo por "
@@ -3686,12 +3819,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This setup also allows diskless workstations and thin clients to be "
+#| "booted on the main network. Unlike workstations, diskless workstations "
+#| "don't have to be added to LDAP with GOsa², but can be, for example if you "
+#| "want to force the hostname."
 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"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
+"Esta configuración permite iniciar a las estaciones sin disco y clientes "
+"ligeros a través de la red principal. A diferencia de las estaciones de "
+"trabajo, las estaciones de trabajo sin disco no necesitan ser agregadas a "
+"LDAP con GOsa², pero pueden agregarse, si necesita forzar el nombre del host."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3727,9 +3870,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 
@@ -3908,8 +4051,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
+#| "or your users won't be able to access their home directories. Diskless "
+#| "workstations and thin clients don't use NFS, so they don't need to be "
+#| "configured."
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -3955,9 +4104,9 @@ msgstr ""
 
 #. 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."
+"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 "
+"be used during exams."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -4087,6 +4236,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
 "send mail to an address you are reading."
@@ -4108,8 +4263,9 @@ msgstr ""
 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>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4146,7 +4302,8 @@ msgid ""
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4252,6 +4409,17 @@ msgstr ""
 "buscar cuellos de botella y el origen de problemas en el sistema. "
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The list of machines being monitored using Munin is generated "
+#| "automatically, based on the list of hosts reporting to sitesummary.  All "
+#| "hosts with the package munin-node installed are registered for Munin "
+#| "monitoring.  It will normally take one day from a machine being installed "
+#| "until Munin monitoring starts, because of the order the cron jobs are "
+#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
+#| "update-munin</computeroutput> as root on the sitesummary server (normally "
+#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
+#| "conf</computeroutput> file."
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -4259,7 +4427,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 "La lista de computadoras monitoreadas por Munin es automáticamente generada, "
@@ -4273,10 +4441,17 @@ msgstr ""
 "<computeroutput>/etc/munin/munin.conf</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The set of measurements being collected is automatically generated on "
+#| "each machine using the <computeroutput>munin-node-configure</"
+#| "computeroutput> program, which probes the plugins available from "
+#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
+#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from <computeroutput>/usr/share/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
@@ -4288,9 +4463,13 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Munin is available from <ulink url=\"http://munin."
+#| "projects.linpro.no/\"/> ."
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 "Información sobre munin está disponible en <ulink url=\"http://munin."
 "projects.linpro.no/\"/> ."
@@ -5140,10 +5319,15 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ sudo apt-get update\n"
+#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+#| "  # after installation, start a graphical session for the first user \n"
+#| "  $ startx"
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -5257,13 +5441,15 @@ msgstr ""
 #. 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 "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
-msgstr ""
+#, fuzzy
+#| msgid "Using backports is simple:"
+msgid "Using backports to install newer software"
+msgstr "Usar backports es sencillo:"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5314,8 +5500,9 @@ msgstr "apt-get install -t jessie-backports tuxtype"
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5357,8 +5544,13 @@ msgid "To quote the apt-cdrom(8) man page:"
 msgstr "Para citar el manual de referencia de apt-cdrom(8):"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
+#| "apt-cdrom takes care of determining the structure of the disc as well as "
+#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
-"apt-cdrom is used to add a new CDROM to APTs list of available sources. apt-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -5367,9 +5559,14 @@ msgstr ""
 "posibles errores de grabación y verifica los ficheros de índice."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
+#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
+#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
-"done by hand. Furthermore each disk in a multi-cd set must be inserted and "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 "Se requiere utilizar apt-cdrom para añadir los discos al sistema APT, no se "
@@ -5395,8 +5592,14 @@ msgid "Automatic cleanup of leftover processes"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
+#| "of background jobs. Background jobs are defined as processes that belong "
+#| "to users who are not currently logged into the machine. It's run by cron "
+#| "job once an hour."
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -5650,8 +5853,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
-msgstr ""
+#, fuzzy
+#| msgid "Machine Administration"
+msgid "Advanced administration howto"
+msgstr "Administración de computadoras"
 
 #. type: Content of: <article><section><para>
 msgid "In this chapter advanced administration tasks are described."
@@ -5668,12 +5873,14 @@ msgstr ""
 #. 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 "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
+#, fuzzy
+#| msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis>(como root en Tjener) </emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5724,14 +5931,19 @@ msgstr "Planitlla"
 #. 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 "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5739,9 +5951,13 @@ msgid "Import users"
 msgstr "Importar usuarios"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose your new template when doing csv import; testing it with a few "
+#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 "Elija su nueva plantilla cuando importe el archivo csv; probarlo con pocos "
 "usuarios es lo recomendable."
@@ -5815,19 +6031,21 @@ 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"
+#, fuzzy
+#| msgid "Easy access to USB drives and CDROMs/DVDs"
+msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "Fácil acceso a dispositivos USB y CDROMs/DVDs"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
 
 #. 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 "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -5846,9 +6064,9 @@ msgstr ""
 #. 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 
 #. type: CDATA
@@ -5900,12 +6118,6 @@ msgid ""
 "can even mount the removable devices and access the files."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr ""
@@ -5918,9 +6130,10 @@ msgstr ""
 
 #. 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."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6000,9 +6213,9 @@ msgstr ""
 
 #. 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."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6039,7 +6252,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -6091,9 +6304,9 @@ 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."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -8936,10 +9149,10 @@ 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), 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."
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -8971,14 +9184,14 @@ msgstr ""
 
 #. 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."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -11081,6 +11294,54 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "Usamos cfengine para editar los archivos de configuración. Estos archivos "
+#~ "se actualizan desde el servidor a los clientes. Para cambiar la "
+#~ "configuración del cliente, es suficiente editar la configuración en el "
+#~ "servidor y dejar que la automatización distribuya los cambios."
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
+#~ "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "The ordering of the network cards after installation might differ from "
+#~ "the ordering during installation. The wanted ordering can be achieved by "
+#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
+#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
+#~ "the changes to take effect."
+#~ msgstr ""
+#~ "El orden de las tarjetas de red después de la instalación puede cambiar "
+#~ "del orden durante la instalación. El orden deseado puede conseguirse "
+#~ "editando el archivo <computeroutput>/etc/udev/rules.d/70-persistent-net."
+#~ "rules</computeroutput>: Usualmente, <emphasis>si esto pasa</emphasis>, "
+#~ "querrá reemplazar eth0 con eth1 y eth1 con eth0; un reinicio del equipo "
+#~ "es necesario para que los cambios tengan efecto."
+
 #~ msgid "Nagios"
 #~ msgstr "Nagios"
 
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 bbd3bd2..0047a71 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+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"
@@ -90,6 +90,19 @@ msgstr ""
 "configuré."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Directly after installation of a school server all services needed for a "
+#| "school network are set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>) and "
+#| "the system is ready to be used. Only users and machines need to be added "
+#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
+#| "environment using PXE has also been prepared, so after initial "
+#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
+#| "all other machines can be installed via the network, this includes "
+#| "\"roaming workstations\" (ones that can be taken away from the school "
+#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
+#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -100,7 +113,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "Immédiatement après l'installation, un serveur faisant fonctionner tous les "
 "services pour le réseau de l'école est configuré (consultez le chapitre "
@@ -155,8 +168,15 @@ msgstr ""
 "environnement de réseau scolaire complètement configuré."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
 msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+"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 "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -218,9 +238,9 @@ msgstr "Topologie du réseau Debian Edu"
 #| "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, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -237,12 +257,20 @@ msgstr ""
 "pas le reste des services du réseau."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "La raison pour laquelle il ne peut y avoir qu'un seul serveur principal dans "
@@ -285,9 +313,15 @@ msgstr ""
 "de travail sans disque, exécuter memtest, ou démarrer du disque dur local."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -325,9 +359,9 @@ msgstr "Serveur principal (tjener)"
 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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Un réseau Skolelinux a besoin d'un serveur principal (aussi appelé "
 "« tjener »  qui est le mot norvégien pour « serveur ») qui a par défaut "
@@ -354,14 +388,14 @@ msgstr "Services exécutés sur le serveur principal"
 #| "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 "
+"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 LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -600,6 +634,16 @@ msgid "ltsp"
 msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "TBD"
+msgid "NBD"
+msgstr "à déterminer"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -610,13 +654,13 @@ msgstr ""
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "munin, nagios and site-summary"
-msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin, nagios et site-summary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "Sitesummary"
-msgid "site-summary"
+msgid "sitesummary"
 msgstr "Sitesummary"
 
 #. type: Content of: <article><section><section><section><para>
@@ -635,13 +679,21 @@ msgstr ""
 "SMB pour les clients Windows et Macintosh."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "Par défaut, le courrier électronique est configuré pour ne délivrer les "
 "messages que localement (c'est-à-dire à l'intérieur de l'école), bien qu'il "
@@ -686,7 +738,7 @@ msgstr ""
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -797,7 +849,7 @@ msgstr ""
 #| "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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -820,7 +872,7 @@ msgstr ""
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
 "Un réseau Skolelinux peut avoir plusieurs serveurs LTSP (aussi appelés "
 "serveurs de clients légers) qui sont installés en sélectionnant le profil de "
@@ -839,6 +891,16 @@ msgstr ""
 "(syslog) des clients légers et transmettre ces messages au destinataire "
 "central des journaux système."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "Clients légers"
@@ -857,16 +919,27 @@ msgstr ""
 "utilisée est celle du projet Linux Terminal Server (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted via NFS from the LTSP "
+#| "server, and finally the X Window System is started. The display manager "
+#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
+#| "data is encrypted on the network. For very old thin clients which are too "
+#| "slow for the encryption this can be set to the behavior from former "
+#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "Les clients légers offrent un bon moyen d'utiliser des machines plus "
 "anciennes et moins puissantes car ils lancent tous les programmes sur le "
@@ -949,11 +1022,17 @@ msgid "Administration"
 msgstr "Administration"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (root not allowed by "
+#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 "Toutes les machines Linux installées avec l'installateur Skolelinux seront "
 "administrables depuis un ordinateur central, très probablement le serveur. "
@@ -963,18 +1042,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"Nous utilisons cfengine pour éditer les fichiers de configuration. Ces "
-"fichiers sont mis à jour sur les clients depuis le serveur central. Pour "
-"changer la configuration d'un client, il suffit d'éditer la configuration "
-"sur le serveur et de laisser les changements se propager automatiquement."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -999,8 +1066,12 @@ msgstr ""
 "images peuvent également être amorcées à partir de clés USB."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "L'objectif est de pouvoir installer un serveur à partir de n’importe quel "
@@ -1298,8 +1369,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 reliée au réseau principal (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
+#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
+#| "\">others are possible</link>."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1427,6 +1503,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Configuring the PXE installation"
+msgid "After the installation:"
+msgstr "Configurer l'installation PXE"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1444,12 +1572,20 @@ msgstr ""
 "ulink> ou <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you need something for an embedded router or accesspoint we recommend "
+#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
+#| "you can also use the original firmware. Using the original firmware is "
+#| "easier; using OpenWRT gives you more choices and control. Check the "
+#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
+#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 "Si vous avez des besoins concernant un routeur embarqué ou un point d'accès, "
@@ -1566,18 +1702,6 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
-#| "iso\">debian-edu-8+edu0-CD.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
-"\">debian-edu-8+edu0-CD.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
 #| "iso\">debian-edu-8+edu0-CD.iso</ulink>"
 msgid ""
@@ -1614,11 +1738,12 @@ msgstr ""
 #| "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.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 "L'image ISO multiarchitecture a une taille de 5,2 Gio et peut être utilisée "
 "pour l'installation de machines amd64 et i386. Veuillez noter qu'elle "
@@ -1628,18 +1753,6 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
-#| "iso\">debian-edu-8+edu0-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
-"\">debian-edu-8+edu0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
 #| "USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
 msgid ""
@@ -1699,11 +1812,19 @@ msgid "Installing Debian Edu"
 msgstr "Installer Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 42,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
 "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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1931,7 +2052,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid "Additional boot parameters for installations"
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr "Paramètres de démarrage additionnels pour les installations"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1941,11 +2062,22 @@ msgstr "Paramètres de démarrage additionnels pour les installations"
 #| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
-"boot menu."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
 msgstr ""
 "Sur i386 et amd64, les options de démarrage peuvent être éditées en appuyant "
 "sur la <emphasis>touche tabulation</emphasis> dans le menu de démarrage."
 
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
@@ -1977,8 +2109,8 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "Pour installer le bureau <emphasis role=\"strong\">GNOME</emphasis> au lieu "
 "de <emphasis role=\"strong\">KDE « Plasma »</emphasis>, ajoutez "
@@ -1986,20 +2118,29 @@ msgstr ""
 "d'initialisation du noyau."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 "Pour installer le bureau <emphasis role=\"strong\">LXDE</emphasis> à la "
 "place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
 "d'initialisation du noyau."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "Pour installer le bureau <emphasis role=\"strong\">LXDE</emphasis> à la "
 "place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
@@ -2012,9 +2153,8 @@ msgstr ""
 #| "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 #| "boot parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "Pour installer le bureau <emphasis role=\"strong\">MATE</emphasis> à la "
 "place, ajoutez <computeroutput>desktop=mate</computeroutput> aux paramètres "
@@ -2042,7 +2182,9 @@ msgstr ""
 "serveur pour clients légers."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a language (for the installation and the installed system)"
+#, fuzzy
+#| msgid "Choose a language (for the installation and the installed system)"
+msgid "Choose a language (for the installation and the installed system)."
 msgstr "Choisissez une langue (pour l'installation et le système installé)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2051,7 +2193,9 @@ msgstr ""
 "Choisissez l'endroit qui devrait normalement être le lieu où vous vivez."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a keyboard keymap (the country's default is usually fine)"
+#, fuzzy
+#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
+msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "Choisissez une disposition de clavier (généralement, le choix par défaut du "
 "pays convient)."
@@ -2061,7 +2205,9 @@ msgid "Choose profile(s) from the following list:"
 msgstr "Choisissez le ou les profils de la liste suivante."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Serveur principal</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -2074,9 +2220,9 @@ msgstr "<emphasis role=\"strong\">Serveur principal</emphasis>"
 #| "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 only install one main server per "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 "C'est le serveur principal (tjener) pour votre école, il fournit tous les "
@@ -2125,7 +2271,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Serveur principal</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -2142,11 +2288,12 @@ msgstr "<emphasis role=\"strong\">Serveur principal</emphasis>"
 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 "Serveur de clients légers (et de stations de travail sans disque), également "
 "appelé serveur LTSP. Les clients sans disque dur s'amorcent et exécutent les "
@@ -2214,7 +2361,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 "Les profils <emphasis role=\"strong\">Serveur principal</emphasis>, "
 "<emphasis role=\"strong\">Station de travail</emphasis> et <emphasis role="
@@ -2229,22 +2376,6 @@ msgstr ""
 "dans la machine qui sera configurée comme serveur principal combiné et comme "
 "serveur de clients légers pour pouvoir l'utiliser après l'installation."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
-msgstr ""
-"L'ordre des cartes réseau après l'installation peut différer de l'ordre "
-"pendant la phase d'installation. L'ordre souhaité peut être obtenu en "
-"éditant <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput> : d'habitude, <emphasis>si cela arrive</emphasis>, vous "
-"souhaiterez remplacer eth0 par eth1 et eth1 par eth0. Un redémarrage est "
-"nécessaire pour que les changements soient pris en compte."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2277,7 +2408,7 @@ msgstr ""
 #| "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 "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -2394,7 +2525,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
 #| msgid "A note on thin-client-server installations"
-msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr "Note à propos des installations de serveur de clients légers"
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2521,8 +2652,8 @@ msgstr "width=400"
 #| "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> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 "Voici à quoi ressemble le menu PXE avec les profils <emphasis role=\"strong"
@@ -2535,6 +2666,12 @@ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2713,10 +2850,10 @@ msgstr ""
 #| "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 + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 "Voici la visite guidée montrant l'installation graphique d'un serveur "
 "principal, d'une station de travail, et d'un serveur de clients légers, "
@@ -2969,7 +3106,7 @@ msgstr "Invite KDM sur tjener"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2979,7 +3116,7 @@ msgstr "KDE et un navigateur Internet"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -3005,9 +3142,15 @@ msgstr "Invite de connexion sur une station de travail sans disque dur"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Desktop and Menu"
+msgstr "Bureau KDE"
+
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr "Démarrage rapide"
@@ -3036,6 +3179,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 "Après l'installation, les premières choses que vous devez faire en tant que "
@@ -3062,10 +3213,16 @@ msgstr ""
 "passer par cette étape) ;"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Adding users and workstations is described in detail below, so please "
+#| "read this chapter completely. It covers how to perform these minumum "
+#| "steps correctly as well, as other stuff that everybody will probably need "
+#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
-"this chapter completely. It covers how to perform these minumum steps "
-"correctly as well, as other stuff that everybody will probably need to do."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 "L'ajout d'utilisateurs et de stations de travail est décrit en détail ci-"
 "dessous, veuillez lire le chapitre au complet. Il explique comment faire "
@@ -3119,7 +3276,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "Debian Edu KDE desktop"
-msgid "Debian Edu MATE desktop"
+msgid "Debian Edu KDE desktop"
 msgstr "bureau Debian Edu KDE"
 
 #. type: Content of: <article><section><section><section><para>
@@ -3180,11 +3337,11 @@ msgstr "Administration DHCP"
 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 + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 "Pour accéder à GOsa², vous avez besoin du serveur principal Skolelinux et "
 "d'un système (client) disposant d'un navigateur web qui peut être le serveur "
@@ -3277,10 +3434,9 @@ 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 LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 "Dans Debian Edu, les informations de comptes, de groupes et de systèmes sont "
 "enregistrées dans un répertoire LDAP. On y accède non seulement depuis le "
@@ -3827,10 +3983,16 @@ msgstr ""
 "\"Architecture\">Architecture</link> de ce manuel."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis role=\"strong"
+#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
-"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
 "Les stations de travail sans disque et les clients légers fonctionnent sans "
@@ -3903,9 +4065,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 "Si les machines ont démarré comme clients légers ou stations de travail sans "
@@ -4117,8 +4279,14 @@ msgstr ""
 "LDAP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
+#| "or your users won't be able to access their home directories. Diskless "
+#| "workstations and thin clients don't use NFS, so they don't need to be "
+#| "configured."
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -4167,10 +4335,15 @@ msgstr ""
 "d'impression désactivées."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian Edu machines in this group will only be allowed to connect to "
+#| "machines on the local network.  Combined with web proxy restrictions this "
+#| "might be used during exams."
 msgid ""
-"Debian Edu machines in this group will only be allowed to connect to "
-"machines on the local network.  Combined with web proxy restrictions this "
-"might be used during exams."
+"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 "
+"be used during exams."
 msgstr ""
 "Les machines Debian Edu dans ce groupe ne seront autorisées à se connecter "
 "qu'à des machines du réseau local. Associé avec des restrictions du "
@@ -4369,6 +4542,14 @@ msgstr ""
 "depuis le chroot LTSP."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "run <computeroutput>apt-get update</computeroutput>"
+msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr "exécutez <computeroutput>apt-get update</computeroutput>"
+
+#. type: Content of: <article><section><section><para>
 msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
@@ -4395,11 +4576,19 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed and configured as described on <ulink url=\"https://wiki."
+#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
+#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed and configured as described on <ulink url=\"https://wiki.debian."
-"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 "Si vous le souhaitez, l'installation des mises à jour peut être rendue "
 "automatique, simplement en installant et configurant le paquet "
@@ -4450,12 +4639,21 @@ msgid "Backup Management"
 msgstr "Gestion des sauvegardes"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail. Note: the site will only work "
+#| "if you temporarily allow ssh root login on the backup server (tjener by "
+#| "default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 "Pour la gestion des sauvegardes, faites pointer votre navigateur sur <ulink "
 "url=\"https://www/slbackup-php\"/>. Veuillez noter que vous devez accéder à "
@@ -4576,6 +4774,17 @@ msgstr ""
 "et la cause de problèmes."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The list of machines being monitored using Munin is generated "
+#| "automatically, based on the list of hosts reporting to sitesummary.  All "
+#| "hosts with the package munin-node installed are registered for Munin "
+#| "monitoring.  It will normally take one day from a machine being installed "
+#| "until Munin monitoring starts, because of the order the cron jobs are "
+#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
+#| "update-munin</computeroutput> as root on the sitesummary server (normally "
+#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
+#| "conf</computeroutput> file."
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -4583,7 +4792,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 "La liste des machines surveillées à l'aide de Munin est créée "
@@ -4598,10 +4807,17 @@ msgstr ""
 "jour le fichier <computeroutput>/etc/munin/munin.conf</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The set of measurements being collected is automatically generated on "
+#| "each machine using the <computeroutput>munin-node-configure</"
+#| "computeroutput> program, which probes the plugins available from "
+#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
+#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from <computeroutput>/usr/share/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
@@ -4612,9 +4828,13 @@ msgstr ""
 "computeroutput> pour les greffons pertinents."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Munin is available from <ulink url=\"http://munin."
+#| "projects.linpro.no/\"/> ."
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 "Des informations sur le système Munin sont disponibles depuis <ulink url="
 "\"http://munin.projects.linpro.no/\"/>."
@@ -5637,10 +5857,15 @@ msgstr ""
 "l'installation (premier utilisateur) :"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ sudo apt-get update\n"
+#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+#| "  # after installation, start a graphical session for the first user \n"
+#| "  $ startx"
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -5765,9 +5990,14 @@ msgstr ""
 "paquets qui étaient auparavant maintenus sur volatile.debian.org."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "While you can use stable-updates directly, you don't have to: stable-"
+#| "updates are pushed into the stable suite regularily when stable point "
+#| "releases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
-"are pushed into the stable suite regularily when stable point releases are "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 "Bien que vous puissiez utiliser les dépôts stable-updates directement, vous "
@@ -5776,7 +6006,9 @@ msgstr ""
 "ce qui arrive environ tous les deux mois."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+#, fuzzy
+#| msgid "Using backports.debian.org to install newer software"
+msgid "Using backports to install newer software"
 msgstr ""
 "Utiliser backports.debian.org pour installer des logiciels plus récents"
 
@@ -5841,11 +6073,19 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t jessie-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Backports are automatically updated (if available) just like other "
+#| "packages. (Previously, extra configuration was needed to achieve this, "
+#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#| "anymore]."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 "Les paquets rétroportés, s'ils sont disponibles, sont automatiquement mis à "
 "jour, comme n'importe quel autre paquet. (Auparavant, la mise à jour "
@@ -5903,8 +6143,13 @@ msgid "To quote the apt-cdrom(8) man page:"
 msgstr "D'après la page de manuel d'apt-cdrom(8) :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
+#| "apt-cdrom takes care of determining the structure of the disc as well as "
+#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
-"apt-cdrom is used to add a new CDROM to APTs list of available sources. apt-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -5914,9 +6159,14 @@ msgstr ""
 "fichiers d'index."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
+#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
+#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
-"done by hand. Furthermore each disk in a multi-cd set must be inserted and "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 "Vous devez utiliser apt-cdrom pour ajouter des CD au système APT, vous ne "
@@ -5942,8 +6192,14 @@ msgid "Automatic cleanup of leftover processes"
 msgstr "Nettoyage automatique des processus résiduels"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
+#| "of background jobs. Background jobs are defined as processes that belong "
+#| "to users who are not currently logged into the machine. It's run by cron "
+#| "job once an hour."
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -6262,7 +6518,9 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
+#, fuzzy
+#| msgid "Advanced administration"
+msgid "Advanced administration howto"
 msgstr "Administration avancée"
 
 #. type: Content of: <article><section><para>
@@ -6278,9 +6536,14 @@ msgid "Create Users in Year Groups"
 msgstr "Création d'utilisateurs dans des groupes par année"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In this example we want to create users in year groups, with common home "
+#| "directories for each group (home0/2014, home0/2015, etc.) We want to "
+#| "create the users by csv import."
 msgid ""
 "In this example we want to create users in year groups, with common home "
-"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 "Dans cet exemple, les utilisateurs créés seront groupés par année, avec un "
@@ -6289,7 +6552,9 @@ msgstr ""
 "CSV."
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
+#, fuzzy
+#| msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis>(en tant que superutilisateur sur Tjener)</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6346,16 +6611,25 @@ msgid "Template"
 msgstr "Modèle"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose 'users' from the main menu. Change to 'Students' in the Base "
+#| "field. An Entry <computeroutput>'NewStudent'</computeroutput> should show "
+#| "up, click it. This is the 'students' template, not a real user. As you'll "
+#| "have to create such a template (to be able to use csv import for your "
+#| "structure) based on this one, notice all entries showing up in the "
+#| "Generic, POSIX and Samba tabs, maybe take screenshots. Now change to /"
+#| "Students/2014 in the Base field; choose Create/Template and start to fill "
+#| "in your desired values, first the Generic tab (add your new 2014 group "
+#| "under Group Membership, too), then add POSIX and Samba account."
 msgid ""
 "Choose 'users' from the main menu. Change to 'Students' in the Base field. "
-"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
 msgstr ""
 "Choisissez « Utilisateurs » dans le menu principal. Changez le champ "
 "« Base » en « Students ». Une entrée <computeroutput>« NewStudent »</"
@@ -6370,14 +6644,25 @@ msgstr ""
 "nouveau groupe 2014 dans le champ « Appartenance au groupe »), puis ajouter "
 "les comptes POSIX et Samba."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Importation des utilisateurs"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose your new template when doing csv import; testing it with a few "
+#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 "Choisissez votre nouveau modèle lors de l'importation CSV. Effectuer d'abord "
 "un test avec un petit nombre d'utilisateurs est recommandé."
@@ -6455,12 +6740,19 @@ msgstr ""
 " echo \"Le nombre de répertoires créés est $dossiers_crees.\""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
+#, fuzzy
+#| msgid "Easy access to USB drives and CDROMs/DVDs"
+msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "Accès facile aux disques USB et aux CD et DVD"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a (diskless) "
+#| "workstation, a popup window appears asking what to do with it, just like "
+#| "in any other normal installation."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
@@ -6469,8 +6761,15 @@ msgstr ""
 "faire avec, comme dans toute autre installation."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a thin client there "
+#| "is only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -6499,11 +6798,18 @@ msgstr ""
 "utilisé, des icônes seront placés sur le bureau permettant un accès facile)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
+#| "This might come in handy if users want to edit files directly on their "
+#| "plugged in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 "Grâce au script suivant, un lien symbolique appelé « media » est créé pour "
 "chaque utilisateur dans leur répertoire personnel pour faciliter l'accès aux "
@@ -6567,14 +6873,6 @@ msgstr ""
 "depuis la console, ils sont capables de monter le périphérique amovible et "
 "d'accéder à son contenu."
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Ce problème est suivi dans le <ulink url=\"http://bugs.skolelinux."
-"org/1376\">bogue Debian Edu nº 1376</ulink>."
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr "Utiliser un serveur dédié pour le stockage"
@@ -6588,10 +6886,16 @@ msgstr ""
 "stockage des répertoires personnels et éventuellement d'autres données."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Add a new system of type server using GOsa² as outlined in the <link "
+#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
+#| "started</link> chapter of this manual."
 msgid ""
-"Add a new system of type server using GOsa² as outlined in the <link linkend="
-"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
-"link> chapter of this manual."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 "Ajoutez un nouveau système de type serveur depuis GOsa², comme indiqué dans "
 "le chapitre <link linkend=\"GettingStarted--"
@@ -6713,10 +7017,15 @@ msgstr ""
 "tjener.intern n'utilise pas automount, pour éviter les boucles de montage :"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create the mount directories using <computeroutput>mkdir</"
+#| "computeroutput>, edit '/etc/fstab' as adequate and run "
+#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
-"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
-"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
-"computeroutput> to mount the new resources."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 "créez les points de montages avec la commande <computeroutput>mkdir</"
 "computeroutput>, éditez et modifiez le fichier « /etc/fstab » selon vos "
@@ -6767,8 +7076,13 @@ msgid "Managing this case with GOsa is quite simple:"
 msgstr "Gérer cette situation avec GOsa est assez simple :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
+#| "level (where already other system management related groups like "
+#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -6836,11 +7150,17 @@ msgstr ""
 "#"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
+#| "dropped to disable internal ssh login access. Note: someone pluging in "
+#| "his box into the dedicated LTSP client network(s) will gain ssh access to "
+#| "the LTSP server(s) as well."
 msgid ""
 "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
-"dropped to disable internal ssh login access. Note: someone pluging in his "
-"box into the dedicated LTSP client network(s) will gain ssh access to the "
-"LTSP server(s) as well."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 "Si uniquement des serveurs LTSP dédiés sont utilisés, le réseau 10.0.0.0/8 "
 "peut être oublié pour désactiver la connexion par SSH en interne. Remarque : "
@@ -10616,10 +10936,10 @@ 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), 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."
+"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."
 msgstr ""
 "La traduction norvégienne Bokmål, dont les droits d'auteur appartiennent à "
 "Petter Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), "
@@ -10682,9 +11002,13 @@ msgstr ""
 "distribuée sous GPL v2 ou toute version ultérieure."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015) and is released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduction danoise, dont les droits d'auteur appartiennent à Joe Hansen "
 "(2012, 2013, 2014, 2015), est distribuée sous GPL v2 ou toute version "
@@ -10697,7 +11021,7 @@ msgstr ""
 #| "and is released under the GPL v2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduction danoise, dont les droits d'auteur appartiennent à Frans "
 "Spiesschaert (2014, 2015) est distribuée sous GPL v2 ou toute version "
@@ -13463,6 +13787,61 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "Nous utilisons cfengine pour éditer les fichiers de configuration. Ces "
+#~ "fichiers sont mis à jour sur les clients depuis le serveur central. Pour "
+#~ "changer la configuration d'un client, il suffit d'éditer la configuration "
+#~ "sur le serveur et de laisser les changements se propager automatiquement."
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
+#~| "iso\">debian-edu-8+edu0-CD.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
+#~ "iso\">debian-edu-8+edu0-CD.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
+#~| "USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
+#~ "iso\">debian-edu-8+edu0-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "The ordering of the network cards after installation might differ from "
+#~ "the ordering during installation. The wanted ordering can be achieved by "
+#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
+#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
+#~ "the changes to take effect."
+#~ msgstr ""
+#~ "L'ordre des cartes réseau après l'installation peut différer de l'ordre "
+#~ "pendant la phase d'installation. L'ordre souhaité peut être obtenu en "
+#~ "éditant <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput> : d'habitude, <emphasis>si cela arrive</emphasis>, vous "
+#~ "souhaiterez remplacer eth0 par eth1 et eth1 par eth0. Un redémarrage est "
+#~ "nécessaire pour que les changements soient pris en compte."
+
+#~ msgid ""
+#~ "This is being tracked as <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian Edu bug #1376</ulink>."
+#~ msgstr ""
+#~ "Ce problème est suivi dans le <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">bogue Debian Edu nº 1376</ulink>."
+
 #~ msgid "Nagios"
 #~ msgstr "Nagios"
 
@@ -14042,9 +14421,6 @@ msgstr ""
 #~ "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\"/> — "
 #~ "assistance par liste de diffusion"
 
-#~ msgid "TBD"
-#~ msgstr "à déterminer"
-
 #~ msgid "Squid"
 #~ msgstr "Squid"
 
@@ -14213,9 +14589,6 @@ msgstr ""
 #~ "Éditez <computeroutput>/etc/apt/sources.list</computeroutput> et "
 #~ "remplacez toutes les occurrences de « wheezy » par « jessie »."
 
-#~ msgid "run <computeroutput>apt-get update</computeroutput>"
-#~ msgstr "exécutez <computeroutput>apt-get update</computeroutput>"
-
 #~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
 #~ msgstr "exécutez <computeroutput>apt-get upgrade</computeroutput>"
 
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 d07b08e..4baf0bf 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+0000\n"
 "PO-Revision-Date: 2015-05-04 19:34+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -88,6 +88,19 @@ msgstr ""
 "configurata per una scuola."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Directly after installation of a school server all services needed for a "
+#| "school network are set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>) and "
+#| "the system is ready to be used. Only users and machines need to be added "
+#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
+#| "environment using PXE has also been prepared, so after initial "
+#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
+#| "all other machines can be installed via the network, this includes "
+#| "\"roaming workstations\" (ones that can be taken away from the school "
+#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
+#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -98,7 +111,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "Immediatamente dopo l'installazione è configurato un server della scuola che "
 "esegue tutti i servizi necessari per la rete scolastica (vedere il prossimo "
@@ -153,8 +166,15 @@ msgstr ""
 "completamente configurata per la scuola."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
 msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+"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 "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -214,9 +234,9 @@ msgstr "La topologia della rete Debian Edu"
 #| "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, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -232,12 +252,20 @@ msgstr ""
 "dei servizi di rete."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "La ragione per cui può essere presente un solo server principale in ogni "
@@ -279,9 +307,15 @@ msgstr ""
 "memtest o avviare dall'hard disk locale."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -319,9 +353,9 @@ msgstr "Server principale (tjener)"
 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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Una rete Skolelinux ha bisogno di un solo server principale (chiamato anche "
 "\"tjener\" che è la traduzione norvegese di \"server\") che ha in modo "
@@ -348,14 +382,14 @@ msgstr "Servizi attivi sul server principale"
 #| "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 "
+"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 LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -595,6 +629,16 @@ msgid "ltsp"
 msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "TBD"
+msgid "NBD"
+msgstr "TBD"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -606,13 +650,13 @@ msgstr ""
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "munin, nagios and site-summary"
-msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin, nagios e site-summary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "Sitesummary"
-msgid "site-summary"
+msgid "sitesummary"
 msgstr "Sitesummary"
 
 #. type: Content of: <article><section><section><section><para>
@@ -631,13 +675,21 @@ msgstr ""
 "Macintosh."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "In modo predefinito la posta elettronica è impostata solo per la consegna in "
 "locale (cioè all'interno della scuola), sebbene la spedizione di e-mail "
@@ -680,7 +732,7 @@ msgstr ""
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -789,7 +841,7 @@ msgstr ""
 #| "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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -812,7 +864,7 @@ msgstr ""
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
 "Una rete Skolelinux può avere diversi server LTSP (chiamati anche server "
 "thin-client), che sono installati selezionando il profilo per server di thin "
@@ -830,6 +882,16 @@ msgstr ""
 "I server di thin-client sono configurati per ricevere il syslog dai thin-"
 "client e inoltrare questi messaggi al syslog principale."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "Thin-client"
@@ -848,16 +910,27 @@ msgstr ""
 "Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted via NFS from the LTSP "
+#| "server, and finally the X Window System is started. The display manager "
+#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
+#| "data is encrypted on the network. For very old thin clients which are too "
+#| "slow for the encryption this can be set to the behavior from former "
+#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "I thin-client sono un modo ottimo per usare macchine deboli e obsolete in "
 "quanto tutti i programmi girano sul server LTSP. Questo funziona come segue: "
@@ -936,11 +1009,17 @@ msgid "Administration"
 msgstr "Amministrazione"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (root not allowed by "
+#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 "Tutte le macchine Linux che sono installate usando l'installatore di "
 "Skolelinux, saranno amministrabili da un computer centrale, probabilmente il "
@@ -949,18 +1028,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"Si usa cfengine per modificare i file di configurazione. Questi file sono "
-"aggiornati dal server ai client. Per cambiare la configurazione del client è "
-"sufficiente modificare la configurazione del server e automaticamente i "
-"cambiamenti saranno distribuiti."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -984,8 +1051,12 @@ msgstr ""
 "tipi possono essere avviati anche da penna USB. "
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "L'obiettivo è quello di essere in grado di installare, solo una volta, un "
@@ -1275,8 +1346,13 @@ 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>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
+#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
+#| "\">others are possible</link>."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1400,6 +1476,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Configuring the PXE installation"
+msgid "After the installation:"
+msgstr "Configurare l'installazione di PXE"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1418,12 +1546,20 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you need something for an embedded router or accesspoint we recommend "
+#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
+#| "you can also use the original firmware. Using the original firmware is "
+#| "easier; using OpenWRT gives you more choices and control. Check the "
+#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
+#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 "Se si ha bisogno di qualcosa per un router embedded o un access point si "
@@ -1538,18 +1674,6 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
-#| "iso\">debian-edu-8+edu0-CD.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
-"\">debian-edu-8+edu0-CD.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
 #| "iso\">debian-edu-8+edu0-CD.iso</ulink>"
 msgid ""
@@ -1585,11 +1709,12 @@ msgstr "Immagine per flash drive USB / Blu-ray disc per i386 e amd64"
 #| "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.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 "L'immagine ISO multi-architettura è grande 5,2 GiB e può essere usata per "
 "l'installazione di macchine amd64 e i386. Durante l'installazione è "
@@ -1599,18 +1724,6 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
-#| "iso\">debian-edu-8+edu0-USB.iso</ulink>"
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
-"\">debian-edu-8+edu0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
 #| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
 #| "USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
 msgid ""
@@ -1670,11 +1783,19 @@ msgid "Installing Debian Edu"
 msgstr "Installare Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 42,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
 "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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1905,7 +2026,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid "Additional boot parameters for installations"
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr "Ulteriori parametri di avvio per le installazioni"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1915,11 +2036,22 @@ msgstr "Ulteriori parametri di avvio per le installazioni"
 #| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
-"boot menu."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
 msgstr ""
 "Le opzioni di avvio su i386/amd64 possono essere modificate premendo "
 "<emphasis>il tasto Tab</emphasis> nel menu di avvio."
 
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
@@ -1951,8 +2083,8 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "Per installare il desktop <emphasis role=\"strong\">GNOME</emphasis> al "
 "posto del desktop <emphasis role=\"strong\">KDE \"Plasma\"</emphasis>, "
@@ -1960,20 +2092,29 @@ msgstr ""
 "avvio del kernel."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 "Per installare invece il desktop <emphasis role=\"strong\">LXDE</emphasis>, "
 "aggiungere <computeroutput>desktop=lxde</computeroutput> ai parametri di "
 "avvio del kernel."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "Per installare il desktop <emphasis role=\"strong\">Xfce</emphasis>, "
 "aggiungere <computeroutput>desktop=xfce</computeroutput> ai parametri di "
@@ -1986,9 +2127,8 @@ msgstr ""
 #| "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 #| "boot parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "Per installare il desktop <emphasis role=\"strong\">MATE</emphasis>, "
 "aggiungere <computeroutput>desktop=mate</computeroutput> ai parametri di "
@@ -2016,7 +2156,9 @@ msgstr ""
 "thin-client."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a language (for the installation and the installed system)"
+#, fuzzy
+#| 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 il sistema installato)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2025,7 +2167,9 @@ 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)"
+#, fuzzy
+#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
+msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "Scegliere una disposizione di tastiera (in genere quella predefinita per il "
 "proprio paese va bene)"
@@ -2035,7 +2179,9 @@ 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>"
+#, fuzzy
+#| 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>
@@ -2048,9 +2194,9 @@ msgstr "<emphasis role=\"strong\">Main-Server</emphasis>"
 #| "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 only install one main server per "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 "Questo è il server principale (tjener) per la scuola e mette a disposizione "
@@ -2097,7 +2243,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Main-Server</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -2114,11 +2260,12 @@ msgstr "<emphasis role=\"strong\">Main-Server</emphasis>"
 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 "I server di thin-client (e workstation senza dischi) sono chiamati anche "
 "server LTSP. I client che non hanno disco si avviano e eseguono il software "
@@ -2184,7 +2331,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 "I profili <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
 "\"strong\">Workstation</emphasis> e <emphasis role=\"strong\">Thin Client "
@@ -2200,22 +2347,6 @@ msgstr ""
 "che funzionerà da server combinato o come server di thin-client, che saranno "
 "utili dopo l'installazione. "
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
-msgstr ""
-"L'ordinamento delle schede di rete dopo l'installazione può essere diverso "
-"dall'ordine delle schede durante l'installazione. Si può ottenere l'ordine "
-"voluto modificando <computeroutput>/etc/udev/rules.d/70-persistent-net."
-"rules</computeroutput>: <emphasis>se questo accade</emphasis>, in genere è "
-"necessario sostituire eth0 con eth1 e eth1 con eth0; un riavvio di sistema è "
-"necessario per attivare questi cambiamenti."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2248,7 +2379,7 @@ msgstr ""
 #| "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 "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -2363,7 +2494,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
 #| msgid "A note on thin-client-server installations"
-msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr "Nota sull'installazione dei thin-client-server"
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2486,8 +2617,8 @@ msgstr "width=400"
 #| "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> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 "Così appare il menu PXE con i profili <emphasis role=\"strong\">Main-Server "
@@ -2499,6 +2630,12 @@ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2671,10 +2808,10 @@ msgstr ""
 #| "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 + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 "Qui sotto ci sono più schermate sulla installazione grafica Main-Server + "
 "Workstation + Thin Client Server e come questa appare al primo avvio del "
@@ -2926,7 +3063,7 @@ msgstr "Login KDM su tjener"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2936,7 +3073,7 @@ msgstr "KDE e il browser"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/27-Tjener-KDE_Desktop.png"
-msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2962,9 +3099,15 @@ msgstr "Login su workstation senza dischi"
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Desktop and Menu"
+msgstr "Desktop KDE"
+
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr "Iniziare"
@@ -2992,6 +3135,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 "Dopo l'installazione, le prime cose che si devono fare come primo utente "
@@ -3017,10 +3168,16 @@ msgstr ""
 "dischi possono essere usate direttamente senza questo passaggio."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Adding users and workstations is described in detail below, so please "
+#| "read this chapter completely. It covers how to perform these minumum "
+#| "steps correctly as well, as other stuff that everybody will probably need "
+#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
-"this chapter completely. It covers how to perform these minumum steps "
-"correctly as well, as other stuff that everybody will probably need to do."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 "Come aggiungere utenti e workstation è descritto sotto, occorre leggere "
 "questo capitolo completamente. Il capitolo descrive come fare i passi "
@@ -3072,7 +3229,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
 #| msgid "Debian Edu KDE desktop"
-msgid "Debian Edu MATE desktop"
+msgid "Debian Edu KDE desktop"
 msgstr "Desktop KDE di Debian Edu"
 
 #. type: Content of: <article><section><section><section><para>
@@ -3133,11 +3290,11 @@ msgstr "Amministrazione DHCP"
 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 + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 "Per accedere a GOsa² occorre avere un server principale Skolelinux e un "
 "sistema (client) con un browser web installato che può essere il server "
@@ -3231,10 +3388,9 @@ 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 LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 "In Debian Edu le informazioni sugli account, i gruppi e il sistema sono "
 "archiviate in una directory LDAP. Questi dati non sono usati solo dal server "
@@ -3773,10 +3929,16 @@ msgstr ""
 "\"Architecture\">architettura</link> di questo manuale."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis role=\"strong"
+#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
-"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
 "Workstation senzadischi e thin-client funzionano senza bisogno di far nulla "
@@ -3848,9 +4010,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 "Se le macchine sono avviate come thin-client/workstation senza dischi o sono "
@@ -4062,8 +4224,14 @@ msgstr ""
 "indirizzo statico da LDAP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
+#| "or your users won't be able to access their home directories. Diskless "
+#| "workstations and thin clients don't use NFS, so they don't need to be "
+#| "configured."
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -4110,10 +4278,15 @@ msgstr ""
 "notte e riattiveranno ogni coda di stampa disabilitata ogni ora."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian Edu machines in this group will only be allowed to connect to "
+#| "machines on the local network.  Combined with web proxy restrictions this "
+#| "might be used during exams."
 msgid ""
-"Debian Edu machines in this group will only be allowed to connect to "
-"machines on the local network.  Combined with web proxy restrictions this "
-"might be used during exams."
+"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 "
+"be used during exams."
 msgstr ""
 "Alle macchine Debian Edu di questo gruppo sarà consentita solo la "
 "connessione alla rete locale. In combinazione con le restrizioni nei proxy "
@@ -4305,6 +4478,14 @@ msgstr ""
 "di LTSP."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "run <computeroutput>apt-get update</computeroutput>"
+msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr "eseguire <computeroutput>apt-get update</computeroutput>"
+
+#. type: Content of: <article><section><section><para>
 msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
@@ -4329,11 +4510,19 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed and configured as described on <ulink url=\"https://wiki."
+#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
+#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed and configured as described on <ulink url=\"https://wiki.debian."
-"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 "Se si vuole l'installazione automatica degli aggiornamenti può essere fatta "
 "facilmente con l'installazione del pacchetto <computeroutput>unattended-"
@@ -4383,12 +4572,21 @@ msgid "Backup Management"
 msgstr "Gestione dei backup"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail. Note: the site will only work "
+#| "if you temporarily allow ssh root login on the backup server (tjener by "
+#| "default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 "Per l'amministrazione dei backup occorre puntare il browser a <ulink url="
 "\"https://www/slbackup-php\"/>. Occorre fare attenzione che si deve accedere "
@@ -4506,6 +4704,17 @@ msgstr ""
 "bottiglia e per l'origine dei problemi del sistema."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The list of machines being monitored using Munin is generated "
+#| "automatically, based on the list of hosts reporting to sitesummary.  All "
+#| "hosts with the package munin-node installed are registered for Munin "
+#| "monitoring.  It will normally take one day from a machine being installed "
+#| "until Munin monitoring starts, because of the order the cron jobs are "
+#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
+#| "update-munin</computeroutput> as root on the sitesummary server (normally "
+#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
+#| "conf</computeroutput> file."
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -4513,7 +4722,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 "L'elenco delle macchine controllate da Munin è generato automaticamente "
@@ -4527,10 +4736,17 @@ msgstr ""
 "il file <computeroutput>/etc/munin/munin.conf</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The set of measurements being collected is automatically generated on "
+#| "each machine using the <computeroutput>munin-node-configure</"
+#| "computeroutput> program, which probes the plugins available from "
+#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
+#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from <computeroutput>/usr/share/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
@@ -4541,9 +4757,13 @@ msgstr ""
 "rilevanti in <computeroutput>/etc/munin/plugins/</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Munin is available from <ulink url=\"http://munin."
+#| "projects.linpro.no/\"/> ."
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 "Maggiori informazioni sul sistema Munin sono disponibili a <ulink url="
 "\"http://munin.projects.linpro.no/\"/>."
@@ -5537,10 +5757,15 @@ msgstr ""
 "server principale):"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ sudo apt-get update\n"
+#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+#| "  # after installation, start a graphical session for the first user \n"
+#| "  $ startx"
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -5664,9 +5889,14 @@ msgstr ""
 "wiki.debian.org/StableUpdates\">stable-updates suite</ulink>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "While you can use stable-updates directly, you don't have to: stable-"
+#| "updates are pushed into the stable suite regularily when stable point "
+#| "releases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
-"are pushed into the stable suite regularily when stable point releases are "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 "Sebbene sia possibile utilizzare direttamente stable-updates, non c'è da "
@@ -5675,7 +5905,9 @@ msgstr ""
 "circa ogni due mesi."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+#, fuzzy
+#| 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"
 
 #. type: Content of: <article><section><section><para>
@@ -5736,11 +5968,19 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t jessie-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Backports are automatically updated (if available) just like other "
+#| "packages. (Previously, extra configuration was needed to achieve this, "
+#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#| "anymore]."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 "I backport sono aggiornati automaticamente (se disponibili) come gli altri "
 "pacchetti. (Precedentemente era necessaria un'ulteriore configurazione per "
@@ -5796,8 +6036,13 @@ 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>
+#, fuzzy
+#| msgid ""
+#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
+#| "apt-cdrom takes care of determining the structure of the disc as well as "
+#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
-"apt-cdrom is used to add a new CDROM to APTs list of available sources. apt-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -5807,9 +6052,14 @@ msgstr ""
 "verificare i file indice."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
+#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
+#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
-"done by hand. Furthermore each disk in a multi-cd set must be inserted and "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 "Per aggiungere dei CD al sistema APT è necessario usare apt-cdrom, in quanto "
@@ -5835,8 +6085,14 @@ msgid "Automatic cleanup of leftover processes"
 msgstr "Pulitura automatica dei processi pendenti"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
+#| "of background jobs. Background jobs are defined as processes that belong "
+#| "to users who are not currently logged into the machine. It's run by cron "
+#| "job once an hour."
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -6149,7 +6405,9 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
+#, fuzzy
+#| msgid "Advanced administration"
+msgid "Advanced administration howto"
 msgstr "Amministrazione avanzata"
 
 #. type: Content of: <article><section><para>
@@ -6166,9 +6424,14 @@ msgid "Create Users in Year Groups"
 msgstr "Creare utenti in gruppi per ogni anno"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In this example we want to create users in year groups, with common home "
+#| "directories for each group (home0/2014, home0/2015, etc.) We want to "
+#| "create the users by csv import."
 msgid ""
 "In this example we want to create users in year groups, with common home "
-"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 "Nell'esempio seguente vogliamo creare utenti in gruppi per ogni anno, con "
@@ -6176,7 +6439,9 @@ msgstr ""
 "utenti saranno creati importando un file csv. "
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
+#, fuzzy
+#| msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis>(come root su Tjener) </emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6232,16 +6497,25 @@ msgid "Template"
 msgstr "Modello di desktop"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose 'users' from the main menu. Change to 'Students' in the Base "
+#| "field. An Entry <computeroutput>'NewStudent'</computeroutput> should show "
+#| "up, click it. This is the 'students' template, not a real user. As you'll "
+#| "have to create such a template (to be able to use csv import for your "
+#| "structure) based on this one, notice all entries showing up in the "
+#| "Generic, POSIX and Samba tabs, maybe take screenshots. Now change to /"
+#| "Students/2014 in the Base field; choose Create/Template and start to fill "
+#| "in your desired values, first the Generic tab (add your new 2014 group "
+#| "under Group Membership, too), then add POSIX and Samba account."
 msgid ""
 "Choose 'users' from the main menu. Change to 'Students' in the Base field. "
-"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
 msgstr ""
 "Scegliere \"users\" dal menu principale e poi \"Students\" nel campo Base. "
 "Si dovrebbe vedere la voce <computeroutput>'NewStudent'</computeroutput>, "
@@ -6254,14 +6528,25 @@ msgstr ""
 "Generic (aggiungere il nuovo gruppo 2014), poi aggiungere gli account POSIX "
 "e Samba."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Importare utenti"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose your new template when doing csv import; testing it with a few "
+#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 "Scegliere il nuovo modello quando si importa il csv; conviene provarlo con "
 "pochi utenti."
@@ -6339,12 +6624,19 @@ 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"
+#, fuzzy
+#| 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>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a (diskless) "
+#| "workstation, a popup window appears asking what to do with it, just like "
+#| "in any other normal installation."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
@@ -6353,8 +6645,15 @@ msgstr ""
 "cosa si vuole fare, come in ogni altra normale installazione."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a thin client there "
+#| "is only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -6382,11 +6681,18 @@ msgstr ""
 "facilitato.)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
+#| "This might come in handy if users want to edit files directly on their "
+#| "plugged in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 "In aggiunta lo script seguente può essere usato per creare un collegamento "
 "simbolico \"media\" nella directory home di tutti gli utenti per avere un "
@@ -6447,14 +6753,6 @@ msgstr ""
 "Quando un utente remoto vede la finestra a comparsa o usa pmount da console, "
 "può montare i dispositivi rimovibili e accedere ai file."
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Questo è indicato come <ulink url=\"http://bugs.skolelinux.org/1376\">Debian "
-"Edu bug #1376</ulink>."
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr "Utilizzare uno storage server dedicato"
@@ -6468,10 +6766,16 @@ msgstr ""
 "directory utente e per altri dati."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Add a new system of type server using GOsa² as outlined in the <link "
+#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
+#| "started</link> chapter of this manual."
 msgid ""
-"Add a new system of type server using GOsa² as outlined in the <link linkend="
-"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
-"link> chapter of this manual."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 "Aggiungere un nuovo sistema tipo server con GOsa² come indicato nella "
 "sezione <link linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-"
@@ -6591,10 +6895,15 @@ msgstr ""
 "evitare loop di montaggio, tjener.intern non usa automount:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create the mount directories using <computeroutput>mkdir</"
+#| "computeroutput>, edit '/etc/fstab' as adequate and run "
+#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
-"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
-"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
-"computeroutput> to mount the new resources."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 "Creare le directory da montare usando <computeroutput>mkdir</"
 "computeroutput>, modificare come necessario \"/etc/fstab\" ed eseguire "
@@ -6644,8 +6953,13 @@ 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>
+#, fuzzy
+#| msgid ""
+#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
+#| "level (where already other system management related groups like "
+#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -6710,11 +7024,17 @@ msgstr ""
 "#"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
+#| "dropped to disable internal ssh login access. Note: someone pluging in "
+#| "his box into the dedicated LTSP client network(s) will gain ssh access to "
+#| "the LTSP server(s) as well."
 msgid ""
 "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
-"dropped to disable internal ssh login access. Note: someone pluging in his "
-"box into the dedicated LTSP client network(s) will gain ssh access to the "
-"LTSP server(s) as well."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 "Se sono utilizzati solo server LTSP dedicati, la rete 10.0.0.0/8 potrebbe "
 "essere disabilitata per il login ssh interno. Nota: qualche pluging nella "
@@ -10407,10 +10727,10 @@ 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), 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."
+"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."
 msgstr ""
 "La traduzione norvegese bokmål è protetta da copyright di Petter "
 "Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore "
@@ -10472,9 +10792,13 @@ msgstr ""
 "licenza GPL v2 o successiva."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015) and is released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduzione in danese  è protetta da copyright da Joe Hansen (2012, 2013, "
 "2014, 2015) e rilasciata sotto licenza GPL v2 o successiva."
@@ -10486,7 +10810,7 @@ msgstr ""
 #| "and is released under the GPL v2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 "La traduzione in olandese  è protetta da copyright da Frans Spiesschaert "
 "(2014, 2015) e rilasciata sotto licenza GPL v2 o successiva."
@@ -13206,6 +13530,61 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "Si usa cfengine per modificare i file di configurazione. Questi file sono "
+#~ "aggiornati dal server ai client. Per cambiare la configurazione del "
+#~ "client è sufficiente modificare la configurazione del server e "
+#~ "automaticamente i cambiamenti saranno distribuiti."
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
+#~| "iso\">debian-edu-8+edu0-CD.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
+#~ "iso\">debian-edu-8+edu0-CD.iso</ulink>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
+#~| "USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
+#~ "iso\">debian-edu-8+edu0-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "The ordering of the network cards after installation might differ from "
+#~ "the ordering during installation. The wanted ordering can be achieved by "
+#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
+#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
+#~ "the changes to take effect."
+#~ msgstr ""
+#~ "L'ordinamento delle schede di rete dopo l'installazione può essere "
+#~ "diverso dall'ordine delle schede durante l'installazione. Si può ottenere "
+#~ "l'ordine voluto modificando <computeroutput>/etc/udev/rules.d/70-"
+#~ "persistent-net.rules</computeroutput>: <emphasis>se questo accade</"
+#~ "emphasis>, in genere è necessario sostituire eth0 con eth1 e eth1 con "
+#~ "eth0; un riavvio di sistema è necessario per attivare questi cambiamenti."
+
+#~ msgid ""
+#~ "This is being tracked as <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian Edu bug #1376</ulink>."
+#~ msgstr ""
+#~ "Questo è indicato come <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian Edu bug #1376</ulink>."
+
 #~ msgid "Nagios"
 #~ msgstr "Nagios"
 
@@ -13779,9 +14158,6 @@ msgstr ""
 #~ "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\"/> - mailing "
 #~ "list di supporto"
 
-#~ msgid "TBD"
-#~ msgstr "TBD"
-
 #~ msgid "Squid"
 #~ msgstr "Squid"
 
@@ -13959,9 +14335,6 @@ msgstr ""
 #~ "Modificare il file <computeroutput>/etc/apt/sources.list</computeroutput> "
 #~ "e sostituire tutte le occorrenze di \"wheezy\" con \"jessie\"."
 
-#~ msgid "run <computeroutput>apt-get update</computeroutput>"
-#~ msgstr "eseguire <computeroutput>apt-get update</computeroutput>"
-
 #~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
 #~ msgstr "eseguire <computeroutput>apt-get upgrade</computeroutput>"
 
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 506b47f..451b081 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+0000\n"
 "PO-Revision-Date: 2016-12-16 23:09+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -75,6 +75,19 @@ msgstr ""
 "す。"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Directly after installation of a school server all services needed for a "
+#| "school network are set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>) and "
+#| "the system is ready to be used. Only users and machines need to be added "
+#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
+#| "environment using PXE has also been prepared, so after initial "
+#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
+#| "all other machines can be installed via the network, this includes "
+#| "\"roaming workstations\" (ones that can be taken away from the school "
+#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
+#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -85,7 +98,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "学校サーバのインストール完了と同時に、学校ネットワークに必要となるサービスは"
 "全て用意され (次の <link linkend=\"Architecture\">この設定の構成の詳細</"
@@ -136,8 +149,15 @@ msgstr ""
 "そのまま使える環境を提供するバージョンの Debian だということです。"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
+msgid ""
+"The Skolelinux project in Norway was founded on July 2nd 2001 and about the "
 "same time Raphaël Hertzog started Debian-Edu in France. Since 2003 both "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -182,11 +202,21 @@ msgid "The Debian Edu network topology"
 msgstr "Debian Edu のネットワーク接続形態"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and LTSP-"
+#| "servers (with associated thin-clients and/or diskless workstations). The "
+#| "number of workstations can be as large or small as you want (starting "
+#| "from none to a lot). The same goes for the LTSP servers, each of which is "
+#| "on a separate network so that the traffic between the clients and the "
+#| "LTSP server doesn't affect the rest of the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
-"a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -201,12 +231,20 @@ msgstr ""
 "ビスの他の部分に影響することはありません。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "中心サーバが学校ネットワークごとに1台だけというのは、中心サーバが DHCP を提供"
@@ -245,9 +283,15 @@ msgstr ""
 "ハードディスクからのブート等を選択できるようになっています。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -275,12 +319,19 @@ msgid "Main server (tjener)"
 msgstr "中心サーバ (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the LTSP-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 "
-"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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Skolelinux ネットワークには中心サーバ (「tjener」とも呼ばれますがこれはノル"
 "ウェー語で「サーバ」という意味です) が1台必要で、デフォルトでIPアドレス "
@@ -293,15 +344,27 @@ msgid "Services running on the main server"
 msgstr "中心サーバで動作するサービス"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"With the exception of the control of the thin-clients, all services are "
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the LTSP-server(s) should be separate (though it is "
+#| "possible to install both the main server and LTSP 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 "
-"reasons, the LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -533,6 +596,14 @@ msgid "ltsp"
 msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "NBD"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -541,11 +612,15 @@ msgstr ""
 "子メールでエラーを報告します。"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, icinga and site-summary"
+#, fuzzy
+#| msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin、icinga、site-summary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "site-summary"
+#, fuzzy
+#| msgid "site-summary"
+msgid "sitesummary"
 msgstr "site-summary"
 
 #. type: Content of: <article><section><section><section><para>
@@ -563,13 +638,21 @@ msgstr ""
 "Macintosh クライアント向けには SMB を経由したアクセスを提供します。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "メールはデフォルトでローカル配送 (つまり学校内) だけで使えるように用意されま"
 "すが、学校に恒久的なインターネット接続がある場合には広くインターネットにも"
@@ -599,10 +682,18 @@ msgstr ""
 "個々のマシンのインターネットアクセスを制御できるようになります。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Network configuration on the clients is done automatically using DHCP. "
+#| "Normal clients are allocated IP addresses in the private subnet "
+#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP-"
+#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
+#| "network traffic of the thin clients doesn't interfere with the rest of "
+#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -696,9 +787,16 @@ msgstr ""
 "時刻を得られるようにすべきです。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or LTSP-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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -713,10 +811,15 @@ msgid "LTSP server(s)"
 msgstr "LTSP サーバ"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (which we called \"thin "
+#| "client servers\" in releases before Stretch), which are installed by "
+#| "selecting the LTSP server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
 "1つの Skolelinux ネットワークに多数の LTSP サーバ (Jessie リリース以前はシン"
 "クライアントサーバと呼んでいました) を配置できます。LTSP サーバのプロファイル"
@@ -730,6 +833,16 @@ msgstr ""
 "LTSP サーバは syslog をシンクライアントやワークステーションから受け取り、中央"
 "ログ収集サーバに送るように設定されます。"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "シンクライアント"
@@ -748,16 +861,27 @@ msgstr ""
 "います。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted via NFS from the LTSP "
+#| "server, and finally the X Window System is started. The display manager "
+#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
+#| "data is encrypted on the network. For very old thin clients which are too "
+#| "slow for the encryption this can be set to the behavior from former "
+#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "シンクライアントはプログラムを全て LTSP サーバから効果的に実行することで非力"
 "なマシンを活用できる良い方法です。これは以下のように動作します。サービスは "
@@ -835,11 +959,17 @@ msgid "Administration"
 msgstr "管理"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (root not allowed by "
+#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 "Skolelinux インストーラによりインストールされる Linux マシンはすべて、中央コ"
 "ンピュータ、ほとんどの場合中心サーバから管理できます。SSH を経由して全マシン"
@@ -848,17 +978,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"設定ファイルの編集には cfengine を利用します。サーバで更新されたファイルがク"
-"ライアントに送られます。クライアントの設定変更はサーバの設定を変更して自動配"
-"布させるだけです。"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -881,8 +1000,12 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "目指すのは、任意のメディアからサーバを一旦インストールしてしまえば、他のクラ"
@@ -1133,8 +1256,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 は中心ネットワーク (10.0.0.0/8) に接続"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
+#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
+#| "\">others are possible</link>."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1253,6 +1381,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Configuring the PXE installation"
+msgid "After the installation:"
+msgstr "PXEインストールの設定"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1270,12 +1450,20 @@ msgstr ""
 "floppyfw\">floppyfw</ulink> を勧めます。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you need something for an embedded router or accesspoint we recommend "
+#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
+#| "you can also use the original firmware. Using the original firmware is "
+#| "easier; using OpenWRT gives you more choices and control. Check the "
+#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
+#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 "何らかの組み込みルータやアクセスポイントが必要な場合は <ulink url=\"http://"
@@ -1372,14 +1560,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
 msgstr ""
@@ -1399,12 +1579,20 @@ msgid "USB drive ISO image for i386 and amd64"
 msgstr "i386 及び amd64 用 USB ISO イメージ"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Like the netinstall image it can "
+#| "be installed on USB flash drives or disk media of sufficient size. Please "
+#| "note that internet access during installation is needed. Like the others "
+#| "it can be downloaded over FTP, HTTP or rsync via:"
+msgid ""
+"The multi-architecture ISO image is 5.5 GiB large and can be used for "
 "installation of amd64 and i386 machines. Like the netinstall image it can be "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 "複数アーキテクチャ対応の ISO イメージは 5.2 GiB の大きさで、 amd64 や i386 マ"
 "シンへのインストールに利用できます。netinstall イメージと同様に十分なサイズ"
@@ -1414,14 +1602,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
 "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
 msgstr ""
@@ -1467,11 +1647,19 @@ msgid "Installing Debian Edu"
 msgstr "Debian Edu のインストール"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 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 "
 "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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1637,17 +1825,34 @@ msgstr ""
 "説明されている項目についてもっと詳細なヘルプを得られるようになっています。"
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+#, fuzzy
+#| msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr "<emphasis>インストール時の追加のブートパラメータ</emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In both cases, 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."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
 msgstr ""
 "どちらの場合もブートメニューでタブキーを押すとブートオプションを編集できるよ"
 "うになっています。"
 
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
@@ -1671,10 +1876,16 @@ msgstr ""
 "に利用します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">MATE</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 <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "<emphasis role=\"strong\">MATE</emphasis> デスクトップに代えて <emphasis "
 "role=\"strong\">GNOME</emphasis> デスクトップをインストールするにはカーネルの"
@@ -1682,30 +1893,43 @@ msgstr ""
 "す。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 "代わりに <emphasis role=\"strong\">LXDE</emphasis> デスクトップをインストール"
 "するにはカーネルのブートパラメータに <computeroutput>desktop=lxde</"
 "computeroutput> を追加します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "代わりに <emphasis role=\"strong\">Xfce</emphasis> デスクトップをインストール"
 "するにはカーネルのブートパラメータに <computeroutput>desktop=xfce</"
 "computeroutput> を追加します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> "
+#| "desktop instead, add <computeroutput>desktop=kde</computeroutput> to the "
+#| "kernel boot parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "代わりに <emphasis role=\"strong\">KDE 「Plasma」</emphasis> デスクトップをイ"
 "ンストールするにはカーネルのブートパラメータに <computeroutput>desktop=kde</"
@@ -1726,7 +1950,9 @@ msgstr ""
 "ド (NIC) が2つ以上あることの確認を忘れないようにしてください。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a language (for the installation and the installed system)"
+#, fuzzy
+#| msgid "Choose a language (for the installation and the installed system)"
+msgid "Choose a language (for the installation and the installed system)."
 msgstr "言語を選択します (インストール時とインストールしたシステム)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1734,7 +1960,9 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr "国や地域を選択します。通常は自分が住んでいる場所です。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a keyboard keymap (the country's default is usually fine)"
+#, fuzzy
+#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
+msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "キーボードの種類を選択します (通常は国や地域のデフォルトでかまいません)。"
 
@@ -1743,15 +1971,24 @@ msgid "Choose profile(s) from the following list:"
 msgstr "以下のリストからプロファイルを選択します:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Main-Server (tjener, 中心サーバ)</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This is the main server (tjener) for your school providing all services "
+#| "pre-configured to work out of the box. You must only install one main "
+#| "server per school! This profile does not include a graphical user "
+#| "interface. If you want a graphical user interface, then select "
+#| "Workstation or LTSP-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 only install one main server per "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 "これは学校向けに提供する全サービスを設定済みでそのまま使える中心サーバ "
@@ -1797,18 +2034,31 @@ msgstr ""
 "ファイルを選択してください。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+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>
+#, fuzzy
+#| 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 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) - an LTSP 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 "シンクライアント (やディスクレスワークステーション) サーバで、LTSP サーバとも"
 "呼ばれます。ハードドライブを持たないクライアントはブートとソフトウェアの実行"
@@ -1848,6 +2098,20 @@ msgstr ""
 "スの基盤に有用です。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
+#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP "
+#| "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 an LTSP 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 an LTSP 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</"
@@ -1859,7 +2123,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 "<emphasis role=\"strong\">中心サーバ</emphasis>、<emphasis role=\"strong\">"
 "ワークステーション</emphasis>、<emphasis role=\"strong\">LTSP サーバ</"
@@ -1874,21 +2138,6 @@ msgstr ""
 "用するためにはそのマシンにネットワークカードが2つないといけないことに注意して"
 "ください。"
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
-msgstr ""
-"インストール後のネットワークカードの順がインストール中とは異なるかもしれませ"
-"ん。<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput> を編集することで希望の順にできます。通常<emphasis>これが起き"
-"た</emphasis>場合は eth0 を eth1 に、eth1 を eth0 に入れ替えるのもいいかもし"
-"れません。変更を反映させるにはシステムの再起動が必要です。"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -1915,8 +2164,13 @@ msgstr ""
 "方法です。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include LTSP-server then the installer "
+#| "will spend quite some time at the end, \"Finishing the installation - "
+#| "Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include LTSP-server then the installer will "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -2026,7 +2280,9 @@ msgstr ""
 "ようになっています。"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on LTSP-server installations using only Thin-Clients"
+#, fuzzy
+#| msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr "シンクライアントだけを扱う LTSP サーバのインストールに関する注意"
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2136,9 +2392,14 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">LTSP-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> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 "<emphasis role=\"strong\">中心サーバ</emphasis>と<emphasis role=\"strong"
@@ -2151,6 +2412,12 @@ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2307,11 +2574,17 @@ msgstr ""
 "モードを使えないということでもなければこちらを使わない理由はありません。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "So here is a screenshot tour through a graphical 64-bit Main-Server + "
+#| "Workstation + LTSP Server installation and how it looks at the first boot "
+#| "of the 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 + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 "以下は中心サーバ + ワークステーション + LTSP サーバを64ビットのグラフィカル"
 "モードでインストールした場合と、中心サーバの最初のブート、ワークステーション"
@@ -2511,7 +2784,9 @@ msgid "tjener KDM Login"
 msgstr "中心サーバの KDM ログイン画面"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+#, fuzzy
+#| msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-MATE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2519,7 +2794,9 @@ msgid "KDE and Browser"
 msgstr "KDE でブラウザを起動"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-MATE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2539,9 +2816,17 @@ msgid "Diskless Workstation Login"
 msgstr "ディスクレスワークステーションのログイン画面"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-MATE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Desktop and Menu"
+msgstr "KDE デスクトップ"
+
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr "さあ始めよう"
@@ -2568,6 +2853,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr "インストール後に最初のユーザとしてまずやらないといけないこと:"
 
@@ -2591,10 +2884,16 @@ msgstr ""
 "テーションはこの手順をやらなくてもそのまま使えます"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Adding users and workstations is described in detail below, so please "
+#| "read this chapter completely. It covers how to perform these minumum "
+#| "steps correctly as well, as other stuff that everybody will probably need "
+#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
-"this chapter completely. It covers how to perform these minumum steps "
-"correctly as well, as other stuff that everybody will probably need to do."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 "ユーザやワークステーションの追加については以下で詳細に説明しています。この章"
 "全体を読んでください。最小限の手順を正しく行う方法や恐らく誰にとっても必要と"
@@ -2634,7 +2933,9 @@ msgstr ""
 "かれる疑問もいくらか扱っています。"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu MATE desktop"
+#, fuzzy
+#| msgid "Debian Edu MATE desktop"
+msgid "Debian Edu KDE desktop"
 msgstr "Debian Edu MATE デスクトップ"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2679,14 +2980,24 @@ msgid "DHCP Administration"
 msgstr "DHCP 管理"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For GOsa² access you need the Skolelinux main server and a (client) "
+#| "system with a web browser installed which can be the main server itself "
+#| "if it was installed as a so called combined server (main server + LTSP "
+#| "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 "
-"installed as a so called combined server (main server + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 "GOsa² へのアクセスには Skolelinux の中心サーバとウェブブラウザがインストール"
 "された (クライアント) システムが必要です。後者については複合サーバ (中心サー"
@@ -2758,14 +3069,22 @@ msgstr ""
 "いでしょう。GOsa² で提供している全管理ページにあるためです。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In Debian Edu, account, group, and system information is stored in an "
+#| "LDAP directory. This data is used not only by the main server, but also "
+#| "by the (diskless) workstations, the LTSP 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 "
 "(diskless) workstations, the LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 "Debian Edu ではアカウントやグループ、システム情報は LDAP ディレクトリに保存さ"
 "れています。このデータは中心サーバだけでなくネットワーク上の (ディスクレス) "
@@ -3255,10 +3574,16 @@ msgstr ""
 "\"Architecture\">構成</link>の章を参照してください。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis role=\"strong"
+#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
-"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
 "ディスクレスワークステーションやシンクライアントは中心ネットワークに接続すれ"
@@ -3306,6 +3631,20 @@ msgstr ""
 "アイコンが表示されます。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If the machines have booted as thin clients/diskless workstations or have "
+#| "been installed using any of the networked profiles, the "
+#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
+#| "to automatically add machines to GOsa². For simple machines it will work "
+#| "out of the box, for machines with more than one mac address the actually "
+#| "used one has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</"
+#| "computeroutput> shows usage information. Please note, that the IP "
+#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+#| "computeroutput> belong to the dynamic IP range. These systems can then be "
+#| "modified 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 "
@@ -3315,9 +3654,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 "マシンがシンクライアント/ディスクレスワークステーションとしてブートされた、あ"
@@ -3515,8 +3854,14 @@ msgstr ""
 "重要となります。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
+#| "or your users won't be able to access their home directories. Diskless "
+#| "workstations and thin clients don't use NFS, so they don't need to be "
+#| "configured."
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -3563,10 +3908,15 @@ msgstr ""
 "された印刷キューがあれば再有効化します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian Edu machines in this group will only be allowed to connect to "
+#| "machines on the local network.  Combined with web proxy restrictions this "
+#| "might be used during exams."
 msgid ""
-"Debian Edu machines in this group will only be allowed to connect to "
-"machines on the local network.  Combined with web proxy restrictions this "
-"might be used during exams."
+"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 "
+"be used during exams."
 msgstr ""
 "このグループの Debian Edu マシンはローカルネットワーク上のマシンにのみ接続を"
 "許可されます。試験期間にウェブプロキシによる制限と組み合わせて利用すると有用"
@@ -3754,6 +4104,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
 "send mail to an address you are reading."
@@ -3776,11 +4132,19 @@ msgstr ""
 "computeroutput> 実行時にダウンロードを待つ必要がなくなります。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed and configured as described on <ulink url=\"https://wiki."
+#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
+#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed and configured as described on <ulink url=\"https://wiki.debian."
-"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 "望むなら更新を自動でインストールさせることも簡単にできます。必要なのは "
 "<computeroutput>unattended-upgrades</computeroutput> パッケージをインストール"
@@ -3828,12 +4192,21 @@ msgid "Backup Management"
 msgstr "バックアップ管理"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail. Note: the site will only work "
+#| "if you temporarily allow ssh root login on the backup server (tjener by "
+#| "default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 "バックアップを管理するにはブラウザで <ulink url=\"https://www/slbackup-php\"/"
 "> にアクセスします。このサイトへのアクセスにはSSLを経由する必要があることに注"
@@ -3945,6 +4318,17 @@ msgstr ""
 "ステム問題の原因を探しているシステム管理者を支援します。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The list of machines being monitored using Munin is generated "
+#| "automatically, based on the list of hosts reporting to sitesummary.  All "
+#| "hosts with the package munin-node installed are registered for Munin "
+#| "monitoring.  It will normally take one day from a machine being installed "
+#| "until Munin monitoring starts, because of the order the cron jobs are "
+#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
+#| "update-munin</computeroutput> as root on the sitesummary server (normally "
+#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
+#| "conf</computeroutput> file."
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -3952,7 +4336,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 "Munin により監視されるマシン一覧は sitesummary に報告しているホスト一覧から自"
@@ -3964,10 +4348,17 @@ msgstr ""
 "<computeroutput>/etc/munin/munin.conf</computeroutput> ファイルを更新します。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The set of measurements being collected is automatically generated on "
+#| "each machine using the <computeroutput>munin-node-configure</"
+#| "computeroutput> program, which probes the plugins available from "
+#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
+#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from <computeroutput>/usr/share/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
@@ -3978,9 +4369,13 @@ msgstr ""
 "シンボリックリンクを探すようになっています。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Munin is available from <ulink url=\"http://munin."
+#| "projects.linpro.no/\"/> ."
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 "Munin についての情報は <ulink url=\"http://munin.projects.linpro.no/\"/> にあ"
 "ります。"
@@ -4854,10 +5249,15 @@ msgstr ""
 "単です:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ sudo apt-get update\n"
+#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+#| "  # after installation, start a graphical session for the first user \n"
+#| "  $ startx"
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -4979,9 +5379,14 @@ msgstr ""
 "\">stable-updates スイート</ulink>に収録するようになりました。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "While you can use stable-updates directly, you don't have to: stable-"
+#| "updates are pushed into the stable suite regularily when stable point "
+#| "releases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
-"are pushed into the stable suite regularily when stable point releases are "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 "stable-updates を直接利用することもできますが、利用しないといけないというわけ"
@@ -4989,7 +5394,9 @@ msgstr ""
 "まれます。これは大体2か月ごとに行われます。"
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+#, fuzzy
+#| msgid "Using backports.debian.org to install newer software"
+msgid "Using backports to install newer software"
 msgstr "backports を利用した、より新しいソフトウェアのインストール"
 
 #. type: Content of: <article><section><section><para>
@@ -5046,11 +5453,19 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Backports are automatically updated (if available) just like other "
+#| "packages. (Previously, extra configuration was needed to achieve this, "
+#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#| "anymore]."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 "backports では他のパッケージと同様、更新されたパッケージが (利用可能になれ"
 "ば) 自動的に更新されます (以前は追加の設定がそのためには必要でしたが2011年以"
@@ -5101,8 +5516,13 @@ msgid "To quote the apt-cdrom(8) man page:"
 msgstr "apt-cdrom(8) man ページから引用します:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
+#| "apt-cdrom takes care of determining the structure of the disc as well as "
+#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
-"apt-cdrom is used to add a new CDROM to APTs list of available sources. apt-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -5111,9 +5531,14 @@ msgstr ""
 "な限り補正し、インデックスファイルの確認を行います。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
+#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
+#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
-"done by hand. Furthermore each disk in a multi-cd set must be inserted and "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 "APT システムに手作業で CD を追加するのは難しいため、apt-cdrom が必要になりま"
@@ -5138,8 +5563,14 @@ msgid "Automatic cleanup of leftover processes"
 msgstr "自動での残存プロセスの掃除"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
+#| "of background jobs. Background jobs are defined as processes that belong "
+#| "to users who are not currently logged into the machine. It's run by cron "
+#| "job once an hour."
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -5440,7 +5871,9 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
+#, fuzzy
+#| msgid "Advanced administration"
+msgid "Advanced administration howto"
 msgstr "高度な管理"
 
 #. type: Content of: <article><section><para>
@@ -5456,9 +5889,14 @@ msgid "Create Users in Year Groups"
 msgstr "年次グループ内のユーザ作成"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In this example we want to create users in year groups, with common home "
+#| "directories for each group (home0/2014, home0/2015, etc.) We want to "
+#| "create the users by csv import."
 msgid ""
 "In this example we want to create users in year groups, with common home "
-"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 "この例では各グループに共通のホームディレクトリ (home0/2014, home0/2015, 等) "
@@ -5466,7 +5904,9 @@ msgstr ""
 "ポートしたいものとします。"
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
+#, fuzzy
+#| msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis>(中心サーバの root で) </emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5523,14 +5963,19 @@ msgstr "テンプレート"
 #. 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 "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5538,9 +5983,13 @@ msgid "Import users"
 msgstr "ユーザのインポート"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose your new template when doing csv import; testing it with a few "
+#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 "CSVをインポートする際に新しいテンプレートを選択します。少数のユーザを使ってテ"
 "ストしておくことを勧めます。"
@@ -5618,12 +6067,19 @@ 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"
+#, fuzzy
+#| msgid "Easy access to USB drives and CDROMs/DVDs"
+msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "USBメモリやCD、DVDへの簡単アクセス"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a (diskless) "
+#| "workstation, a popup window appears asking what to do with it, just like "
+#| "in any other normal installation."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
@@ -5631,8 +6087,15 @@ msgstr ""
 "他の通常のインストールと同じようにウィンドウが出てきてどうするか質問します。"
 
 #. 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 "
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a thin client there "
+#| "is only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
+msgid ""
+"When users insert a USB drive or a DVD / CD-ROM into a thin client there is "
 "only a notify-window showing up for a few seconds. The media is "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -5659,11 +6122,18 @@ msgstr ""
 "デスクトップに置かれ、簡単にアクセスできるようになっています)。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
+#| "This might come in handy if users want to edit files directly on their "
+#| "plugged in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 "さらに、以下のスクリプトを使って全ユーザのホームディレクトリにシンボリックリ"
 "ンク「media」を作成し、USBメモリやCD、DVD等シンクライアントに差し込んだメディ"
@@ -5724,14 +6194,6 @@ msgstr ""
 "使っている場合、そのユーザはその脱着可能デバイスをマウントし、ファイルにアク"
 "セスできます。"
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"これは <ulink url=\"http://bugs.skolelinux.org/1376\">Debian Edu バグ#1376</"
-"ulink> で追跡されています。"
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr "ストレージ専用サーバの利用"
@@ -5745,10 +6207,16 @@ msgstr ""
 "レージサーバを用意します。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Add a new system of type server using GOsa² as outlined in the <link "
+#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
+#| "started</link> chapter of this manual."
 msgid ""
-"Add a new system of type server using GOsa² as outlined in the <link linkend="
-"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
-"link> chapter of this manual."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 "このマニュアルの<link linkend=\"GettingStarted--"
 "Machine_Management_with_GOsa.2BALI-\">さあ始めよう</link>の章で説明しているよ"
@@ -5866,10 +6334,15 @@ msgstr ""
 "tjener.intern:/etc/fstab に関連する項目を追加します:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create the mount directories using <computeroutput>mkdir</"
+#| "computeroutput>, edit '/etc/fstab' as adequate and run "
+#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
-"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
-"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
-"computeroutput> to mount the new resources."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 "<computeroutput>mkdir</computeroutput> を使ってマウントするディレクトリを作成"
 "し、「/etc/fstab」を適切に編集して <computeroutput>mount -a</computeroutput> "
@@ -5916,8 +6389,13 @@ msgid "Managing this case with GOsa is quite simple:"
 msgstr "GOsa で管理する方法はかなり簡単です:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
+#| "level (where already other system management related groups like "
+#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -5984,11 +6462,17 @@ msgstr ""
 "#"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
+#| "dropped to disable internal ssh login access. Note: someone pluging in "
+#| "his box into the dedicated LTSP client network(s) will gain ssh access to "
+#| "the LTSP server(s) as well."
 msgid ""
 "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
-"dropped to disable internal ssh login access. Note: someone pluging in his "
-"box into the dedicated LTSP client network(s) will gain ssh access to the "
-"LTSP server(s) as well."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 "特定の LTSP サーバしか使わない場合は 10.0.0.0/8 ネットワークを外して内部 ssh "
 "ログインアクセスを無効化することもできます。注意: 誰かが特定の LTSP クライア"
@@ -9394,10 +9878,10 @@ 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), 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."
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -9429,14 +9913,14 @@ msgstr ""
 
 #. 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."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -11840,3 +12324,48 @@ msgid ""
 msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
+
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "設定ファイルの編集には cfengine を利用します。サーバで更新されたファイルが"
+#~ "クライアントに送られます。クライアントの設定変更はサーバの設定を変更して自"
+#~ "動配布させるだけです。"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "The ordering of the network cards after installation might differ from "
+#~ "the ordering during installation. The wanted ordering can be achieved by "
+#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
+#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
+#~ "the changes to take effect."
+#~ msgstr ""
+#~ "インストール後のネットワークカードの順がインストール中とは異なるかもしれま"
+#~ "せん。<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput> を編集することで希望の順にできます。通常<emphasis>これが起"
+#~ "きた</emphasis>場合は eth0 を eth1 に、eth1 を eth0 に入れ替えるのもいいか"
+#~ "もしれません。変更を反映させるにはシステムの再起動が必要です。"
+
+#~ msgid ""
+#~ "This is being tracked as <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian Edu bug #1376</ulink>."
+#~ msgstr ""
+#~ "これは <ulink url=\"http://bugs.skolelinux.org/1376\">Debian Edu バグ"
+#~ "#1376</ulink> で追跡されています。"
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 226a054..776fc07 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+0000\n"
 "PO-Revision-Date: 2017-02-05 11:34+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -90,6 +90,19 @@ msgstr ""
 "ferdig oppsatt og tilpasset skoler."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Directly after installation of a school server all services needed for a "
+#| "school network are set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>) and "
+#| "the system is ready to be used. Only users and machines need to be added "
+#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
+#| "environment using PXE has also been prepared, so after initial "
+#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
+#| "all other machines can be installed via the network, this includes "
+#| "\"roaming workstations\" (ones that can be taken away from the school "
+#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
+#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -100,7 +113,7 @@ msgid ""
 "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."
+"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 skoleserver (se neste kapittel <link linkend="
@@ -152,8 +165,15 @@ msgstr ""
 "ferdig oppsatt og tilpasset skoler."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
 msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+"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 "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -198,11 +218,21 @@ msgid "The Debian Edu network topology"
 msgstr "Nettverket Debian Edu sitt oppsett"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and LTSP-"
+#| "servers (with associated thin-clients and/or diskless workstations). The "
+#| "number of workstations can be as large or small as you want (starting "
+#| "from none to a lot). The same goes for the LTSP servers, each of which is "
+#| "on a separate network so that the traffic between the clients and the "
+#| "LTSP server doesn't affect the rest of the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
-"a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -219,12 +249,20 @@ msgstr ""
 "resten av nettverkstjenestene."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "Grunnen til at det bare kan være en hovedtjener i hvert skolenettverk, er at "
@@ -265,9 +303,15 @@ msgstr ""
 "eller velge oppstart fra den lokale harddisken."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -294,12 +338,19 @@ msgid "Main server (tjener)"
 msgstr "Hovedtjener"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the LTSP-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 "
-"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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Et Skolelinux-nett trenger en hovedtjener (også kalt tjener), som har som "
 "standard IP-adresse 10.0.2.2. Hovedtjeneren installeres ved å velge "
@@ -311,15 +362,27 @@ msgid "Services running on the main server"
 msgstr "Tjenester som kjører på hovedtjeneren"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"With the exception of the control of the thin-clients, all services are "
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the LTSP-server(s) should be separate (though it is "
+#| "possible to install both the main server and LTSP 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 "
-"reasons, the LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -555,6 +618,14 @@ msgid "ltsp"
 msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "NBD"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -565,13 +636,13 @@ msgstr ""
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "munin, nagios and site-summary"
-msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin, nagios og site-summary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "Sitesummary"
-msgid "site-summary"
+msgid "sitesummary"
 msgstr "Site Summary)"
 
 #. type: Content of: <article><section><section><section><para>
@@ -589,13 +660,21 @@ msgstr ""
 "filer for, NFS for Unix-klienter, SMB for Windows og Macintosh-klienter."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "Som standard er e-post satt opp med bare lokal leveranse (f.eks. innen "
 "skolen). Men e-postlevering til resten av Internett kan settes opp dersom "
@@ -626,10 +705,18 @@ msgstr ""
 "kontrollere Internett-tilgang på individuelle maskiner."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Network configuration on the clients is done automatically using DHCP. "
+#| "Normal clients are allocated IP addresses in the private subnet "
+#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP-"
+#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
+#| "network traffic of the thin clients doesn't interfere with the rest of "
+#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -735,7 +822,7 @@ msgstr ""
 #| "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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -751,13 +838,18 @@ msgid "LTSP server(s)"
 msgstr "LTSP-tjener(e)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (which we called \"thin "
+#| "client servers\" in releases before Stretch), which are installed by "
+#| "selecting the LTSP server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
-"Et Skolelinux-nett kan ha mange LTSP-tjenere (som vi kalte \""
-"tynnklienttjenere\" i versjoner før Stretch), som installeres ved å velge\n"
+"Et Skolelinux-nett kan ha mange LTSP-tjenere (som vi kalte "
+"\"tynnklienttjenere\" i versjoner før Stretch), som installeres ved å velge\n"
 "tynnklienttjener-profilen."
 
 #. type: Content of: <article><section><section><section><para>
@@ -768,6 +860,16 @@ msgstr ""
 "LTPS er satt opp til å motta syslog fra tynnklient- og arbeidsstasjoner, og "
 "videresende disse meldingene til den sentrale mottakeren av syslogmeldinger."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "Tynnklienter"
@@ -786,16 +888,27 @@ msgstr ""
 "Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted via NFS from the LTSP "
+#| "server, and finally the X Window System is started. The display manager "
+#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
+#| "data is encrypted on the network. For very old thin clients which are too "
+#| "slow for the encryption this can be set to the behavior from former "
+#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "Tynnklienter er en bra måte å bruke gamle, trege datamaskiner siden de "
 "egentlig kjører alle programmene på LTSP-tjeneren. Dette fungerer som "
@@ -875,11 +988,17 @@ msgid "Administration"
 msgstr "Administrasjon"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (root not allowed by "
+#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 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 "
@@ -889,17 +1008,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"Vi bruker CFEngine til å redigere oppsettfiler. Disse filene blir oppdatert "
-"fra tjeneren til klientene. For å endre oppsettet på klientene er det nok å "
-"endre tjeneroppsettet, og så la automatikken fordele endringene."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -923,8 +1031,12 @@ msgstr ""
 "en USB-minnepenn."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "Målet er å gjøre det mulig å installere en tjener fra ett type medium kun  "
@@ -946,8 +1058,8 @@ msgid ""
 "up automatically with reasonable values, to be changed from a central "
 "location by the system administrator subsequent to the installation."
 msgstr ""
-"Installasjonen skal ikke stille noen spørsmål, med unntak av ønsket språk ("
-"f.eks. norsk bokmål, nynorsk, samisk) og maskinprofil (hovedtjener, "
+"Installasjonen skal ikke stille noen spørsmål, med unntak av ønsket språk (f."
+"eks. norsk bokmål, nynorsk, samisk) og maskinprofil (hovedtjener, "
 "arbeidsstasjon, tynnklienttjener). Alt annet oppsett vil bli gjort "
 "automatisk med fornuftige verdier, som kan endres av systemadministratoren "
 "etter installasjonen."
@@ -1187,8 +1299,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 koblet til hovednettverket (10.0.2.0/23)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
+#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
+#| "\">others are possible</link>."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1312,6 +1429,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Configuring the PXE installation"
+msgid "After the installation:"
+msgstr "Modifisering av PXE-installasjonen"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1329,12 +1498,20 @@ msgstr ""
 "ulink> eller <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you need something for an embedded router or accesspoint we recommend "
+#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
+#| "you can also use the original firmware. Using the original firmware is "
+#| "easier; using OpenWRT gives you more choices and control. Check the "
+#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
+#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 "Hvis du trenger en innebygd ruter eller tilgangsspunkt, anbefaler vi å bruke "
@@ -1435,14 +1612,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
 msgstr ""
@@ -1462,12 +1631,20 @@ msgid "USB drive ISO image for i386 and amd64"
 msgstr "USB-lagringsenhet ISO-bilde for i386 og AMD64"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Like the netinstall image it can "
+#| "be installed on USB flash drives or disk media of sufficient size. Please "
+#| "note that internet access during installation is needed. Like the others "
+#| "it can be downloaded over FTP, HTTP or rsync via:"
 msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 "Multi-arkitektur ISO-bildet er på 5.2 GiB og kan brukes til installasjon av "
 "forskjellige AMD64- og i386-maskiner. Som nettinnstallasjonsbildet kan det "
@@ -1477,14 +1654,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
 "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
 msgstr ""
@@ -1536,11 +1705,19 @@ msgid "Installing Debian Edu"
 msgstr "Installasjon av Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 42,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
 "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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1703,17 +1880,34 @@ msgstr ""
 "tastaturet i stand til å gi mer detaljert hjelp om de aktuelle emnene."
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+#, fuzzy
+#| msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr "<emphasis>Flere oppstartsparametre for installasjoner</emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In both cases, 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."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
 msgstr ""
 "I begge tlfelle kan oppstartsalternativer redigeres ved å trykke på TAB-"
 "tasten i oppstartsmenyen."
 
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
@@ -1737,10 +1931,16 @@ msgstr ""
 "mellomlageret i hovedtjeneren."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">MATE</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 <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "For å installere skrivebordsmiljøet <emphasis role=\"strong\">GNOME</"
 "emphasis> i stedet for <emphasis role=\"strong\">MATE</emphasis>, legg til "
@@ -1748,30 +1948,43 @@ msgstr ""
 "oppstartsparametere."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 "For å installere <emphasis role=\"strong\">LXDE</emphasis>-skrivebordsmiljø "
 "i stedet legg til <computeroutput>desktop=lxde</computeroutput> i kjernens "
 "boot/oppstartsparametere."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "For å installere <emphasis role=\"strong\">Xfce</emphasis>-skrivebordsmiljø "
 "i stedet, legg til <computeroutput>desktop=xfce</computeroutput> i kjernens "
 "boot/oppstartsparametere."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> "
+#| "desktop instead, add <computeroutput>desktop=kde</computeroutput> to the "
+#| "kernel boot parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "For å installere <emphasis role=\"strong\">KDE Plasma</emphasis>-"
 "skrivebordsmiljø i stedet, legg til <computeroutput>desktop=kde</"
@@ -1798,7 +2011,9 @@ msgstr ""
 "nettverkskort (NIC-er) hvis du planlegger å sette opp en tynnklientserver."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a language (for the installation and the installed system)"
+#, fuzzy
+#| msgid "Choose a language (for the installation and the installed system)"
+msgid "Choose a language (for the installation and the installed system)."
 msgstr "Velg et språk (for installasjonen og det installerte systemet)."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1806,7 +2021,9 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr "Velg et sted som vanligvis er stedet du bor."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a keyboard keymap (the country's default is usually fine)"
+#, fuzzy
+#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
+msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "Velg et tastaturoppsett (vanligvis er standardoppsettet for landet ditt bra)."
 
@@ -1815,7 +2032,9 @@ msgid "Choose profile(s) from the following list:"
 msgstr "Velg profil(er) fra denne listen:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Hovedtjener</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1828,9 +2047,9 @@ msgstr "<emphasis role=\"strong\">Hovedtjener</emphasis>"
 #| "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 only install one main server per "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 "Dette er hovedtjeneren (tjener) for din skole som sørger for at alle "
@@ -1876,7 +2095,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Hovedtjener</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1893,11 +2112,12 @@ msgstr "<emphasis role=\"strong\">Hovedtjener</emphasis>"
 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 "Tynnklienttjener (og tjener for diskløse arbeidsstasjoner) omtales også som "
 "LTSP-tjener. Klienter uten harddisk starter opp og kjører programvare fra "
@@ -1963,7 +2183,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 "Profilene til <emphasis role=\"strong\">hovedtjener </emphasis>, <emphasis "
 "role=\"strong \">arbeidsstasjon</emphasis> og <emphasis role=\"strong"
@@ -1978,22 +2198,6 @@ msgstr ""
 "maskin som skal gjøres til en kombinert hovedtjener om den skal komme til "
 "nytte etter installasjon."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
-msgstr ""
-"Etter installasjonen kan rekkefølgen for nettverkskortene avvike fra "
-"oppsettet under installasjonen. Den ønskede rekkefølgen kan oppnås ved å "
-"redigere  <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
-"computeroutput>. <emphasis>Hvis dette er aktuelt</emphasis>, vil du "
-"vanligvis ønske å erstatte eth0 med eth1 og eth1 med eth0. Omstart må til "
-"for å at endringene skal tre i kraft."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2024,7 +2228,7 @@ msgstr ""
 #| "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 "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -2135,7 +2339,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
 #| msgid "A note on thin-client-server installations"
-msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr "En kommentar om installasjon av tynnklienttjenere"
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2258,8 +2462,8 @@ msgstr "width=400"
 #| "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> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 "Slik ser PXE-menyen ut når man har  <emphasis role=\"strong\">hovedtjener</"
@@ -2271,6 +2475,12 @@ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2437,10 +2647,10 @@ msgstr ""
 #| "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 + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 "Disse skjermbildene gir en gjennomgang av en grafisk 64-bit hovedtjener + "
 "arbeidsstasjon + tynnklient-tjenerinstallasjon, og hvordan det ser ut ved "
@@ -2640,7 +2850,9 @@ msgid "tjener KDM Login"
 msgstr "KDM-innlogging på tjener"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+#, fuzzy
+#| msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-MATE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2648,7 +2860,9 @@ msgid "KDE and Browser"
 msgstr "KDE og nettleser"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-MATE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2668,9 +2882,17 @@ msgid "Diskless Workstation Login"
 msgstr "Diskløs Arbeidstasjoner Innlogging"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-MATE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Desktop and Menu"
+msgstr "KDE Desktop"
+
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr "Komme i gang"
@@ -2698,6 +2920,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 "Etter installasjonen, de første tingene du trenger å gjøre som den første "
@@ -2722,10 +2952,16 @@ msgstr ""
 "kan brukes direkte uten dette trinnet."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Adding users and workstations is described in detail below, so please "
+#| "read this chapter completely. It covers how to perform these minumum "
+#| "steps correctly as well, as other stuff that everybody will probably need "
+#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
-"this chapter completely. It covers how to perform these minumum steps "
-"correctly as well, as other stuff that everybody will probably need to do."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 "Å legge til brukere og arbeidsstasjoner er beskrevet i detalj nedenfor, så "
 "vær vennlig å les dette kapittelet fullstendig. Her vises korrekt hvorledes "
@@ -2768,7 +3004,9 @@ msgstr ""
 " "
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu MATE desktop"
+#, fuzzy
+#| msgid "Debian Edu MATE desktop"
+msgid "Debian Edu KDE desktop"
 msgstr "Debian Edu MATE desktop"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2827,11 +3065,11 @@ msgstr "DHCP-administrasjon"
 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 + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 "For tilgang til GOsa² trenger du Skolelinux-hovedtjeneren og en maskin med "
 "en nettleser. Dersom du har installert en såkalt kombinerttjener (hoved-, "
@@ -2919,10 +3157,9 @@ 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 LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 "I Debian Edu er kontoinformasjon lagret i en LDAP-katalog, og blir brukt "
 "derfra, ikke bare fra hovedtjeneren selv, men også arbeidstassjoner og "
@@ -3429,10 +3666,16 @@ msgstr ""
 "i denne manualen."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis role=\"strong"
+#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
-"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
 "Dette oppsettet gjør at man også kan starte diskløse arbeidsstasjoner og "
@@ -3497,9 +3740,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 "Hvis maskinene har startet som tynne klienter/diskløse arbeidsstasjoner, "
@@ -3702,8 +3945,14 @@ msgstr ""
 "bruke statiske IP-adresser fra LDAP."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
+#| "or your users won't be able to access their home directories. Diskless "
+#| "workstations and thin clients don't use NFS, so they don't need to be "
+#| "configured."
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -3750,10 +3999,15 @@ msgstr ""
 "om natten for å spare energi."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian Edu machines in this group will only be allowed to connect to "
+#| "machines on the local network.  Combined with web proxy restrictions this "
+#| "might be used during exams."
 msgid ""
-"Debian Edu machines in this group will only be allowed to connect to "
-"machines on the local network.  Combined with web proxy restrictions this "
-"might be used during exams."
+"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 "
+"be used during exams."
 msgstr ""
 "Debian Edu-maskiner i denne gruppen vil bare få lov til å koble til maskiner "
 "på det lokale nettverket. Kombinert med web proxy-begrensninger kan dette "
@@ -3943,6 +4197,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
 "send mail to an address you are reading."
@@ -3966,11 +4226,19 @@ msgstr ""
 "upgrade</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed and configured as described on <ulink url=\"https://wiki."
+#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
+#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed and configured as described on <ulink url=\"https://wiki.debian."
-"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 "Automatisk installasjon av oppdateringer kan gjøres enkelt hvis det er "
 "ønskelig, det trengs bare at pakken <computeroutput>unattended-upgrades</"
@@ -4018,12 +4286,21 @@ msgid "Backup Management"
 msgstr "Håndtering av sikkerhetskopier"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail. Note: the site will only work "
+#| "if you temporarily allow ssh root login on the backup server (tjener by "
+#| "default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 "For håndtering av sikkerhetskopier, så går du til adressen <ulink url="
 "\"https://www/slbackup-php\">https://www/slbackup-php</ulink> med "
@@ -4136,6 +4413,17 @@ msgstr ""
 "flaskehalser og kilde for systemproblemer."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The list of machines being monitored using Munin is generated "
+#| "automatically, based on the list of hosts reporting to sitesummary.  All "
+#| "hosts with the package munin-node installed are registered for Munin "
+#| "monitoring.  It will normally take one day from a machine being installed "
+#| "until Munin monitoring starts, because of the order the cron jobs are "
+#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
+#| "update-munin</computeroutput> as root on the sitesummary server (normally "
+#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
+#| "conf</computeroutput> file."
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -4143,7 +4431,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 "Listen over maskiner som blir overvåket ved hjelp av munin blir generert "
@@ -4157,10 +4445,17 @@ msgstr ""
 "computeroutput> som root på sitesummary-tjeneren (vanligvis hovedtjeneren)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The set of measurements being collected is automatically generated on "
+#| "each machine using the <computeroutput>munin-node-configure</"
+#| "computeroutput> program, which probes the plugins available from "
+#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
+#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from <computeroutput>/usr/share/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
@@ -4171,9 +4466,13 @@ msgstr ""
 "passer for  <computeroutput>/etc/munin/plugins/</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Munin is available from <ulink url=\"http://munin."
+#| "projects.linpro.no/\"/> ."
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 "Informasjon om muninsystemet er tilgjengelig fra <ulink url=\"http://munin."
 "projects.linpro.no/\"/>."
@@ -5127,10 +5426,15 @@ msgstr ""
 "under installasjonen av hovedserveren (førstebruker):"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ sudo apt-get update\n"
+#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+#| "  # after installation, start a graphical session for the first user \n"
+#| "  $ startx"
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -5252,9 +5556,14 @@ msgstr ""
 "StableUpdates\">samlingen stable-updates</ulink>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "While you can use stable-updates directly, you don't have to: stable-"
+#| "updates are pushed into the stable suite regularily when stable point "
+#| "releases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
-"are pushed into the stable suite regularily when stable point releases are "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 "Selv om du kan bruke stable-updates direkte, trenger du det ikke; stable-"
@@ -5262,7 +5571,9 @@ msgstr ""
 "versjoner blir laget, noe som grovt sett skjer hver annen måned."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+#, fuzzy
+#| msgid "Using backports.debian.org to install newer software"
+msgid "Using backports to install newer software"
 msgstr "Å bruke backports.org til å installere nyere programvare"
 
 #. type: Content of: <article><section><section><para>
@@ -5287,10 +5598,10 @@ msgstr ""
 "Backports er pakker fra Debian testing (for det meste) og Debian unstable (i "
 "noen få tilfeller, f.eks. sikkerhetsoppdateringer), som er kompilert for "
 "Debian stable. Du vil derfor ikke trenge nye bibliotek (så langt det er "
-"mulig) på en stabil Debian-distribusjon som Debian Edu. <emphasis role=\""
-"strong\">Vi anbefaler deg til bare å plukke ut enkeltpakker som passer til "
-"dine behov, og ikke bruke alle pakkene som er tilgjengelig i "
-"backports.</emphasis>"
+"mulig) på en stabil Debian-distribusjon som Debian Edu. <emphasis role="
+"\"strong\">Vi anbefaler deg til bare å plukke ut enkeltpakker som passer til "
+"dine behov, og ikke bruke alle pakkene som er tilgjengelig i backports.</"
+"emphasis>"
 
 #. type: Content of: <article><section><section><para>
 msgid "Using backports is simple:"
@@ -5320,11 +5631,19 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Backports are automatically updated (if available) just like other "
+#| "packages. (Previously, extra configuration was needed to achieve this, "
+#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#| "anymore]."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 "Tilbakeførte pakker (backports) blir automatisk oppdatert (hvis "
 "tilgjengelig) akkurat som andre pakker. Tidligere trengtes et ekstra oppsett "
@@ -5376,8 +5695,13 @@ msgid "To quote the apt-cdrom(8) man page:"
 msgstr "For å sitere apt-cdrom(8) manualsiden:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
+#| "apt-cdrom takes care of determining the structure of the disc as well as "
+#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
-"apt-cdrom is used to add a new CDROM to APTs list of available sources. apt-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -5386,9 +5710,14 @@ msgstr ""
 "korrigere for ulike, mulige feilbrenninger, og å verifisere filindeksen."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
+#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
+#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
-"done by hand. Furthermore each disk in a multi-cd set must be inserted and "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 "Det er nødvendig å bruke APT-cdrom for å legge CD-er til APT-systemet. Det "
@@ -5413,8 +5742,14 @@ msgid "Automatic cleanup of leftover processes"
 msgstr "Automatisk opprydding av prosesser som er til overs"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
+#| "of background jobs. Background jobs are defined as processes that belong "
+#| "to users who are not currently logged into the machine. It's run by cron "
+#| "job once an hour."
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -5722,7 +6057,9 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
+#, fuzzy
+#| msgid "Advanced administration"
+msgid "Advanced administration howto"
 msgstr "Administrasjon"
 
 #. type: Content of: <article><section><para>
@@ -5738,9 +6075,14 @@ msgid "Create Users in Year Groups"
 msgstr "Lage brukere i årsgrupper"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In this example we want to create users in year groups, with common home "
+#| "directories for each group (home0/2014, home0/2015, etc.) We want to "
+#| "create the users by csv import."
 msgid ""
 "In this example we want to create users in year groups, with common home "
-"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 "I dette eksemplet vil vi lage brukere i årsgrupper, med felles hjemmemapper "
@@ -5748,7 +6090,9 @@ msgstr ""
 "importere CSV-er."
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
+#, fuzzy
+#| msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis>(as root on Tjener) </emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5802,16 +6146,25 @@ msgid "Template"
 msgstr "Mal"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose 'users' from the main menu. Change to 'Students' in the Base "
+#| "field. An Entry <computeroutput>'NewStudent'</computeroutput> should show "
+#| "up, click it. This is the 'students' template, not a real user. As you'll "
+#| "have to create such a template (to be able to use csv import for your "
+#| "structure) based on this one, notice all entries showing up in the "
+#| "Generic, POSIX and Samba tabs, maybe take screenshots. Now change to /"
+#| "Students/2014 in the Base field; choose Create/Template and start to fill "
+#| "in your desired values, first the Generic tab (add your new 2014 group "
+#| "under Group Membership, too), then add POSIX and Samba account."
 msgid ""
 "Choose 'users' from the main menu. Change to 'Students' in the Base field. "
-"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
 msgstr ""
 "Velg  «users» fra hovedmenyen. Skift til «Students» i Base-feltet. Inngangen "
 "<computeroutput>«NewStudent»</computeroutput> skal vises, klikk på den. "
@@ -5822,14 +6175,25 @@ msgstr ""
 "inn de ønskede verdier, først i Generic-fanen (legg til din nye 2014 groupe "
 "under Group Membership, også), legg derettet til POSIX og Samba-konto."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Importer brukere"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose your new template when doing csv import; testing it with a few "
+#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 "Velg din nye mal når du importerer CSV-en. Det anbefales å teste med noen få "
 "brukere."
@@ -5906,12 +6270,19 @@ msgstr ""
 "echo \"$created_dir folders has been created\""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
+#, fuzzy
+#| msgid "Easy access to USB drives and CDROMs/DVDs"
+msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "Enkel tilgang til USB-enheter og CD-ROM(-er)/DVD(-er)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a (diskless) "
+#| "workstation, a popup window appears asking what to do with it, just like "
+#| "in any other normal installation."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
@@ -5920,8 +6291,15 @@ msgstr ""
 "på andre installasjoner."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a thin client there "
+#| "is only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -5948,11 +6326,18 @@ msgstr ""
 "på skrivebordet for enkel tilgjengelighet)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
+#| "This might come in handy if users want to edit files directly on their "
+#| "plugged in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 "Ved hjelp av følgende script vil linken \"Media\" opprettes for alle brukere "
 "på deres hjemmeområde. Dette gir enkel tilgang til USB-penner, CD-ROM og "
@@ -6006,14 +6391,6 @@ msgstr ""
 "Når andre brukere ser vinduet som spretter opp, så kan de montere USB-pennen "
 "og bla gjennom innholdet med full tilgang."
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Dette holdes rede på som <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr "Bruke en øremerket tjener til lagring"
@@ -6027,14 +6404,20 @@ msgstr ""
 "brukerhjemmemapper og mulige andre data."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Add a new system of type server using GOsa² as outlined in the <link "
+#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
+#| "started</link> chapter of this manual."
 msgid ""
-"Add a new system of type server using GOsa² as outlined in the <link linkend="
-"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
-"link> chapter of this manual."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
-"Å legge til et nytt system for servertype ved å bruke GOsa² som beskrevet i <"
-"link linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
-"started</link> kapittelet i denne håndboken."
+"Å legge til et nytt system for servertype ved å bruke GOsa² som beskrevet i "
+"<link linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-"
+"\">Getting started</link> kapittelet i denne håndboken."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
@@ -6150,10 +6533,15 @@ msgstr ""
 "intern ikke bruker automonter for å unngå monteringssløyfer:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create the mount directories using <computeroutput>mkdir</"
+#| "computeroutput>, edit '/etc/fstab' as adequate and run "
+#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
-"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
-"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
-"computeroutput> to mount the new resources."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 "Lag kataloger ved å bruke <computeroutput>mkdir</computeroutput>, rediger «/"
 "etc/fstab» som passende og kjør  <computeroutput>mount -a</computeroutput> "
@@ -6201,8 +6589,13 @@ msgid "Managing this case with GOsa is quite simple:"
 msgstr "Håndtering av dette tilfellet er ganske enkelt med GOsa:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
+#| "level (where already other system management related groups like "
+#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -6266,11 +6659,17 @@ msgstr ""
 "# "
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
+#| "dropped to disable internal ssh login access. Note: someone pluging in "
+#| "his box into the dedicated LTSP client network(s) will gain ssh access to "
+#| "the LTSP server(s) as well."
 msgid ""
 "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
-"dropped to disable internal ssh login access. Note: someone pluging in his "
-"box into the dedicated LTSP client network(s) will gain ssh access to the "
-"LTSP server(s) as well."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 "Hvis bare dedikert LTSP-tjenere brukes, så kan man droppe nettverket på "
 "10.0.0.0/8 ved å skru av innlogging fra intern SSH. Merk: Om noen plugger "
@@ -9835,10 +10234,10 @@ 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), 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."
+"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."
 msgstr ""
 "Opphavsretten for oversettelsen til norsk bokmål tilhører Petter "
 "Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore "
@@ -9900,17 +10299,25 @@ msgstr ""
 "senere versjon."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015) and is released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 "Opphavsretten til den danske oversettelsen tilhører Joe Hansen (2012, 2013, "
 "2014, 2015) og er gitt ut i henhold til GPL v2 eller en senere utgave."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+#| "2016) and is released under the GPL v2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 "Opphavsretten for den nederlandske oversettelsen tilhører Frans Spiesschaert "
 "(2014, 2015,2016), og er utgitt under GPL v2 eller en senere versjon."
@@ -9985,10 +10392,10 @@ msgstr ""
 "dokumentet plassert i PO-filer. Mer informasjon om prosessen finnes "
 "i<computeroutput>/usr/share/doc/debian-edu-doc/README.debian-edu-jessie-"
 "manuelle-oversettelser </computeroutput>. Dette Git-arkivet (se nedenfor) "
-"inneholder også denne filen. Ta en titt der og på <ulink url = \""
-"https://wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#\">"
-"språkspesifikke konvensjoner</ulink> hvis du ønsker å bidra til å oversette "
-"dette dokumentet."
+"inneholder også denne filen. Ta en titt der og på <ulink url = \"https://"
+"wiki.debian.org/DebianEdu/Contribute/Translation/Conventions#"
+"\">språkspesifikke konvensjoner</ulink> hvis du ønsker å bidra til å "
+"oversette dette dokumentet."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -12203,9 +12610,9 @@ msgid ""
 "\">Installation chapter</link> to learn how to install with GNOME instead of "
 "KDE as desktop."
 msgstr ""
-"GNOME er lagt til som støttet skrivebordsmiljø, se i <link linkend=\""
-"Installation\">kapittel om installasjon.</link> for å lære å installere med "
-"GNOME i stedet for KDE som skrivebordsmiljø."
+"GNOME er lagt til som støttet skrivebordsmiljø, se i <link linkend="
+"\"Installation\">kapittel om installasjon.</link> for å lære å installere "
+"med GNOME i stedet for KDE som skrivebordsmiljø."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Support for more than 50 languages."
@@ -12580,6 +12987,53 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "Vi bruker CFEngine til å redigere oppsettfiler. Disse filene blir "
+#~ "oppdatert fra tjeneren til klientene. For å endre oppsettet på klientene "
+#~ "er det nok å endre tjeneroppsettet, og så la automatikken fordele "
+#~ "endringene."
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "The ordering of the network cards after installation might differ from "
+#~ "the ordering during installation. The wanted ordering can be achieved by "
+#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
+#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
+#~ "the changes to take effect."
+#~ msgstr ""
+#~ "Etter installasjonen kan rekkefølgen for nettverkskortene avvike fra "
+#~ "oppsettet under installasjonen. Den ønskede rekkefølgen kan oppnås ved å "
+#~ "redigere  <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>. <emphasis>Hvis dette er aktuelt</emphasis>, vil du "
+#~ "vanligvis ønske å erstatte eth0 med eth1 og eth1 med eth0. Omstart må til "
+#~ "for å at endringene skal tre i kraft."
+
+#~ msgid ""
+#~ "This is being tracked as <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian Edu bug #1376</ulink>."
+#~ msgstr ""
+#~ "Dette holdes rede på som <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian Edu bug #1376</ulink>."
+
 #~ msgid "Nagios"
 #~ msgstr "Nagios"
 
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 b676fc0..0b130cb 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+0000\n"
 "PO-Revision-Date: 2017-01-22 16:31+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -76,6 +76,19 @@ msgstr ""
 "geconfigureerd schoolnetwerk."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Directly after installation of a school server all services needed for a "
+#| "school network are set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>) and "
+#| "the system is ready to be used. Only users and machines need to be added "
+#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
+#| "environment using PXE has also been prepared, so after initial "
+#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
+#| "all other machines can be installed via the network, this includes "
+#| "\"roaming workstations\" (ones that can be taken away from the school "
+#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
+#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -86,7 +99,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "Onmiddellijk na de installatie van een schoolserver worden alle diensten die "
 "nodig zijn in een schoolnetwerk ingesteld (Raadpleeg het volgende hoofdstuk "
@@ -142,8 +155,15 @@ msgstr ""
 "schoolnetwerk."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
 msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+"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 "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -190,11 +210,21 @@ msgid "The Debian Edu network topology"
 msgstr "Netwerktopologie van Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and LTSP-"
+#| "servers (with associated thin-clients and/or diskless workstations). The "
+#| "number of workstations can be as large or small as you want (starting "
+#| "from none to a lot). The same goes for the LTSP servers, each of which is "
+#| "on a separate network so that the traffic between the clients and the "
+#| "LTSP server doesn't affect the rest of the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
-"a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -210,12 +240,20 @@ msgstr ""
 "de clients en de LTSP-server de andere netwerkdiensten niet hindert."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "De reden waarom er in elk schoolnetwerk slechts één hoofdserver kan zijn, "
@@ -260,9 +298,15 @@ msgstr ""
 "harde schijf opstarten."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -291,12 +335,19 @@ msgid "Main server (tjener)"
 msgstr "De hoofdserver (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the LTSP-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 "
-"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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Een netwerk van Skolelinux heeft één hoofdserver (ook \"tjener\" genaamd, "
 "wat Noors is voor \"server\") die standaard het IP-adres 10.0.2.2 heeft en "
@@ -309,15 +360,27 @@ msgid "Services running on the main server"
 msgstr "De diensten op de hoofdserver"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"With the exception of the control of the thin-clients, all services are "
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the LTSP-server(s) should be separate (though it is "
+#| "possible to install both the main server and LTSP 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 "
-"reasons, the LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -557,6 +620,16 @@ msgid "ltsp"
 msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#, fuzzy
+#| msgid "TBD"
+msgid "NBD"
+msgstr "TBD"
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -565,13 +638,15 @@ msgstr ""
 "geschiedenis op het web. Foutrapportage per e-mail"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "munin, nagios and site-summary"
-msgid "munin, icinga and site-summary"
+#, fuzzy
+#| msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin, icinga en site-summary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "Sitesummary"
-msgid "site-summary"
+#, fuzzy
+#| msgid "site-summary"
+msgid "sitesummary"
 msgstr "site-summary"
 
 #. type: Content of: <article><section><section><section><para>
@@ -591,13 +666,21 @@ msgstr ""
 "clients via SMB toegang tot hun bestanden krijgen."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "Standaard werd de mailserver ingesteld om enkel lokale post te bedelen, dit "
 "wil zeggen binnen de school. Nochtans kan de server ook ingesteld worden om "
@@ -631,10 +714,18 @@ msgstr ""
 "te houden over de toegang tot het internet van individuele machines."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Network configuration on the clients is done automatically using DHCP. "
+#| "Normal clients are allocated IP addresses in the private subnet "
+#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP-"
+#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
+#| "network traffic of the thin clients doesn't interfere with the rest of "
+#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -738,9 +829,16 @@ msgstr ""
 "tijdsaanduiding binnen het ganse netwerk."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or LTSP-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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -757,10 +855,15 @@ msgid "LTSP server(s)"
 msgstr "LTSP-server(s)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (which we called \"thin "
+#| "client servers\" in releases before Stretch), which are installed by "
+#| "selecting the LTSP server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
 "Een netwerk van Skolelinux kan meerdere LTSP-servers (die we in releases "
 "voor Stretch \"thin-clientservers\" noemden) bevatten. Men zet een LTSP-"
@@ -775,6 +878,16 @@ msgstr ""
 "ontvangen van thin clients en werkstations en om die door te sturen naar de "
 "centrale systeemlogboekdienst."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "Thin clients"
@@ -793,16 +906,27 @@ msgstr ""
 "Skolelinux gebruikt, is dat van het Linux Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted via NFS from the LTSP "
+#| "server, and finally the X Window System is started. The display manager "
+#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
+#| "data is encrypted on the network. For very old thin clients which are too "
+#| "slow for the encryption this can be set to the behavior from former "
+#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "Het thin-clientsysteem is een goede manier om nuttig gebruik te maken van "
 "oudere en weinig krachtige machines, aangezien alle programma's die zij "
@@ -886,11 +1010,17 @@ msgid "Administration"
 msgstr "Beheer"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (root not allowed by "
+#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 "Alle Linuxmachines die met behulp van het installatieprogramma van "
 "Skolelinux geïnstalleerd werden, kunnen vanaf een centrale computer, meestal "
@@ -900,19 +1030,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"Wij gebruiken cfengine om configuratiebestanden te bewerken. Deze bestanden "
-"worden door de server op de clients geactualiseerd. Om de configuratie van "
-"clientcomputers te wijzigen, volstaat het dus om het configuratiebestand op "
-"de server te bewerken. De configuratie wordt vervolgens automatisch naar de "
-"clientcomputers overgezet."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -936,8 +1053,12 @@ msgstr ""
 "kan men ook gebruiken om een computer op te starten vanaf een USB-stick."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "Het basisidee is dat men eenmaal een server installeert met behulp van om "
@@ -1211,8 +1332,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 is verbonden met het hoofdnetwerk (10.0.0.0/8),"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
+#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
+#| "\">others are possible</link>."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1342,6 +1468,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Configuring the PXE installation"
+msgid "After the installation:"
+msgstr "De PXE-installatie configureren"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1360,12 +1538,20 @@ msgstr ""
 "\">floppyfw</ulink> aan."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you need something for an embedded router or accesspoint we recommend "
+#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
+#| "you can also use the original firmware. Using the original firmware is "
+#| "easier; using OpenWRT gives you more choices and control. Check the "
+#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
+#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 "Indien u als router en toegangspunt een ingebouwd model verkiest, raden we u "
@@ -1467,14 +1653,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
 msgstr ""
@@ -1494,12 +1672,20 @@ msgid "USB drive ISO image for i386 and amd64"
 msgstr "USB-stick-ISO-image voor i386 en amd64"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Like the netinstall image it can "
+#| "be installed on USB flash drives or disk media of sufficient size. Please "
+#| "note that internet access during installation is needed. Like the others "
+#| "it can be downloaded over FTP, HTTP or rsync via:"
 msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 "Het multi-achitectuur ISO-image is 5,2 GiB groot en is geschikt voor "
 "installaties op zowel amd64- als i386-computers. Net zoals het netinstall-"
@@ -1510,14 +1696,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
 "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
 msgstr ""
@@ -1573,11 +1751,19 @@ msgid "Installing Debian Edu"
 msgstr "Debian Edu installeren"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 42,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
 "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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1751,17 +1937,34 @@ msgstr ""
 "het behandelde onderwerp."
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+#, fuzzy
+#| msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr "<emphasis>Bijkomende opstartparameters voor installaties</emphasis>"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In both cases, 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."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
 msgstr ""
 "In beide gevallen kunt u de opstartopties van het installatieprogramma "
 "bewerken door in het opstartmenu op de TAB-toets te drukken."
 
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
@@ -1786,10 +1989,16 @@ msgstr ""
 "de proxydienst van de hoofdserver gebruikt."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">MATE</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 <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "Om de bureaubladomgeving van <emphasis role=\"strong\">GNOME</emphasis> in "
 "plaats van die van <emphasis role=\"strong\">MATE</emphasis> te installeren, "
@@ -1797,30 +2006,43 @@ msgstr ""
 "opstartparameters van de kernel."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 "Wenst u daarentegen <emphasis role=\"strong\">LXDE</emphasis> als "
 "bureaubladomgeving, voeg dan <computeroutput>desktop=lxde</computeroutput> "
 "toe aan de opstartparameters van de kernel."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "Om de <emphasis role=\"strong\">Xfce</emphasis> bureaubladomgeving te "
 "installeren, moet u <computeroutput>desktop=xfce</computeroutput> toevoegen "
 "als opstartparameter van de kernel."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> "
+#| "desktop instead, add <computeroutput>desktop=kde</computeroutput> to the "
+#| "kernel boot parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "En om in plaats daarvan de <emphasis role=\"strong\">KDE Plasma</emphasis> "
 "bureaubladomgeving te installeren, moet u <computeroutput>desktop=kde</"
@@ -1842,7 +2064,9 @@ msgstr ""
 "bent om een LTSP-server te installeren."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a language (for the installation and the installed system)"
+#, fuzzy
+#| msgid "Choose a language (for the installation and the installed system)"
+msgid "Choose a language (for the installation and the installed system)."
 msgstr ""
 "Kies een taal (voor het installatieproces en voor het geïnstalleerd systeem)"
 
@@ -1851,7 +2075,9 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr "Kies een plaats. Meestal is dit de plaats waar u woont."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a keyboard keymap (the country's default is usually fine)"
+#, fuzzy
+#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
+msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr ""
 "Kies een toetsenbordindeling (meestal is de standaard toetsenbordindeling "
 "voor uw land de juiste keuze)"
@@ -1861,15 +2087,24 @@ msgid "Choose profile(s) from the following list:"
 msgstr "Kies (een) profiel(en) uit de volgende lijst:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Hoofdserver</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This is the main server (tjener) for your school providing all services "
+#| "pre-configured to work out of the box. You must only install one main "
+#| "server per school! This profile does not include a graphical user "
+#| "interface. If you want a graphical user interface, then select "
+#| "Workstation or LTSP-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 only install one main server per "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 "Dit is de hoofdserver (tjener) van uw school, waarop alle diensten klaar "
@@ -1917,18 +2152,31 @@ msgstr ""
 "'autonome computer'."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+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>
+#, fuzzy
+#| 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 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) - an LTSP 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 "Een server voor thin clients (en schijfloze werkstations) wordt LTSP-server "
 "genoemd. Clients zonder harde schijf starten op en voeren programma's uit "
@@ -1971,6 +2219,20 @@ msgstr ""
 "manueel daarnaartoe verhuist."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
+#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP "
+#| "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 an LTSP 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 an LTSP 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</"
@@ -1982,7 +2244,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 "De profielen <emphasis role=\"strong\">Hoofdserver</emphasis>, <emphasis "
 "role=\"strong\">Werkstation</emphasis> en <emphasis role=\"strong\">LTSP-"
@@ -1997,23 +2259,6 @@ msgstr ""
 "hoofdserver of als LTSP-server dienst zal doen over 2 netwerkkaarten moet "
 "beschikken om na installatie bruikbaar te zijn."
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
-msgstr ""
-"Het kan gebeuren dat de onderlinge volgorde van de netwerkkaarten na "
-"installatie verschillend is van die tijdens de installatie. U kunt de "
-"gewenste volgorde bekomen door het bestand <computeroutput>/etc/udev/rules."
-"d/70-persistent-net.rules</computeroutput> te bewerken. <emphasis>Indien dit "
-"probleem zich stelt</emphasis>, zult u normaal gezien eth0 moeten vervangen "
-"door eth1, en eth1 door eth0. Nadien zult u de computer opnieuw moeten "
-"opstarten opdat de wijzigingen van kracht zouden worden."
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2042,8 +2287,13 @@ msgstr ""
 "mee helpen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include LTSP-server then the installer "
+#| "will spend quite some time at the end, \"Finishing the installation - "
+#| "Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include LTSP-server then the installer will "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -2158,7 +2408,9 @@ msgstr ""
 "verschillende keren gedownload wordt."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on LTSP-server installations using only Thin-Clients"
+#, fuzzy
+#| msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr ""
 "Een noot bij installaties van LTSP-servers die enkel thin clients bedienen"
 
@@ -2273,9 +2525,14 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">LTSP-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> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 "Bij een hoofdserver met zowel een <emphasis role=\"strong\">Hoofdserver-</"
@@ -2288,6 +2545,12 @@ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2458,11 +2721,17 @@ msgstr ""
 "grafische modus niet te gebruiken."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "So here is a screenshot tour through a graphical 64-bit Main-Server + "
+#| "Workstation + LTSP Server installation and how it looks at the first boot "
+#| "of the 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 + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 "Hier volgt dus een rondleiding langs enkele schermafdrukken van een 64-bits "
 "grafische installatie van Hoofdserver + Werkstation + LTSP-server, van het "
@@ -2663,7 +2932,9 @@ msgid "tjener KDM Login"
 msgstr "KDM-aanmeldscherm op tjener"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+#, fuzzy
+#| msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-MATE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2671,7 +2942,9 @@ msgid "KDE and Browser"
 msgstr "KDE met browser"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-MATE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2691,9 +2964,17 @@ msgid "Diskless Workstation Login"
 msgstr "Aanmeldscherm op een schijfloos werkstation"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-MATE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Desktop and Menu"
+msgstr "Bureaublad van KDE"
+
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr "Aan de slag"
@@ -2723,6 +3004,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 "De eerste dingen die u als eerste gebruiker te doen staan na de installatie:"
@@ -2747,10 +3036,16 @@ msgstr ""
 "werkstation kan men zonder deze stap onmiddellijk gebruiken."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Adding users and workstations is described in detail below, so please "
+#| "read this chapter completely. It covers how to perform these minumum "
+#| "steps correctly as well, as other stuff that everybody will probably need "
+#| "to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
-"this chapter completely. It covers how to perform these minumum steps "
-"correctly as well, as other stuff that everybody will probably need to do."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 "Hierna gaan we meer in detail in op het toevoegen van gebruikers en "
 "werkstations. Lees dus alstublieft dit hoofdstuk volledig. Het beschrijft "
@@ -2795,7 +3090,9 @@ msgstr ""
 "wenken en behandelt ook enkele veel voorkomende vragen."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu MATE desktop"
+#, fuzzy
+#| msgid "Debian Edu MATE desktop"
+msgid "Debian Edu KDE desktop"
 msgstr "Het MATE-bureaublad van Debian Edu"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2842,14 +3139,24 @@ msgid "DHCP Administration"
 msgstr "Het DHCP-beheer"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For GOsa² access you need the Skolelinux main server and a (client) "
+#| "system with a web browser installed which can be the main server itself "
+#| "if it was installed as a so called combined server (main server + LTSP "
+#| "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 "
-"installed as a so called combined server (main server + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 "Om het programma GOsa² te kunnen gebruiken is de hoofdserver van Skolelinux "
 "nodig en een (client)systeem waarop een webbrowser geïnstalleerd staat. Dit "
@@ -2928,14 +3235,22 @@ msgstr ""
 "specifieke pagina van GOsa² u zich bevindt."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In Debian Edu, account, group, and system information is stored in an "
+#| "LDAP directory. This data is used not only by the main server, but also "
+#| "by the (diskless) workstations, the LTSP 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 "
 "(diskless) workstations, the LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 "In Debian Edu wordt informatie over accounts, groepen en systemen opgeslagen "
 "in een register van LDAP. Deze gegevens worden niet enkel door de "
@@ -3470,10 +3785,16 @@ msgstr ""
 "link> in deze handleiding."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis role=\"strong"
+#| "\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+#| "\">can</emphasis>."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks <emphasis role=\"strong"
-"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
 "Schijfloze werkstations en thin clients zijn onmiddellijk klaar voor gebruik "
@@ -3525,6 +3846,20 @@ msgstr ""
 "passend icoon koppelen."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If the machines have booted as thin clients/diskless workstations or have "
+#| "been installed using any of the networked profiles, the "
+#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
+#| "to automatically add machines to GOsa². For simple machines it will work "
+#| "out of the box, for machines with more than one mac address the actually "
+#| "used one has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</"
+#| "computeroutput> shows usage information. Please note, that the IP "
+#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
+#| "computeroutput> belong to the dynamic IP range. These systems can then be "
+#| "modified 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 "
@@ -3534,9 +3869,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 "Als de machines opgestart werden als thin clients of schijfloze werkstations "
@@ -3744,8 +4079,14 @@ msgstr ""
 "dat ze door LDAP een statisch IP-adres toegewezen krijgen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
+#| "or your users won't be able to access their home directories. Diskless "
+#| "workstations and thin clients don't use NFS, so they don't need to be "
+#| "configured."
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -3794,10 +4135,15 @@ msgstr ""
 "geraakte printerwachtrijen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Debian Edu machines in this group will only be allowed to connect to "
+#| "machines on the local network.  Combined with web proxy restrictions this "
+#| "might be used during exams."
 msgid ""
-"Debian Edu machines in this group will only be allowed to connect to "
-"machines on the local network.  Combined with web proxy restrictions this "
-"might be used during exams."
+"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 "
+"be used during exams."
 msgstr ""
 "Machines van Debian Edu die tot deze groep behoren, kunnen enkel verbinding "
 "maken met machines op het lokale netwerk. Tijdens examens kan men deze "
@@ -3997,6 +4343,14 @@ msgstr ""
 "worden."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "run <computeroutput>apt-get update</computeroutput>"
+msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr "geef de opdracht <computeroutput>apt-get update</computeroutput>"
+
+#. type: Content of: <article><section><section><para>
 msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
@@ -4022,11 +4376,19 @@ msgstr ""
 "get upgrade</computeroutput> uitvoert."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Automatic installation of updates can be done easily if desired, it just "
+#| "needs the <computeroutput>unattended-upgrades</computeroutput> package to "
+#| "be installed and configured as described on <ulink url=\"https://wiki."
+#| "debian.org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</"
+#| "ulink>."
 msgid ""
 "Automatic installation of updates can be done easily if desired, it just "
 "needs the <computeroutput>unattended-upgrades</computeroutput> package to be "
-"installed and configured as described on <ulink url=\"https://wiki.debian."
-"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 "Indien u dit verkiest, kunt u het systeem gemakkelijk zelf automatisch de "
 "nodige opwaarderingen laten uitvoeren. Daarvoor dient u enkel het pakket "
@@ -4078,12 +4440,21 @@ msgid "Backup Management"
 msgstr "Reservekopieën beheren"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For backup management point your browser to <ulink url=\"https://www/"
+#| "slbackup-php\"/>. Please note that you need to access this site via SSL, "
+#| "since you have to enter the root password there. If you try to access "
+#| "this site without using SSL it will fail. Note: the site will only work "
+#| "if you temporarily allow ssh root login on the backup server (tjener by "
+#| "default)."
 msgid ""
 "For backup management point your browser to <ulink url=\"https://www/"
 "slbackup-php\"/>. Please note that you need to access this site via SSL, "
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 "Voor het beheer van reservekopieën gaat u met de browser naar het adres "
 "<ulink url=\"https://www/slbackup-php\"/>. Denk eraan om een SSL-verbinding "
@@ -4202,6 +4573,17 @@ msgstr ""
 "zoeken naar de oorzaak van knelpunten of problemen in het systeem."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The list of machines being monitored using Munin is generated "
+#| "automatically, based on the list of hosts reporting to sitesummary.  All "
+#| "hosts with the package munin-node installed are registered for Munin "
+#| "monitoring.  It will normally take one day from a machine being installed "
+#| "until Munin monitoring starts, because of the order the cron jobs are "
+#| "executed.  To speed up the process, run <computeroutput>sitesummary-"
+#| "update-munin</computeroutput> as root on the sitesummary server (normally "
+#| "the main-server).  This will update the <computeroutput>/etc/munin/munin."
+#| "conf</computeroutput> file."
 msgid ""
 "The list of machines being monitored using Munin is generated automatically, "
 "based on the list of hosts reporting to sitesummary.  All hosts with the "
@@ -4209,7 +4591,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 "Munin maakt automatisch een lijst op van machines die opgevolgd moeten "
@@ -4225,10 +4607,17 @@ msgstr ""
 "geactualiseerd."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The set of measurements being collected is automatically generated on "
+#| "each machine using the <computeroutput>munin-node-configure</"
+#| "computeroutput> program, which probes the plugins available from "
+#| "<computeroutput>/usr/share/munin/plugins/</computeroutput> and symlinks "
+#| "the relevant ones to <computeroutput>/etc/munin/plugins/</computeroutput>."
 msgid ""
 "The set of measurements being collected is automatically generated on each "
 "machine using the <computeroutput>munin-node-configure</computeroutput> "
-"program, which probes the plugins available from <computeroutput>/usr/share/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
@@ -4240,9 +4629,13 @@ msgstr ""
 "koppeling maakt naar die welke relevant zijn."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Information about Munin is available from <ulink url=\"http://munin."
+#| "projects.linpro.no/\"/> ."
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 "Meer informatie over Munin is te vinden op <ulink url=\"http://munin."
 "projects.linpro.no/\"/>."
@@ -4252,15 +4645,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 LTSP-"
-#| "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 "
@@ -4281,11 +4665,6 @@ msgstr ""
 "<computeroutput>nagios-nrpe-server</computeroutput> op installeren."
 
 #. 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 "
@@ -4300,18 +4679,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-"
@@ -4326,11 +4697,6 @@ msgstr ""
 "computeroutput> en <computeroutput>notify-by-email</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 "
@@ -4343,10 +4709,6 @@ msgstr ""
 "computeroutput> dat een lijst bevat van op te volgen machines en diensten."
 
 #. 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 "
@@ -4358,9 +4720,6 @@ msgstr ""
 "gegenereerde bestand."
 
 #. 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."
@@ -4369,13 +4728,10 @@ msgstr ""
 "in het pakket <computeroutput>icinga-doc</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 "Gebruikelijke waarschuwingen door Icinga en hoe ermee om te gaan"
 
 #. 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 ""
 "Hier volgen instructies voor de manier waarop u met de meest voorkomende "
@@ -5214,10 +5570,15 @@ msgstr ""
 "grafische) shell de volgende reeks opdrachten:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ sudo apt-get update\n"
+#| "  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+#| "  # after installation, start a graphical session for the first user \n"
+#| "  $ startx"
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -5345,9 +5706,14 @@ msgstr ""
 "\"http://wiki.debian.org/StableUpdates\">stable-updates suite</ulink>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "While you can use stable-updates directly, you don't have to: stable-"
+#| "updates are pushed into the stable suite regularily when stable point "
+#| "releases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
-"are pushed into the stable suite regularily when stable point releases are "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 "Hoewel u rechtstreeks gebruik kunt maken van stable-updates, is dit niet "
@@ -5357,7 +5723,9 @@ msgstr ""
 "stable-updates toegevoegd aan de suite van de stabiele uitgave."
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+#, fuzzy
+#| msgid "Using backports.debian.org to install newer software"
+msgid "Using backports to install newer software"
 msgstr "Meer recente programmatuur installeren met backports.debian.org"
 
 #. type: Content of: <article><section><section><para>
@@ -5416,11 +5784,19 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Backports are automatically updated (if available) just like other "
+#| "packages. (Previously, extra configuration was needed to achieve this, "
+#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#| "anymore]."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 "Ook pakketten uit backports worden net als andere pakketten automatisch "
 "bijgewerkt (als er een bijgewerkte versie beschikbaar is). (Vroeger was "
@@ -5472,8 +5848,13 @@ msgid "To quote the apt-cdrom(8) man page:"
 msgstr "Het volgende is een citaat uit de man-pagina van apt-cdrom(8):"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "apt-cdrom is used to add a new CDROM to APTs list of available sources. "
+#| "apt-cdrom takes care of determining the structure of the disc as well as "
+#| "correcting for several possible mis-burns and verifying the index files."
 msgid ""
-"apt-cdrom is used to add a new CDROM to APTs list of available sources. apt-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -5484,9 +5865,14 @@ msgstr ""
 "het zal eveneens de indexbestanden controleren."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot "
+#| "be done by hand. Furthermore each disk in a multi-cd set must be inserted "
+#| "and scanned separately to account for possible mis-burns."
 msgid ""
 "It is necessary to use apt-cdrom to add CDs to the APT system, it cannot be "
-"done by hand. Furthermore each disk in a multi-cd set must be inserted and "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 "Het is noodzakelijk om apt-cdrom te gebruiken om nieuwe cd's toe te voegen "
@@ -5514,8 +5900,14 @@ msgid "Automatic cleanup of leftover processes"
 msgstr "Het automatisch opruimen van processen die niet meer in gebruik zijn"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>killer</computeroutput> is is a perl script that gets rid "
+#| "of background jobs. Background jobs are defined as processes that belong "
+#| "to users who are not currently logged into the machine. It's run by cron "
+#| "job once an hour."
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -5844,7 +6236,9 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
+#, fuzzy
+#| msgid "Advanced administration"
+msgid "Advanced administration howto"
 msgstr "Systeembeheer voor gevorderden"
 
 #. type: Content of: <article><section><para>
@@ -5862,9 +6256,14 @@ msgid "Create Users in Year Groups"
 msgstr "Maak gebruikersgroepen per jaartal"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In this example we want to create users in year groups, with common home "
+#| "directories for each group (home0/2014, home0/2015, etc.) We want to "
+#| "create the users by csv import."
 msgid ""
 "In this example we want to create users in year groups, with common home "
-"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 "In dit voorbeeld willen we gebruikersgroepen maken per jaartal met een door "
@@ -5872,7 +6271,9 @@ msgstr ""
 "willen de gebruikers aanmaken via het importeren van een csv-bestand."
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
+#, fuzzy
+#| msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
 msgstr "<emphasis>(als systeembeheerder op Tjener) </emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5928,16 +6329,25 @@ msgid "Template"
 msgstr "Sjabloon"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose 'users' from the main menu. Change to 'Students' in the Base "
+#| "field. An Entry <computeroutput>'NewStudent'</computeroutput> should show "
+#| "up, click it. This is the 'students' template, not a real user. As you'll "
+#| "have to create such a template (to be able to use csv import for your "
+#| "structure) based on this one, notice all entries showing up in the "
+#| "Generic, POSIX and Samba tabs, maybe take screenshots. Now change to /"
+#| "Students/2014 in the Base field; choose Create/Template and start to fill "
+#| "in your desired values, first the Generic tab (add your new 2014 group "
+#| "under Group Membership, too), then add POSIX and Samba account."
 msgid ""
 "Choose 'users' from the main menu. Change to 'Students' in the Base field. "
-"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
 msgstr ""
 "Kies 'gebruikers' in het hoofdmenu. Verander de inhoud van het veld 'Basis' "
 "in 'Studenten'. Nu zou een item <computeroutput>'NewStudent'</"
@@ -5952,14 +6362,25 @@ msgstr ""
 "veld 'Groepslidmaatschap') en nadien voor de tabbladen POSIX en Samba-"
 "account."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Import users"
 msgstr "Gebruikers importeren"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Choose your new template when doing csv import; testing it with a few "
+#| "users recommended."
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 "Kies uw nieuw sjabloon bij het uitvoeren van een gegevensimport vanuit uw "
 "csv-bestand. Doe eerst een test met enkele gebruikers."
@@ -6039,12 +6460,19 @@ msgstr ""
 " echo \"$created_dir mappen werden aangemaakt.\""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
+#, fuzzy
+#| msgid "Easy access to USB drives and CDROMs/DVDs"
+msgid "Easy access to USB drives and CD-ROMs/DVDs"
 msgstr "Gemakkelijk toegang krijgen tot USB-sticks en cd-roms/dvd's"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a (diskless) "
+#| "workstation, a popup window appears asking what to do with it, just like "
+#| "in any other normal installation."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
@@ -6054,8 +6482,15 @@ msgstr ""
 "gewone installatie."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or a DVD / CDROM into a thin client there "
+#| "is only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -6085,11 +6520,18 @@ msgstr ""
 "gemakkelijke toegang mogelijk.)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM / DVD or whatever media is connected to the thin client. "
+#| "This might come in handy if users want to edit files directly on their "
+#| "plugged in media."
 msgid ""
 "In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 "Bijkomend kunt u het volgende script gebruiken om in de persoonlijke map van "
 "alle gebruikers een symbolische koppeling \"media\" aan te maken en zo de "
@@ -6153,14 +6595,6 @@ msgstr ""
 "reageert of aan de console het commando pmount gebruikt, kan hij het "
 "verwijderbaar medium zelfs aankoppelen en de bestanden erop bewerken."
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Dit staat bekend onder het bugrapport  <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr "Een aparte server voor het opslaan van bestanden"
@@ -6175,10 +6609,16 @@ msgstr ""
 "gegevensbestanden."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Add a new system of type server using GOsa² as outlined in the <link "
+#| "linkend=\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting "
+#| "started</link> chapter of this manual."
 msgid ""
-"Add a new system of type server using GOsa² as outlined in the <link linkend="
-"\"GettingStarted--Machine_Management_with_GOsa.2BALI-\">Getting started</"
-"link> chapter of this manual."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 "Voeg met behulp van GOsa² een nieuw type server toe, zoals geschetst werd in "
 "het hoofdstuk <link linkend=\"GettingStarted--"
@@ -6303,10 +6743,15 @@ msgstr ""
 "het ontstaan van eindeloze lussen van aankoppelingen te vermijden."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create the mount directories using <computeroutput>mkdir</"
+#| "computeroutput>, edit '/etc/fstab' as adequate and run "
+#| "<computeroutput>mount -a</computeroutput> to mount the new resources."
 msgid ""
-"Create the mount directories using <computeroutput>mkdir</computeroutput>, "
-"edit '/etc/fstab' as adequate and run <computeroutput>mount -a</"
-"computeroutput> to mount the new resources."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 "Maak de aankoppelmappen aan met behulp van het commando "
 "<computeroutput>mkdir</computeroutput>, voer de overeenkomstige aanpassingen "
@@ -6358,8 +6803,13 @@ msgid "Managing this case with GOsa is quite simple:"
 msgstr "Een dergelijke situatie beheren is heel eenvoudig met GOsa:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Create a group <computeroutput>sshusers</computeroutput> on the root "
+#| "level (where already other system management related groups like "
+#| "<computeroutput>gosa-admins</computeroutput> show up)."
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -6428,11 +6878,17 @@ msgstr ""
 "#"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
+#| "dropped to disable internal ssh login access. Note: someone pluging in "
+#| "his box into the dedicated LTSP client network(s) will gain ssh access to "
+#| "the LTSP server(s) as well."
 msgid ""
 "If only dedicated LTSP servers are used, the 10.0.0.0/8 network could be "
-"dropped to disable internal ssh login access. Note: someone pluging in his "
-"box into the dedicated LTSP client network(s) will gain ssh access to the "
-"LTSP server(s) as well."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 "Indien enkel gereserveerde LTSP-servers gebruikt worden, kunt u het netwerk "
 "10.0.0.0/8 weglaten om de mogelijkheid uit te schakelen om zich intern via "
@@ -10024,7 +10480,6 @@ msgid "Other changes compared to the previous release"
 msgstr "Andere veranderingen vergeleken met de vorige uitgave"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Icinga2 replaces Nagios as monitoring tool. Icinga2"
 msgid "Icinga replaces Nagios as monitoring tool."
 msgstr "Icinga vervangt Nagios als monitoringsysteem."
 
@@ -10094,14 +10549,23 @@ 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), 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), 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."
+"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."
 msgstr ""
 "De auteursrechten van de vertaling naar het Bokmål berusten bij Petter "
 "Reinholdtsen (2007, 2012, 2014, 2015, 2016, 2017), Håvard Korsvoll "
@@ -10155,18 +10619,26 @@ msgstr ""
 "de licentie GPL v2 of een latere versie."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
+#| "2015) and is released under the GPL v2 or any later version."
 msgid ""
-"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
-"and is released under the GPL v2 or any later version."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de Deense vertaling berusten bij Joe Hansen (2012, "
 "2013, 2014, 2015). De vertaling is vrijgegeven onder de licentie GPL v2 of "
 "een latere versie."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
+#| "2016) and is released under the GPL v2 or any later version."
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 "De auteursrechten van de Nederlandse vertaling berusten bij Frans "
 "Spiesschaert (2014, 2015, 2016). De vertaling is vrijgegeven onder de "
@@ -12924,6 +13396,56 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "Wij gebruiken cfengine om configuratiebestanden te bewerken. Deze "
+#~ "bestanden worden door de server op de clients geactualiseerd. Om de "
+#~ "configuratie van clientcomputers te wijzigen, volstaat het dus om het "
+#~ "configuratiebestand op de server te bewerken. De configuratie wordt "
+#~ "vervolgens automatisch naar de clientcomputers overgezet."
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "The ordering of the network cards after installation might differ from "
+#~ "the ordering during installation. The wanted ordering can be achieved by "
+#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
+#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
+#~ "the changes to take effect."
+#~ msgstr ""
+#~ "Het kan gebeuren dat de onderlinge volgorde van de netwerkkaarten na "
+#~ "installatie verschillend is van die tijdens de installatie. U kunt de "
+#~ "gewenste volgorde bekomen door het bestand <computeroutput>/etc/udev/"
+#~ "rules.d/70-persistent-net.rules</computeroutput> te bewerken. "
+#~ "<emphasis>Indien dit probleem zich stelt</emphasis>, zult u normaal "
+#~ "gezien eth0 moeten vervangen door eth1, en eth1 door eth0. Nadien zult u "
+#~ "de computer opnieuw moeten opstarten opdat de wijzigingen van kracht "
+#~ "zouden worden."
+
+#~ msgid ""
+#~ "This is being tracked as <ulink url=\"http://bugs.skolelinux."
+#~ "org/1376\">Debian Edu bug #1376</ulink>."
+#~ msgstr ""
+#~ "Dit staat bekend onder het bugrapport  <ulink url=\"http://bugs."
+#~ "skolelinux.org/1376\">Debian Edu bug #1376</ulink>."
+
 #~ msgid "Nagios"
 #~ msgstr "Nagios"
 
@@ -13505,9 +14027,6 @@ msgstr ""
 #~ "<ulink url=\"http://www.skolelinux.de/mailman/listinfo/user\"/> - "
 #~ "mailinglijst voor het bieden van ondersteuning"
 
-#~ msgid "TBD"
-#~ msgstr "TBD"
-
 #~ msgid "Squid"
 #~ msgstr "Squid"
 
@@ -13687,9 +14206,6 @@ msgstr ""
 #~ "Bewerk het bestand <computeroutput>/etc/apt/sources.list</computeroutput> "
 #~ "en vervang overal het woord \"wheezy\" door het woord \"jessie\"."
 
-#~ msgid "run <computeroutput>apt-get update</computeroutput>"
-#~ msgstr "geef de opdracht <computeroutput>apt-get update</computeroutput>"
-
 #~ msgid "run <computeroutput>apt-get upgrade</computeroutput>"
 #~ msgstr "geef de opdracht <computeroutput>apt-get upgrade</computeroutput>"
 
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 ceaffeb..c1a7a5e 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+0000\n"
 "PO-Revision-Date: 2017-02-01 08:31+0000\n"
 "Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -58,8 +58,8 @@ msgid ""
 msgstr ""
 "<link linkend=\"Translations\">Tłumaczenia</link> są częścią pakietu "
 "<computeroutput>debian-edu-doc</computeroutput>. Pakiet można zainstalować "
-"na serwerze WWW. Jest on również dostępny <ulink url=\""
-"http://maintainer.skolelinux.org/debian-edu-doc/\">online</ulink>."
+"na serwerze WWW. Jest on również dostępny <ulink url=\"http://maintainer."
+"skolelinux.org/debian-edu-doc/\">online</ulink>."
 
 # type: Content of: <article><section><title>
 #. type: Content of: <article><section><title>
@@ -78,6 +78,19 @@ msgstr ""
 
 # type: Content of: <article><section><para>
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Directly after installation of a school server all services needed for a "
+#| "school network are set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>) and "
+#| "the system is ready to be used. Only users and machines need to be added "
+#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
+#| "environment using PXE has also been prepared, so after initial "
+#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
+#| "all other machines can be installed via the network, this includes "
+#| "\"roaming workstations\" (ones that can be taken away from the school "
+#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
+#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -88,7 +101,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "Bezpośrednio po instalacji serwera  szkolnego wszystkie usługi, potrzebne do "
 "szkolnej sieci komputerowej, są skonfigurowane (zobacz następny rozdział "
@@ -131,10 +144,10 @@ msgid ""
 "subproject."
 msgstr ""
 "<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> jest dystrybucją "
-"Linuksa stworzoną przez projekt Debian Edu. Jako dystrybucja Debiana typu <"
-"ulink url=\"http://wiki.debian.org/DebianPureBlends\">Pure Blends</ulink> "
-"jest oficjalnym podprojektem <ulink url=\"http://www.debian.org\""
-">Debiana</ulink>."
+"Linuksa stworzoną przez projekt Debian Edu. Jako dystrybucja Debiana typu "
+"<ulink url=\"http://wiki.debian.org/DebianPureBlends\">Pure Blends</ulink> "
+"jest oficjalnym podprojektem <ulink url=\"http://www.debian.org\">Debiana</"
+"ulink>."
 
 # type: Content of: <article><section><section><para>
 #. type: Content of: <article><section><section><para>
@@ -148,8 +161,15 @@ msgstr ""
 
 # type: Content of: <article><section><section><para>
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
+msgid ""
+"The Skolelinux project in Norway was founded on July 2nd 2001 and about the "
 "same time Raphaël Hertzog started Debian-Edu in France. Since 2003 both "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -201,11 +221,21 @@ msgid "The Debian Edu network topology"
 msgstr "Topologia sieci komputerowej Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and LTSP-"
+#| "servers (with associated thin-clients and/or diskless workstations). The "
+#| "number of workstations can be as large or small as you want (starting "
+#| "from none to a lot). The same goes for the LTSP servers, each of which is "
+#| "on a separate network so that the traffic between the clients and the "
+#| "LTSP server doesn't affect the rest of the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
-"a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -223,12 +253,20 @@ msgstr ""
 
 # type: Content of: <article><section><section><para>
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "Powód, dla którego może być tylko jeden główny serwer w każdej szkolnej "
@@ -274,9 +312,15 @@ msgstr ""
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -307,12 +351,19 @@ msgid "Main server (tjener)"
 msgstr "Serwer główny (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the LTSP-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 "
-"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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "Sieć komputerowa Skolelinux potrzebuje jednego serwera głównego (zwanego też "
 "\"tjener\", co w języku norweskim także oznacza \"serwer\"), który domyślnie "
@@ -327,15 +378,27 @@ msgid "Services running on the main server"
 msgstr "Usługi uruchamiane na serwerze głównym"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"With the exception of the control of the thin-clients, all services are "
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the LTSP-server(s) should be separate (though it is "
+#| "possible to install both the main server and LTSP 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 "
-"reasons, the LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -625,6 +688,14 @@ msgstr "LTSP"
 msgid "ltsp"
 msgstr "ltsp"
 
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "NBD"
+msgstr ""
+
 # type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
@@ -638,11 +709,11 @@ msgstr ""
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "munin, nagios and site-summary"
-msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin, nagios i podsumowanie witryny"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "site-summary"
+msgid "sitesummary"
 msgstr ""
 
 # type: Content of: <article><section><section><section><para>
@@ -657,19 +728,27 @@ msgstr ""
 "Pliki osobiste dla każdego użytkownika są przechowywane w katalogach home. "
 "Są one dostępne za pomocą serwera. Katalogi home są dostępne ze wszystkich "
 "maszyn. Dzięki temu, użytkownicy mają dostęp do tych samych plików "
-"niezależnie od tego, której maszyny używają. Serwer ma charakter \""
-"agnostyczny\": oferuje dostęp poprzez NFS dla klientów Uniksa, SMB dla "
+"niezależnie od tego, której maszyny używają. Serwer ma charakter "
+"\"agnostyczny\": oferuje dostęp poprzez NFS dla klientów Uniksa, SMB dla "
 "klientów Windowsa i Mackintosha."
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "Poczta elektroniczna jest domyślnie skonfigurowana tylko do dostarczania "
 "lokalnego (tj. w obrębie szkoły), chociaż dostarczanie listów e-mail do "
@@ -677,9 +756,9 @@ msgstr ""
 "łącze internetowe. Listy dyskusyjne są skonfigurowane na podstawie bazy "
 "danych użytkowników w ten sposób, że każda klasa szkolna ma własna listę "
 "dyskusyjną. Klienty są tak skonfigurowane, aby dostarczały listy e-mail do "
-"serwera (przy użyciu 'smarthost'), a użytkownicy mogą mieć<link linkend=\""
-"Users--Using_email\">dostęp do swojej osobistej poczty elektronicznej</link> "
-"poprzez IMAP."
+"serwera (przy użyciu 'smarthost'), a użytkownicy mogą mieć<link linkend="
+"\"Users--Using_email\">dostęp do swojej osobistej poczty elektronicznej</"
+"link> poprzez IMAP."
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
@@ -706,10 +785,18 @@ msgstr ""
 "maszynach."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Network configuration on the clients is done automatically using DHCP. "
+#| "Normal clients are allocated IP addresses in the private subnet "
+#| "10.0.0.0/8, while thin clients are connected to the corresponding LTSP-"
+#| "server via the separate subnet 192.168.0.0/24 (this is to ensure that the "
+#| "network traffic of the thin clients doesn't interfere with the rest of "
+#| "the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -741,10 +828,10 @@ msgid ""
 "can use it as the main DNS Server."
 msgstr ""
 "Domyślnie, serwer DNS jest zainstalowany z domeną tylko do użytku lokalnego "
-"(*.intern), aż do czasu, gdy zainstalowana zostanie rzeczywista (\""
-"zewnętrzna\") domena DNS.  Serwer DNS jest zainstalowany jako serwer DNS z "
-"pamięcią podręczną tak, aby wszystkie maszyny w sieci mogły go używać jako "
-"głównego serwera DNS."
+"(*.intern), aż do czasu, gdy zainstalowana zostanie rzeczywista (\"zewnętrzna"
+"\") domena DNS.  Serwer DNS jest zainstalowany jako serwer DNS z pamięcią "
+"podręczną tak, aby wszystkie maszyny w sieci mogły go używać jako głównego "
+"serwera DNS."
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
@@ -817,9 +904,16 @@ msgstr ""
 "zapewniając w ten sposób poprawny czas dla całej sieci komputerowej."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or LTSP-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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -835,13 +929,18 @@ msgid "LTSP server(s)"
 msgstr "Serwer /serwery LTSP"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (which we called \"thin "
+#| "client servers\" in releases before Stretch), which are installed by "
+#| "selecting the LTSP server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
-"Sieć komputerowa Skolelinux może mieć wiele serwerów LTSP (zwanych ”"
-"serwerami cienkich klientów” w wydaniach poprzedzajacych Stretch), które są "
+"Sieć komputerowa Skolelinux może mieć wiele serwerów LTSP (zwanych "
+"”serwerami cienkich klientów” w wydaniach poprzedzajacych Stretch), które są "
 "zainstalowane poprzez wybranie profilu klienta serwera LTSP."
 
 #. type: Content of: <article><section><section><section><para>
@@ -853,6 +952,16 @@ msgstr ""
 "stacji roboczych, a także aby przekazywać te komunikaty dalej,  do "
 "centralnego odbiorcy syslog."
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 # type: Content of: <article><section><section><section><title>
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
@@ -875,16 +984,27 @@ msgstr ""
 
 # type: Content of: <article><section><section><section><para>
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted 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 "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "Cienkie klienty są dobrym sposobem, aby skorzystać ze starszych, słabszych "
 "maszyn, ponieważ mogą skutecznie uruchamiać wszystkie programy na serwerze "
@@ -973,32 +1093,26 @@ msgid "Administration"
 msgstr "Administracja"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (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 "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 "Wszystkie maszyny Linux, zainstalowane za pomocą instalatora Skolelinux, "
 "będzie można administrować z komputera centralnego, najprawdopodobniej z "
-"serwera. Możliwe będzie logowanie do wszystkich maszyn poprzez SSH ("
-"logowanie jako root nie będzie — domyślnie — dozwolone). Tak więc, będzie "
+"serwera. Możliwe będzie logowanie do wszystkich maszyn poprzez SSH "
+"(logowanie jako root nie będzie — domyślnie — dozwolone). Tak więc, będzie "
 "możliwy pełny dostęp do tych maszyn."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"Do modyfikacji plików konfiguracyjnych używamy cfengine. Te pliki są "
-"aktualizowane na zasadzie: z serwera do klientów. Aby zmienić konfigurację "
-"klienta, wystarczy zmodyfikować konfigurację serwera, i w ten sposób "
-"pozwolić na automatyczne rozproszenie zmian."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -1022,8 +1136,12 @@ msgstr ""
 "pamięci USB."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "Celem ostatecznym jest to, aby zainstalować serwer z dowolnego typu nośnika, "
@@ -1085,11 +1203,11 @@ msgstr ""
 "unikalne nazwy albo, że katalogi współdzielone posiadają również (na "
 "wszystkich komputerach) tego rodzaju nazwy, katalogi można zamontować jako "
 "<computeroutput> /skole/host/katalog</computeroutput>. Początkowo, utworzony "
-"jest jeden katalog na serwerze, "
-"<computeroutput>/skole/tjener/home0/</computeroutput>, w którym są utworzone "
-"wszystkie konta użytkowników. Następnie, można utworzyć — w razie potrzeby — "
-"więcej katalogów, aby dostosować poszczególne grupy użytkowników do "
-"określonych wzorców użytkowania."
+"jest jeden katalog na serwerze, <computeroutput>/skole/tjener/home0/</"
+"computeroutput>, w którym są utworzone wszystkie konta użytkowników. "
+"Następnie, można utworzyć — w razie potrzeby — więcej katalogów, aby "
+"dostosować poszczególne grupy użytkowników do określonych wzorców "
+"użytkowania."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1139,21 +1257,21 @@ msgstr ""
 "dostępu do grupy zgodnie z opisem powyżej), ale Debian Edu używa domyślnej "
 "wartości 002. Oznacza to, że pliki są tworzone z dostępem do odczytu dla "
 "wszystkich, co może być póżniej usunięte przez bezpośrednie działanie "
-"użytkownika. Można to alternatywnie zmienić, modyfikując "
-"<computeroutput>/etc/pam.d/common-session</computeroutput>) do umask 007 co "
-"oznacza, że dostęp do odczytu jest początkowo zablokowany.  Niezbędne będzie "
-"działanie użytkownika, aby udostępnić pliki. Pierwsze podejście zachęca do "
-"dzielenia się wiedzą i sprawia, że system staje się bardziej przejrzysty, "
-"podczas gdy druga metoda zmniejsza ryzyko rozprzestrzenienia się "
-"niechcianych informacji poufnych. Problem z pierwszym rozwiązaniem polega na "
-"tym, że nie jest widoczne dla użytkowników to, czy materiały przez nich "
-"tworzone będą dostępne dla innych. Użytkownicy mogą to wykryć jedynie "
-"sprawdzając katalogi innych użytkowników i widząc, że ich pliki są czytelne. "
-"Problem z drugim rozwiązaniem polega na tym, że tylko niewiele osób "
-"prawdopodobnie zechce udostępnić swoje pliki, nawet jeśli nie zawierają one "
-"poufnych informacji, a treści w nich zawarte nie sa pomocne ciekawskim "
-"użytkownikom, którzy chcą dowiedzieć się, jak inni rozwiązują poszczególne "
-"problemy (zazwyczaj związane z konfiguracją)."
+"użytkownika. Można to alternatywnie zmienić, modyfikując <computeroutput>/"
+"etc/pam.d/common-session</computeroutput>) do umask 007 co oznacza, że "
+"dostęp do odczytu jest początkowo zablokowany.  Niezbędne będzie działanie "
+"użytkownika, aby udostępnić pliki. Pierwsze podejście zachęca do dzielenia "
+"się wiedzą i sprawia, że system staje się bardziej przejrzysty, podczas gdy "
+"druga metoda zmniejsza ryzyko rozprzestrzenienia się niechcianych informacji "
+"poufnych. Problem z pierwszym rozwiązaniem polega na tym, że nie jest "
+"widoczne dla użytkowników to, czy materiały przez nich tworzone będą "
+"dostępne dla innych. Użytkownicy mogą to wykryć jedynie sprawdzając katalogi "
+"innych użytkowników i widząc, że ich pliki są czytelne. Problem z drugim "
+"rozwiązaniem polega na tym, że tylko niewiele osób prawdopodobnie zechce "
+"udostępnić swoje pliki, nawet jeśli nie zawierają one poufnych informacji, a "
+"treści w nich zawarte nie sa pomocne ciekawskim użytkownikom, którzy chcą "
+"dowiedzieć się, jak inni rozwiązują poszczególne problemy (zazwyczaj "
+"związane z konfiguracją)."
 
 #. type: Content of: <article><section><title>
 msgid "Requirements"
@@ -1181,8 +1299,8 @@ msgid ""
 "The purpose of the different profiles is explained in the <link linkend="
 "\"Architecture\">network architecture</link> chapter."
 msgstr ""
-"Cel różnych profili jest wyjaśniony w rozdziale <link linkend=\""
-"Architecture\">architektura sieciowa</link>."
+"Cel różnych profili jest wyjaśniony w rozdziale <link linkend=\"Architecture"
+"\">architektura sieciowa</link>."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1271,7 +1389,7 @@ msgstr ""
 
 #. 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 "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1369,6 +1487,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Installation"
+msgid "After the installation:"
+msgstr "Instalacja"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1386,7 +1556,7 @@ msgid ""
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 
@@ -1459,12 +1629,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
 msgstr ""
@@ -1481,17 +1645,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1541,7 +1700,7 @@ 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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1679,13 +1838,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
-"boot menu."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1706,29 +1876,27 @@ msgstr ""
 #. 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\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 
 #. 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."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 
 #. 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."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1743,7 +1911,7 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1751,7 +1919,7 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1759,15 +1927,17 @@ msgid "Choose profile(s) from the following list:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
-msgstr ""
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgid "<emphasis role=\"strong\">Main Server</emphasis>"
+msgstr "<emphasis role=\"strong\">Serwer-LTSP</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 "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 
@@ -1797,18 +1967,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Serwer-LTSP</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1845,17 +2018,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1876,7 +2039,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Wait. If the selected profiles include LTSP-server then the installer will "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -1954,7 +2117,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2035,8 +2198,8 @@ msgstr ""
 
 #. 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\">LTSP-Server</emphasis> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 
@@ -2046,6 +2209,12 @@ msgstr "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2156,10 +2325,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"So here is a screenshot tour through a graphical 64-bit Main-Server + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2358,7 +2527,9 @@ msgid "tjener KDM Login"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+#, fuzzy
+#| msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr "./images/26-Tjener-MATE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2366,7 +2537,9 @@ msgid "KDE and Browser"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-MATE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2387,9 +2560,15 @@ msgid "Diskless Workstation Login"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-MATE_Desktop.png"
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop and Menu"
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Getting started"
 msgstr ""
@@ -2410,6 +2589,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 
@@ -2431,8 +2618,8 @@ msgstr ""
 #. 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."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2458,9 +2645,12 @@ msgid ""
 "and some frequently asked questions."
 msgstr ""
 
+# type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu MATE desktop"
-msgstr ""
+#, fuzzy
+#| msgid "Debian Edu login"
+msgid "Debian Edu KDE desktop"
+msgstr "Login Debian Edu"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2503,11 +2693,11 @@ msgstr ""
 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 + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2564,10 +2754,9 @@ 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 LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2943,7 +3132,7 @@ msgstr ""
 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"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
 
@@ -2981,9 +3170,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 
@@ -3142,7 +3331,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -3180,9 +3369,9 @@ msgstr ""
 
 #. 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."
+"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 "
+"be used during exams."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3310,6 +3499,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
 "send mail to an address you are reading."
@@ -3328,8 +3523,9 @@ msgstr ""
 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>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3366,7 +3562,8 @@ msgid ""
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3455,7 +3652,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 
@@ -3463,15 +3660,15 @@ msgstr ""
 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/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -4118,7 +4315,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -4211,12 +4408,12 @@ msgstr ""
 #. 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 "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+msgid "Using backports to install newer software"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4262,8 +4459,9 @@ msgstr ""
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4302,7 +4500,7 @@ msgstr ""
 
 #. 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-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -4310,7 +4508,7 @@ msgstr ""
 #. 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 "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 
@@ -4331,7 +4529,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -4561,8 +4759,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
-msgstr ""
+#, fuzzy
+#| msgid "Administration"
+msgid "Advanced administration howto"
+msgstr "Administracja"
 
 #. type: Content of: <article><section><para>
 msgid "In this chapter advanced administration tasks are described."
@@ -4579,13 +4779,16 @@ msgstr ""
 #. 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 "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 
+# type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
-msgstr ""
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Table of services</emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
+msgstr "<emphasis role=\"strong\">Tabela usług</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Make the necessary year group directories"
@@ -4631,14 +4834,19 @@ msgstr ""
 #. 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 "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4648,7 +4856,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4698,19 +4906,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
 
 #. 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 "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -4729,9 +4937,9 @@ msgstr ""
 #. 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 
 #. type: CDATA
@@ -4769,12 +4977,6 @@ msgid ""
 "can even mount the removable devices and access the files."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr ""
@@ -4787,9 +4989,10 @@ msgstr ""
 
 #. 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."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -4869,9 +5072,9 @@ msgstr ""
 
 #. 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."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4908,7 +5111,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -4960,9 +5163,9 @@ 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."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -7591,10 +7794,10 @@ 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), 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."
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -7626,14 +7829,14 @@ msgstr ""
 
 #. 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."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -9636,8 +9839,19 @@ msgid ""
 "More information on even older releases can be found at <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgstr ""
-"Więcej informacji na temat starszych wydań można znaleźć na <ulink url=\""
-"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+"Więcej informacji na temat starszych wydań można znaleźć na <ulink url="
+"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "Do modyfikacji plików konfiguracyjnych używamy cfengine. Te pliki są "
+#~ "aktualizowane na zasadzie: z serwera do klientów. Aby zmienić "
+#~ "konfigurację klienta, wystarczy zmodyfikować konfigurację serwera, i w "
+#~ "ten sposób pozwolić na automatyczne rozproszenie zmian."
 
 # type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #~ msgid "Thin Client Server/s"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 98ca258..98fc202 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-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+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"
@@ -75,7 +75,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -107,7 +107,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+"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 "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -145,9 +145,9 @@ msgstr ""
 #. 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 LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -160,7 +160,7 @@ msgid ""
 "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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 
@@ -188,7 +188,7 @@ msgstr ""
 #. 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 "
+"syslinux pointing 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."
 msgstr ""
@@ -212,9 +212,9 @@ msgstr ""
 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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -223,14 +223,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"With the exception of the control of the thin-clients, all services are "
+"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 LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -448,17 +448,25 @@ msgid "ltsp"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "NBD"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "site-summary"
+msgid "sitesummary"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -474,10 +482,9 @@ msgstr ""
 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."
+"a permanent Internet connection. 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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -498,7 +505,7 @@ msgstr ""
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -561,7 +568,7 @@ msgstr ""
 #. 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 LTSP-server. Access to "
+"network, or connected to a server, workstation or LTSP 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."
@@ -575,7 +582,7 @@ msgstr ""
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -584,6 +591,16 @@ msgid ""
 "workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr ""
@@ -601,12 +618,12 @@ 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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -662,16 +679,8 @@ msgstr ""
 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."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -694,7 +703,7 @@ msgstr ""
 
 #. 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 "
+"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."
 msgstr ""
 
@@ -870,7 +879,7 @@ msgstr ""
 
 #. 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 "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -968,6 +977,56 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid "After the installation:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -985,7 +1044,7 @@ msgid ""
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 
@@ -1058,12 +1117,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
 msgstr ""
@@ -1080,17 +1133,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1140,7 +1188,7 @@ 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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1273,13 +1321,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
-"boot menu."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/BD_command_line.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1300,29 +1357,27 @@ msgstr ""
 #. 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\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 
 #. 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."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 
 #. 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."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1337,7 +1392,7 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1345,7 +1400,7 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1353,15 +1408,15 @@ msgid "Choose profile(s) from the following list:"
 msgstr ""
 
 #. 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 ""
 
 #. 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 "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 
@@ -1391,18 +1446,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1439,17 +1495,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1470,7 +1516,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Wait. If the selected profiles include LTSP-server then the installer will "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -1548,7 +1594,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -1629,8 +1675,8 @@ msgstr ""
 
 #. 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\">LTSP-Server</emphasis> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 
@@ -1640,6 +1686,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -1750,10 +1802,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"So here is a screenshot tour through a graphical 64-bit Main-Server + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -1949,7 +2001,7 @@ msgid "tjener KDM Login"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -1957,7 +2009,7 @@ msgid "KDE and Browser"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -1977,7 +2029,11 @@ msgid "Diskless Workstation Login"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop and Menu"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -2000,6 +2056,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 
@@ -2021,8 +2085,8 @@ msgstr ""
 #. 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."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2049,7 +2113,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu MATE desktop"
+msgid "Debian Edu KDE desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2093,11 +2157,11 @@ msgstr ""
 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 + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2154,10 +2218,9 @@ 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 LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2533,7 +2596,7 @@ msgstr ""
 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"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
 
@@ -2571,9 +2634,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 
@@ -2732,7 +2795,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -2770,9 +2833,9 @@ msgstr ""
 
 #. 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."
+"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 "
+"be used during exams."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2900,6 +2963,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
 "send mail to an address you are reading."
@@ -2918,8 +2987,9 @@ msgstr ""
 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>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2956,7 +3026,8 @@ msgid ""
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3045,7 +3116,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 
@@ -3053,15 +3124,15 @@ msgstr ""
 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/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -3708,7 +3779,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -3801,12 +3872,12 @@ msgstr ""
 #. 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 "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+msgid "Using backports to install newer software"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3852,8 +3923,9 @@ msgstr ""
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3892,7 +3964,7 @@ msgstr ""
 
 #. 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-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -3900,7 +3972,7 @@ msgstr ""
 #. 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 "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 
@@ -3921,7 +3993,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -4151,7 +4223,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
+msgid "Advanced administration howto"
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -4169,12 +4241,12 @@ msgstr ""
 #. 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 "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4221,14 +4293,19 @@ msgstr ""
 #. 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 "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4238,7 +4315,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4288,19 +4365,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
 
 #. 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 "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -4319,9 +4396,9 @@ msgstr ""
 #. 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 
 #. type: CDATA
@@ -4359,12 +4436,6 @@ msgid ""
 "can even mount the removable devices and access the files."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr ""
@@ -4377,9 +4448,10 @@ msgstr ""
 
 #. 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."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -4459,9 +4531,9 @@ msgstr ""
 
 #. 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."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4498,7 +4570,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -4550,9 +4622,9 @@ 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."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -7175,10 +7247,10 @@ 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), 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."
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -7210,14 +7282,14 @@ msgstr ""
 
 #. 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."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) 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 5b9b8d4..43c5a6a 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -19,7 +19,7 @@
 </title>
 <para>Debian Edu aka Skolelinux is a Linux distribution based on Debian providing an out-of-the box environment of a completely configured school network.   
 </para>
-<para>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 a [...]
+<para>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 a [...]
 </para>
 <para>Several educational applications like celestia, drgeo, gcompris, kalzium, kgeography, solfege and scratch are included in the default desktop setup, which can be extended easily and almost endlessly via the Debian universe. 
 </para>
@@ -31,7 +31,7 @@
 </para>
 <para>What this means for your school is that Skolelinux is a version of Debian providing an out-of-the box environment of a completely configured school-network. 
 </para>
-<para>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. 
+<para>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 projects are united, but both names stayed. "Skole" and (Debian-)"Education" are just two well understood terms in these regions. 
 </para>
 <para>The main target group in Norway initially were schools serving the 6-16 years age bracket. Today the system is in use in several countries around the world, with most installations in Norway, Spain, Germany and France. 
 </para>
@@ -50,9 +50,9 @@
 </title>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/Debian_Edu_Network_Stretch.png"/></imageobject><textobject><phrase>The Debian Edu network topology</phrase></textobject></inlinemediaobject> 
 </para>
-<para>The figure is a sketch of the assumed network topology. The default setup of a Skolelinux network assumes that there is one (and only one) main-server, while allowing the inclusion of both normal workstations and LTSP-servers (with associated thin-clients and/or diskless workstations). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the LTSP servers, each of which is on a separate network so that the traffic between t [...]
+<para>The figure is a sketch of the assumed network topology. The default setup of a Skolelinux network assumes that there is one (and only one) main server, while allowing the inclusion of both normal workstations and LTSP servers (with associated thin clients and/or diskless workstations). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the LTSP servers, each of which is on a separate network so that the traffic between t [...]
 </para>
-<para>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. 
+<para>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. 
 </para>
 <para>In order to simplify the standard setup of Skolelinux, the Internet connection runs over a separate router. It is possible to set up Debian with both a modem and an ISDN connection; however, no attempt is made to make such a setup work out of the box for Skolelinux (the setup needed to adjust the default situation to this should be documented separately). 
 </para>
@@ -62,7 +62,7 @@
 </title>
 <para>DHCPD on Tjener serves the 10.0.0.0/8 network, providing a syslinux menu via PXE-boot where you can choose whether to install a new server/workstation, boot a thin client or a diskless workstation, run memtest, or boot from the local hard disk. 
 </para>
-<para>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. 
+<para>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 option (stored in LDAP) to have clients directly boot via PXE from the terminal server. 
 </para>
 <para>DHCPD on the LTSP servers only serves a dedicated network on the second interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) and should seldom need to be changed. 
 </para>
@@ -73,14 +73,14 @@
 <section id="Architecture--Main_server_.28tjener.29">
 <title>Main server (tjener)
 </title>
-<para>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 LTSP-server and workstation profiles in addition to the main server profile. 
+<para>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 LTSP Server and Workstation profiles in addition to the Main Server profile. 
 </para>
 </section>
 
 <section id="Architecture--Services_running_on_the_main_server">
 <title>Services running on the main server
 </title>
-<para>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 LTSP-server(s) should be separate (though it is possible to install both the main server and LTSP 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 m [...]
+<para>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 LTSP server(s) should be separate (though it is possible to install both the Main Server and LTSP 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 m [...]
 </para>
 <para>To ensure security all connections where passwords are transmitted over the network are encrypted, so no passwords are sent over the network as plain text. 
 </para>
@@ -184,21 +184,27 @@
 </para></entry><entry colsep="1" rowsep="1">
 <para> ltsp 
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
+<para> Network Block Device Server 
+</para></entry><entry colsep="1" rowsep="1">
+<para> NBD 
+</para></entry><entry colsep="1" rowsep="1">
+<para> --- 
+</para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
 <para> Machine and Service Surveillance with Error Reporting, plus Status and History on the Web. Error Reporting by email 
 </para></entry><entry colsep="1" rowsep="1">
-<para>munin, icinga and site-summary 
+<para>Munin, Icinga and Sitesummary 
 </para></entry><entry colsep="1" rowsep="1">
-<para> site-summary 
+<para> sitesummary 
 </para></entry></row></tbody></tgroup></informaltable>
 <para>Personal files for each user are stored in their home directories, which are made available by the server. Home directories are accessible from all machines, giving users access to the same files regardless of which machine they are using. The server is operating system agnostic, offering access via NFS for Unix clients, SMB for Windows and Macintosh clients. 
 </para>
-<para>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. 
+<para>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. 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. 
 </para>
 <para>All services are accessible using the same username and password, thanks to the central user database for authentication and authorisation. 
 </para>
 <para>To increase performance on frequently accessed sites a web proxy that caches files locally (Squid) is used. In conjunction with blocking web-traffic in the router this also enables control of Internet access on individual machines. 
 </para>
-<para>Network configuration on the clients is done automatically using DHCP. Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, while thin clients are connected to the corresponding LTSP-server via the separate subnet 192.168.0.0/24 (this is to ensure that the network traffic of the thin clients doesn't interfere with the rest of the network services). 
+<para>Network configuration on the clients is done automatically using DHCP. Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, while thin clients are connected to the corresponding LTSP server via the separate subnet 192.168.0.0/24 (this is to ensure that the network traffic of the thin clients doesn't interfere with the rest of the network services). 
 </para>
 <para>Centralised logging is set up so that all machines send their syslog messages to the server. The syslog service is set up so that it only accepts incoming messages from the local network. 
 </para>
@@ -212,17 +218,19 @@
 </para>
 <para>In order to avoid certain problems with NFS, and to make it simpler to debug problems, the different machines need synchronised clocks. To achieve this the Skolelinux server is set up as a local Network Time Protocol (NTP) server, and all workstations and clients are set up to synchronise with the server. The server itself should synchronise its clock via NTP against machines on the Internet, thus ensuring the whole network has the correct time. 
 </para>
-<para>Printers are connected where convenient, either directly onto the main network, or connected to a server, workstation or LTSP-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. 
+<para>Printers are connected where convenient, either directly onto the main network, or connected to a server, workstation or LTSP 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. 
 </para>
 </section>
 
 <section id="Architecture--LTSP_server.28s.29">
 <title>LTSP server(s)
 </title>
-<para>A Skolelinux network can have many LTSP servers (which we called "thin client servers" in releases before Stretch), which are installed by selecting the LTSP server profile. 
+<para>A Skolelinux network can have many LTSP servers (which we called "thin client servers" in releases before Stretch), which are installed by selecting the LTSP Server profile. 
 </para>
 <para>The LTSP servers are set up to receive syslog from thin clients and workstations, and forward these messages to the central syslog recipient.  
 </para>
+<para>Please note: Thin clients are using the programs installed on the server. Diskless workstations are using the programs installed in the server's LTSP chroot, the client root filesystem is provided using NBD (Network Block Device). After each modification to the LTSP chroot the related NBD image has to be re-generated; run <computeroutput>ltsp-update-image</computeroutput> on the LTSP server. 
+</para>
 </section>
 
 <section id="Architecture--Thin_clients">
@@ -230,7 +238,7 @@
 </title>
 <para>A thin client setup enables ordinary PCs to function as (X-)terminals. This means that the machine boots from a diskette or directly from the server using network-PROM (or PXE) without using the local client hard drive. The thin client setup used is that of the Linux Terminal Server Project (LTSP). 
 </para>
-<para>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 cli [...]
+<para>Thin clients are a good way to make use of older, weaker machines as they effectively run all programs on the LTSP server. This works as follows: the service uses DHCP and TFTP to connect to the network and boot from the network. Next, the file system is mounted from the LTSP server using NBD, and finally the X Window System is started. The display manager (LDM) connects to the LTSP server via SSH with X-forwarding. This way all data is encrypted on the network. For very old thin c [...]
 </para>
 </section>
 
@@ -258,9 +266,7 @@
 <section id="Architecture--Administration">
 <title>Administration
 </title>
-<para>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. 
-</para>
-<para>We use cfengine to edit configuration files. These files are updated from the server to the clients. In order to change the client configuration, it suffices to edit the server configuration and let the automation distribute the changes. 
+<para>All the Linux machines that are installed with the Skolelinux installer will be administrable from a central computer, most likely the server. It will be possible to log in to all machines via SSH (by default, root is not allowed to log in with password), and thereby have full access to the machines. 
 </para>
 <para>All user information is kept in an LDAP directory. Updates of user accounts are made against this database, which is used by the clients for user authentication. 
 </para>
@@ -270,7 +276,7 @@
 </title>
 <para>Currently there are two kinds of installation media images: netinstall (CD)  and multi-arch USB flash drive. Both images can also be booted from USB sticks. 
 </para>
-<para>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.  
+<para>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.  
 </para>
 <para>Only the netinstall image needs access to the Internet during installation. 
 </para>
@@ -350,7 +356,7 @@
 <para>eth0 is connected to the main network (10.0.0.0/8), 
 </para></listitem>
 <listitem>
-<para>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>. 
+<para>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>. 
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para>Laptops are movable workstations, so they have the same requirements as workstations. 
@@ -404,11 +410,46 @@
 </title>
 <para>A router/gateway, connected to the Internet on the external interface and running on the IP address 10.0.0.1 with netmask 255.0.0.0 on the internal interface, is needed to connect to the Internet. 
 </para>
+<para>A system with two network interfaces could be turned into a gateway if the Debian Edu 'Minimal' profile is installed. 
+</para>
+<para>After the installation: 
+</para>
+<itemizedlist>
+<listitem>
+<para>Adjust the /etc/network/interfaces file. 
+</para></listitem>
+<listitem>
+<para>Change the hostname permanently to 'gateway'. 
+</para></listitem>
+<listitem>
+<para>Enable IP forwarding and NAT for the 10.0.0.0/8 network. 
+</para></listitem>
+<listitem>
+<para>As an option install a firewall and / or a traffic shaping tool. 
+</para></listitem></itemizedlist><screen><![CDATA[ #!/bin/sh
+ # Turn a system with profile 'Minimal' into a gateway/firewall. 
+ #
+ sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces
+ sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces
+ echo 'address 10.0.0.1' >> /etc/network/interfaces
+ echo 'netmask 255.0.0.0' >> /etc/network/interfaces
+ hostname -b gateway
+ hostname > /etc/hostname 
+ service networking stop
+ service networking start
+ sed -i 's#NAT=#NAT="10.0.0.0/8"#' /etc/default/enable-nat 
+ service enable-nat restart
+ # You might want a firewall (shorewall or ufw) and traffic shaping.
+ #apt update
+ #apt install shorewall
+ # or
+ #apt install ufw
+ #apt install wondershaper  ]]></screen>
 <para>The router should not run a DHCP server, it can run a DNS server, though this is not needed and will not be used. 
 </para>
 <para>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>. 
 </para>
-<para>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>.  
+<para>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/toh/start">supported hardware</ulink>.  
 </para>
 <para>It is possible to use a different network setup (there is a <ulink url="http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet">documented procedure</ulink> to do this), but if you are not forced to do this by an existing network infrastructure, we recommend against doing so and recommend you stay with the default <link linkend="Architecture">network architecture</link>. 
 </para>
@@ -441,8 +482,6 @@
 <para>The netinstall CD, which also can be used for installation from USB flash drives, is suitable to install i386 and amd64 machines. As the name implies, internet access is required for the installation. It's available via 
 </para>
 <itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD.iso">debian-edu-9+edu0~a0-CD.iso</ulink> 
-</para>
 <para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD.iso">debian-edu-9+edu0~a0-CD.iso</ulink> 
 </para>
 <para><computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-9+edu0~a0-CD.iso ./debian-edu-9+edu0~a0-CD.iso </computeroutput> 
@@ -452,11 +491,9 @@
 <section id="Installation--USB_drive_ISO_image_for_i386_and_amd64">
 <title>USB drive ISO image for i386 and amd64
 </title>
-<para>The multi-architecture ISO image is 5.2 GiB large and can be used for installation of amd64 and i386 machines. Like the netinstall image it can be installed on USB flash drives or disk media of sufficient size. Please note that internet access during installation is needed. Like the others it can be downloaded over FTP, HTTP or rsync via: 
+<para>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 installed on USB flash drives or disk media of sufficient size. Please note that internet access is needed during installation if the 'LTSP Server' profile is chosen. Like the others it can be downloaded over HTTP or rsync via: 
 </para>
 <itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB.iso">debian-edu-9+edu0~a0-USB.iso</ulink> 
-</para>
 <para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB.iso">debian-edu-9+edu0~a0-USB.iso</ulink> 
 </para>
 <para><computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-edu-9+edu0~a0-USB.iso ./debian-edu-9+edu0~a0-USB.iso </computeroutput> 
@@ -481,7 +518,7 @@
 <section id="Installation--Installing_Debian_Edu">
 <title>Installing Debian Edu
 </title>
-<para>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. 
+<para>When you do a Debian Edu installation, you have a few options to choose from. Don't be afraid; there aren't many. We have done a good job of hiding the complexity of Debian during the installation and beyond. However, Debian Edu is Debian, and if you want there are more than 52,000 packages to choose from and a billion configuration options. For the majority of our users, our defaults should be fine. 
 </para>
 
 <section id="Installation--Installation_types_and_options">
@@ -529,9 +566,11 @@
 </para>
 <para> This Help screen is self explaining and enables the <F>-keys on the keyboard for getting more detailed help on the topics described. 
 </para>
-<para><emphasis>Additional boot parameters for installations</emphasis> 
+<para><emphasis>Add or change boot parameters for installations</emphasis> 
+</para>
+<para>In both cases, boot options can be edited by pressing the TAB key in the boot menu; the screenshot shows the command line for <emphasis role="strong">Graphical install</emphasis>.  
 </para>
-<para>In both cases, boot options can be edited by pressing the TAB key in the boot menu. 
+<para> <inlinemediaobject><imageobject><imagedata fileref="./images/BD_command_line.png"/></imageobject><textobject><phrase>Edit command line options</phrase></textobject></inlinemediaobject> 
 </para>
 <itemizedlist>
 <listitem>
@@ -541,16 +580,16 @@
 <para>If you have already installed the main server profile on a machine, further installations should be done via PXE, as this will automatically use the proxy of the main server. 
 </para></listitem>
 <listitem>
-<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the <emphasis role="strong">MATE</emphasis> desktop, add <computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters. 
+<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the default <emphasis role="strong">KDE Plasma</emphasis> desktop, replace kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter. 
 </para></listitem>
 <listitem>
-<para>To install the <emphasis role="strong">LXDE</emphasis> desktop instead, add <computeroutput>desktop=lxde</computeroutput> to the kernel boot parameters. 
+<para>To install the <emphasis role="strong">LXDE</emphasis> desktop instead, use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is intended to be used.)  
 </para></listitem>
 <listitem>
-<para>To install the <emphasis role="strong">Xfce</emphasis> desktop instead, add <computeroutput>desktop=xfce</computeroutput> to the kernel boot parameters. 
+<para>To install the <emphasis role="strong">Xfce</emphasis> desktop instead, use <computeroutput>desktop=xfce</computeroutput>. 
 </para></listitem>
 <listitem>
-<para>And to install the <emphasis role="strong">KDE Plasma</emphasis> desktop instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot parameters. 
+<para>And to install the <emphasis role="strong">MATE</emphasis> desktop instead, use <computeroutput>desktop=mate</computeroutput>. 
 </para></listitem></itemizedlist>
 </section>
 
@@ -561,23 +600,23 @@
 </para>
 <itemizedlist>
 <listitem>
-<para>Choose a language (for the installation and the installed system) 
+<para>Choose a language (for the installation and the installed system). 
 </para></listitem>
 <listitem>
 <para>Choose a location which normally should be the location where you live. 
 </para></listitem>
 <listitem>
-<para>Choose a keyboard keymap (the country's default is usually fine) 
+<para>Choose a keyboard keymap (the country's default is usually fine). 
 </para></listitem>
 <listitem>
 <para>Choose profile(s) from the following list: 
 </para>
 <itemizedlist>
 <listitem>
-<para><emphasis role="strong">Main-Server</emphasis> 
+<para><emphasis role="strong">Main Server</emphasis> 
 </para>
 <itemizedlist><listitem override="none">
-<para>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 LTSP-Server in addition to this one. 
+<para>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 school!  This profile does not include a graphical user interface. If you want a graphical user interface, then select Workstation or LTSP Server in addition to this one. 
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para><emphasis role="strong">Workstation</emphasis> 
@@ -592,10 +631,10 @@
 <para>Same as workstation but capable of authentication using cached credentials, meaning it can be used outside the school network. The users' files and profiles are stored on the local disk. For single user notebooks and laptops this profile should be selected and not 'Workstation' or 'Standalone' as suggested in earlier releases. 
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para><emphasis role="strong">LTSP-Server</emphasis> 
+<para><emphasis role="strong">LTSP Server</emphasis> 
 </para>
 <itemizedlist><listitem override="none">
-<para>A thin client (and diskless workstation) server, is called an 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) - an LTSP server can always be used as [...]
+<para>A thin client (and diskless workstation) server, is called an LTSP server. Clients without hard drives boot and run software from this server. This computer needs two network interfaces, 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) - an LTSP server can always be us [...]
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para><emphasis role="strong">Standalone</emphasis> 
@@ -609,11 +648,8 @@
 <itemizedlist><listitem override="none">
 <para>This profile will install the base packages and configure the machine to integrate into the Debian Edu network, but without any services and applications.  It is useful as a platform for single services manually moved out from the main-server. 
 </para></listitem></itemizedlist></listitem></itemizedlist>
-<para>The <emphasis role="strong">Main Server</emphasis>, <emphasis role="strong">Workstation</emphasis> and <emphasis role="strong">LTSP 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 an LTSP server and also be used as a workstation. This is the default choice, since we assume most people will install <link linkend="Install [...]
-</para></listitem></itemizedlist>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> The ordering of the network cards after installation might differ from the ordering during installation. The wanted ordering can be achieved by editing  <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 with eth1 and eth1 with eth0 [...]
-</para>
-<itemizedlist>
+<para>The <emphasis role="strong">Main Server</emphasis>, <emphasis role="strong">Workstation</emphasis> and <emphasis role="strong">LTSP 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 an LTSP server and also be used as a workstation. This is the default choice, since we assume most people will install <link linkend="Install [...]
+</para></listitem>
 <listitem>
 <para>Say "yes" or "no" to automatic partitioning. Be aware that saying "yes" will destroy all data on the hard drives!  Saying "no" on the other hand will require more work - you will need to make sure that the required partitions are created and are big enough. 
 </para></listitem>
@@ -621,7 +657,7 @@
 <para>Please say "yes" to submitting information to <ulink url="http://popcon.skolelinux.org/"/> to allow us to know which packages are popular and should be kept for future releases.  Although you don't have to, it is a simple way for you to help. <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:)</phrase></textobject></inlinemediaobject> 
 </para></listitem>
 <listitem>
-<para>Wait. If the selected profiles include LTSP-server then the installer will spend quite some time at the end, "Finishing the installation - Running debian-edu-profile-udeb..." 
+<para>Wait. If the selected profiles include LTSP Server then the installer will spend quite some time at the end, "Finishing the installation - Running debian-edu-profile-udeb..." 
 </para></listitem>
 <listitem>
 <para>After giving the root password, you will be asked to create a normal user account "for non-administrative tasks". For Debian Edu this account is very important: it is the account you will use to manage the Skolelinux network.  
@@ -659,8 +695,8 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 </section>
 
-<section id="Installation--A_note_on_LTSP-server_installations_using_only_Thin-Clients">
-<title>A note on LTSP-server installations using only Thin-Clients
+<section id="Installation--Notes_on_LTSP_Server_installations_using_only_Thin-Clients">
+<title>Notes on LTSP Server installations using only Thin-Clients
 </title>
 <para>Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-client</computeroutput> makes it possible to skip one step which converts the LTSP chroot from a thin-client chroot into a combined thin-client/diskless workstation chroot.  
 </para>
@@ -691,10 +727,12 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/pxe-tjener.png"/></imageobject><textobject><phrase>width=400</phrase></textobject></inlinemediaobject> 
 </para>
-<para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> and <emphasis role="strong">LTSP-Server</emphasis> profiles: 
+<para>This is how the PXE menu looks with the <emphasis role="strong">Main Server</emphasis> and <emphasis role="strong">LTSP Server</emphasis> profiles: 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>width=400</phrase></textobject></inlinemediaobject> 
 </para>
+<para>To install a desktop environment of your choice instead of the default one, press TAB and edit the kernel boot options (like explained above).  
+</para>
 <para>This setup also allows diskless workstations and thin clients to be booted on the main network. Unlike workstations, diskless workstations don't have to be added to LDAP with GOsa², but can be, for example if you want to force the hostname. 
 </para>
 <para>More information about network clients can be found in the <link linkend="NetworkClients">Network clients HowTo</link> chapter. 
@@ -733,7 +771,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </title>
 <para>The text mode and the graphical installation are functionally identical - only the appearance is different. The graphical mode offers the opportunity to use a mouse, and of course looks much nicer and more modern. Unless the hardware has trouble with the graphical mode, there is no reason not to use it.  
 </para>
-<para>So here is a screenshot tour through a graphical 64-bit Main-Server + Workstation + LTSP Server installation and how it looks at the first boot of the tjener, a PXE boot on the workstation network and on the thinclient network: 
+<para>So here is a screenshot tour through a graphical 64-bit Main Server + Workstation + LTSP Server installation and how it looks at the first boot of the main server, a PXE boot on the workstation network and on the LTSP client network: 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/01-Installer_64bit_boot_menu.png"/></imageobject><textobject><phrase>01-Installer_64bit_boot_menu.png</phrase></textobject></inlinemediaobject> 
 </para>
@@ -785,15 +823,15 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/23-Tjener-Login.png"/></imageobject><textobject><phrase>tjener KDM Login</phrase></textobject></inlinemediaobject> 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/26-Tjener-MATE_Desktop_Browser.png"/></imageobject><textobject><phrase>KDE and Browser</phrase></textobject></inlinemediaobject> 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/26-Tjener-KDE_Desktop_Browser.png"/></imageobject><textobject><phrase>KDE and Browser</phrase></textobject></inlinemediaobject> 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-MATE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop</phrase></textobject></inlinemediaobject> 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-KDE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop</phrase></textobject></inlinemediaobject> 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>28-Diskless-WS-GRUB_Boot_menu-PXE.png</phrase></textobject></inlinemediaobject> 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/29-Diskless-WS-LDM_Login.png"/></imageobject><textobject><phrase>Diskless Workstation Login</phrase></textobject></inlinemediaobject> 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/31-ThinClient-MATE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop</phrase></textobject></inlinemediaobject> 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/31-ThinClient-KDE_Desktop.png"/></imageobject><textobject><phrase>KDE Desktop and Menu</phrase></textobject></inlinemediaobject> 
 </para>
 </section>
 </section>
@@ -808,6 +846,8 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </title>
 <para>During installation of the main server a first user account was created. In the following text this account will be referenced as "first user". This account is special, as there's no Samba account (can be added via GOsa²), the home directory permission is set to 700 (so <computeroutput>chmod o+x ~</computeroutput> is needed to make personal web pages accessible), and the first user can use <computeroutput>sudo</computeroutput> to become root. 
 </para>
+<para>See the information about Debian Edu specific   <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Stretch//Architecture#File_system_access_configuration">file system access configuration</ulink> before adding users. 
+</para>
 <para>After the installation, the first things you need to do as first user are: 
 </para><orderedlist numeration="arabic">
 <listitem>
@@ -819,7 +859,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 <listitem>
 <para>Add workstations with GOsa² - thin-client and diskless workstation can be used directly without this step. 
 </para></listitem></orderedlist>
-<para>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. 
+<para>Adding users and workstations is described in detail below, so please read this chapter completely. It covers how to perform these minimum steps correctly as well as other stuff that everybody will probably need to do. 
 </para>
 <para>There is additional information available elsewhere in this manual: the <link linkend="Features">New features in Stretch</link> chapter should be read by everyone who is familiar with previous releases. And for those upgrading from a previous release, make sure to read the <link linkend="Upgrades">Upgrades</link> chapter. 
 </para>
@@ -827,7 +867,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para>The <link linkend="HowTo">HowTo</link> chapter covers more tips and tricks and some frequently asked questions. 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-MATE_Desktop.png"/></imageobject><textobject><phrase>Debian Edu MATE desktop</phrase></textobject></inlinemediaobject> 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/27-Tjener-KDE_Desktop.png"/></imageobject><textobject><phrase>Debian Edu KDE desktop</phrase></textobject></inlinemediaobject> 
 </para>
 
 <section id="GettingStarted--Services_running_on_the_main_server">
@@ -862,7 +902,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 <listitem>
 <para>DHCP Administration 
 </para></listitem></itemizedlist>
-<para>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 + LTSP 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>. 
+<para>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 + LTSP Server + Workstation profiles). 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>. 
 </para>
 <para>From a web browser use the URL <ulink url="https://www/gosa"/> for GOsa² access, and log in as the first user. 
 </para>
@@ -885,7 +925,7 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 <para>Next, you can choose a task in the menu or click any of the task icons on the overview page. For navigation, we recommend using the menu on the left side of the screen, as it will stay visible there on all administration pages offered by GOsa². 
 </para>
-<para>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 LTSP 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. 
+<para>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 LTSP servers and the Windows machines on the network. With LDAP, account information about students, 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. 
 </para>
 <para>GOsa² is an administration tool that uses LDAP to store its information and provide a hierarchical department structure. To each "department" you can add user accounts, groups, systems, netgroups, etc. Depending on the structure of your institution, you can use the department structure in GOsa²/LDAP to transfer your organisational structure into the LDAP data tree of the Debian Edu main server. 
 </para>
@@ -1045,13 +1085,13 @@ net groupmap add unixgroup=NEW_GROUP type=domain ntgroup="NEW_GROUP"\
 </title>
 <para>Machine management basically allows you to manage all networked devices in your Debian Edu network. Every machine added to the LDAP directory using GOsa² has a hostname, an IP address, a MAC address and a domain name (which is usually "intern"). For a fuller description of the Debian Edu architecture see the <link linkend="Architecture">architecture</link> chapter of this manual. 
 </para>
-<para>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>. 
+<para>Diskless workstations and thin-clients work out-of-the-box when connected to the main network. Only workstations with disks <emphasis role="strong">have to</emphasis> be added with GOsa², but all <emphasis role="strong">can</emphasis>. 
 </para>
 <para>To add a machine, use the GOsa² main menu, systems, add. You can use an IP address/hostname from the preconfigured address space 10.0.0.0/8. Currently there are only two predefined fixed addresses: 10.0.2.2 (tjener) and 10.0.0.1 (gateway). The addresses from 10.0.16.20 to 10.0.31.254 (roughly 10.0.16.0/20 or 4000 hosts) are reserved for DHCP and are assigned dynamically. 
 </para>
 <para>To assign a host with the MAC address 52:54:00:12:34:10 a static IP address in GOsa² you have to enter the MAC address, the hostname and the IP; alternatively you might click the <computeroutput>Propose ip</computeroutput> button which will show the first free fixed address in 10.0.0.0/8, most probably something like 10.0.0.2 if you add the first machine this way. It may be better to first think about your network: for example you could use 10.0.0.x with x>10 and x<50 for ser [...]
 </para>
-<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa². For simple machines it will work out of the box, for machines with more than one mac address the actually used one has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP add [...]
+<para>If the machines have booted as thin clients/diskless workstations or have been installed using any of the networked profiles, the <computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to automatically add machines to GOsa². For simple machines it will work out of the box, for machines with more than one mac address the actually used one has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage information. Please note, that the IP add [...]
 </para><screen><![CDATA[root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations
 info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.
 
@@ -1128,7 +1168,7 @@ enter password: ]]></screen>
 <itemizedlist><listitem override="none">
 <para>The home directories are exported by the main-server to be mounted by the workstations and the LTSP servers. For security reasons, only hosts within the workstation-hosts, ltsp-server-hosts and server-hosts <computeroutput>NetGroups</computeroutput> can mount the exported NFS shares. So it is rather important to remember to configure these kinds of machines properly in the LDAP tree using GOsa² and to configure them to use static IP addresses from LDAP. 
 </para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> 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. 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> 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. 
 </para></listitem></itemizedlist></listitem>
 <listitem>
 <para>fs-autoresize 
@@ -1152,7 +1192,7 @@ enter password: ]]></screen>
 <para>netblock-hosts 
 </para>
 <itemizedlist><listitem override="none">
-<para>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. 
+<para>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 be used during exams. 
 </para></listitem></itemizedlist></listitem></itemizedlist>
 <para>Another important part of machine configuration is the 'Samba host' flag (in the 'Host information' area). If you plan to add existing Windows systems to the Skolelinux Samba domain, you need to add the Windows host to the LDAP tree and set this flag to be able to join the Windows host to the domain. For more information about adding Windows hosts to the Skolelinux network see the <link linkend="NetworkClients--Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"> [...]
 </para>
@@ -1204,11 +1244,13 @@ LC_ALL=C TMP= TMPDIR= ltsp-chroot -p apt-get upgrade -y
 ltsp-update-kernels # If a new kernel was installed]]></screen>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> It is important to run <computeroutput>ltsp-update-kernels</computeroutput> if a new kernel was installed in the LTSP chroot, to keep the kernel and kernel modules in sync.  The kernel is handed out via TFTP when the machine does PXE boot, and the kernel modules are fetched from the LTSP chroot. 
 </para>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the NBD image(s).  
+</para>
 <para>It is also a good idea to install <computeroutput>cron-apt</computeroutput> and <computeroutput>apt-listchanges</computeroutput> and configure them to send mail to an address you are reading. 
 </para>
 <para><computeroutput>cron-apt</computeroutput> will notify you once a day via email about any packages that can be upgraded. It does not install these upgrades, but does download them (usually in the night), so you don't have to wait for the download when you do <computeroutput>apt-get upgrade</computeroutput>. 
 </para>
-<para>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>. 
+<para>Automatic installation of updates can be done easily if desired, it just needs the <computeroutput>unattended-upgrades</computeroutput> package to be configured as described on <ulink url="https://wiki.debian.org/UnattendedUpgrades">wiki.debian.org/UnattendedUpgrades</ulink>. On new installations security updates are enabled by default. 
 </para>
 <para><computeroutput>apt-listchanges</computeroutput> can send new changelog entries to you via email, or alternativly display them in the terminal when running <computeroutput>aptitude</computeroutput> or <computeroutput>apt-get</computeroutput>. 
 </para>
@@ -1224,7 +1266,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 <section id="Maintenance--Backup_Management">
 <title>Backup Management
 </title>
-<para>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). 
+<para>For backup management point your browser to <ulink url="https://www/slbackup-php"/>. Please note that you need to access this site via SSL, since you have to enter the root password there. If you try to access this site without using SSL it will fail. Note: the site will only work if you temporarily allow ssh root login on the backup server (main server 'tjener' by default). 
 </para>
 <para>By default tjener will back up <computeroutput>/skole/tjener/home0</computeroutput>, <computeroutput>/etc/</computeroutput>, <computeroutput>/root/.svk</computeroutput> and LDAP to /skole/backup which is under the LVM. If you only want to have spare copies of things (in case you delete them) this setup should be fine for you. 
 </para>
@@ -1255,11 +1297,11 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 </title>
 <para>The Munin trend reporting system is available from <ulink url="https://www/munin/"/>.  It provides system status measurement graphs on a daily, weekly, monthly and yearly basis, and provides the system administrator with help when looking for bottlenecks and the source of system problems. 
 </para>
-<para>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 (norma [...]
+<para>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 (norma [...]
 </para>
-<para>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>. 
+<para>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>. 
 </para>
-<para>Information about Munin is available from <ulink url="http://munin.projects.linpro.no/"/> . 
+<para>Information about Munin is available from <ulink url="http://munin-monitoring.org/"/>. 
 </para>
 </section>
 
@@ -1540,7 +1582,7 @@ resize2fs /dev/vg_system/skole+tjener+home0]]></screen>
 </title>
 <para>If you (probably accidentally) installed a pure main-server profile and don't have a client with a web-browser handy, it's easy to install a minimal desktop on the main server using this command sequence in a (non-graphical) shell as the user you created during the main server's installation (first user): 
 </para><screen><![CDATA[  $ sudo apt-get update
-  $ sudo apt-get install gnome-session gnome-terminal firefox xorg
+  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg
   # after installation, start a graphical session for the first user 
   $ startx]]></screen>
 </section>
@@ -1585,12 +1627,12 @@ Click "This session only" if asked for the certificate.]]></screen>
 </title>
 <para>Since the Squeeze release in 2011, Debian has included packages formerly maintained in volatile.debian.org in the <ulink url="http://wiki.debian.org/StableUpdates">stable-updates suite</ulink>. 
 </para>
-<para>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. 
+<para>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 done, which roughly happens every two months. 
 </para>
 </section>
 
-<section id="Administration--Using_backports.debian.org_to_install_newer_software">
-<title>Using backports.debian.org to install newer software
+<section id="Administration--Using_backports_to_install_newer_software">
+<title>Using backports to install newer software
 </title>
 <para>You are running Debian Edu because you prefer the stability of Debian Edu. It runs great; there is just one problem: sometimes software is a little bit more outdated than you like. This is where backports.debian.org steps in. 
 </para>
@@ -1601,7 +1643,7 @@ Click "This session only" if asked for the certificate.]]></screen>
 apt-get update]]></screen>
 <para>After which one can install backported packages easily, the following command will install a backported version of <emphasis>tuxtype</emphasis>: 
 </para><screen><![CDATA[apt-get install -t stretch-backports tuxtype]]></screen>
-<para>Backports are automatically updated (if available) just like other packages. (Previously, extra configuration was needed to achieve this, but since 2011 this [[<ulink url="http://backports.debian.org/news/squeeze-backports_and_lenny-backports-sloppy_started/|is"/> not needed anymore]. 
+<para>Backports are automatically updated (if available) just like other packages. (Previously, extra configuration was needed to achieve this, but since 2011 this <ulink url="http://backports.debian.org/news/squeeze-backports_and_lenny-backports-sloppy_started/">is not needed anymore</ulink>. 
 </para>
 <para>Like the normal archive, backports has three sections: main, contrib and non-free. 
 </para>
@@ -1618,9 +1660,9 @@ apt-cdrom add -m]]></screen>
 <para>To quote the apt-cdrom(8) man page: 
 </para>
 <itemizedlist><listitem override="none">
-<para>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.  
+<para>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 correcting for several possible mis-burns and verifying the index files.  
 </para></listitem><listitem override="none">
-<para>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. 
+<para>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. 
 </para></listitem></itemizedlist>
 <para>Then run these two commands to upgrade the system: 
 </para><screen><![CDATA[apt-get update
@@ -1630,7 +1672,7 @@ apt-get upgrade]]></screen>
 <section id="Administration--Automatic_cleanup_of_leftover_processes">
 <title>Automatic cleanup of leftover processes
 </title>
-<para><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.  
+<para><computeroutput>killer</computeroutput> 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.  
 </para>
 <para>To install it run the following command as root: 
 </para><screen><![CDATA[ apt-get install killer]]></screen>
@@ -1742,7 +1784,7 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 
 
 <section id="AdvancedAdministration">
-<title>Advanced administration
+<title>Advanced administration howto
 </title>
 <para>In this chapter advanced administration tasks are described.   
 </para>
@@ -1754,9 +1796,9 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 <section id="AdvancedAdministration--Create_Users_in_Year_Groups">
 <title>Create Users in Year Groups
 </title>
-<para>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. 
+<para>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. 
 </para>
-<para><emphasis>(as root on Tjener) </emphasis> 
+<para><emphasis>(as root on the main server) </emphasis> 
 </para>
 <itemizedlist>
 <listitem>
@@ -1782,13 +1824,15 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 <listitem>
 <para>Template 
 </para></listitem></itemizedlist>
-<para>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 sta [...]
+<para>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 to have information ready for the new template. 
+</para>
+<para>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. 
 </para>
 <itemizedlist>
 <listitem>
 <para>Import users 
 </para></listitem></itemizedlist>
-<para>Choose your new template when doing csv import; testing it with a few users recommended. 
+<para>Choose your new template when doing csv import; testing it with a few users is recommended. 
 </para>
 </section>
 </section>
@@ -1825,16 +1869,16 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
  echo "$created_dir folders have been created"]]></screen>
 </section>
 
-<section id="AdvancedAdministration--Easy_access_to_USB_drives_and_CDROMs.2BAC8DVDs">
-<title>Easy access to USB drives and CDROMs/DVDs
+<section id="AdvancedAdministration--Easy_access_to_USB_drives_and_CD-ROMs.2BAC8DVDs">
+<title>Easy access to USB drives and CD-ROMs/DVDs
 </title>
-<para>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. 
+<para>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 any other normal installation. 
 </para>
-<para>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. 
+<para>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 automatically mounted and it is possible to access it browsing to the /media/$user folder. This is quite difficult for many non experienced users. 
 </para>
 <para>It is possible to have the default KDE "Plasma" file manager Dolphin showing up if KDE "Plasma" (or LDXE, if installed in parallel to KDE "Plasma") is in use as desktop environment. To configure this, simply execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal server. (When using GNOME, device icons will be placed on the desktop allowing easy access).  
 </para>
-<para>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. 
+<para>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-ROM / 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. 
 </para><screen><![CDATA[ #!/bin/bash
  home_path="/skole/tjener/home0"
  shared_folder="media"
@@ -1857,8 +1901,6 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 </para>
 <para>If remote users acknowledge the popup or use pmount from the console, they can even mount the removable devices and access the files. 
 </para>
-<para>This is being tracked as <ulink url="http://bugs.skolelinux.org/1376">Debian Edu bug #1376</ulink>. 
-</para>
 </section>
 </section>
 </section>
@@ -1870,7 +1912,7 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 </para>
 <itemizedlist>
 <listitem>
-<para>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. 
+<para>Add a new system of type <computeroutput>server</computeroutput> using GOsa² as outlined in the <link linkend="GettingStarted--Machine_Management_with_GOsa.2BALI-">Getting started</link> chapter of this manual. 
 </para>
 <itemizedlist><listitem override="none">
 <para>This example uses 'nas-server.intern' as the server name. Once 'nas-server.intern' is configured, check if the NFS export points on the new storage server are exported to the relevant subnets or machines: 
@@ -1907,7 +1949,7 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 <para>Add the relevant entries in tjener.intern:/etc/fstab, because tjener.intern does not use automount to avoid mounting loops: 
 </para>
 <itemizedlist><listitem override="none">
-<para>Create the mount directories using <computeroutput>mkdir</computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount -a</computeroutput> to mount the new resources. 
+<para>Create the mount point directories using <computeroutput>mkdir</computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount -a</computeroutput> to mount the new resources. 
 </para></listitem></itemizedlist></listitem></itemizedlist>
 <para>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. 
 </para>
@@ -1928,7 +1970,7 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 </para>
 <itemizedlist>
 <listitem>
-<para>Create a group <computeroutput>sshusers</computeroutput> on the root level (where already other system management related groups like <computeroutput>gosa-admins</computeroutput> show up). 
+<para>Create a group <computeroutput>sshusers</computeroutput> on the base level (where already other system management related groups like <computeroutput>gosa-admins</computeroutput> show up). 
 </para></listitem>
 <listitem>
 <para>Add users to the new group <computeroutput>sshusers</computeroutput>. 
@@ -1956,7 +1998,7 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 + : ALL : 10.0.0.0/8 192.168.0.0/24 192.168.1.0/24
 - : ALL : ALL
 #]]></screen>
-<para>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. 
+<para>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 box to the dedicated LTSP client network(s) will gain ssh access to the LTSP server(s) as well. 
 </para>
 </section>
 
@@ -3357,7 +3399,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), 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), 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>
@@ -3365,9 +3407,9 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </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>
-<para>The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) and is released under the GPL v2 or any later version. 
+<para>The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, 2016) and is released under the GPL v2 or any later version. 
 </para>
-<para>The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, 2016) and is released under the GPL v2 or any later version. 
+<para>The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, 2016, 2017) and is released under the GPL v2 or any later version. 
 </para>
 <para>The Japanese translation is copyrighted by victory (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 18137c2..0f33504 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-01-20 12:40+0000\n"
+"POT-Creation-Date: 2017-02-19 12:02+0000\n"
 "PO-Revision-Date: 2016-12-24 00:48+0800\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
@@ -74,6 +74,19 @@ msgstr ""
 "的已完全配置的学校网络环境。"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Directly after installation of a school server all services needed for a "
+#| "school network are set up (see the next chapter <link linkend="
+#| "\"Architecture\">details of the architecture of this setup</link>) and "
+#| "the system is ready to be used. Only users and machines need to be added "
+#| "via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting "
+#| "environment using PXE has also been prepared, so after initial "
+#| "installation of the main server from CD, Blu-ray disc or USB flash drive "
+#| "all other machines can be installed via the network, this includes "
+#| "\"roaming workstations\" (ones that can be taken away from the school "
+#| "network, usually laptops or netbooks) as well as PXE booting for diskless "
+#| "machines like traditional thin-clients."
 msgid ""
 "Directly after installation of a school server all services needed for a "
 "school network are set up (see the next chapter <link linkend=\"Architecture"
@@ -84,7 +97,7 @@ msgid ""
 "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."
+"PXE booting for diskless machines like traditional thin clients."
 msgstr ""
 "一俟学校网络所需所有服务的学校服务器安装之后就是设置(参看下一章 <link "
 "linkend=\"Architecture\">details of the architecture of this setup</link>) "
@@ -130,8 +143,15 @@ msgstr ""
 "法。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The Skolelinux project in Norway was founded on Juli 2nd 2001 and about "
+#| "the same time Raphaël Hertzog started Debian-Edu in France. Since 2003 "
+#| "both projects are united, but both names stayed. \"Skole\" and "
+#| "(Debian-)\"Education\" are just two well understood terms in these "
+#| "regions."
 msgid ""
-"The Skolelinux project in Norway was founded on Juli 2nd 2001 and about the "
+"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 "
 "projects are united, but both names stayed. \"Skole\" and "
 "(Debian-)\"Education\" are just two well understood terms in these regions."
@@ -185,9 +205,9 @@ msgstr "Debian Edu 网络拓扑"
 #| "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, "
-"while allowing the inclusion of both normal workstations and LTSP-servers "
-"(with associated thin-clients and/or diskless workstations). The number of "
+"a Skolelinux network assumes that there is one (and only one) main server, "
+"while allowing the inclusion of both normal workstations and LTSP servers "
+"(with associated thin clients and/or diskless workstations). The number of "
 "workstations can be as large or small as you want (starting from none to a "
 "lot). The same goes for the LTSP servers, each of which is on a separate "
 "network so that the traffic between the clients and the LTSP server doesn't "
@@ -200,12 +220,20 @@ msgstr ""
 "余的网络服务器。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The reason that there can only be one main server in each school network "
+#| "is that the main server provides DHCP, and there can be only one machine "
+#| "doing so in each network. It is possible to move services from the main "
+#| "server to other machines by setting up the service on another machine, "
+#| "and subsequently updating the DNS-configuration, pointing the DNS alias "
+#| "for that service to the right computer."
 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 "
+"subsequently updating the DNS configuration, pointing the DNS alias for that "
 "service to the right computer."
 msgstr ""
 "在每个学校网络中仅能有一个主服务器的原因是主服务器提供 DHCP,因而在每一网络中"
@@ -240,9 +268,15 @@ msgstr ""
 "行内存测试,或者从本地硬盘引导。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is designed to be modified - that is, you can have the NFS-root in "
+#| "syslinux point to one of the LTSP servers or change the DHCP next-server "
+#| "option (stored in LDAP) to have clients directly boot via PXE from the "
+#| "terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"syslinux pointing 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."
 msgstr ""
@@ -278,9 +312,9 @@ msgstr "主服务器 (tjener)"
 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 LTSP-server and "
-"workstation profiles in addition to the main server profile."
+"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 LTSP Server and "
+"Workstation profiles in addition to the Main Server profile."
 msgstr ""
 "一个 Skolelinux 网络需要一个主服务器(也称作 \"tjener\" 是挪威语“服务器”的意"
 "思)预先缺省 IP 地址为 10.0.2.2 并由选择主服务器profile而安装。除了主服务器"
@@ -304,14 +338,14 @@ msgstr "运行在主服务器上的服务"
 #| "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 "
+"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 LTSP-server(s) should be separate (though it is possible to "
-"install both the main server and LTSP server profiles on the same machine). "
+"reasons, the LTSP server(s) should be separate (though it is possible to "
+"install both the Main Server and LTSP 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 "
+"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)."
 msgstr ""
@@ -542,6 +576,14 @@ msgid "ltsp"
 msgstr "ltsp"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "Network Block Device Server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+msgid "NBD"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -550,11 +592,11 @@ msgstr "以错误报告监视机器和服务,和 Web 上的Status与历史。
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
 #| msgid "munin, nagios and site-summary"
-msgid "munin, icinga and site-summary"
+msgid "Munin, Icinga and Sitesummary"
 msgstr "munin, nagios 和 site-summary"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "site-summary"
+msgid "sitesummary"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -570,13 +612,21 @@ msgstr ""
 "通过 NFS 的 Unix 客户端,SMB 的 Windows 和 Macintosh 客户端提供存取通路。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By default email is set up for local delivery (i.e. within the school) "
+#| "only, though email delivery to the wider Internet may be set up if the "
+#| "school has a permanent Internet connection. Mailing lists are set up "
+#| "based on the user database, giving each class their own mailing list. "
+#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
+#| "users can <link linkend=\"Users--Using_email\">access their personal "
+#| "mail</link> through IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
-"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."
+"a permanent Internet connection. 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."
 msgstr ""
 "缺省电子邮件设置仅为本地投递(即学校内),不过若学校有固定互联网连接可以设置"
 "电子邮件投递到更宽广的互联网。设置基于用户数据库的邮件列表,给予每个班级他们"
@@ -612,7 +662,7 @@ msgstr ""
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding LTSP-server via the "
+"while thin clients are connected to the corresponding LTSP server via the "
 "separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
 "of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
@@ -703,7 +753,7 @@ msgstr ""
 #| "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 "
+"network, or connected to a server, workstation or LTSP 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."
@@ -724,7 +774,7 @@ msgstr ""
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
-"selecting the LTSP server profile."
+"selecting the LTSP Server profile."
 msgstr ""
 "一个 Skolelinux 网络上可以有许多 LTSP 服务器(亦称瘦客户端服务器),是由选择"
 "瘦客户端服务器profile而安装。"
@@ -740,6 +790,16 @@ msgid ""
 msgstr ""
 "瘦客户端服务器设置接收来自瘦客户端的日志,并转递这些信息到中央日志接受者。"
 
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Please note: Thin clients are using the programs installed on the server. "
+"Diskless workstations are using the programs installed in the server's LTSP "
+"chroot, the client root filesystem is provided using NBD (Network Block "
+"Device). After each modification to the LTSP chroot the related NBD image "
+"has to be re-generated; run <computeroutput>ltsp-update-image</"
+"computeroutput> on the LTSP server."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Thin clients"
 msgstr "瘦客户端"
@@ -756,16 +816,27 @@ msgstr ""
 "设置使用的是 Linux 终端服务器项目 (LTSP)。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients are a good way to make use of older, weaker machines as they "
+#| "effectively run all programs on the LTSP server. This works as follows: "
+#| "the service uses DHCP and TFTP to connect to the network and boot from "
+#| "the network. Next, the file system is mounted via NFS from the LTSP "
+#| "server, and finally the X Window System is started. The display manager "
+#| "(LDM) connects to the LTSP server via SSH with X-forwarding. This way all "
+#| "data is encrypted on the network. For very old thin clients which are too "
+#| "slow for the encryption this can be set to the behavior from former "
+#| "versions, which is to use a direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
 "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."
+"network. Next, the file system is mounted from the LTSP server using NBD, "
+"and finally the X Window System is started. The display manager (LDM) "
+"connects to the LTSP server via SSH with X-forwarding. This way all data is "
+"encrypted on the network. For very old thin clients which are too slow for "
+"the encryption this can be set to the behavior from former versions, which "
+"is to use a direct X connection via XDMCP."
 msgstr ""
 "瘦客户端是实际在 LTSP 服务器上运行所有程序而使用较陈旧,性能不佳机器的好方"
 "法。这个工作顺序是:该服务使用 DHCP 和 TFTP 连接到网络并从网络引导。接下来,"
@@ -834,27 +905,23 @@ msgid "Administration"
 msgstr "管理"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Linux machines that are installed with the Skolelinux installer "
+#| "will be administrable from a central computer, most likely the server. It "
+#| "will be possible to log in to all machines via SSH (root not allowed by "
+#| "default), and thereby have full access to the machines."
 msgid ""
 "All the Linux machines that are installed with the Skolelinux installer will "
 "be administrable from a central computer, most likely the server. It will be "
-"possible to log in to all machines via SSH (root not allowed by default), "
-"and thereby have full access to the machines."
+"possible to log in to all machines via SSH (by default, root is not allowed "
+"to log in with password), and thereby have full access to the machines."
 msgstr ""
 "由 Skolelinux 安装程序安装的所有 Linux 机器将能从中央计算机管理,最适合服务"
 "器。将能通过 SSH (缺省 root 不被允许)登录到所有机器,从而完全访问这些机器。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"We use cfengine to edit configuration files. These files are updated from "
-"the server to the clients. In order to change the client configuration, it "
-"suffices to edit the server configuration and let the automation distribute "
-"the changes."
-msgstr ""
-"我们使用 cfengine 来编辑配置文件。这些文件从服务器更新到客户端。为了改变客户"
-"端配置,其能满足编辑服务器配置并使之自动分发变化。"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
 "authentication."
@@ -876,8 +943,12 @@ msgstr ""
 "以从 USB 棒被引导。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The aim is to be able to install a server from any type medium once, and "
+#| "install all other clients over the network by booting from the network."
 msgid ""
-"The aim is to be able to install a server from any type medium once, and "
+"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."
 msgstr ""
 "力求一旦能从任何类型媒体安装服务器,而由网络引导在网络上安装其他客户端。"
@@ -1121,8 +1192,13 @@ msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 连接到主网(10.0.0.0/8)。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but "
+#| "<link linkend=\"NetworkClients--Use_a_different_LTSP_client_network"
+#| "\">others are possible</link>."
 msgid ""
-"eth1 is used for serving LTSP clients (192.168.0.0/24 as default, but <link "
+"eth1 is used for serving LTSP clients (192.168.0.0/24 as default), but <link "
 "linkend=\"NetworkClients--Use_a_different_LTSP_client_network\">others are "
 "possible</link>."
 msgstr ""
@@ -1234,6 +1310,58 @@ msgstr ""
 
 #. 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."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "Select type of installation"
+msgid "After the installation:"
+msgstr "选择安装类型"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Adjust the /etc/network/interfaces file."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Change the hostname permanently to 'gateway'."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "As an option install a firewall and / or a traffic shaping tool."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+" # Turn a system with profile 'Minimal' into a gateway/firewall. \n"
+" #\n"
+" sed -i 's/auto eth0/auto eth0 eth1/' /etc/network/interfaces\n"
+" sed -i '/eth1/ s/dhcp/static/' /etc/network/interfaces\n"
+" echo 'address 10.0.0.1' >> /etc/network/interfaces\n"
+" echo 'netmask 255.0.0.0' >> /etc/network/interfaces\n"
+" hostname -b gateway\n"
+" hostname > /etc/hostname \n"
+" service networking stop\n"
+" service networking start\n"
+" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
+" service enable-nat restart\n"
+" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" #apt update\n"
+" #apt install shorewall\n"
+" # or\n"
+" #apt install ufw\n"
+" #apt install wondershaper"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "The router should not run a DHCP server, it can run a DNS server, though "
 "this is not needed and will not be used."
 msgstr ""
@@ -1251,12 +1379,20 @@ msgstr ""
 "floppyfw\">floppyfw</ulink>。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you need something for an embedded router or accesspoint we recommend "
+#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
+#| "you can also use the original firmware. Using the original firmware is "
+#| "easier; using OpenWRT gives you more choices and control. Check the "
+#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
+#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
 "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"
+"webpages for a list of <ulink url=\"http://wiki.openwrt.org/toh/start"
 "\">supported hardware</ulink>."
 msgstr ""
 "如果你需要固定路由或访问点的某事我们建议使用 <ulink url=\"http://openwrt.org"
@@ -1346,14 +1482,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
-"iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-CD."
 "iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
 msgstr ""
@@ -1373,12 +1501,20 @@ msgid "USB drive ISO image for i386 and amd64"
 msgstr "i386 和 amd64 的 USB 驱动器 ISO 镜像"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
+#| "installation of amd64 and i386 machines. Like the netinstall image it can "
+#| "be installed on USB flash drives or disk media of sufficient size. Please "
+#| "note that internet access during installation is needed. Like the others "
+#| "it can be downloaded over FTP, HTTP or rsync via:"
 msgid ""
-"The multi-architecture ISO image is 5.2 GiB large and can be used for "
+"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 "
 "installed on USB flash drives or disk media of sufficient size. Please note "
-"that internet access during installation is needed. Like the others it can "
-"be downloaded over FTP, HTTP or rsync via:"
+"that internet access is needed during installation if the 'LTSP Server' "
+"profile is chosen. Like the others it can be downloaded over HTTP or rsync "
+"via:"
 msgstr ""
 "多架构 ISO 镜像是 5.2 BiB 大并用于安装 amd64 和 i386 机器。像网络安装媒体一样"
 "它可以被安置于 USB 闪存或足够大小的媒介盘。请注意安装时需要互联网访问。像其他"
@@ -1386,14 +1522,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-USB."
-"iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
 "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
 msgstr ""
@@ -1442,11 +1570,19 @@ msgid "Installing Debian Edu"
 msgstr "安装 Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 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 "
 "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 "
+"Edu is Debian, and if you want there are more than 52,000 packages to choose "
 "from and a billion configuration options. For the majority of our users, our "
 "defaults should be fine."
 msgstr ""
@@ -1649,7 +1785,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid "Additional boot parameters for installations"
-msgid "<emphasis>Additional boot parameters for installations</emphasis>"
+msgid "<emphasis>Add or change boot parameters for installations</emphasis>"
 msgstr "另外的安装引导参数"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1659,9 +1795,20 @@ msgstr "另外的安装引导参数"
 #| "boot menu."
 msgid ""
 "In both cases, boot options can be edited by pressing the TAB key in the "
-"boot menu."
+"boot menu; the screenshot shows the command line for <emphasis role=\"strong"
+"\">Graphical install</emphasis>."
 msgstr "在 i386/amd64 中,以在引导菜单中按 TAB 键可以编辑引导选项。"
 
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/BD_command_line.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Edit command line options"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
@@ -1691,27 +1838,36 @@ msgstr ""
 #| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
-"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
+"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
+"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
 msgstr ""
 "安装 <emphasis role=\"strong\">GNOME</emphasis> 桌面代替 <emphasis role="
 "\"strong\">KDE \"Plasma\"</emphasis> 桌面,加入 "
 "<computeroutput>desktop=gnome</computeroutput> 到内核引导参数。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
+"intended to be used.)"
 msgstr ""
 "替代安装 <emphasis role=\"strong\">LXDE</emphasis> 桌面,加入 "
 "<computeroutput>desktop=lxde</computeroutput> 到内核引导参数。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-"parameters."
+"use <computeroutput>desktop=xfce</computeroutput>."
 msgstr ""
 "替代安装 <emphasis role=\"strong\">Xfce</emphasis> 桌面,加入 "
 "<computeroutput>desktop=xfce</computeroutput> 到内核引导参数。"
@@ -1723,9 +1879,8 @@ msgstr ""
 #| "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
 #| "boot parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
-"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
-"parameters."
+"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+"instead, use <computeroutput>desktop=mate</computeroutput>."
 msgstr ""
 "而改为安装 <emphasis role=\"strong\">MATE</emphasis> 桌面,加入 "
 "<computeroutput>desktop=mate</computeroutput> 到内核引导参数。"
@@ -1751,7 +1906,9 @@ msgstr ""
 "个网卡 (NIC)。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a language (for the installation and the installed system)"
+#, fuzzy
+#| msgid "Choose a language (for the installation and the installed system)"
+msgid "Choose a language (for the installation and the installed system)."
 msgstr "选择一种语言(对于本安装及安装后的系统)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1759,7 +1916,9 @@ msgid "Choose a location which normally should be the location where you live."
 msgstr "选择一个区域那通常是你生活的地方。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose a keyboard keymap (the country's default is usually fine)"
+#, fuzzy
+#| msgid "Choose a keyboard keymap (the country's default is usually fine)"
+msgid "Choose a keyboard keymap (the country's default is usually fine)."
 msgstr "选择键盘布局(缺省的地区通常很好)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1767,7 +1926,9 @@ msgid "Choose profile(s) from the following list:"
 msgstr "从以下列表中选择profile:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">Main Server</emphasis>"
 msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1780,9 +1941,9 @@ msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 #| "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 only install one main server per "
+"configured to work out of the box. You must install only 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 LTSP-Server in "
+"want a graphical user interface, then select Workstation or LTSP Server in "
 "addition to this one."
 msgstr ""
 "这是为你的学校提供所有服务的预配置开箱即可工作的主服务器 (tjener)。每一个学校"
@@ -1822,7 +1983,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
-msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP Server</emphasis>"
 msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1839,11 +2000,12 @@ msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 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 "
-"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) - an LTSP server can always be used as a workstation, too."
+"computer needs two network interfaces, 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) - an LTSP server can always be used as a workstation, "
+"too."
 msgstr ""
 "一个瘦客户(和无盘工作站)服务器,也称为 LTSP 服务器。客户端没有硬盘驱动器而"
 "是从服务器引导和运行软件。这台计算机需要两个网卡,大量的内存,适合更多的处理"
@@ -1903,7 +2065,7 @@ msgid ""
 "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 an LTSP server to become usefull after the installation."
+"server or as an LTSP server to become useful after the installation."
 msgstr ""
 "<emphasis role=\"strong\">主服务器</emphasis>,<emphasis role=\"strong\">工作"
 "站</emphasis>和<emphasis role=\"strong\">瘦客户端服务器</emphasis>profiles已"
@@ -1914,20 +2076,6 @@ msgstr ""
 "PXE</link> 安装。清注意在所安装的机器上必需有两个网卡在安装之后被安装成有用的"
 "组合主服务器或作为瘦客户端服务器。"
 
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"The ordering of the network cards after installation might differ from the "
-"ordering during installation. The wanted ordering can be achieved by editing "
-"<computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: "
-"Usually <emphasis>if this happens</emphasis>, you will want to replace eth0 "
-"with eth1 and eth1 with eth0; a reboot is needed for the changes to take "
-"effect."
-msgstr ""
-"安装之后的网卡顺序可能与安装期间的顺序不同。由编辑 <computeroutput>/etc/udev/"
-"rules.d/70-persistent-net.rules</computeroutput> 实现其想要的顺序:通常"
-"<emphasis>这如果出现了</emphasis>,你将需要以 eth1 代替 eth0 或以 eth0 代替 "
-"eth1;需要重新启动使这个变化生效。"
-
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -1956,7 +2104,7 @@ msgstr ""
 #| "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 "
+"Wait. If the selected profiles include LTSP Server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
 "debian-edu-profile-udeb...\""
 msgstr ""
@@ -2056,7 +2204,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
 #| msgid "A note on thin-client-server installations"
-msgid "A note on LTSP-server installations using only Thin-Clients"
+msgid "Notes on LTSP Server installations using only Thin-Clients"
 msgstr "瘦客户端服务器安装的注释"
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -2169,8 +2317,8 @@ msgstr ""
 #| "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> "
+"This is how the PXE menu looks with the <emphasis role=\"strong\">Main "
+"Server</emphasis> and <emphasis role=\"strong\">LTSP Server</emphasis> "
 "profiles:"
 msgstr ""
 "这是有<emphasis role=\"strong\">主服务器</emphasis>和<emphasis role=\"strong"
@@ -2184,6 +2332,12 @@ msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
+"To install a desktop environment of your choice instead of the default one, "
+"press TAB and edit the kernel boot options (like explained above)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
 "to be added to LDAP with GOsa², but can be, for example if you want to force "
@@ -2337,10 +2491,10 @@ msgstr ""
 #| "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 + "
+"So here is a screenshot tour through a graphical 64-bit Main Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
-"the tjener, a PXE boot on the workstation network and on the thinclient "
-"network:"
+"the main server, a PXE boot on the workstation network and on the LTSP "
+"client network:"
 msgstr ""
 "那么这里是自始至终的主服务器 + 工作站 + 瘦客户端服务器的图形安装以及所看到的 "
 "tjener 第一次引导,在工作站网络和瘦客户端网络上 PXE 引导的屏幕快照观览:"
@@ -2550,8 +2704,10 @@ msgid "tjener KDM Login"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
-msgstr ""
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
+msgstr "./images/alert.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE and Browser"
@@ -2560,7 +2716,7 @@ msgstr ""
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
 #| msgid "./images/alert.png"
-msgid "./images/27-Tjener-MATE_Desktop.png"
+msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/alert.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2584,7 +2740,13 @@ msgid "Diskless Workstation Login"
 msgstr "无盘工作站"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/31-ThinClient-MATE_Desktop.png"
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/31-ThinClient-KDE_Desktop.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop and Menu"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -2607,6 +2769,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"See the information about Debian Edu specific <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Stretch//"
+"Architecture#File_system_access_configuration\">file system access "
+"configuration</ulink> before adding users."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "After the installation, the first things you need to do as first user are:"
 msgstr ""
 
@@ -2628,8 +2798,8 @@ msgstr ""
 #. 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."
+"this chapter completely. It covers how to perform these minimum steps "
+"correctly as well as other stuff that everybody will probably need to do."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2656,8 +2826,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "Debian Edu MATE desktop"
-msgstr ""
+#, fuzzy
+#| msgid "The Debian Edu network topology"
+msgid "Debian Edu KDE desktop"
+msgstr "Debian Edu 网络拓扑"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2700,11 +2872,11 @@ msgstr ""
 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 + LTSP 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>."
+"installed as a so called combined server (Main Server + LTSP Server + "
+"Workstation profiles). 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>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -2761,10 +2933,9 @@ 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 LTSP 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."
+"network. With LDAP, account information about students, 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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3137,12 +3308,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This setup also allows diskless workstations and thin clients to be "
+#| "booted on the main network. Unlike workstations, diskless workstations "
+#| "don't have to be added to LDAP with GOsa², but can be, for example if you "
+#| "want to force the hostname."
 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"
+"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
 "\">can</emphasis>."
 msgstr ""
+"这个设置也允许无盘工作站和瘦客户端在主网上被引导。不像工作站,无盘工作站没有"
+"用 GOsa² 被添加到 LDAP,但可以,为示例如果你想要强行主机名。"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -3178,9 +3357,9 @@ msgid ""
 "has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
 "shows usage information. Please note, that the IP addresses shown after "
 "usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-"dynamic IP range. These systems can then be modified 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 "
+"dynamic IP range. These systems can then be modified to suit your network: "
+"rename each new system, activate DHCP and DNS, add it to netgroups if "
+"needed, reboot the system afterwards. The following screenshots show how "
 "this looks in practice:"
 msgstr ""
 
@@ -3339,7 +3518,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Remember to configure workstations and ltsp-servers properly with GOsa², or "
+"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."
@@ -3377,9 +3556,9 @@ msgstr ""
 
 #. 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."
+"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 "
+"be used during exams."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3507,6 +3686,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
+"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+"NBD image(s)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
 "It is also a good idea to install <computeroutput>cron-apt</computeroutput> "
 "and <computeroutput>apt-listchanges</computeroutput> and configure them to "
 "send mail to an address you are reading."
@@ -3525,8 +3710,9 @@ msgstr ""
 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>."
+"configured as described on <ulink url=\"https://wiki.debian.org/"
+"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
+"installations security updates are enabled by default."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3563,7 +3749,8 @@ msgid ""
 "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)."
+"temporarily allow ssh root login on the backup server (main server 'tjener' "
+"by default)."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -3652,7 +3839,7 @@ msgid ""
 "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 "
+"root on the sitesummary server (normally the main server).  This will update "
 "the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
 msgstr ""
 
@@ -3660,15 +3847,15 @@ msgstr ""
 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/"
+"program which probes the plugins available from <computeroutput>/usr/share/"
 "munin/plugins/</computeroutput> and symlinks the relevant ones to "
 "<computeroutput>/etc/munin/plugins/</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Information about Munin is available from <ulink url=\"http://munin.projects."
-"linpro.no/\"/> ."
+"Information about Munin is available from <ulink url=\"http://munin-"
+"monitoring.org/\"/>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -4315,7 +4502,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "$ sudo apt-get update\n"
-"  $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
+"  $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
 "  # after installation, start a graphical session for the first user \n"
 "  $ startx"
 msgstr ""
@@ -4408,12 +4595,12 @@ msgstr ""
 #. 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 "
+"are pushed into the stable suite regularly when stable point releases are "
 "done, which roughly happens every two months."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using backports.debian.org to install newer software"
+msgid "Using backports to install newer software"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4459,8 +4646,9 @@ msgstr ""
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+"this <ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+"ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4499,7 +4687,7 @@ msgstr ""
 
 #. 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-"
+"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 "
 "correcting for several possible mis-burns and verifying the index files."
 msgstr ""
@@ -4507,7 +4695,7 @@ msgstr ""
 #. 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 "
+"done by hand. Furthermore each disk in a multi-CD set must be inserted and "
 "scanned separately to account for possible mis-burns."
 msgstr ""
 
@@ -4528,7 +4716,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"<computeroutput>killer</computeroutput> is is a perl script that gets rid of "
+"<computeroutput>killer</computeroutput> 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."
@@ -4758,8 +4946,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
-msgid "Advanced administration"
-msgstr ""
+#, fuzzy
+#| msgid "Administration"
+msgid "Advanced administration howto"
+msgstr "管理"
 
 #. type: Content of: <article><section><para>
 msgid "In this chapter advanced administration tasks are described."
@@ -4776,13 +4966,15 @@ msgstr ""
 #. 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 "
+"directories for each group (home0/2014, home0/2015, etc). We want to create "
 "the users by csv import."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
-msgid "<emphasis>(as root on Tjener) </emphasis>"
-msgstr ""
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis>(as root on the main server) </emphasis>"
+msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Make the necessary year group directories"
@@ -4828,14 +5020,19 @@ msgstr ""
 #. 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 "
+"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."
+"Samba tabs, maybe take screenshots to have information ready for the new "
+"template."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4845,7 +5042,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Choose your new template when doing csv import; testing it with a few users "
-"recommended."
+"is recommended."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4895,19 +5092,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"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 "
 "any other normal installation."
 msgstr ""
 
 #. 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 "
+"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 "
 "automatically mounted and it is possible to access it browsing to the /media/"
 "$user folder. This is quite difficult for many non experienced users."
@@ -4926,9 +5123,9 @@ msgstr ""
 #. 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."
+"\" for all users in their home folder for easy access to USB drives, CD-"
+"ROM / 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."
 msgstr ""
 
 #. type: CDATA
@@ -4966,12 +5163,6 @@ msgid ""
 "can even mount the removable devices and access the files."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-
 #. type: Content of: <article><section><section><title>
 msgid "Use a dedicated storage server"
 msgstr ""
@@ -4984,9 +5175,10 @@ msgstr ""
 
 #. 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."
+"Add a new system of type <computeroutput>server</computeroutput> using GOsa² "
+"as outlined in the <link linkend=\"GettingStarted--"
+"Machine_Management_with_GOsa.2BALI-\">Getting started</link> chapter of this "
+"manual."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -5066,9 +5258,9 @@ msgstr ""
 
 #. 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."
+"Create the mount point directories using <computeroutput>mkdir</"
+"computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount "
+"-a</computeroutput> to mount the new resources."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5105,7 +5297,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Create a group <computeroutput>sshusers</computeroutput> on the root level "
+"Create a group <computeroutput>sshusers</computeroutput> on the base level "
 "(where already other system management related groups like "
 "<computeroutput>gosa-admins</computeroutput> show up)."
 msgstr ""
@@ -5157,9 +5349,9 @@ 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."
+"dropped to disable internal ssh login access. Note: someone connecting his "
+"box to the dedicated LTSP client network(s) will gain ssh access to the LTSP "
+"server(s) as well."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -7789,10 +7981,10 @@ 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), 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."
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -7824,14 +8016,14 @@ msgstr ""
 
 #. 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."
+"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
+"2016) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
 "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
-"2016) and is released under the GPL v2 or any later version."
+"2016, 2017) and is released under the GPL v2 or any later version."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -9834,6 +10026,42 @@ msgid ""
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgstr ""
 
+#~ msgid ""
+#~ "We use cfengine to edit configuration files. These files are updated from "
+#~ "the server to the clients. In order to change the client configuration, "
+#~ "it suffices to edit the server configuration and let the automation "
+#~ "distribute the changes."
+#~ msgstr ""
+#~ "我们使用 cfengine 来编辑配置文件。这些文件从服务器更新到客户端。为了改变客"
+#~ "户端配置,其能满足编辑服务器配置并使之自动分发变化。"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "CD.iso\">debian-edu-9+edu0~a0-CD.iso</ulink>"
+
+#~ msgid ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+#~ msgstr ""
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-9+edu0~a0-"
+#~ "USB.iso\">debian-edu-9+edu0~a0-USB.iso</ulink>"
+
+#~ msgid ""
+#~ "The ordering of the network cards after installation might differ from "
+#~ "the ordering during installation. The wanted ordering can be achieved by "
+#~ "editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+#~ "computeroutput>: Usually <emphasis>if this happens</emphasis>, you will "
+#~ "want to replace eth0 with eth1 and eth1 with eth0; a reboot is needed for "
+#~ "the changes to take effect."
+#~ msgstr ""
+#~ "安装之后的网卡顺序可能与安装期间的顺序不同。由编辑 <computeroutput>/etc/"
+#~ "udev/rules.d/70-persistent-net.rules</computeroutput> 实现其想要的顺序:通"
+#~ "常<emphasis>这如果出现了</emphasis>,你将需要以 eth1 代替 eth0 或以 eth0 "
+#~ "代替 eth1;需要重新启动使这个变化生效。"
+
 #~ msgid "{{attachment:23-Tjener-KDM_Login.png}}"
 #~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
 
@@ -9843,9 +10071,6 @@ msgstr ""
 #~ msgid "LTSP server(s) (Thin client server(s))"
 #~ msgstr "LTSP 服务器(瘦客户端服务器)"
 
-#~ msgid "Select type of installation"
-#~ msgstr "选择安装类型"
-
 #~ msgid ""
 #~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
 #~ "amd64 GTK installer where you can use the mouse."
diff --git a/documentation/debian-edu-stretch/images/26-Tjener-KDE_Desktop_Browser.png b/documentation/debian-edu-stretch/images/26-Tjener-KDE_Desktop_Browser.png
new file mode 100644
index 0000000..f5a1e86
Binary files /dev/null and b/documentation/debian-edu-stretch/images/26-Tjener-KDE_Desktop_Browser.png differ
diff --git a/documentation/debian-edu-stretch/images/27-Tjener-KDE_Desktop.png b/documentation/debian-edu-stretch/images/27-Tjener-KDE_Desktop.png
new file mode 100644
index 0000000..beba729
Binary files /dev/null and b/documentation/debian-edu-stretch/images/27-Tjener-KDE_Desktop.png differ
diff --git a/documentation/debian-edu-stretch/images/31-ThinClient-KDE_Desktop.png b/documentation/debian-edu-stretch/images/31-ThinClient-KDE_Desktop.png
new file mode 100644
index 0000000..95f2db5
Binary files /dev/null and b/documentation/debian-edu-stretch/images/31-ThinClient-KDE_Desktop.png differ
diff --git a/documentation/debian-edu-stretch/images/BD_command_line.png b/documentation/debian-edu-stretch/images/BD_command_line.png
new file mode 100644
index 0000000..e0950df
Binary files /dev/null and b/documentation/debian-edu-stretch/images/BD_command_line.png differ

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