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

[Holger Levsen]

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

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

commit 9cc48c96f6e9e0d9b4a82ff7133df990966afefb
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Dec 3 18:02:48 2016 +0100

    Update Debian Edu Stretch manual from the wiki.
    
    As a notable change, the "Thin-Client Server" profile has been renamed to
    "LTSP Server", which has been reflected in various places in the manual.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                                   |   4 +-
 .../debian-edu-stretch-manual.da.po                | 479 +++++++++++++++-----
 .../debian-edu-stretch-manual.de.po                | 491 +++++++++++++++-----
 .../debian-edu-stretch-manual.es.po                | 399 ++++++++++++-----
 .../debian-edu-stretch-manual.fr.po                | 456 ++++++++++++++-----
 .../debian-edu-stretch-manual.it.po                | 456 ++++++++++++++-----
 .../debian-edu-stretch-manual.ja.po                | 469 +++++++++++++++-----
 .../debian-edu-stretch-manual.nb.po                | 491 +++++++++++++++-----
 .../debian-edu-stretch-manual.nl.po                | 493 ++++++++++++++++-----
 .../debian-edu-stretch-manual.pl.po                | 290 +++++++-----
 .../debian-edu-stretch-manual.pot                  | 223 +++++-----
 .../debian-edu-stretch-manual.xml                  |  86 ++--
 12 files changed, 3102 insertions(+), 1235 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf6ee9b..967a1ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 debian-edu-doc (1.913~20161206) UNRELEASED; urgency=medium
 
-  * continue development
+  * Update Debian Edu Stretch manual from the wiki. As a notable change, the
+    "Thin-Client Server" profile has been renamed to "LTSP Server", which has
+    been reflected in various places in the manual.
 
  -- Holger Levsen <holger at debian.org>  Tue, 29 Nov 2016 01:23:53 +0100
 
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 be30c59..602528e 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: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+0000\n"
 "PO-Revision-Date: 2016-10-06 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -187,15 +187,26 @@ msgid "The Debian Edu network topology"
 msgstr "Debian Edu-netværkstopologi"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 "Figuren er en tegning af den forventede netværkstopologi. "
 "Standardopsætningen for et Skolelinuxnetværk antager, at der er en (og kun "
@@ -284,12 +295,19 @@ msgid "Main server (tjener)"
 msgstr "Hovedserver (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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 "
@@ -302,17 +320,29 @@ msgid "Services running on the main server"
 msgstr "Tjenester der kører på hovedserveren"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 "Med undtagelse af kontrollen af tynde klienter, så opsættes alle tjenester "
 "oprindeligt på en central computer (hovedserveren). Af ydelsesårsager skal "
@@ -534,8 +564,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "Servere for tynde klienter"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "Internetserver"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -609,13 +641,20 @@ msgstr ""
 "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 thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 "Netværkskonfiguration på klienterne udføres automatisk med brug af DHCP. "
 "Normale klienter allokeres IP-adresser i det private undernet 10.0.0.0/8, "
@@ -710,11 +749,18 @@ msgstr ""
 "og dermed sikre at hele netværket har den korrekt tidsangivelse."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 "Printere forbindes hvor det er passende, enten direkte til hovednetværket, "
@@ -724,22 +770,31 @@ msgstr ""
 "og adgangskontrol for printere."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "LTSP-servere (servere for tynde klienter)"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "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 "
 "klientserver."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The thin client servers are set up to receive syslog from the thin "
+#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 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."
@@ -914,12 +969,20 @@ msgstr ""
 "Kun netinstall-aftrykket kræver adgang til internettet under installation."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 "Installationen skal ikke spørge om noget, med undtagelse af det ønskede "
 "sprog (f.eks. norsk bokmål, nynorsk, samisk) og maskinprofil (server, "
@@ -1068,9 +1131,13 @@ msgstr ""
 "AMD K5) eller 64-bit (Debianarkitektur »amd64«) x86-processorer."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 "Mindst 2 GiB RAM for 30 klienter og 4 GiB RAM for 50-60 klienter anbefales "
 "til profilerne for hovedserveren og serveren for tynde klienter."
@@ -1134,8 +1201,8 @@ msgstr "Kravet for minimal diskplads afhænger af profilen som installeres:"
 #| "main server + thin client server: 60 GiB. As usual with disk space on a "
 #| "main server, \"the bigger the better\"."
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 "hovedserver + tynd klient-server: 60 GiB. Som sædvanlig med diskplads på en "
 "hovedserver, »jo større jo bedre«."
@@ -1143,7 +1210,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "thin client server: 40 GiB."
-msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "Server for tynde klienter: 40 GiB"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1151,8 +1218,12 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "arbejdsstation eller uafhængig: 30 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin client servers need two network cards when using the default network "
+#| "architecture:"
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 "Servere for tynde klienter skal have to netværkskort når netværkets "
@@ -1833,11 +1904,16 @@ msgid "The installation process"
 msgstr "Installationsprocessen"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#| "Stretch/Requirements\">system requirements</ulink> and make sure you have "
+#| "at least two network cards (NICs) if you plan on setting up a thin client "
+#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "Husk <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Stretch/"
 "Requirements\">systemkravene</ulink> og sikr dig at du har mindst to "
@@ -1864,12 +1940,19 @@ 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>
+#, fuzzy
+#| msgid ""
+#| "This is the main server (tjener) for your school providing all services "
+#| "pre-configured to work out of the box. You must only install one main "
+#| "server per school! This profile does not include a graphical user "
+#| "interface. If you want a graphical user interface, then select "
+#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"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 "
 "prækonfigureret til at virke ud af boksen. Du kan kun installere en "
@@ -1912,18 +1995,30 @@ msgstr ""
 "i tidligere udgivelser."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr "<emphasis role=\"strong\">Server for tynde klienter</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-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>
-msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+#, fuzzy
+#| msgid ""
+#| "A thin client (and diskless workstation) server, also called a LTSP "
+#| "server. Clients without hard drives boot and run software from this "
+#| "server. This computer needs two network cards, a lot of memory, and "
+#| "ideally more than one processor or core. See the chapter about <link "
+#| "linkend=\"NetworkClients\">networked clients</link> for more information "
+#| "on this subject. Choosing this profile also enables the workstation "
+#| "profile (even if it is not selected) - a thin client server can always be "
+#| "used as a workstation, too."
+msgid ""
+"A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
 "computer needs two network cards, a lot of memory, and ideally more than one "
 "processor or core. See the chapter about <link linkend=\"NetworkClients"
 "\">networked clients</link> for more information on this subject. Choosing "
 "this profile also enables the workstation profile (even if it is not "
-"selected) - a thin client server can always be used as a workstation, too."
+"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 "
@@ -1963,18 +2058,33 @@ msgstr ""
 "flytning væk fra hovedserveren."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
+#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
+#| "Client Server</emphasis> profiles are preselected. These profiles can be "
+#| "installed on one machine together if you want to install a so called "
+#| "<emphasis>combined main server</emphasis>. This means the main server "
+#| "will be a thin client server and also be used as a workstation. This is "
+#| "the default choice, since we assume most people will install <link "
+#| "linkend=\"Installation--"
+#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
+#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
+#| "cards installed in a machine which is going to be installed as a combined "
+#| "main server or as a thin client server to become usefull after the "
+#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 "Profilerne <emphasis role=\"strong\">Hovedserver</emphasis>, <emphasis role="
 "\"strong\">Arbejdsstation</emphasis> og <emphasis role=\"strong\">Server for "
@@ -2031,10 +2141,15 @@ msgstr ""
 "nem måde at hjælpe."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include Thin-client-server then the "
+#| "installer will spend quite some time at the end, \"Finishing the "
+#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"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 ""
 "Vent. Hvis de valgte profiler inkluderer serveren for tynde klienter, så vil "
 "installationsprogrammet bruge ret lang tid i slutningen, »Finishing the "
@@ -2142,27 +2257,21 @@ msgstr ""
 "nettet."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
+#, fuzzy
+#| msgid "A note on thin-client-server installations"
+msgid "A note 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>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
-msgstr ""
-"For det første er dette profilnavn forvirrende af historiske årsager. "
-"Aktuelt installerer denne profil rent faktisk et LTSP-servermiljø for tynde "
-"klienter og for arbejdsstationer. Debianfejl <ulink url=\"http://bugs.debian."
-"org/588510#\">588510</ulink> er blevet indsendt for at ændre navnet på "
-"profilen til et bedre valg."
-
-#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+#| "client</computeroutput> makes it possible to skip the step which converts "
+#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
+#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -2268,10 +2377,15 @@ msgid "width=400"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 "Sådan ser PXE-menuen ud med profilerne for <emphasis role=\"strong"
 "\">hovedserveren</emphasis> og <emphasis role=\"strong\">Serveren for tynde "
@@ -2455,9 +2569,9 @@ msgstr ""
 #| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 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 "
@@ -2938,10 +3052,20 @@ msgid "DHCP Administration"
 msgstr "DHCP-administration"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For GOsa² access you need the Skolelinux main server and a (client) "
+#| "system with a web browser installed which can be the main server itself "
+#| "if it was installed as a so called combined server (main server + thin "
+#| "client server + workstation). If all of the mentioned before is not "
+#| "available, see: <link linkend=\"Administration--"
+#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+#| "\">Installing a graphical environment on the main-server to use GOsa²</"
+#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server + "
+"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-"
@@ -3019,14 +3143,23 @@ msgstr ""
 "af skærmen, da den vil forblive synlig på alle administrationssider i GOsa²."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In Debian Edu, account, group, and system information is stored in an "
+#| "LDAP directory. This data is used not only by the main server, but also "
+#| "by the (diskless) workstations, the thin client servers and the Windows "
+#| "machines on the network. With LDAP, account information about students, "
+#| "pupils, teachers, etc. only needs to be entered once. After information "
+#| "has been provided in LDAP, the information will be available to all "
+#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 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) "
@@ -4280,12 +4413,22 @@ msgid "Nagios"
 msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. The set of machines and services being "
+#| "monitored is automatically generated using information collected by the "
+#| "sitesummary system. The machines with the profile Main-server and Thin-"
+#| "client-server receive full monitoring, while workstations and thin "
+#| "clients receive simple monitoring. To enable full monitoring on a "
+#| "workstation, install the <computeroutput>nagios-nrpe-server</"
+#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -4400,13 +4543,21 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "New package are available for upgrades.  The critical ones are normally "
+#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
+#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
+#| "client servers, remember to also update the LTSP chroot using "
+#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
+#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 "Nye pakker er tilgængelige for opgradering. De kritiske er normalt "
 "sikkerhedsmæssige rettelser. For at opgradere så kør »apt-get upgrade &"
@@ -4646,12 +4797,18 @@ msgstr ""
 "testmiljø eller har sikkerhedskopier klar til en gendannelse."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Please note that the following recipe applies to a default Debian Edu "
+#| "main server installation (desktop=kde, profiles Main-Server, Workstation, "
+#| "Thin-Client-Server). (For a general overview concerning jessie to stretch "
+#| "upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
+#| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 "Bemærk venligst at den følgende opskrift gælder for standardinstallationen "
 "af Debian Edus hovedserver (desktop=kde, profiler Main-Server, Workstation, "
@@ -7042,14 +7199,24 @@ msgid "Use a different LTSP client network"
 msgstr "Brug et andet LTSP-klientnetværk"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If lots of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 "192.168.0.0/24 er standardnetværk for LTSP-klienten hvis en maskine "
 "installeres via profilen for tynd klient-server. Hvis en masse LTSP-klienter "
@@ -7243,9 +7410,14 @@ msgstr ""
 "Tving alle tynde klienter til at bruge LXDE som standardskrivebordsmiljø"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Make sure that LXDE is installed on the thin client server; then add a "
+#| "line like this below <computeroutput>[default]</computeroutput> in \"lts."
+#| "conf\":"
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 "Sikr dig at LXDE er installeret på serveren for tynde klienter; tilføj så en "
 "linje som denne nedenfor <computeroutput>[default]</computeroutput> i »lts."
@@ -8245,13 +8417,21 @@ msgid "Remote Desktop Service"
 msgstr "Tjeneste for fjernskrivebord"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+#, fuzzy
+#| msgid ""
+#| "Beginning with this release, choosing the thin client server profile or "
+#| "the combined server profile installs xrdp, a package which uses the "
+#| "Remote Desktop Protocol to present a graphical login to a remote client. "
+#| "Microsoft Windows users can connect to the thin client server running "
+#| "xrdp without installing additional software - they simply start a Remote "
+#| "Desktop Connection on their Windows machine and connect."
+msgid ""
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 "Fra og med denne version, vil valg af profilen for Server for tynde klienter "
 "eller den kombinerede serverprofil installere xrdp, en pakke som bruger "
@@ -9616,10 +9796,15 @@ msgid "New features for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Manual for Debian Edu 9+edu0 kodenavn Stretch"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release "
+#| "of Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:"
+#| "debian-edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 "Dette er en <emphasis role=\"strong\">meget tidlig ALFA</emphasis> udgivelse "
 "af Debian Edu 9+edu0. Giv venligst tilbagemeldinger til <ulink url=\"mailto:"
@@ -9642,15 +9827,33 @@ msgid "Installation changes"
 msgstr "Installationsændringer"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New version of debian-installer from Debian Stretch, see <ulink url="
+#| "\"http://www.debian.org/releases/stretch/installmanual\">installation "
+#| "manual</ulink> for more details."
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
 msgstr ""
 "Ny version af debianinstallationsprogrammet fra Debian Stretch, se <ulink "
 "url=\"http://www.debian.org/releases/stretch/installmanual"
 "\">installationsmanual</ulink> for yderligere detaljer."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "Programopdateringer"
@@ -11185,10 +11388,14 @@ msgid "LTSP diskless workstations run without any configuration."
 msgstr "LTSP-diskløse arbejdsstationer kører uden nogen konfiguration."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On the dedicated client network of thin client servers (default "
+#| "192.168.0.0/24), machines run by default as diskless workstations if they "
+#| "are powerful enough."
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 "På det dedikerede klientnetværk for tynde klientservere (standard "
 "192.168.0.0/24), kører maskiner som standard som diskløse arbejdsstationer "
@@ -12007,9 +12214,13 @@ msgstr ""
 "bruger fra 144 til 24 MiB."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New tool notify-local-users to send desktop notification to all logged in "
+#| "users on a machine.  Useful for thin client servers."
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 "Nyt værktøj notify-local-users til at sende skrivebordspåmindelser til alle "
 "brugere (der er logget på) på en maskine. Brugbart for servere for tynde "
@@ -12174,9 +12385,13 @@ msgstr ""
 "eller arbejdsplads."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "A diskless workstation option is installed but not activated by default "
+#| "on all servers with the thin-client-server profile."
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 "En indstilling for diskløs arbejdsstation installeres men er ikke aktiveret "
 "som standard på alle servere med profilen for servere for tynde klienter."
@@ -12523,6 +12738,28 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Thin Client Server/s"
+#~ msgstr "Servere for tynde klienter"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "LTSP-servere (servere for tynde klienter)"
+
+#~ msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">Server for tynde klienter</emphasis>"
+
+#~ msgid ""
+#~ "First of all, this profile name is confusing for historic reasons. "
+#~ "Currently this profile actually installs an LTSP server environment for "
+#~ "thin-clients and for diskless workstations. Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
+#~ "change the name of the profile into a better suited one."
+#~ msgstr ""
+#~ "For det første er dette profilnavn forvirrende af historiske årsager. "
+#~ "Aktuelt installerer denne profil rent faktisk et LTSP-servermiljø for "
+#~ "tynde klienter og for arbejdsstationer. Debianfejl <ulink url=\"http://"
+#~ "bugs.debian.org/588510#\">588510</ulink> er blevet indsendt for at ændre "
+#~ "navnet på profilen til et bedre valg."
+
 #, fuzzy
 #~| msgid "{{attachment:Installer_help.png}}"
 #~ msgid "{{attachment:01-Installer_boot_menu.png}}"
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 05a8f94..956c652 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: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+0000\n"
 "PO-Revision-Date: 2016-11-15 19:27+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -203,15 +203,26 @@ 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 thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 "Die Abbildung skizziert die vorgesehene Netzwerkstruktur. Die "
 "Standardeinstellung von Skolelinux setzt genau einen Hauptserver »Tjener« "
@@ -302,12 +313,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 thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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,17 +339,29 @@ msgid "Services running on the main server"
 msgstr "Dienste des Hauptservers"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 "Abgesehen von der Versorgung der Thin Clients werden alle Netzwerkdienste "
 "von einem zentralen Server (dem Hauptserver) bereitgestellt. Es ist möglich, "
@@ -551,8 +581,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "Terminal-Server"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "Web-Server"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -630,13 +662,20 @@ 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 thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 "Die Netzwerkeinrichtung der Client-Rechner erfolgt automatisch mittels DHCP. "
 "Normale Clients bekommen IP-Adressen aus dem privaten Subnetz 10.0.0.0/8 "
@@ -736,11 +775,18 @@ 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 thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 "Drucker können entweder an das Hauptnetzwerk, an den Server, eine "
@@ -750,22 +796,31 @@ msgstr ""
 "und Zugriffskontrollisten für Drucker erreicht."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "LTSP-Server (Terminal-Server)"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "Ein Skolelinux-Netzwerk kann mehrere LTSP-Server (auch Terminal-Server "
 "genannt) enthalten; die Installation erfolgt durch Auswahl des Profils "
 "»Terminal-Server«."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The thin client servers are set up to receive syslog from the thin "
+#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 "Der Terminal-Server ist so konfiguriert, dass er die Systemmeldungen "
 "(Syslog) der Thin Clients empfängt und an den zentralen Systemmeldungsdienst "
@@ -941,12 +996,20 @@ msgstr ""
 "Nur das Image »netinst« benötigt während der Installation Internetzugang."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 "Die Installation sollte keine Fragen mit Ausnahme der gewünschten Sprache (z."
 "B. Norwegian Bokmål, Nynorsk, Sami, German) und dem Rechnerprofil "
@@ -1096,9 +1159,13 @@ msgstr ""
 "oder 64-Bit (Debian-Architektur 'amd64') x86-Prozessoren haben."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 "Mindestens 2 GiB RAM für 30 Clients und 4 GiB RAM für 50-60 Clients werden "
 "für die Profile »main server« und »thin client server« empfohlen."
@@ -1164,15 +1231,21 @@ msgstr ""
 "ab."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 70 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 "main server + thin client server: 70 GiB. Wie üblich gilt für den "
 "Plattenplatz eines Main-Servers: »Je mehr, umso besser«."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 50 GiB."
+#, fuzzy
+#| msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "thin client server: 50 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1180,8 +1253,12 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "workstation oder standalone: 30 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin client servers need two network cards when using the default network "
+#| "architecture:"
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 "Terminal-Server (LTSP) benötigen zwei Netzwerkkarten, wenn sie die Standard-"
@@ -1792,11 +1869,16 @@ msgid "The installation process"
 msgstr "Der Installationprozess"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#| "Stretch/Requirements\">system requirements</ulink> and make sure you have "
+#| "at least two network cards (NICs) if you plan on setting up a thin client "
+#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "Denken Sie an die <ulink url=\"http://wiki.debian.org/DebianEdu/"
 "Documentation/Stretch/Requirements\">Systemvoraussetzungen</ulink> und "
@@ -1829,12 +1911,19 @@ 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 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 "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"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 "
 "vorkonfiguriert sind, damit diese sofort funktionieren. Sie dürfen nur einen "
@@ -1878,18 +1967,30 @@ msgstr ""
 "»Einzelplatzrechner« gewählt werden"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr "<emphasis role=\"strong\">Terminal-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgstr "<emphasis role=\"strong\">Hauptserver</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+#, fuzzy
+#| msgid ""
+#| "A thin client (and diskless workstation) server, also called a LTSP "
+#| "server. Clients without hard drives boot and run software from this "
+#| "server. This computer needs two network cards, a lot of memory, and "
+#| "ideally more than one processor or core. See the chapter about <link "
+#| "linkend=\"NetworkClients\">networked clients</link> for more information "
+#| "on this subject. Choosing this profile also enables the workstation "
+#| "profile (even if it is not selected) - a thin client server can always be "
+#| "used as a workstation, too."
+msgid ""
+"A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
 "computer needs two network cards, a lot of memory, and ideally more than one "
 "processor or core. See the chapter about <link linkend=\"NetworkClients"
 "\">networked clients</link> for more information on this subject. Choosing "
 "this profile also enables the workstation profile (even if it is not "
-"selected) - a thin client server can always be used as a workstation, too."
+"selected) - an LTSP server can always be used as a workstation, too."
 msgstr ""
 "Server für Thin Clients (und Diskless Workstations), auch LTSP-Server "
 "genannt. Rechner ohne Festplatte erhalten die Software zum Booten und ihre "
@@ -1931,18 +2032,33 @@ 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\">Thin "
+#| "Client Server</emphasis> profiles are preselected. These profiles can be "
+#| "installed on one machine together if you want to install a so called "
+#| "<emphasis>combined main server</emphasis>. This means the main server "
+#| "will be a thin client server and also be used as a workstation. This is "
+#| "the default choice, since we assume most people will install <link "
+#| "linkend=\"Installation--"
+#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
+#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
+#| "cards installed in a machine which is going to be installed as a combined "
+#| "main server or as a thin client server to become usefull after the "
+#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 "Die Profile <emphasis role=\"strong\">Hauptserver</emphasis>, <emphasis role="
 "\"strong\">Arbeitsplatzrechner</emphasis> und <emphasis role=\"strong"
@@ -1999,10 +2115,15 @@ msgstr ""
 "Sie auf einfache Art helfen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include Thin-client-server then the "
+#| "installer will spend quite some time at the end, \"Finishing the "
+#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"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 ""
 "Bitte beachten: Falls sich das Profil Terminal-Server unter den gewählten "
 "Profilen befindet, wird das Installationsprogramm am Ende einige Zeit für "
@@ -2113,27 +2234,21 @@ msgstr ""
 "mehrfache Herunterladen desselben Pakets aus dem Netz zu vermeiden."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
+#, fuzzy
+#| msgid "A note on thin-client-server installations"
+msgid "A note on LTSP-server installations using only Thin-Clients"
 msgstr "Bemerkung zur Installation des Profils Terminal-Server"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
-msgstr ""
-"Aus historischen Gründen trägt dieses Profil einen irreführenden Namen: "
-"Gegenwärtig wird eine LTSP-Serverumgebung für Thin Clients und Diskless "
-"Workstations installiert. Der Debian-Bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> wurde mit der Absicht eingesendet, den "
-"Profilnamen in einen besser geeigneten zu ändern."
-
-#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+#| "client</computeroutput> makes it possible to skip the step which converts "
+#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
+#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -2238,10 +2353,15 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 "So sieht das PXE-Menü mit dem <emphasis role=\"strong\">Hauptserver</"
 "emphasis>- und <emphasis role=\"strong\">Terminal-Server</emphasis>-Profil "
@@ -2416,11 +2536,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 + Thin Client Server installation and how it looks at the "
+#| "first boot of the tjener, a PXE boot on the workstation network and on "
+#| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 msgstr ""
 "Hier folgt nun eine Serie von Screenshots einer graphischen Installation "
 "(Hauptserver + Arbeitsplatzrechner + Terminal-Server, 64-Bit); gefolgt von "
@@ -2797,10 +2923,20 @@ 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 + thin "
+#| "client server + workstation). If all of the mentioned before is not "
+#| "available, see: <link linkend=\"Administration--"
+#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+#| "\">Installing a graphical environment on the main-server to use GOsa²</"
+#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server + "
+"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-"
@@ -2880,14 +3016,23 @@ 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 thin client servers and the Windows "
+#| "machines on the network. With LDAP, account information about students, "
+#| "pupils, teachers, etc. only needs to be entered once. After information "
+#| "has been provided in LDAP, the information will be available to all "
+#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 msgstr ""
 "In Debian Edu werden die Daten von Benutzern, Gruppen und Systemen in einem "
 "LDAP-Verzeichnis gespeichert. Darauf greifen nicht nur der Hauptserver, "
@@ -4174,12 +4319,22 @@ msgid "Nagios"
 msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. The set of machines and services being "
+#| "monitored is automatically generated using information collected by the "
+#| "sitesummary system. The machines with the profile Main-server and Thin-"
+#| "client-server receive full monitoring, while workstations and thin "
+#| "clients receive simple monitoring. To enable full monitoring on a "
+#| "workstation, install the <computeroutput>nagios-nrpe-server</"
+#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -4299,13 +4454,21 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "New package are available for upgrades.  The critical ones are normally "
+#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
+#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
+#| "client servers, remember to also update the LTSP chroot using "
+#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
+#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 "Neue Pakete stehen für Upgrades zur Verfügung. Die Bezeichnung »critical« "
 "tragen normalerweise Pakete, die Sicherheitslücken schließen. Um das Upgrade "
@@ -4555,12 +4718,18 @@ msgstr ""
 "ermöglichen, notfalls wieder zurück zu gehen."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Please note that the following recipe applies to a default Debian Edu "
+#| "main server installation (desktop=kde, profiles Main-Server, Workstation, "
+#| "Thin-Client-Server). (For a general overview concerning jessie to stretch "
+#| "upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
+#| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 "Bitte beachten Sie, dass sich das folgende Rezept auf die "
 "Standardinstallation eines Debian-Edu-Hauptservers bezieht (desktop=kde, "
@@ -7003,14 +7172,24 @@ msgid "Use a different LTSP client network"
 msgstr "Ein anderes LTSP-Client-Netzwerk verwenden"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If lots of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 "192.168.0.0/24 ist das voreingestellte LTSP-Client-Netzwerk, wenn für die "
 "Installation einer Maschine das Profil »Thin-Client-Server« gewählt wird. "
@@ -7213,9 +7392,14 @@ msgstr ""
 "Thin Clients."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Make sure that LXDE is installed on the thin client server; then add a "
+#| "line like this below <computeroutput>[default]</computeroutput> in \"lts."
+#| "conf\":"
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 "Stellen Sie sicher, dass LXDE auf dem Terminal-Server installiert ist; fügen "
 "Sie dann in »lts.conf« unterhalb von <computeroutput>[default]</"
@@ -8231,13 +8415,21 @@ msgid "Remote Desktop Service"
 msgstr "Remote-Desktop-Service"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+#, fuzzy
+#| msgid ""
+#| "Beginning with this release, choosing the thin client server profile or "
+#| "the combined server profile installs xrdp, a package which uses the "
+#| "Remote Desktop Protocol to present a graphical login to a remote client. "
+#| "Microsoft Windows users can connect to the thin client server running "
+#| "xrdp without installing additional software - they simply start a Remote "
+#| "Desktop Connection on their Windows machine and connect."
+msgid ""
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 "Seit dieser Veröffentlichung wird bei Verwendung des Profils »Terminal-"
 "Server« und bei Kombiservern das Paket xrdp installiert; xrdp verwendet das "
@@ -9653,10 +9845,15 @@ msgid "New features for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Handbuch für Debian Edu 9+edu0, Codename Stretch"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release "
+#| "of Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:"
+#| "debian-edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 "Dies ist ein <emphasis role=\"strong\">sehr frühes ALPHA</emphasis> Release "
 "von Debian Edu 9+edu0 Rückmeldungen bitte an <ulink url=\"mailto:debian-"
@@ -9679,15 +9876,33 @@ msgid "Installation changes"
 msgstr "Installationsbezogene Änderungen"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New version of debian-installer from Debian Stretch, see <ulink url="
+#| "\"http://www.debian.org/releases/stretch/installmanual\">installation "
+#| "manual</ulink> for more details."
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
 msgstr ""
 "Neue Version des Debian-Installationsprogramms aus Debian Stretch , siehe "
 "<ulink url=\"http://www.debian.org/releases/stretch/installmanual\">Debian-"
 "Installationsanleitung</ulink> für weitere Informationen."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "Aktualisierung von Software"
@@ -11231,10 +11446,14 @@ msgid "LTSP diskless workstations run without any configuration."
 msgstr "LTSP Diskless Workstations benötigen keine Konfiguration."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On the dedicated client network of thin client servers (default "
+#| "192.168.0.0/24), machines run by default as diskless workstations if they "
+#| "are powerful enough."
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 "Im ausdrücklich für Clients vorgesehenen Netzwerk eines »Terminal-"
 "Servers« (voreingestellt 192.168.0.0/24), starten alle Maschinen als "
@@ -12087,9 +12306,13 @@ msgstr ""
 "Plattenbelegung für jeden Benutzer von 144 auf 24 MiB reduziert ist."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New tool notify-local-users to send desktop notification to all logged in "
+#| "users on a machine.  Useful for thin client servers."
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 "Neues Werkzeug »notify-local-users«; damit können allen angemeldeten "
 "Benutzern Nachrichten auf die Arbeitsfläche geschickt werden - nützlich für "
@@ -12255,9 +12478,13 @@ msgstr ""
 "»Thin-Client« oder »Workstation« (Arbeitsplatzrechner) zu wählen."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "A diskless workstation option is installed but not activated by default "
+#| "on all servers with the thin-client-server profile."
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 "Die Umgebung für Diskless Workstations wird auf allen Servern mit dem Profil "
 "»Terminal-Server« installiert, aber voreingestellt nicht aktiviert."
@@ -12611,6 +12838,28 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid "Thin Client Server/s"
+#~ msgstr "Terminal-Server"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "LTSP-Server (Terminal-Server)"
+
+#~ msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">Terminal-Server</emphasis>"
+
+#~ msgid ""
+#~ "First of all, this profile name is confusing for historic reasons. "
+#~ "Currently this profile actually installs an LTSP server environment for "
+#~ "thin-clients and for diskless workstations. Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
+#~ "change the name of the profile into a better suited one."
+#~ msgstr ""
+#~ "Aus historischen Gründen trägt dieses Profil einen irreführenden Namen: "
+#~ "Gegenwärtig wird eine LTSP-Serverumgebung für Thin Clients und Diskless "
+#~ "Workstations installiert. Der Debian-Bug <ulink url=\"https://bugs.debian."
+#~ "org/588510#\">588510</ulink> wurde mit der Absicht eingesendet, den "
+#~ "Profilnamen in einen besser geeigneten zu ändern."
+
 #~ msgid "Help screen"
 #~ msgstr "Hilfe-Bildschirm des Installationsprogramms"
 
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 b2d04c9..d81adbf 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: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -219,15 +219,26 @@ msgid "The Debian Edu network topology"
 msgstr "La Topología de red de Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 "La figura es un esquema propuesto de la topología de red. La configuración "
 "predeterminada de Skolelinux asume que hay un (y sólo uno) servidor "
@@ -317,12 +328,19 @@ msgid "Main server (tjener)"
 msgstr "Servidor principal (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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 "
@@ -336,17 +354,29 @@ msgid "Services running on the main server"
 msgstr "Servicios que corren en el servidor principal"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 "Con la excepción del control de los clientes ligeros, todos los servicios se "
 "configuran inicialmente en un ordenador central (el servidor principal). "
@@ -572,8 +602,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "Servidor(es) de clientes ligeros"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "Servidor Web"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -647,13 +679,20 @@ msgstr ""
 "acceso a Internet individualmente para cada puesto."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Network configuration on the clients is done automatically using DHCP. "
+#| "Normal clients are allocated IP addresses in the private subnet "
+#| "10.0.0.0/8, while thin clients are connected to the corresponding thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 "La configuración de red en los clientes se hace automáticamente con DHCP. "
 "Los clientes normales reciben direcciones IP en el rango privado 10.0.0.0/8, "
@@ -749,11 +788,18 @@ msgstr ""
 "toda la red tenga la hora correcta."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 "Las impresoras se conectan donde sean necesarias, bien directamente en la "
@@ -763,22 +809,31 @@ msgstr ""
 "de acceso a las impresoras."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "Servidor(es) LTSP (Servidor(es) de cliente(s) ligero(s))"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "Una red Skolelinux puede tener muchos servidores LTSP (también llamado "
 "servidor de clientes ligeros), que pueden ser instalados seleccionando el "
 "perfil servidor de clientes ligeros."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The thin client servers are set up to receive syslog from the thin "
+#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 "EL servidor de clientes ligeros está configurado para recibir los registros "
 "de los clientes ligeros y reenviarlos al servidor central."
@@ -959,12 +1014,20 @@ msgstr ""
 "Solo la instalación en red necesita acceso a Internet durante la instalación."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 "La instalación no debería hacer ninguna pregunta, con la excepción del "
 "idioma deseado (p. ej. Noruego, Español, etc) y el perfil de la máquina "
@@ -1103,7 +1166,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1169,8 +1232,8 @@ msgstr ""
 #| "main server + thin client server: 60 GiB. As usual with disk space on a "
 #| "main server, \"the bigger the better\"."
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 "Servidor principal + servidor de clientes delgados: 60Gb. Como siempre, con "
 "espacio de disco en el servidor principal, \"entre más , mejor\"."
@@ -1178,7 +1241,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "thin client server: 40 GiB."
-msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "servidor para clientes delgados: 40Gb"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1186,8 +1249,12 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "Estación de trabajo, o independiente: 30 Gb"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin client servers need two network cards when using the default network "
+#| "architecture:"
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 "Los servidores para clientes ligeros necesitan dos tarjetas de red cuando la "
@@ -1924,8 +1991,7 @@ msgstr "El proceso de instalación"
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "Recuerde los <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Jessie/Requirements\">requerimientos del sistema</ulink> y asegúrese que "
@@ -1955,12 +2021,19 @@ msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This is the main server (tjener) for your school providing all services "
+#| "pre-configured to work out of the box. You must only install one main "
+#| "server per school! This profile does not include a graphical user "
+#| "interface. If you want a graphical user interface, then select "
+#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"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 "
 "los servicios preconfigurados listos para trabajar. ¡Usted solo debe "
@@ -1999,18 +2072,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr ""
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">LTSP client kernel</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>
-msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+#, fuzzy
+#| msgid ""
+#| "A thin client (and diskless workstation) server, also called a LTSP "
+#| "server. Clients without hard drives boot and run software from this "
+#| "server. This computer needs two network cards, a lot of memory, and "
+#| "ideally more than one processor or core. See the chapter about <link "
+#| "linkend=\"NetworkClients\">networked clients</link> for more information "
+#| "on this subject. Choosing this profile also enables the workstation "
+#| "profile (even if it is not selected) - a thin client server can always be "
+#| "used as a workstation, too."
+msgid ""
+"A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
 "computer needs two network cards, a lot of memory, and ideally more than one "
 "processor or core. See the chapter about <link linkend=\"NetworkClients"
 "\">networked clients</link> for more information on this subject. Choosing "
 "this profile also enables the workstation profile (even if it is not "
-"selected) - a thin client server can always be used as a workstation, too."
+"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 "
@@ -2051,18 +2136,33 @@ msgstr ""
 "servidor principal."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
+#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
+#| "Client Server</emphasis> profiles are preselected. These profiles can be "
+#| "installed on one machine together if you want to install a so called "
+#| "<emphasis>combined main server</emphasis>. This means the main server "
+#| "will be a thin client server and also be used as a workstation. This is "
+#| "the default choice, since we assume most people will install <link "
+#| "linkend=\"Installation--"
+#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
+#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
+#| "cards installed in a machine which is going to be installed as a combined "
+#| "main server or as a thin client server to become usefull after the "
+#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 "Los perfiles  <emphasis role=\"strong\">Main Server</emphasis>, <emphasis "
 "role=\"strong\">Workstation</emphasis> y <emphasis role=\"strong\">Thin "
@@ -2120,10 +2220,15 @@ msgstr ""
 "hacerlo, pero es la manera más fácil de que colabore."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include Thin-client-server then the "
+#| "installer will spend quite some time at the end, \"Finishing the "
+#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"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 ""
 "Espere. Si en los perfiles seleccionados se incluye Thin-client-server, "
 "entonces el instalador tardará un poco mas al final \"Finalizando la "
@@ -2225,22 +2330,21 @@ msgstr ""
 "veces desde Internet. "
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
+#, fuzzy
+#| msgid "A note on thin-client-server installations"
+msgid "A note 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>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+#| "client</computeroutput> makes it possible to skip the step which converts "
+#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
+#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -2342,8 +2446,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\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -2533,9 +2637,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -3002,10 +3106,20 @@ msgid "DHCP Administration"
 msgstr "Administración DHCP"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For GOsa² access you need the Skolelinux main server and a (client) "
+#| "system with a web browser installed which can be the main server itself "
+#| "if it was installed as a so called combined server (main server + thin "
+#| "client server + workstation). If all of the mentioned before is not "
+#| "available, see: <link linkend=\"Administration--"
+#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+#| "\">Installing a graphical environment on the main-server to use GOsa²</"
+#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server + "
+"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-"
@@ -3085,14 +3199,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In Debian Edu, account, group, and system information is stored in an "
+#| "LDAP directory. This data is used not only by the main server, but also "
+#| "by the (diskless) workstations, the thin client servers and the Windows "
+#| "machines on the network. With LDAP, account information about students, "
+#| "pupils, teachers, etc. only needs to be entered once. After information "
+#| "has been provided in LDAP, the information will be available to all "
+#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 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 "
@@ -4167,12 +4290,22 @@ msgid "Nagios"
 msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. The set of machines and services being "
+#| "monitored is automatically generated using information collected by the "
+#| "sitesummary system. The machines with the profile Main-server and Thin-"
+#| "client-server receive full monitoring, while workstations and thin "
+#| "clients receive simple monitoring. To enable full monitoring on a "
+#| "workstation, install the <computeroutput>nagios-nrpe-server</"
+#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -4290,13 +4423,21 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "New package are available for upgrades.  The critical ones are normally "
+#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
+#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
+#| "client servers, remember to also update the LTSP chroot using "
+#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
+#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 "Hay nuevos paquetes disponibles para actualizar. Los paquetes críticos "
 "normalmente son mejoras de seguridad. Para actualizar, ejecute 'apt-get "
@@ -4538,10 +4679,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6497,12 +6637,12 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6637,8 +6777,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 
 #. type: CDATA
@@ -7376,12 +7516,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -8537,9 +8677,9 @@ msgstr "Manual para Debian-Edu 8.0+edu0 nombre código \"Jessie\""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -8569,14 +8709,27 @@ msgstr ""
 #| "\"http://www.debian.org/releases/jessie/installmanual\">installation "
 #| "manual</ulink> for more details."
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
 msgstr ""
 "Nueva versión de debian-installer de Debian Jessie, vea el <ulink url="
 "\"http://www.debian.org/releases/jessie/installmanual\">manual de "
 "instalación</ulink> para más detalles."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "Actualizaciones de software"
@@ -9760,9 +9913,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -10406,9 +10558,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New tool notify-local-users to send desktop notification to all logged in "
+#| "users on a machine.  Useful for thin client servers."
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 "Nueva herramienta notify-local-users para enviar notificaciones de "
 "escritorio a todos los usuarios registrados en una computadora. Útil en "
@@ -10542,9 +10698,13 @@ msgstr ""
 "sin disco, cliente ligero y estación de trabajo."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "A diskless workstation option is installed but not activated by default "
+#| "on all servers with the thin-client-server profile."
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 "Opción de estación de trabajo sin disco es instalada pero no activada por "
 "defecto en los servidores con el perfil servidor de clientes ligeros."
@@ -10863,6 +11023,12 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Thin Client Server/s"
+#~ msgstr "Servidor(es) de clientes ligeros"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "Servidor(es) LTSP (Servidor(es) de cliente(s) ligero(s))"
+
 #, fuzzy
 #~| msgid "Installer help screen"
 #~ msgid "Help screen"
@@ -11042,9 +11208,6 @@ msgstr ""
 #~ "USETHEME=\"true\"\n"
 #~ "THEME=\"/usr/share/apps/kdm/themes/debian-moreblue\""
 
-#~ msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-#~ msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
-
 #~ msgid "Replacing LDM with KDM"
 #~ msgstr "Reemplazar LDM con KDM"
 
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 5687b85..13cf770 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: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+0000\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -205,15 +205,26 @@ msgid "The Debian Edu network topology"
 msgstr "Topologie du réseau Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 "Le diagramme est un schéma de la topologie supposée du réseau. La "
 "configuration par défaut d'un réseau Skolelinux suppose qu'il y a un (et un "
@@ -304,12 +315,19 @@ msgid "Main server (tjener)"
 msgstr "Serveur principal (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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 "
@@ -323,17 +341,29 @@ msgid "Services running on the main server"
 msgstr "Services exécutés sur le serveur principal"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 "À l'exception du contrôle des clients légers, tous les services sont "
 "initialement configurés sur un ordinateur central (le serveur principal). "
@@ -556,8 +586,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "Serveur de clients légers"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "Serveur web"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -635,13 +667,20 @@ msgstr ""
 "l'accès à Internet sur chaque machine."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Network configuration on the clients is done automatically using DHCP. "
+#| "Normal clients are allocated IP addresses in the private subnet "
+#| "10.0.0.0/8, while thin clients are connected to the corresponding thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 "La configuration du réseau sur les clients est effectuée automatiquement à "
 "l'aide de DHCP. Les clients normaux reçoivent une adresse IP appartenant au "
@@ -741,11 +780,18 @@ msgstr ""
 "ainsi une heure correcte sur tout le réseau."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 "Les imprimantes sont connectées où cela est le plus pratique, soit "
@@ -755,22 +801,31 @@ msgstr ""
 "par l'intermédiaire de quota et de contrôle d'accès aux imprimantes."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "Serveurs LTSP (serveurs de clients légers)"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "Un réseau Skolelinux peut avoir plusieurs serveurs LTSP (aussi appelés "
 "serveurs de clients légers) qui sont installés en sélectionnant le profil de "
 "serveur de clients légers."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The thin client servers are set up to receive syslog from the thin "
+#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 "Le serveur de clients légers est configuré pour recevoir le journal système "
 "(syslog) des clients légers et transmettre ces messages au destinataire "
@@ -952,12 +1007,20 @@ msgstr ""
 "pendant l'installation."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 "L'installation ne devrait pas poser de questions, excepté la langue (par "
 "exemple norvégien Bokmål, norvégien nynorsk, same) et le profil de la "
@@ -1117,9 +1180,13 @@ msgstr ""
 "(architecture Debian « amd64 »)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 "Il est recommandé d'avoir pour les profils de serveur principal et de "
 "serveur de clients légérs un minimum de 2 Gio de mémoire vive pour "
@@ -1189,8 +1256,8 @@ msgstr "L'espace disque minimal nécessaire dépend du profil installé :"
 #| "main server + thin client server: 60 GiB. As usual with disk space on a "
 #| "main server, \"the bigger the better\"."
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 "serveur principal + serveur de clients léger : 60 Gio. Comme d'habiture pour "
 "l'espace disque sur un serveur principal, « plus il y a d'espace, mieux "
@@ -1199,7 +1266,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "thin client server: 40 GiB."
-msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "serveur de clients légers : 40 Gio."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1207,8 +1274,12 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "station de travail ou post autonome : 30 Gio."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin client servers need two network cards when using the default network "
+#| "architecture:"
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 "Les serveurs de clients légers ont besoin de deux cartes réseau lorsque "
@@ -1955,8 +2026,7 @@ msgstr "Le processus d'installation"
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "Souvenez-vous des <ulink url=\"http://wiki.debian.org/DebianEdu/"
 "Documentation/Jessie/Requirements\">besoins matériels</ulink> et assurez-"
@@ -1987,12 +2057,19 @@ msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Serveur principal</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This is the main server (tjener) for your school providing all services "
+#| "pre-configured to work out of the box. You must only install one main "
+#| "server per school! This profile does not include a graphical user "
+#| "interface. If you want a graphical user interface, then select "
+#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"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 "
 "services préconfigurés pour fonctionner sans modification. Vous ne devez "
@@ -2038,18 +2115,30 @@ msgstr ""
 "versions précédentes."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr "<emphasis role=\"strong\">Serveur pour clients légers</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-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>
-msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+#, fuzzy
+#| msgid ""
+#| "A thin client (and diskless workstation) server, also called a LTSP "
+#| "server. Clients without hard drives boot and run software from this "
+#| "server. This computer needs two network cards, a lot of memory, and "
+#| "ideally more than one processor or core. See the chapter about <link "
+#| "linkend=\"NetworkClients\">networked clients</link> for more information "
+#| "on this subject. Choosing this profile also enables the workstation "
+#| "profile (even if it is not selected) - a thin client server can always be "
+#| "used as a workstation, too."
+msgid ""
+"A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
 "computer needs two network cards, a lot of memory, and ideally more than one "
 "processor or core. See the chapter about <link linkend=\"NetworkClients"
 "\">networked clients</link> for more information on this subject. Choosing "
 "this profile also enables the workstation profile (even if it is not "
-"selected) - a thin client server can always be used as a workstation, too."
+"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 "
@@ -2091,18 +2180,33 @@ msgstr ""
 "même du serveur principal."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
+#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
+#| "Client Server</emphasis> profiles are preselected. These profiles can be "
+#| "installed on one machine together if you want to install a so called "
+#| "<emphasis>combined main server</emphasis>. This means the main server "
+#| "will be a thin client server and also be used as a workstation. This is "
+#| "the default choice, since we assume most people will install <link "
+#| "linkend=\"Installation--"
+#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
+#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
+#| "cards installed in a machine which is going to be installed as a combined "
+#| "main server or as a thin client server to become usefull after the "
+#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 "Les profils <emphasis role=\"strong\">Serveur principal</emphasis>, "
 "<emphasis role=\"strong\">Station de travail</emphasis> et <emphasis role="
@@ -2159,10 +2263,15 @@ msgstr ""
 "moyen facile pour vous de nous aider."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include Thin-client-server then the "
+#| "installer will spend quite some time at the end, \"Finishing the "
+#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"Wait. If the selected profiles include LTSP-server then the installer will "
+"spend quite some time at the end, \"Finishing the installation - Running "
+"debian-edu-profile-udeb...\""
 msgstr ""
 "Patientez. Si le profil de serveur de clients légers est dans votre liste de "
 "choix de profils à installer, l'installateur passera un bon moment à la fin "
@@ -2275,27 +2384,21 @@ msgstr ""
 "éviter de télécharger depuis Internet le même paquet plusieurs fois."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
+#, fuzzy
+#| msgid "A note on thin-client-server installations"
+msgid "A note 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>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
-msgstr ""
-"Premièrement, le nom de ce profil porte à confusion pour des raisons "
-"historiques : il installe en fait un environnement de serveur LTSP pour les "
-"clients légers et les stations de travail sans disque. Le bogue Debian "
-"nº <ulink url=\"http://bugs.debian.org/588510\">588510</ulink> a été ouvert "
-"pour changer le nom de ce profil."
-
-#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+#| "client</computeroutput> makes it possible to skip the step which converts "
+#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
+#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -2404,10 +2507,15 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 "Voici à quoi ressemble le menu PXE avec les profils <emphasis role=\"strong"
 "\">Serveur principal</emphasis> et <emphasis role=\"strong\">Serveur de "
@@ -2598,9 +2706,9 @@ msgstr ""
 #| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 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, "
@@ -3051,10 +3159,20 @@ msgid "DHCP Administration"
 msgstr "Administration DHCP"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For GOsa² access you need the Skolelinux main server and a (client) "
+#| "system with a web browser installed which can be the main server itself "
+#| "if it was installed as a so called combined server (main server + thin "
+#| "client server + workstation). If all of the mentioned before is not "
+#| "available, see: <link linkend=\"Administration--"
+#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+#| "\">Installing a graphical environment on the main-server to use GOsa²</"
+#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server + "
+"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-"
@@ -3138,14 +3256,23 @@ msgstr ""
 "toutes les pages d'administration de GOsa²."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In Debian Edu, account, group, and system information is stored in an "
+#| "LDAP directory. This data is used not only by the main server, but also "
+#| "by the (diskless) workstations, the thin client servers and the Windows "
+#| "machines on the network. With LDAP, account information about students, "
+#| "pupils, teachers, etc. only needs to be entered once. After information "
+#| "has been provided in LDAP, the information will be available to all "
+#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 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 "
@@ -4474,12 +4601,22 @@ msgid "Nagios"
 msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. The set of machines and services being "
+#| "monitored is automatically generated using information collected by the "
+#| "sitesummary system. The machines with the profile Main-server and Thin-"
+#| "client-server receive full monitoring, while workstations and thin "
+#| "clients receive simple monitoring. To enable full monitoring on a "
+#| "workstation, install the <computeroutput>nagios-nrpe-server</"
+#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -4599,13 +4736,21 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "New package are available for upgrades.  The critical ones are normally "
+#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
+#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
+#| "client servers, remember to also update the LTSP chroot using "
+#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
+#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 "Un nouveau paquet est disponible pour la mise à jour. Les paquets critiques "
 "sont normalement des corrections de sécurité. Pour mettre à jour, lancez "
@@ -4877,10 +5022,9 @@ msgstr ""
 #| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 "Veuillez noter que la recette suivante s'applique à une installation de "
 "serveur principal de Debian Edu (bureau KDE, profils Serveur principal, "
@@ -7375,14 +7519,24 @@ msgid "Use a different LTSP client network"
 msgstr "Utiliser un réseau différent pour les clients légers"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If lots of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 "192.168.0.0/24 est par défaut le réseau des clients légers si une machine "
 "est installée en utilisant le profil serveur client léger. Si une quantité "
@@ -7586,9 +7740,14 @@ msgstr ""
 "par défaut"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Make sure that LXDE is installed on the thin client server; then add a "
+#| "line like this below <computeroutput>[default]</computeroutput> in \"lts."
+#| "conf\":"
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 "Assurez-vous que LXDE est installé sur le serveur de clients léger. Ensuite "
 "ajouter une ligne comme celle-ci sous <computeroutput>[default]</"
@@ -8648,13 +8807,21 @@ msgid "Remote Desktop Service"
 msgstr "Service de Bureaux distants"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+#, fuzzy
+#| msgid ""
+#| "Beginning with this release, choosing the thin client server profile or "
+#| "the combined server profile installs xrdp, a package which uses the "
+#| "Remote Desktop Protocol to present a graphical login to a remote client. "
+#| "Microsoft Windows users can connect to the thin client server running "
+#| "xrdp without installing additional software - they simply start a Remote "
+#| "Desktop Connection on their Windows machine and connect."
+msgid ""
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 "À partir de cette version, le choix du profil de serveur de clients légers "
 "ou de serveur combiné conduit à l'installation de xrdp, un paquet qui "
@@ -10100,9 +10267,9 @@ msgstr "Manuel de Debian Edu 8+edu0 nom de code Jessie"
 #| "<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian."
 #| "org</ulink>!"
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 "Ceci est la première version bêta de Debian Edu 8+edu0. Veuillez envoyer vos "
 "retours à <ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists."
@@ -10135,14 +10302,27 @@ msgstr "Changements dans l'installation"
 #| "\"http://www.debian.org/releases/squeeze/installmanual\">installation "
 #| "manual</ulink> for more details."
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
 msgstr ""
 "Nouvelle version de l'installateur Debian de Squeeze. Consultez le <ulink "
 "url=\"http://www.debian.org/releases/squeeze/installmanual\">manuel "
 "d'installation</ulink> pour plus de détails."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "Mises à jour des logiciels"
@@ -11771,10 +11951,14 @@ msgid "LTSP diskless workstations run without any configuration."
 msgstr "Les stations de travail sans disque fonctionnent sans configuration."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On the dedicated client network of thin client servers (default "
+#| "192.168.0.0/24), machines run by default as diskless workstations if they "
+#| "are powerful enough."
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 "Sur le réseau dédié aux clients des serveurs de clients légers (par défaut "
 "192.168.0.0/24), les machines fonctionnent par défaut comme des stations de "
@@ -12631,9 +12815,13 @@ msgstr ""
 "mémoire de chaque utilisateur sur le disque de 144 à 24 Mio."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New tool notify-local-users to send desktop notification to all logged in "
+#| "users on a machine.  Useful for thin client servers."
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 "Nouvel outils notify-local-users pour envoyer des notifications à tous les "
 "utilisateurs connectés à une station de travail. Très utile pour les "
@@ -12806,9 +12994,13 @@ msgstr ""
 "travail sans disque, client léger ou station de travail."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "A diskless workstation option is installed but not activated by default "
+#| "on all servers with the thin-client-server profile."
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 "Option de station de travail sans disque installée mais non activée par "
 "défaut sur tous les serveurs ayant le profil de serveur de clients légers."
@@ -13171,6 +13363,28 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid "Thin Client Server/s"
+#~ msgstr "Serveur de clients légers"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "Serveurs LTSP (serveurs de clients légers)"
+
+#~ msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">Serveur pour clients légers</emphasis>"
+
+#~ msgid ""
+#~ "First of all, this profile name is confusing for historic reasons. "
+#~ "Currently this profile actually installs an LTSP server environment for "
+#~ "thin-clients and for diskless workstations. Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
+#~ "change the name of the profile into a better suited one."
+#~ msgstr ""
+#~ "Premièrement, le nom de ce profil porte à confusion pour des raisons "
+#~ "historiques : il installe en fait un environnement de serveur LTSP pour "
+#~ "les clients légers et les stations de travail sans disque. Le bogue "
+#~ "Debian nº <ulink url=\"http://bugs.debian.org/588510\">588510</ulink> a "
+#~ "été ouvert pour changer le nom de ce profil."
+
 #, fuzzy
 #~| msgid "Installer help screen"
 #~ msgid "Help screen"
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 ad6d84b..2e7ded8 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: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+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"
@@ -201,15 +201,26 @@ msgid "The Debian Edu network topology"
 msgstr "La topologia della rete Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 "La figura rappresenta uno schema della topologia di rete. La configurazione "
 "predefinita di una rete Skolelinux presuppone uno e un solo server "
@@ -298,12 +309,19 @@ msgid "Main server (tjener)"
 msgstr "Server principale (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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 "
@@ -317,17 +335,29 @@ msgid "Services running on the main server"
 msgstr "Servizi attivi sul server principale"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 "Con l'eccezione del controllo dei thin-client, tutti i servizi sono "
 "inizialmente configurati su un computer centrale (il server principale). Per "
@@ -551,8 +581,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "Server di thin-client"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "Server web"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -629,13 +661,20 @@ msgstr ""
 "singole macchine."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Network configuration on the clients is done automatically using DHCP. "
+#| "Normal clients are allocated IP addresses in the private subnet "
+#| "10.0.0.0/8, while thin clients are connected to the corresponding thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 "La configurazione di rete dei client è fatta automaticamente con l'uso di "
 "DHCP. Ai client regolari vengono assegnati IP nella sottorete privata "
@@ -733,11 +772,18 @@ msgstr ""
 "assicurare che l'intera rete abbia l'ora esatta."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 "Le stampanti vengono collegate dove più comodo, direttamente alla rete "
@@ -747,22 +793,31 @@ msgstr ""
 "accessi per le stampanti."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "Server LTSP (server di thin-client)"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "Una rete Skolelinux può avere diversi server LTSP (chiamati anche server "
 "thin-client), che sono installati selezionando il profilo per server di thin "
 "client."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The thin client servers are set up to receive syslog from the thin "
+#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 "I server di thin-client sono configurati per ricevere il syslog dai thin-"
 "client e inoltrare questi messaggi al syslog principale."
@@ -937,12 +992,20 @@ msgstr ""
 "l'installazione."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 "L'installazione non dovrebbe fare alcuna domanda, con l'eccezione della "
 "lingua desiderata (es. norvegese bokmal, nynorsk, sami) e del profilo della "
@@ -1097,9 +1160,13 @@ msgstr ""
 "Intel Pentium e AMD K5) o a 64 bit (architettura Debian 'amd64')."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 "Sono consigliati per i profili server principale e server thin client  "
 "almeno 2 GiB RAM per 30 client e 4 GiB RAM per 50-60 client."
@@ -1167,8 +1234,8 @@ msgstr ""
 #| "main server + thin client server: 60 GiB. As usual with disk space on a "
 #| "main server, \"the bigger the better\"."
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 "main server + thin client server: 60 GiB. Come al solito con lo spazio disco "
 "sul server principale, \"più grande è meglio\"."
@@ -1176,7 +1243,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "thin client server: 40 GiB."
-msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "thin client server: 40 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1184,8 +1251,12 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "workstation o standalone: 30 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin client servers need two network cards when using the default network "
+#| "architecture:"
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 "i server thin-client devono avere due schede di rete quando si usa "
@@ -1929,8 +2000,7 @@ msgstr "Il processo d'installazione"
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "Ricordarsi i <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Jessie/Requirements\">requisiti di sistema</ulink> e assicurarsi di avere "
@@ -1961,12 +2031,19 @@ 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>
+#, fuzzy
+#| msgid ""
+#| "This is the main server (tjener) for your school providing all services "
+#| "pre-configured to work out of the box. You must only install one main "
+#| "server per school! This profile does not include a graphical user "
+#| "interface. If you want a graphical user interface, then select "
+#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"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 "
 "tutti i servizi preconfigurati e pronti all'uso. Si deve installare un solo "
@@ -2010,18 +2087,30 @@ msgstr ""
 "suggerito nei precedenti rilasci."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-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>
-msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+#, fuzzy
+#| msgid ""
+#| "A thin client (and diskless workstation) server, also called a LTSP "
+#| "server. Clients without hard drives boot and run software from this "
+#| "server. This computer needs two network cards, a lot of memory, and "
+#| "ideally more than one processor or core. See the chapter about <link "
+#| "linkend=\"NetworkClients\">networked clients</link> for more information "
+#| "on this subject. Choosing this profile also enables the workstation "
+#| "profile (even if it is not selected) - a thin client server can always be "
+#| "used as a workstation, too."
+msgid ""
+"A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
 "computer needs two network cards, a lot of memory, and ideally more than one "
 "processor or core. See the chapter about <link linkend=\"NetworkClients"
 "\">networked clients</link> for more information on this subject. Choosing "
 "this profile also enables the workstation profile (even if it is not "
-"selected) - a thin client server can always be used as a workstation, too."
+"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 "
@@ -2061,18 +2150,33 @@ msgstr ""
 "manualmente dal server principale."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
+#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
+#| "Client Server</emphasis> profiles are preselected. These profiles can be "
+#| "installed on one machine together if you want to install a so called "
+#| "<emphasis>combined main server</emphasis>. This means the main server "
+#| "will be a thin client server and also be used as a workstation. This is "
+#| "the default choice, since we assume most people will install <link "
+#| "linkend=\"Installation--"
+#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
+#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
+#| "cards installed in a machine which is going to be installed as a combined "
+#| "main server or as a thin client server to become usefull after the "
+#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 "I profili <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
 "\"strong\">Workstation</emphasis> e <emphasis role=\"strong\">Thin Client "
@@ -2130,10 +2234,15 @@ msgstr ""
 "obbligatorio, ma è un modo semplice per aiutarci."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include Thin-client-server then the "
+#| "installer will spend quite some time at the end, \"Finishing the "
+#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"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 ""
 "Aspettare, se il server thin-client è tra i profili selezionati, allora "
 "l'installatore rimarrà per un tempo piuttosto lungo alla fine nella fase "
@@ -2244,27 +2353,21 @@ msgstr ""
 "lo stesso pacchetto dalla rete più volte."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
+#, fuzzy
+#| msgid "A note on thin-client-server installations"
+msgid "A note 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>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
-msgstr ""
-"Prima di tutto, questo profilo ha un nome che può confondere, per ragioni "
-"storiche: il profilo installa effettivamente un ambiente server LTSP per "
-"thin-client e workstation senza disco. C'è un bug Debian <ulink url="
-"\"https://bugs.debian.org/588510#\">588510</ulink> per trovare un termine "
-"più adatto per il nome del profilo."
-
-#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+#| "client</computeroutput> makes it possible to skip the step which converts "
+#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
+#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -2369,10 +2472,15 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 "Così appare il menu PXE con i profili <emphasis role=\"strong\">Main-Server "
 "</emphasis> e <emphasis role=\"strong\">Thin-Client-Server</emphasis>:"
@@ -2556,9 +2664,9 @@ msgstr ""
 #| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 msgstr ""
 "Qui sotto ci sono più schermate sulla installazione grafica Main-Server + "
 "Workstation + Thin Client Server e come questa appare al primo avvio del "
@@ -3004,10 +3112,20 @@ msgid "DHCP Administration"
 msgstr "Amministrazione DHCP"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For GOsa² access you need the Skolelinux main server and a (client) "
+#| "system with a web browser installed which can be the main server itself "
+#| "if it was installed as a so called combined server (main server + thin "
+#| "client server + workstation). If all of the mentioned before is not "
+#| "available, see: <link linkend=\"Administration--"
+#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+#| "\">Installing a graphical environment on the main-server to use GOsa²</"
+#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server + "
+"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-"
@@ -3092,14 +3210,23 @@ msgstr ""
 "visibile su tutte le pagine di amministrazione di GOsa²."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In Debian Edu, account, group, and system information is stored in an "
+#| "LDAP directory. This data is used not only by the main server, but also "
+#| "by the (diskless) workstations, the thin client servers and the Windows "
+#| "machines on the network. With LDAP, account information about students, "
+#| "pupils, teachers, etc. only needs to be entered once. After information "
+#| "has been provided in LDAP, the information will be available to all "
+#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 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 "
@@ -4403,12 +4530,22 @@ msgid "Nagios"
 msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. The set of machines and services being "
+#| "monitored is automatically generated using information collected by the "
+#| "sitesummary system. The machines with the profile Main-server and Thin-"
+#| "client-server receive full monitoring, while workstations and thin "
+#| "clients receive simple monitoring. To enable full monitoring on a "
+#| "workstation, install the <computeroutput>nagios-nrpe-server</"
+#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -4524,13 +4661,21 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "New package are available for upgrades.  The critical ones are normally "
+#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
+#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
+#| "client servers, remember to also update the LTSP chroot using "
+#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
+#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 "Nuovi pacchetti sono disponibili per gli aggiornamenti. Quelli critici sono "
 "normalmente correzioni di sicurezza. Per l'aggiornamento, eseguire come root "
@@ -4794,10 +4939,9 @@ msgstr ""
 #| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 "Bisogna fare attenzione in quanto la seguente procedura si applica "
 "all'installazione di default del server principale Debian Edu (desktop=kde, "
@@ -7235,14 +7379,24 @@ msgid "Use a different LTSP client network"
 msgstr "Utilizzare una diversa rete per client LTSP"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If lots of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 "Se una macchina è installata usando il profilo Thin-Client-Server la rete "
 "predefinita per i client LTSP è 192.168.0.0/24. Se sono usati molti client "
@@ -7438,9 +7592,14 @@ msgid "Force all thin clients to use LXDE as default desktop environment"
 msgstr "Forzare tutti i thin-client ad usare come ambiente desktop LXDE"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Make sure that LXDE is installed on the thin client server; then add a "
+#| "line like this below <computeroutput>[default]</computeroutput> in \"lts."
+#| "conf\":"
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 "Assicurarsi che LXDE sia installato sul server thin-client; poi aggiungere "
 "una riga come questa sotto <computeroutput>[default]</computeroutput> in "
@@ -8477,13 +8636,21 @@ msgid "Remote Desktop Service"
 msgstr "Servizio di desktop remoto"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+#, fuzzy
+#| msgid ""
+#| "Beginning with this release, choosing the thin client server profile or "
+#| "the combined server profile installs xrdp, a package which uses the "
+#| "Remote Desktop Protocol to present a graphical login to a remote client. "
+#| "Microsoft Windows users can connect to the thin client server running "
+#| "xrdp without installing additional software - they simply start a Remote "
+#| "Desktop Connection on their Windows machine and connect."
+msgid ""
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 "A partire da questa versione, scegliendo il profilo server di thin-client o "
 "il profilo server combinato, viene installato xrdp, un pacchetto che usa il "
@@ -9890,9 +10057,9 @@ msgstr "Manuale per Debian Edu 8+edu0 Nome in codice Jessie"
 #| "<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian."
 #| "org</ulink>!"
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 "Questa è la prima beta release di Debian Edu 8+edu0. Si prega di inviare "
 "segnalazioni e commenti a <ulink url=\"mailto:debian-edu at lists.debian.org"
@@ -9925,14 +10092,27 @@ msgstr "Cambiamenti nell'installazione"
 #| "\"http://www.debian.org/releases/squeeze/installmanual\">installation "
 #| "manual</ulink> for more details."
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
 msgstr ""
 "Per le nuove versioni dell'installatore da Debian Squeeze, vedere per "
 "maggiori dettagli il <ulink url=\"http://www.debian.org/releases/wheezy/"
 "installmanual\">manuale di installazione</ulink>."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "Aggiornamenti software"
@@ -11557,10 +11737,14 @@ msgstr ""
 "Le workstation senza dischi LTSP funzionano senza alcuna configurazione."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On the dedicated client network of thin client servers (default "
+#| "192.168.0.0/24), machines run by default as diskless workstations if they "
+#| "are powerful enough."
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 "Sulla rete dei server di thin client (con impostazione predefinita "
 "192.168.0.0/24), le macchine funzionano per impostazione predefinita, come "
@@ -12392,9 +12576,13 @@ msgstr ""
 "utente sul disco da  144 a 24 MiB."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New tool notify-local-users to send desktop notification to all logged in "
+#| "users on a machine.  Useful for thin client servers."
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 "Nuovo strumento notify-local-users per mandare una notifica sul desktop a "
 "tutti gli utenti connessi su una macchina. Utile per i server thin client."
@@ -12564,9 +12752,13 @@ msgstr ""
 "senza dischi, thin-client or workstation."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "A diskless workstation option is installed but not activated by default "
+#| "on all servers with the thin-client-server profile."
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 "L'opzione per workstation senza dischi è installata, ma non attivata in modo "
 "predefinito su tutti i server con il profilo thin-client-server."
@@ -12916,6 +13108,28 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Thin Client Server/s"
+#~ msgstr "Server di thin-client"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "Server LTSP (server di thin-client)"
+
+#~ msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+
+#~ msgid ""
+#~ "First of all, this profile name is confusing for historic reasons. "
+#~ "Currently this profile actually installs an LTSP server environment for "
+#~ "thin-clients and for diskless workstations. Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
+#~ "change the name of the profile into a better suited one."
+#~ msgstr ""
+#~ "Prima di tutto, questo profilo ha un nome che può confondere, per ragioni "
+#~ "storiche: il profilo installa effettivamente un ambiente server LTSP per "
+#~ "thin-client e workstation senza disco. C'è un bug Debian <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> per trovare un termine "
+#~ "più adatto per il nome del profilo."
+
 #, fuzzy
 #~| msgid "Installer help screen"
 #~ msgid "Help screen"
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 9578c36..01efbdd 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: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+0000\n"
 "PO-Revision-Date: 2016-07-20 23:17+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -188,15 +188,26 @@ msgid "The Debian Edu network topology"
 msgstr "デフォルトのネットワーク設定"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 "絵は仮のネットワーク接続形態のスケッチです。Skolelinux はデフォルトではネット"
 "ワークに通常のワークステーションやシンクライアントサーバ (及びそれに結びつけ"
@@ -281,12 +292,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 thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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アドレス "
@@ -300,17 +318,29 @@ msgid "Services running on the main server"
 msgstr "中心サーバで動作するサービス"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 "シンクライアントの制御を例外として、サービスは全て中央コンピュータ (中心サー"
 "バ) で用意されます。性能のためにシンクライアントサーバには別個のマシンを当て"
@@ -528,8 +558,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "シンクライアントサーバ"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "ウェブサーバ"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -602,13 +634,20 @@ 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 thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 "クライアントのネットワーク設定は DHCP を使って自動的に行われます。通常のクラ"
 "イアントにはプライベート用のサブネット 10.0.0.0/8 に属するIPアドレスが割り当"
@@ -700,11 +739,18 @@ 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 thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 "プリンタは便利のいいところで、メインのネットワークに直接接続するか、ネット"
@@ -713,22 +759,31 @@ msgstr ""
 "これにはプリンタに対する割り当てとアクセス制御を利用します。"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "LTSP サーバ (シンクライアントサーバ)"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "1つの Skolelinux ネットワークに多数の LTSP サーバ (シンクライアントサーバとも"
 "呼ばれます) を配置できます。シンクライアントサーバのプロファイルを選択してイ"
 "ンストールします。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The thin client servers are set up to receive syslog from the thin "
+#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 "シンクライアントサーバは syslog をシンクライアントから受け取り、中央ログ収集"
 "サーバに送るように設定されます。"
@@ -900,12 +955,20 @@ msgstr ""
 "す。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 "インストールでは目的の言語 (例えば日本語や英語) とマシンのプロファイル (サー"
 "バ、ワークステーション、シンクライアントサーバ) を除き、何も聞いてこないはず"
@@ -1051,9 +1114,13 @@ msgstr ""
 "ビット (Debian アーキテクチャ「amd64」) の x86 プロセッサが必要です。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 "中心サーバ及びシンクライアントサーバプロファイルでは、30 クライアントで最低 "
 "2 GiB、50-60 クライアントでは最低 4 GiB の RAM 容量を推奨します。"
@@ -1119,8 +1186,8 @@ msgstr ""
 #| "main server + thin client server: 60 GiB. As usual with disk space on a "
 #| "main server, \"the bigger the better\"."
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 "中心サーバ + シンクライアントサーバ: 60GiB。中心サーバのディスク容量について"
 "は例によって「多ければ多いほどよい」ということになります。"
@@ -1128,7 +1195,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid "thin client server: 40 GiB."
-msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "シンクライアントサーバ: 40GiB"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1136,8 +1203,12 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "ワークステーション及び単独: 30 GiB"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin client servers need two network cards when using the default network "
+#| "architecture:"
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 "デフォルトのネットワーク構成で利用する場合、シンクライアントサーバにはネット"
@@ -1808,11 +1879,16 @@ msgid "The installation process"
 msgstr "インストールプロセス"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#| "Stretch/Requirements\">system requirements</ulink> and make sure you have "
+#| "at least two network cards (NICs) if you plan on setting up a thin client "
+#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "シンクライアントサーバを用意する際は<ulink url=\"http://wiki.debian.org/"
 "DebianEdu/Documentation/Stretch/Requirements\">システム要件</ulink>と、ネット"
@@ -1840,12 +1916,19 @@ 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 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 "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"want a graphical user interface, then select Workstation or LTSP-Server in "
+"addition to this one."
 msgstr ""
 "これは学校向けに提供する全サービスを設定済みでそのまま使える中心サーバ "
 "(tjener) です。学校のネットワークに中心サーバを1台だけインストールしないとい"
@@ -1890,20 +1973,30 @@ msgstr ""
 "ファイルを選択してください。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr ""
-"<emphasis role=\"strong\">Thin-Client-Server (シンクライアントサーバ)</"
-"emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgstr "<emphasis role=\"strong\">Main-Server (tjener, 中心サーバ)</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+#, fuzzy
+#| msgid ""
+#| "A thin client (and diskless workstation) server, also called a LTSP "
+#| "server. Clients without hard drives boot and run software from this "
+#| "server. This computer needs two network cards, a lot of memory, and "
+#| "ideally more than one processor or core. See the chapter about <link "
+#| "linkend=\"NetworkClients\">networked clients</link> for more information "
+#| "on this subject. Choosing this profile also enables the workstation "
+#| "profile (even if it is not selected) - a thin client server can always be "
+#| "used as a workstation, too."
+msgid ""
+"A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
 "computer needs two network cards, a lot of memory, and ideally more than one "
 "processor or core. See the chapter about <link linkend=\"NetworkClients"
 "\">networked clients</link> for more information on this subject. Choosing "
 "this profile also enables the workstation profile (even if it is not "
-"selected) - a thin client server can always be used as a workstation, too."
+"selected) - an LTSP server can always be used as a workstation, too."
 msgstr ""
 "シンクライアント (やディスクレスワークステーション) サーバで、LTSP サーバとも"
 "呼ばれます。ハードドライブを持たないクライアントはブートとソフトウェアの実行"
@@ -1943,18 +2036,33 @@ 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\">Thin "
+#| "Client Server</emphasis> profiles are preselected. These profiles can be "
+#| "installed on one machine together if you want to install a so called "
+#| "<emphasis>combined main server</emphasis>. This means the main server "
+#| "will be a thin client server and also be used as a workstation. This is "
+#| "the default choice, since we assume most people will install <link "
+#| "linkend=\"Installation--"
+#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
+#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
+#| "cards installed in a machine which is going to be installed as a combined "
+#| "main server or as a thin client server to become usefull after the "
+#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 "<emphasis role=\"strong\">中心サーバ</emphasis>、<emphasis role=\"strong\">"
 "ワークステーション</emphasis>、<emphasis role=\"strong\">シンクライアントサー"
@@ -2010,10 +2118,15 @@ msgstr ""
 "方法です。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include Thin-client-server then the "
+#| "installer will spend quite some time at the end, \"Finishing the "
+#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"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 ""
 "待ってください。シンクライアントサーバのプロファイルも選択した場合、最後の"
 "「インストールを終了しています - debian-edu-profile-udeb を実行していま"
@@ -2121,27 +2234,21 @@ msgstr ""
 "ようになっています。"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
+#, fuzzy
+#| msgid "A note on thin-client-server installations"
+msgid "A note on LTSP-server installations using only Thin-Clients"
 msgstr "シンクライアントサーバのインストールに関する注意"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
-msgstr ""
-"何よりもまず、このプロファイルは歴史的経緯のため紛らわしい名前になっていま"
-"す。現在このプロファイルが実際にインストールするのはシンクライアント及びディ"
-"スクレスワークステーション用の LTSP サーバ環境です。このプロファイル名をもっ"
-"と適した名前に変更しようという Debian バグ <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> が提出されています。"
-
-#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+#| "client</computeroutput> makes it possible to skip the step which converts "
+#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
+#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -2247,10 +2354,15 @@ msgid "width=400"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 "<emphasis role=\"strong\">中心サーバ</emphasis>と<emphasis role=\"strong\">シ"
 "ンクライアントサーバ</emphasis>プロファイルの場合 PXE メニューはこんな感じに"
@@ -2428,9 +2540,9 @@ msgstr ""
 #| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 msgstr ""
 "以下は中心サーバ + ワークステーション + シンクライアントサーバをグラフィカル"
 "モードでインストールした場合と、tjener の最初のブート、ワークステーションネッ"
@@ -2906,10 +3018,20 @@ 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 + thin "
+#| "client server + workstation). If all of the mentioned before is not "
+#| "available, see: <link linkend=\"Administration--"
+#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+#| "\">Installing a graphical environment on the main-server to use GOsa²</"
+#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server + "
+"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-"
@@ -2987,14 +3109,23 @@ 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 thin client servers and the Windows "
+#| "machines on the network. With LDAP, account information about students, "
+#| "pupils, teachers, etc. only needs to be entered once. After information "
+#| "has been provided in LDAP, the information will be available to all "
+#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 msgstr ""
 "Debian Edu ではアカウントやグループ、システム情報は LDAP ディレクトリに保存さ"
 "れています。このデータは中心サーバだけでなくネットワーク上の (ディスクレス) "
@@ -4244,12 +4375,22 @@ msgid "Nagios"
 msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. The set of machines and services being "
+#| "monitored is automatically generated using information collected by the "
+#| "sitesummary system. The machines with the profile Main-server and Thin-"
+#| "client-server receive full monitoring, while workstations and thin "
+#| "clients receive simple monitoring. To enable full monitoring on a "
+#| "workstation, install the <computeroutput>nagios-nrpe-server</"
+#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -4363,13 +4504,21 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "New package are available for upgrades.  The critical ones are normally "
+#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
+#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
+#| "client servers, remember to also update the LTSP chroot using "
+#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
+#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 "アップグレードできる新しいパッケージが利用可能になっています。通常重要なのは"
 "セキュリティの修正です。アップグレードするにはターミナルまたは ssh 経由でログ"
@@ -4603,12 +4752,18 @@ msgstr ""
 "うにバックアップを用意してください。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Please note that the following recipe applies to a default Debian Edu "
+#| "main server installation (desktop=kde, profiles Main-Server, Workstation, "
+#| "Thin-Client-Server). (For a general overview concerning jessie to stretch "
+#| "upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
+#| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 "以下の方法はデフォルトでインストールした Debian Edu 中心サーバ (デスクトップ"
 "は kde、プロファイルは中心サーバ、ワークステーション、シンクライアントサー"
@@ -6941,14 +7096,24 @@ msgid "Use a different LTSP client network"
 msgstr "異なる LTSP クライアントネットワークの利用"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If lots of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 "シンクライアントサーバのプロファイルを使ってインストールしたマシンではデフォ"
 "ルトの LTSP クライアントネットワークは 192.168.0.0/24 となっています。LTSP ク"
@@ -7137,9 +7302,14 @@ msgid "Force all thin clients to use LXDE as default desktop environment"
 msgstr "全シンクライアントにデフォルトのデスクトップ環境として LXDE を強制"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Make sure that LXDE is installed on the thin client server; then add a "
+#| "line like this below <computeroutput>[default]</computeroutput> in \"lts."
+#| "conf\":"
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 "シンクライアントサーバに LXDE がインストールされていることを確認してくださ"
 "い。それから「lts.conf」の <computeroutput>[default]</computeroutput> に以下"
@@ -8108,13 +8278,21 @@ msgid "Remote Desktop Service"
 msgstr "リモートデスクトップサービス"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+#, fuzzy
+#| msgid ""
+#| "Beginning with this release, choosing the thin client server profile or "
+#| "the combined server profile installs xrdp, a package which uses the "
+#| "Remote Desktop Protocol to present a graphical login to a remote client. "
+#| "Microsoft Windows users can connect to the thin client server running "
+#| "xrdp without installing additional software - they simply start a Remote "
+#| "Desktop Connection on their Windows machine and connect."
+msgid ""
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 "このリリースから、シンクライアントサーバや複合サーバのプロファイルを選択した"
 "場合には xrdp をインストールするようになっています。このパッケージwhich uses "
@@ -9451,9 +9629,9 @@ msgstr "Debian Edu 9+edu0 コード名 Stretch の新機能"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -9477,15 +9655,33 @@ msgid "Installation changes"
 msgstr "インストールの変更"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New version of debian-installer from Debian Stretch, see <ulink url="
+#| "\"http://www.debian.org/releases/stretch/installmanual\">installation "
+#| "manual</ulink> for more details."
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
 msgstr ""
 "Debian Stretch 用の新しいバージョンの debian-installer。詳細については<ulink "
 "url=\"http://www.debian.org/releases/stretch/installmanual\">インストールマ"
 "ニュアル</ulink>を見てください。"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "ソフトウェアの更新"
@@ -10894,9 +11090,8 @@ msgstr "LTSP ディスクレスワークステーションが追加設定無し
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -11565,7 +11760,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -11702,9 +11897,13 @@ msgstr ""
 "ワークステーションをユーザが選択できるようになっています。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "A diskless workstation option is installed but not activated by default "
+#| "on all servers with the thin-client-server profile."
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 "シンクライアントサーバのプロファイルでインストールした全サーバでディスクレス"
 "ワークステーションプロファイルもインストールされますがデフォルトでは有効化さ"
@@ -12040,6 +12239,30 @@ msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
 
+#~ msgid "Thin Client Server/s"
+#~ msgstr "シンクライアントサーバ"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "LTSP サーバ (シンクライアントサーバ)"
+
+#~ msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Thin-Client-Server (シンクライアントサーバ)</"
+#~ "emphasis>"
+
+#~ msgid ""
+#~ "First of all, this profile name is confusing for historic reasons. "
+#~ "Currently this profile actually installs an LTSP server environment for "
+#~ "thin-clients and for diskless workstations. Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
+#~ "change the name of the profile into a better suited one."
+#~ msgstr ""
+#~ "何よりもまず、このプロファイルは歴史的経緯のため紛らわしい名前になっていま"
+#~ "す。現在このプロファイルが実際にインストールするのはシンクライアント及び"
+#~ "ディスクレスワークステーション用の LTSP サーバ環境です。このプロファイル名"
+#~ "をもっと適した名前に変更しようという Debian バグ <ulink url=\"https://"
+#~ "bugs.debian.org/588510#\">588510</ulink> が提出されています。"
+
 #, fuzzy
 #~| msgid "{{attachment:Installer_help.png}}"
 #~ msgid "{{attachment:01-Installer_boot_menu.png}}"
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 d996fc3..8c11dfe 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: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+0000\n"
 "PO-Revision-Date: 2016-11-27 08:02+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -198,15 +198,26 @@ 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 thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 "Figuren er en skisse over det forventede nettverksoppsettet (topologien). "
 "Standardoppsettet til et skolelinuxnettverk forventer at det er en (og bare "
@@ -294,12 +305,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 thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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 "
@@ -312,17 +330,29 @@ msgid "Services running on the main server"
 msgstr "Tjenester som kjører på hovedtjeneren"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 "Med unntak av kontrollen med tynnklienter, er alle tjenester i "
 "utgangspunktet satt opp på en sentral maskin (hovedtjener). Av "
@@ -544,8 +574,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "Tynnklienttjener(e)"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "Webtjener"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -619,13 +651,20 @@ 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 thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 "Nettverksoppsett på klienter blir gjort automatisk ved hjelp av DHCP. "
 "Vanlige klienter blir gitt IP-adresser i det private undernettet 10.0.0.0/8, "
@@ -720,11 +759,18 @@ msgstr ""
 "nettverket har riktig tid."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 "Skrivere tilkoples der det er ønskelig, enten direkte på nettverket eller "
@@ -734,21 +780,30 @@ msgstr ""
 "skrivere."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "LTSP-tjenere (tynnklienttjener(e))"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "Et Skolelinux-nett kan ha mange LTSP-tjenere (tynnklienttjenere), som "
 "installeres ved å velge profilen for en  tynnklienttjener."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The thin client servers are set up to receive syslog from the thin "
+#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 "Tynnklienttjeneren er satt opp til å motta syslog fra de tynne klientene og "
 "videresende disse meldingene til den sentrale mottakeren for syslogmeldinger."
@@ -924,12 +979,20 @@ msgstr ""
 "installasjonen."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 "Installasjonen skal ikke komme med noen spørsmål, med unntak av ønsket språk "
 "(f.eks. norsk bokmål, nynorsk, samisk) og maskinprofil (tjener, "
@@ -1069,9 +1132,13 @@ msgstr ""
 "klassen), eller 64-bit (Debian-arkitektur «AMD64»)."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 "Det er anbefalt minst 2 GiB RAM for 30 klienter og 4 GiB RAM for 50-60 "
 "klienter for hovedtjener- og tynnklienttjenerprofiler."
@@ -1130,15 +1197,21 @@ msgstr ""
 "Minimumskravet til lagerplass avhenger av hvilken profil som er installert:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 70 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 "Hovedtjener + tynnklient: 70 GiB. Som vanlig med diskplass på en "
 "hovedtjener, «jo større jo bedre»."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 50 GiB."
+#, fuzzy
+#| msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "Tynnklienttjener: 50 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1146,8 +1219,12 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "Arbeidsstasjon eller frittstående: 30 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin client servers need two network cards when using the default network "
+#| "architecture:"
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 "Tynnklienttjenere trenger to nettverkskort ved bruk av standard "
@@ -1753,11 +1830,16 @@ msgid "The installation process"
 msgstr "Installasjonsprosessen"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#| "Stretch/Requirements\">system requirements</ulink> and make sure you have "
+#| "at least two network cards (NICs) if you plan on setting up a thin client "
+#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "Husk  <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Stretch/"
 "Requirements\">system requirements</ulink>, og pass på at du har minst to "
@@ -1785,12 +1867,19 @@ 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>
+#, fuzzy
+#| msgid ""
+#| "This is the main server (tjener) for your school providing all services "
+#| "pre-configured to work out of the box. You must only install one main "
+#| "server per school! This profile does not include a graphical user "
+#| "interface. If you want a graphical user interface, then select "
+#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"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 "
 "tjenestene virker med en gang. Dette fordi de er forhåndskonfigurert. Du kan "
@@ -1833,18 +1922,30 @@ msgstr ""
 "denne profilen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr "<emphasis role='strong'>Tynnklienttjener</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-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>
-msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+#, fuzzy
+#| msgid ""
+#| "A thin client (and diskless workstation) server, also called a LTSP "
+#| "server. Clients without hard drives boot and run software from this "
+#| "server. This computer needs two network cards, a lot of memory, and "
+#| "ideally more than one processor or core. See the chapter about <link "
+#| "linkend=\"NetworkClients\">networked clients</link> for more information "
+#| "on this subject. Choosing this profile also enables the workstation "
+#| "profile (even if it is not selected) - a thin client server can always be "
+#| "used as a workstation, too."
+msgid ""
+"A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
 "computer needs two network cards, a lot of memory, and ideally more than one "
 "processor or core. See the chapter about <link linkend=\"NetworkClients"
 "\">networked clients</link> for more information on this subject. Choosing "
 "this profile also enables the workstation profile (even if it is not "
-"selected) - a thin client server can always be used as a workstation, too."
+"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 "
@@ -1884,18 +1985,33 @@ msgstr ""
 "flytter manuelt ut fra hovedtjeneren."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
+#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
+#| "Client Server</emphasis> profiles are preselected. These profiles can be "
+#| "installed on one machine together if you want to install a so called "
+#| "<emphasis>combined main server</emphasis>. This means the main server "
+#| "will be a thin client server and also be used as a workstation. This is "
+#| "the default choice, since we assume most people will install <link "
+#| "linkend=\"Installation--"
+#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
+#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
+#| "cards installed in a machine which is going to be installed as a combined "
+#| "main server or as a thin client server to become usefull after the "
+#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 "Profilene til <emphasis role=\"strong\">hovedtjener </emphasis>, <emphasis "
 "role=\"strong \">arbeidsstasjon</emphasis> og <emphasis role=\"strong"
@@ -1950,10 +2066,15 @@ msgstr ""
 "er selvfølgelig frivillig."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include Thin-client-server then the "
+#| "installer will spend quite some time at the end, \"Finishing the "
+#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"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 ""
 "Hvis tynnklientserver er en av de valgte profilene, vil installasjonen ta en "
 "del tid mot slutten, og det står da «Fullfører installasjonen ...» på "
@@ -2060,27 +2181,21 @@ msgstr ""
 "unngå til å laste ned den samme pakken flere ganger fra nettet."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
+#, fuzzy
+#| msgid "A note on thin-client-server installations"
+msgid "A note on LTSP-server installations using only Thin-Clients"
 msgstr "En kommentar om installasjon av tynnklienttjenere"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
-msgstr ""
-"Først og fremst så er denne profilen navngitt på en forvirrende måte av "
-"historiske årsaker. Profilen installerer et LTSP-servermiljø for "
-"tynnklienter og for diskløse arbeidsstasjoner. Debian bug <ulink url="
-"\"https://bugs.debian.org/588510#\">588510</ulink> er blitt aktivert for å "
-"endre profilnavnet til noe som er mer passende."
-
-#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+#| "client</computeroutput> makes it possible to skip the step which converts "
+#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
+#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -2185,10 +2300,15 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 "Slik ser PXE-menyen ut når man har  <emphasis role=\"strong\">hovedtjener</"
 "emphasis> og <emphasis role=\"strong\">tynnklienttjener</emphasis>profilene:"
@@ -2358,11 +2478,17 @@ msgstr ""
 "er det all grunn til å bruke dette.   "
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "So here is a screenshot tour through a graphical 64-bit Main-Server + "
+#| "Workstation + Thin Client Server installation and how it looks at the "
+#| "first boot of the tjener, a PXE boot on the workstation network and on "
+#| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 msgstr ""
 "Disse skjermbildene gir en gjennomgang av en grafisk 64-bit hovedtjener + "
 "arbeidsstasjon + tynnklient-tjenerinstallasjon, og hvordan det ser ut ved "
@@ -2736,10 +2862,20 @@ msgid "DHCP Administration"
 msgstr "DHCP-administrasjon"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For GOsa² access you need the Skolelinux main server and a (client) "
+#| "system with a web browser installed which can be the main server itself "
+#| "if it was installed as a so called combined server (main server + thin "
+#| "client server + workstation). If all of the mentioned before is not "
+#| "available, see: <link linkend=\"Administration--"
+#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+#| "\">Installing a graphical environment on the main-server to use GOsa²</"
+#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server + "
+"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-"
@@ -2818,14 +2954,23 @@ msgstr ""
 "administrasjonssidene som ligger inne i GOsa²."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In Debian Edu, account, group, and system information is stored in an "
+#| "LDAP directory. This data is used not only by the main server, but also "
+#| "by the (diskless) workstations, the thin client servers and the Windows "
+#| "machines on the network. With LDAP, account information about students, "
+#| "pupils, teachers, etc. only needs to be entered once. After information "
+#| "has been provided in LDAP, the information will be available to all "
+#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 msgstr ""
 "I Debian Edu er kontoinformasjon lagret i en LDAP-katalog, og blir brukt "
 "derfra, ikke bare fra hovedtjeneren selv, men også arbeidstassjoner og "
@@ -4071,12 +4216,22 @@ msgid "Nagios"
 msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. The set of machines and services being "
+#| "monitored is automatically generated using information collected by the "
+#| "sitesummary system. The machines with the profile Main-server and Thin-"
+#| "client-server receive full monitoring, while workstations and thin "
+#| "clients receive simple monitoring. To enable full monitoring on a "
+#| "workstation, install the <computeroutput>nagios-nrpe-server</"
+#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -4193,13 +4348,21 @@ msgstr ""
 "oppdateringer)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "New package are available for upgrades.  The critical ones are normally "
+#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
+#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
+#| "client servers, remember to also update the LTSP chroot using "
+#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
+#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 "Ny pakke er tilgjengelig for oppgraderinger. De kritiske er normalt "
 "sikkerhetsfikser. For å oppgradere, kjør \"apt-get upgrade && apt-"
@@ -4437,12 +4600,18 @@ msgstr ""
 "tilbake ved eventuelle problemer."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Please note that the following recipe applies to a default Debian Edu "
+#| "main server installation (desktop=kde, profiles Main-Server, Workstation, "
+#| "Thin-Client-Server). (For a general overview concerning jessie to stretch "
+#| "upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
+#| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 "Vær oppmerksom på at følgende oppskrift gjelder en standard Debian Edu-"
 "hovedtjener-installasjon  (desktop=kde, profiles Main-Server, Workstation, "
@@ -6795,14 +6964,24 @@ msgid "Use a different LTSP client network"
 msgstr "Bruk et annet nettverksoppsett for LTSP-tynnklienter"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If lots of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 "192.168.0.0/24 er standard LTSP-tjenernettverk hvis maskinen har installert "
 "med Thin-Client-Server-Profile (tynnklientserverprofilen). Hvis mange LTS-"
@@ -6999,9 +7178,14 @@ msgstr ""
 "skrivebordsmiljø"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Make sure that LXDE is installed on the thin client server; then add a "
+#| "line like this below <computeroutput>[default]</computeroutput> in \"lts."
+#| "conf\":"
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 "Kontroller at LXDE er installert på den tynnklienten; legg deretter til en "
 "linje som dette nedenfor"
@@ -7998,13 +8182,21 @@ msgid "Remote Desktop Service"
 msgstr "Tjeneste for skrivebordsomgivelse via nett"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+#, fuzzy
+#| msgid ""
+#| "Beginning with this release, choosing the thin client server profile or "
+#| "the combined server profile installs xrdp, a package which uses the "
+#| "Remote Desktop Protocol to present a graphical login to a remote client. "
+#| "Microsoft Windows users can connect to the thin client server running "
+#| "xrdp without installing additional software - they simply start a Remote "
+#| "Desktop Connection on their Windows machine and connect."
+msgid ""
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 "Fra og med denne utgivelsen, enten tynnklienttjenerprofil eller den "
 "kombinerte tjenerprofilen velges, installeres XRDP, en pakke som bruker "
@@ -9377,10 +9569,15 @@ msgid "New features for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Nye egenskaper hos Debian Edu 9+edu0 kodenavn Stretch"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release "
+#| "of Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:"
+#| "debian-edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 "Dette er en <emphasis role=\"strong\">very early ALPHA</emphasis>-utgave av "
 "Debian Edu 9+edu0. Vennligst send tilbakemeldinger til <ulink url=\"mailto:"
@@ -9403,15 +9600,33 @@ msgid "Installation changes"
 msgstr "Installasjonsendringer"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New version of debian-installer from Debian Stretch, see <ulink url="
+#| "\"http://www.debian.org/releases/stretch/installmanual\">installation "
+#| "manual</ulink> for more details."
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
 msgstr ""
 "Om ny versjon av debian-installer fra Debian Stretch, se <ulink url=\"http://"
 "www.debian.org/releases/lenny/installmanual\"> manualen til Debian "
 "Installer</ulink> for flere detaljer."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "Programvareoppdateringer"
@@ -10944,10 +11159,14 @@ msgid "LTSP diskless workstations run without any configuration."
 msgstr "LTSP-diskløse arbeidsstasjoner kjører uten noen konfigurasjon."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On the dedicated client network of thin client servers (default "
+#| "192.168.0.0/24), machines run by default as diskless workstations if they "
+#| "are powerful enough."
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 "På det dedikerte klientnettverket  av tynnklienttjenere "
 "(standard192.168.0.0/24), kjører maskiner som standard som diskløse "
@@ -11763,9 +11982,13 @@ msgstr ""
 "144 til 24 MiB."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New tool notify-local-users to send desktop notification to all logged in "
+#| "users on a machine.  Useful for thin client servers."
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 "Nytt verktøy notify-local-users for beskjedsending til alle påloggede "
 "brukere på en maskin. Nyttig for tynnklienttjenere."
@@ -11934,9 +12157,13 @@ msgstr ""
 "tynnklient eller arbeidsstasjon."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "A diskless workstation option is installed but not activated by default "
+#| "on all servers with the thin-client-server profile."
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 "Mulighet for diskløse arbeidsstasjoner er installert, men ikke aktivert på "
 "alle tjenere med LTSP -profil. "
@@ -12282,6 +12509,28 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
+#~ msgid "Thin Client Server/s"
+#~ msgstr "Tynnklienttjener(e)"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "LTSP-tjenere (tynnklienttjener(e))"
+
+#~ msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+#~ msgstr "<emphasis role='strong'>Tynnklienttjener</emphasis>"
+
+#~ msgid ""
+#~ "First of all, this profile name is confusing for historic reasons. "
+#~ "Currently this profile actually installs an LTSP server environment for "
+#~ "thin-clients and for diskless workstations. Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
+#~ "change the name of the profile into a better suited one."
+#~ msgstr ""
+#~ "Først og fremst så er denne profilen navngitt på en forvirrende måte av "
+#~ "historiske årsaker. Profilen installerer et LTSP-servermiljø for "
+#~ "tynnklienter og for diskløse arbeidsstasjoner. Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> er blitt aktivert for "
+#~ "å endre profilnavnet til noe som er mer passende."
+
 #, fuzzy
 #~| msgid "Installer help screen"
 #~ msgid "Help screen"
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 066544a..a4cc2d9 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: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+0000\n"
 "PO-Revision-Date: 2016-11-25 10:09+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"
@@ -190,15 +190,26 @@ 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 thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 "De afbeelding schetst het schema van de veronderstelde netwerktopologie. De "
 "standaardopstelling van een Skolelinux netwerk veronderstelt dat er één (en "
@@ -292,12 +303,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 thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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 "
@@ -310,17 +328,29 @@ msgid "Services running on the main server"
 msgstr "De diensten op de hoofdserver"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 "Behalve het beheer van de thin clients, worden initieel alle diensten "
 "geïnstalleerd op één centrale computer (de hoofdserver). Met het oog op "
@@ -546,8 +576,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "Thin-clientserver/s"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "Webserver"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -626,13 +658,20 @@ 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 thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 "De netwerkconfiguratie van de clientcomputers gebeurt automatisch met behulp "
 "van DHCP. Gewone clientcomputers krijgen een IP-adres toegewezen uit het "
@@ -734,11 +773,18 @@ 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 thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 "Printers kunnen geplaatst worden waar dit het meest praktisch is. Ze kunnen "
@@ -749,22 +795,31 @@ msgstr ""
 "toegangsrechten als een quotaregeling zijn mogelijk."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "LTSP-servers (Thin-clientservers)"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "Een netwerk van Skolelinux kan meerdere LTSP-servers (ook thin-clientservers "
 "genaamd) bevatten. Men zet een thin-clientserver op door bij de installatie "
 "het thin-clientserverprofiel te selecteren."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The thin client servers are set up to receive syslog from the thin "
+#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 "Thin-clientservers staan ingesteld om systeemlogboekberichten (syslog) te "
 "ontvangen van de thin clients en om die door te sturen naar de centrale "
@@ -947,12 +1002,20 @@ msgstr ""
 "tijdens het installatieproces."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 "Tijdens de installatie moet geen enkele vraag beantwoord worden, met "
 "uitzondering van de gewenste taal (bijvoorbeeld Noors Bokmål, Nynorsk, Sami, "
@@ -1109,9 +1172,13 @@ msgstr ""
 "type x86 hebben."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 "Minstens 2GB RAM bij 30 clients en 4GB RAM bij 50-60 clients wordt "
 "aanbevolen voor de profielen hoofdserver en thin-clientserver."
@@ -1178,15 +1245,21 @@ msgstr ""
 "profiel:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 70 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 "hoofdserver + thlin-clientserver: 70 GiB. Zoals gewoonlijk met schijfruimte "
 "op een hoofdserver, geldt \"hoe meer, hoe beter\"."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 50 GiB."
+#, fuzzy
+#| msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "thin-clientserver: 50 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1194,8 +1267,12 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "werkstations en autonome computers: 30GB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin client servers need two network cards when using the default network "
+#| "architecture:"
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 "Als men de standaardarchitectuur voor het netwerk aanhoudt, moet men thin-"
@@ -1826,11 +1903,16 @@ msgid "The installation process"
 msgstr "Het installatieproces"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#| "Stretch/Requirements\">system requirements</ulink> and make sure you have "
+#| "at least two network cards (NICs) if you plan on setting up a thin client "
+#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "Hou rekening met de <ulink url=\"http://wiki.debian.org/DebianEdu/"
 "Documentation/Stretch/Requirements\">systeemvereisten</ulink> en zorg ervoor "
@@ -1861,12 +1943,19 @@ 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 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 "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"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 "
 "voor gebruik vooraf geconfigureerd worden. U mag slechts één hoofdserver per "
@@ -1913,18 +2002,30 @@ msgstr ""
 "'autonome computer'."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr "<emphasis role=\"strong\">Thin-clientserver</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgstr "<emphasis role=\"strong\">Hoofdserver</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+#, fuzzy
+#| msgid ""
+#| "A thin client (and diskless workstation) server, also called a LTSP "
+#| "server. Clients without hard drives boot and run software from this "
+#| "server. This computer needs two network cards, a lot of memory, and "
+#| "ideally more than one processor or core. See the chapter about <link "
+#| "linkend=\"NetworkClients\">networked clients</link> for more information "
+#| "on this subject. Choosing this profile also enables the workstation "
+#| "profile (even if it is not selected) - a thin client server can always be "
+#| "used as a workstation, too."
+msgid ""
+"A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
 "computer needs two network cards, a lot of memory, and ideally more than one "
 "processor or core. See the chapter about <link linkend=\"NetworkClients"
 "\">networked clients</link> for more information on this subject. Choosing "
 "this profile also enables the workstation profile (even if it is not "
-"selected) - a thin client server can always be used as a workstation, too."
+"selected) - an LTSP server can always be used as a workstation, too."
 msgstr ""
 "Dit is een server voor thin clients (en schijfloze werkstations), ook LTSP-"
 "server genaamd. Clients zonder harde schijf starten op en voeren programma's "
@@ -1967,18 +2068,33 @@ 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\">Thin "
+#| "Client Server</emphasis> profiles are preselected. These profiles can be "
+#| "installed on one machine together if you want to install a so called "
+#| "<emphasis>combined main server</emphasis>. This means the main server "
+#| "will be a thin client server and also be used as a workstation. This is "
+#| "the default choice, since we assume most people will install <link "
+#| "linkend=\"Installation--"
+#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
+#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
+#| "cards installed in a machine which is going to be installed as a combined "
+#| "main server or as a thin client server to become usefull after the "
+#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 "De profielen <emphasis role=\"strong\">Hoofdserver</emphasis>, <emphasis "
 "role=\"strong\">Werkstation</emphasis> en <emphasis role=\"strong\">Thin-"
@@ -2038,10 +2154,15 @@ msgstr ""
 "mee helpen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include Thin-client-server then the "
+#| "installer will spend quite some time at the end, \"Finishing the "
+#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"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 ""
 "Heb wat geduld. Indien het thin-clientprofiel een van de te installeren "
 "profielen is, zal het installatieprogramma op het einde behoorlijk wat tijd "
@@ -2154,28 +2275,21 @@ msgstr ""
 "verschillende keren gedownload wordt."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
+#, fuzzy
+#| msgid "A note on thin-client-server installations"
+msgid "A note on LTSP-server installations using only Thin-Clients"
 msgstr "Een noot bij installaties van thin-clientservers"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
-msgstr ""
-"Vooreerst: de benaming voor dit profiel is om historische redenen "
-"verwarrend. Momenteel installeert dit profiel feitelijk een LTSP-"
-"serveromgeving voor thin clients en voor schijfloze werkstations. Er is een "
-"foutrapport <ulink url=\"https://bugs.debian.org/588510#\">588510</ulink> "
-"opgemaakt bij Debian met de vraag om voor dit profiel een beter passende "
-"benaming te gebruiken."
-
-#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+#| "client</computeroutput> makes it possible to skip the step which converts "
+#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
+#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -2283,10 +2397,15 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 "Bij een hoofdserver met zowel een <emphasis role=\"strong\">Hoofdserver-</"
 "emphasis> als een <emphasis role=\"strong\">Thin-clientserver-</"
@@ -2468,11 +2587,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 + Thin Client Server installation and how it looks at the "
+#| "first boot of the tjener, a PXE boot on the workstation network and on "
+#| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 msgstr ""
 "Hier volgt dus een rondleiding langs enkele schermafdrukken van een 64-bits "
 "grafische installatie van Hoofdserver + Werkstation + Thin-clientserver, van "
@@ -2852,10 +2977,20 @@ 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 + thin "
+#| "client server + workstation). If all of the mentioned before is not "
+#| "available, see: <link linkend=\"Administration--"
+#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
+#| "\">Installing a graphical environment on the main-server to use GOsa²</"
+#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server + "
+"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-"
@@ -2939,14 +3074,23 @@ 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 thin client servers and the Windows "
+#| "machines on the network. With LDAP, account information about students, "
+#| "pupils, teachers, etc. only needs to be entered once. After information "
+#| "has been provided in LDAP, the information will be available to all "
+#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 msgstr ""
 "In Debian Edu wordt informatie over accounts, groepen en systemen opgeslagen "
 "in een register van LDAP. Deze gegevens worden niet enkel door de "
@@ -4261,12 +4405,22 @@ msgid "Nagios"
 msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Nagios system and service monitoring is available from <ulink url="
+#| "\"https://www/nagios3/\"/>. The set of machines and services being "
+#| "monitored is automatically generated using information collected by the "
+#| "sitesummary system. The machines with the profile Main-server and Thin-"
+#| "client-server receive full monitoring, while workstations and thin "
+#| "clients receive simple monitoring. To enable full monitoring on a "
+#| "workstation, install the <computeroutput>nagios-nrpe-server</"
+#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -4387,13 +4541,21 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "New package are available for upgrades.  The critical ones are normally "
+#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
+#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
+#| "client servers, remember to also update the LTSP chroot using "
+#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
+#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 "Er zijn nieuwe pakketten voor opwaardering beschikbaar. De cruciale daarvan "
 "zijn meestal beveiligingsbijwerkingen. Om de opwaardering door te voeren "
@@ -4648,12 +4810,18 @@ msgstr ""
 "naar de oorspronkelijke situatie kunt terugkeren."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Please note that the following recipe applies to a default Debian Edu "
+#| "main server installation (desktop=kde, profiles Main-Server, Workstation, "
+#| "Thin-Client-Server). (For a general overview concerning jessie to stretch "
+#| "upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
+#| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 "De volgende procedure is van toepassing voor een standaardinstallatie van de "
 "hoofdserver van Debian Edu (bureaublad=kde, profielen Hoofdserver, "
@@ -7148,14 +7316,24 @@ msgid "Use a different LTSP client network"
 msgstr "Gebruik een verschillend LTSP clientnetwerk"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "192.168.0.0/24 is the default LTSP client network if a machine is "
+#| "installed using the Thin-Client-Server profile. If lots of LTSP clients "
+#| "are used or if different LTSP servers should serve both i386 and amd64 "
+#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
+#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
+#| "computeroutput> and adjust the eth1 settings accordingly. Use "
+#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
+#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 "Het standaard LTSP clientnetwerk is 192.168.0.0/24 als een computer "
 "geïnstalleerd wordt met behulp van het profiel Thin-Client-Server. Indien er "
@@ -7357,9 +7535,14 @@ msgid "Force all thin clients to use LXDE as default desktop environment"
 msgstr "LXDE voor alle thin clients standaard instellen als bureaubladomgeving"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Make sure that LXDE is installed on the thin client server; then add a "
+#| "line like this below <computeroutput>[default]</computeroutput> in \"lts."
+#| "conf\":"
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 "Zorg er voor dat LXDE geïnstalleerd is op de thin-clientserver; voeg "
 "vervolgens in \"lts.conf\" onder <computeroutput>[default]</computeroutput> "
@@ -8406,13 +8589,21 @@ msgid "Remote Desktop Service"
 msgstr "De dienst extern bureaublad (Remote Desktop Service)"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+#, fuzzy
+#| msgid ""
+#| "Beginning with this release, choosing the thin client server profile or "
+#| "the combined server profile installs xrdp, a package which uses the "
+#| "Remote Desktop Protocol to present a graphical login to a remote client. "
+#| "Microsoft Windows users can connect to the thin client server running "
+#| "xrdp without installing additional software - they simply start a Remote "
+#| "Desktop Connection on their Windows machine and connect."
+msgid ""
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 "Wanneer u er voor kiest om een profiel van thin-clientserver of van "
 "gecombineerde server te installeren, wordt vanaf deze uitgave ook het pakket "
@@ -9838,10 +10029,15 @@ msgid "New features for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Nieuwe functionaliteit voor Debian Edu 9+edu0 codenaam Stretch"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release "
+#| "of Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:"
+#| "debian-edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 "Dit is een <emphasis role=\"strong\">zeer vroege ALPHA</emphasis>-uitgave "
 "van Debian Edu 9.0+edu0. Graag krijgen we feedback via <ulink url=\"mailto:"
@@ -9864,15 +10060,33 @@ msgid "Installation changes"
 msgstr "Veranderingen aan het installatieproces"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New version of debian-installer from Debian Stretch, see <ulink url="
+#| "\"http://www.debian.org/releases/stretch/installmanual\">installation "
+#| "manual</ulink> for more details."
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
 msgstr ""
 "Nieuwe versie van het installatieprogramma van Debian Stretch. Voor meer "
 "details kunt u terecht bij de <ulink url=\"http://www.debian.org/releases/"
 "stretch/installmanual\">installatiehandleiding</ulink>.."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
+msgstr ""
+
 #. type: Content of: <article><section><section><section><title>
 msgid "Software updates"
 msgstr "Bijwerkingen van programmatuur"
@@ -11436,10 +11650,14 @@ msgstr ""
 "Schijfloze werkstations van LTSP functioneren zonder bijkomende configuratie."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On the dedicated client network of thin client servers (default "
+#| "192.168.0.0/24), machines run by default as diskless workstations if they "
+#| "are powerful enough."
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 "Op het gereserveerde netwerk voor clientcomputers (standaard 192.168.0.0/24) "
 "dat door de thin-clientservers bediend wordt, functioneren clients standaard "
@@ -12321,9 +12539,13 @@ msgstr ""
 "schijfvoetafdruk van elke gebruiker verminderde van 144 naar 24 MB."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "New tool notify-local-users to send desktop notification to all logged in "
+#| "users on a machine.  Useful for thin client servers."
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 "Het nieuwe hulpmiddel notify-local-users maakt het mogelijk om een bericht "
 "te sturen naar het bureaublad van alle aangemelde gebruikers. Dit is nuttig "
@@ -12496,9 +12718,13 @@ msgstr ""
 "werkstation, thin client of werkstation."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "A diskless workstation option is installed but not activated by default "
+#| "on all servers with the thin-client-server profile."
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 "Ook het profiel schijfloos werkstation wordt standaard geïnstalleerd maar "
 "niet geactiveerd op alle servers met het thin-clientserverprofiel."
@@ -12862,6 +13088,29 @@ msgstr ""
 "Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid "Thin Client Server/s"
+#~ msgstr "Thin-clientserver/s"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "LTSP-servers (Thin-clientservers)"
+
+#~ msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">Thin-clientserver</emphasis>"
+
+#~ msgid ""
+#~ "First of all, this profile name is confusing for historic reasons. "
+#~ "Currently this profile actually installs an LTSP server environment for "
+#~ "thin-clients and for diskless workstations. Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
+#~ "change the name of the profile into a better suited one."
+#~ msgstr ""
+#~ "Vooreerst: de benaming voor dit profiel is om historische redenen "
+#~ "verwarrend. Momenteel installeert dit profiel feitelijk een LTSP-"
+#~ "serveromgeving voor thin clients en voor schijfloze werkstations. Er is "
+#~ "een foutrapport <ulink url=\"https://bugs.debian.org/588510#\">588510</"
+#~ "ulink> opgemaakt bij Debian met de vraag om voor dit profiel een beter "
+#~ "passende benaming te gebruiken."
+
 #, fuzzy
 #~| msgid "Installer help screen"
 #~ msgid "Help screen"
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 53f8a70..5d7657f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+0000\n"
 "PO-Revision-Date: 2016-11-22 10:39+0000\n"
 "Last-Translator: Stanisław Krukowski <dfk0077 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -189,15 +189,26 @@ 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 thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 "Rysunek jest szkicem przypuszczalnej topologii sieci komputerowej. Domyślna "
 "konfiguracja sieci komputerowej Skolelinux zakłada, że jest jeden (i tylko "
@@ -288,12 +299,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 thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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 "
@@ -307,17 +325,29 @@ msgid "Services running on the main server"
 msgstr "Usługi uruchamiane na serwerze głównym"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 "Za wyjątkiem sterowania terminalami komputerowymi, wszystkie usługi są "
 "początkowo zainstalowane na jednym komputerze centralnym (komputerze "
@@ -542,8 +572,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "Serwer /serwery terminala /terminali"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "Serwer WWW"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -622,13 +654,20 @@ 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 thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 "Konfiguracja sieci komputerowej dla klientów jest wykonywana automatycznie "
 "za pomocą DHCP. Zwykłe klienty mają adresy IP  przydzielane w prywatnej "
@@ -727,11 +766,18 @@ msgstr ""
 "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 thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 "Drukarki mogą być podłączone, zależnie od potrzeb, bezpośrednio do głównej "
@@ -741,13 +787,18 @@ msgstr ""
 "można osiągnąć poprzez zastosowanie kwot i kontroli dostępu do drukarek."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "Serwer /y LTSP (serwer /y terminalowy /e)"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "Sieć komputerowa Skolelinux może mieć wiele serwerów LTSP (zwanych też "
 "serwerami klienckimi), które są zainstalowane poprzez wybranie profilu "
@@ -755,8 +806,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -881,10 +932,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -977,7 +1028,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1021,12 +1072,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 50 GiB."
+#, fuzzy
+#| msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "serwer terminalowy: 50 GB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1035,7 +1088,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 
@@ -1512,8 +1565,7 @@ msgstr ""
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1541,8 +1593,8 @@ msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"want a graphical user interface, then select Workstation or LTSP-Server in "
+"addition to this one."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1571,18 +1623,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr ""
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">DNS service name</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgstr "<emphasis role=\"strong\">Nazwa DNS usługi</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+"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) - a thin client server can always be used as a workstation, too."
+"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>
@@ -1610,16 +1664,16 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1650,9 +1704,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"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 ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1728,22 +1782,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
+msgid "A note on LTSP-server installations using only Thin-Clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -1819,8 +1864,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\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -1940,9 +1985,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2282,7 +2327,7 @@ 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 + thin client server + "
+"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-"
@@ -2342,11 +2387,11 @@ msgstr ""
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3260,8 +3305,8 @@ msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -3343,10 +3388,10 @@ msgstr ""
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><para>
@@ -3512,10 +3557,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5247,12 +5291,12 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5387,8 +5431,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 
 #. type: CDATA
@@ -6111,12 +6155,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7179,9 +7223,9 @@ msgstr "Nowe cechy dla Debiana Edu 9+edu0 Nazwa kodowa Strech"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -7200,9 +7244,22 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -8341,9 +8398,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8983,7 +9039,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -9103,7 +9159,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9384,6 +9440,12 @@ msgid ""
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgstr ""
 
+#~ msgid "Thin Client Server/s"
+#~ msgstr "Serwer /serwery terminala /terminali"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "Serwer /y LTSP (serwer /y terminalowy /e)"
+
 #, fuzzy
 #~| msgid "./images/23-Tjener-KDM_Login.png"
 #~ msgid "{{attachment:01-Installer_boot_menu.png}}"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 0b8f2c3..2af7b56 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: 2016-11-28 23:31+0000\n"
+"POT-Creation-Date: 2016-12-03 16:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -146,12 +146,12 @@ msgstr ""
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -213,8 +213,8 @@ msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"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>
@@ -225,14 +225,14 @@ msgstr ""
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"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)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -436,7 +436,7 @@ msgid "cfengine"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
+msgid "LTSP Server/s"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -494,10 +494,9 @@ 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 thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"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 ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -558,26 +557,27 @@ 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 thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
+msgid "LTSP server(s)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -702,10 +702,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -798,7 +798,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -842,12 +842,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -856,7 +856,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr ""
 
@@ -1329,8 +1329,7 @@ msgstr ""
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1358,8 +1357,8 @@ msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"want a graphical user interface, then select Workstation or LTSP-Server in "
+"addition to this one."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1388,18 +1387,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-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, also called a LTSP server. "
+"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) - a thin client server can always be used as a workstation, too."
+"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>
@@ -1427,16 +1426,16 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">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 a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"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 a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1467,9 +1466,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"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 ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1545,22 +1544,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
+msgid "A note on LTSP-server installations using only Thin-Clients"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -1636,8 +1626,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\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -1757,9 +1747,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-"Workstation + Thin Client Server installation and how it looks at the first "
-"boot of the tjener, a PXE boot on the workstation network and on the "
-"thinclient network:"
+"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:"
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
@@ -2099,7 +2089,7 @@ 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 + thin client server + "
+"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-"
@@ -2159,11 +2149,11 @@ msgstr ""
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(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."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3077,8 +3067,8 @@ msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"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."
@@ -3160,10 +3150,10 @@ msgstr ""
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><para>
@@ -3329,10 +3319,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5064,12 +5053,12 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5204,8 +5193,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 
 #. type: CDATA
@@ -5928,12 +5917,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6996,9 +6985,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -7017,9 +7006,22 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">SoftWaves theme</ulink>, the default artwork for Debian "
+"9 Stretch."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -8157,9 +8159,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8799,7 +8800,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -8919,7 +8920,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index fdbae3b..b448b87 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -50,7 +50,7 @@
 </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 thin-client-servers (with associated thin-clients and/or diskless workstations). The number of workstations can be as large or small as you want (starting from none to a lot). The same goes for the thin-client servers, each of which is on a separate network so that the tra [...]
+<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>
@@ -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 thin-client-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 thin-client-server should be a separate machine (though it is possible to install both the main server and thin-client server profiles on the same machine). All services are allocated a dedicated DNS-name and are offered exclusively over IPv4. The allocated DNS name makes it easy to move individual services from the main-se [...]
+<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>
@@ -178,7 +178,7 @@
 </para></entry><entry colsep="1" rowsep="1">
 <para> cfengine 
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
-<para> Thin Client Server/s 
+<para> LTSP Server/s 
 </para></entry><entry colsep="1" rowsep="1">
 <para> LTSP 
 </para></entry><entry colsep="1" rowsep="1">
@@ -198,7 +198,7 @@
 </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 thin-client-server via the separate subnet 192.168.0.0/24 (this is to ensure that the network traffic of the thin clients doesn't interfere with the rest of the network services). 
+<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,16 +212,16 @@
 </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 thin-client-server. Access to printers can be controlled for individual users according to the groups they belong to; this will be achieved by using quota and access control for printers. 
+<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_.28Thin_client_server.28s.29.29">
-<title>LTSP server(s) (Thin client server(s))
+<section id="Architecture--LTSP_server.28s.29">
+<title>LTSP server(s)
 </title>
-<para>A Skolelinux network can have many LTSP servers (also called thin client servers), which are installed by selecting the Thin client 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 thin client servers are set up to receive syslog from the thin clients, and forward these messages to the central syslog recipient.  
+<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>
 </section>
 
@@ -274,7 +274,7 @@
 </para>
 <para>Only the netinstall image needs access to the Internet during installation. 
 </para>
-<para>The installation should not ask any questions, with the exception of desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, workstation, thin client server). All other configuration will be set up automatically with reasonable values, to be changed from a central location by the system administrator subsequent to the installation. 
+<para>The installation should not ask any questions, with the exception of desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main server, workstation, LTSP server, ...). All other configuration will be set up automatically with reasonable values, to be changed from a central location by the system administrator subsequent to the installation. 
 </para>
 </section>
 
@@ -310,7 +310,7 @@
 <para>The computers running Debian Edu / Skolelinux must have either 32 bit (Debian architecture 'i386', oldest supported processors are 686 class ones) or 64 bit (Debian architecture 'amd64') x86 processors. 
 </para></listitem>
 <listitem>
-<para>At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are recommended for the main and thin client server profiles.  
+<para>At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are recommended for the main and LTSP server profiles.  
 </para></listitem>
 <listitem>
 <para>Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are possible, though 256 MiB RAM or more and faster processors are recommended. 
@@ -334,16 +334,16 @@
 </para>
 <itemizedlist>
 <listitem>
-<para>main server + thin client server: 70 GiB. As usual with disk space on a main server, "the bigger the better". 
+<para>combined main server + LTSP server: 70 GiB. As usual with disk space on a main server, "the bigger the better". 
 </para></listitem>
 <listitem>
-<para>thin client server: 50 GiB. 
+<para>LTSP server: 50 GiB. 
 </para></listitem>
 <listitem>
 <para>workstation or standalone: 30 GiB.  
 </para></listitem></itemizedlist></listitem>
 <listitem>
-<para>Thin client servers need two network cards when using the default network architecture: 
+<para>LTSP servers need two network cards when using the default network architecture: 
 </para>
 <itemizedlist>
 <listitem>
@@ -557,7 +557,7 @@
 <section id="Installation--The_installation_process">
 <title>The installation process
 </title>
-<para>Remember the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Stretch/Requirements">system requirements</ulink> and make sure you have at least two network cards (NICs) if you plan on setting up a thin client server. 
+<para>Remember the <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Stretch/Requirements">system requirements</ulink> and make sure you have at least two network cards (NICs) if you plan on setting up an LTSP server. 
 </para>
 <itemizedlist>
 <listitem>
@@ -577,7 +577,7 @@
 <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 Thin-Client-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 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></listitem></itemizedlist></listitem>
 <listitem>
 <para><emphasis role="strong">Workstation</emphasis> 
@@ -592,10 +592,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">Thin-Client-Server</emphasis> 
+<para><emphasis role="strong">LTSP-Server</emphasis> 
 </para>
 <itemizedlist><listitem override="none">
-<para>A thin client (and diskless workstation) server, also called a LTSP server. Clients without hard drives boot and run software from this server. This computer needs two network cards, a lot of memory, and ideally more than one processor or core. See the chapter about <link linkend="NetworkClients">networked clients</link> for more information on this subject. Choosing this profile also enables the workstation profile (even if it is not selected) - a thin client server can always be  [...]
+<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></listitem></itemizedlist></listitem>
 <listitem>
 <para><emphasis role="strong">Standalone</emphasis> 
@@ -609,7 +609,7 @@
 <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">Thin Client Server</emphasis> profiles are preselected. These profiles can be installed on one machine together if you want to install a so called <emphasis>combined main server</emphasis>. This means the main server will be a thin client server and also be used as a workstation. This is the default choice, since we assume most people will install <link lin [...]
+<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>
@@ -621,7 +621,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 Thin-client-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,12 +659,10 @@ deb http://security.debian.org/ stretch/updates main ]]></screen>
 </para>
 </section>
 
-<section id="Installation--A_note_on_thin-client-server_installations">
-<title>A note on thin-client-server installations
+<section id="Installation--A_note_on_LTSP-server_installations_using_only_Thin-Clients">
+<title>A note on LTSP-server installations using only Thin-Clients
 </title>
-<para>First of all, this profile name is confusing for historic reasons. Currently this profile actually installs an LTSP server environment for thin-clients and for diskless workstations. Debian bug <ulink url="https://bugs.debian.org/588510#">588510</ulink> has been filed to change the name of the profile into a better suited one. 
-</para>
-<para>Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-client</computeroutput> makes it possible to skip the step which converts the LTSP chroot from a thin-client chroot into a combined thin-client/diskless workstation chroot.  
+<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>
 <para>This is useful in certain situations, such as if you want a pure thin client chroot or if there is already a diskless chroot on another server, which can be rsynced. For these situations skipping this step will cut down the installation time considerably. 
 </para>
@@ -693,7 +691,7 @@ 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">Thin-Client-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>
@@ -735,7 +733,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 + Thin Client Server installation and how it looks at the first boot of the tjener, a PXE boot on the workstation network and on the thinclient network: 
+<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>
 <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>
@@ -864,7 +862,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 + thin client server + workstation). If all of the mentioned before is not available, see: <link linkend="Administration--Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-">Installing a graphical environment on the main-server to use GOsa²</link>. 
+<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>
 <para>From a web browser use the URL <ulink url="https://www/gosa"/> for GOsa² access, and log in as the first user. 
 </para>
@@ -887,7 +885,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 thin client servers and the Windows machines on the network. With LDAP, account information about students, pupils, teachers, etc. only needs to be entered once. After information has been provided in LDAP, the information will be available to all systems on the whole Skolelinux network. 
+<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>
 <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>
@@ -1268,7 +1266,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 <section id="Maintenance--Nagios">
 <title>Nagios
 </title>
-<para>Nagios system and service monitoring is available from <ulink url="https://www/nagios3/"/>. The set of machines and services being monitored is automatically generated using information collected by the sitesummary system. The machines with the profile Main-server and Thin-client-server receive full monitoring, while workstations and thin clients receive simple monitoring. To enable full monitoring on a workstation, install the <computeroutput>nagios-nrpe-server</computeroutput> pa [...]
+<para>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 o [...]
 </para>
 <para>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: 
 </para><screen><![CDATA[htpasswd /etc/nagios3/htpasswd.users nagiosadmin]]></screen>
@@ -1297,7 +1295,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 <section id="Maintenance--APT_CRITICAL:_13_packages_available_for_upgrade_.2813_critical_updates.29.">
 <title>APT CRITICAL: 13 packages available for upgrade (13 critical updates).
 </title>
-<para>New package are available for upgrades.  The critical ones are normally security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-upgrade' as root in a terminal or log in via ssh to do the same.  On thin client servers, remember to also update the LTSP chroot using <computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get upgrade</computeroutput>. 
+<para>New package are available for upgrades.  The critical ones are normally security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP servers, remember to also update the LTSP chroot using <computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get upgrade</computeroutput>. 
 </para>
 <para>If you do not want to manually upgrade packages and trust Debian to do a good job with new versions, you can install the <computeroutput>unattended-upgrades</computeroutput> package and configure it to automatically upgrade all new packages every night.  This will not upgrade the LTSP chroots. 
 </para>
@@ -1370,7 +1368,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
 </title>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Be prepared: make sure you have tested the upgrade from Jessie in a test environment or have backups ready to be able to go back.  
 </para>
-<para>Please note that the following recipe applies to a default Debian Edu main server installation (desktop=kde, profiles Main-Server, Workstation, Thin-Client-Server). (For a general overview concerning jessie to stretch upgrade, see: <ulink url="https://www.debian.org/releases/stretch/releasenotes"/>) 
+<para>Please note that the following recipe applies to a default Debian Edu main server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-Server). (For a general overview concerning jessie to stretch upgrade, see: <ulink url="https://www.debian.org/releases/stretch/releasenotes"/>) 
 </para>
 <para>Don't use X, use a virtual console, log in as root. Read all debconf information carefully, choose 'keep the local version currently installed'; in most cases hitting return will be fine. Press 'q' to quit the apt-listchanges pager once you've read the information. 
 </para>
@@ -2176,7 +2174,7 @@ d-i     apt-setup/local1/key    string          http://example.org/key.asc]]></s
 <section id="NetworkClients--Use_a_different_LTSP_client_network">
 <title>Use a different LTSP client network
 </title>
-<para>192.168.0.0/24 is the default LTSP client network if a machine is installed using the Thin-Client-Server profile. If lots of LTSP clients are used or if different LTSP servers should serve both i386 and amd64 chroot environments the second preconfigured network 192.168.1.0/24 could be used as well. Edit the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any other LDAP editor to i [...]
+<para>192.168.0.0/24 is the default LTSP client network if a machine is installed using the LTSP profile. If lots of LTSP clients are used or if different LTSP servers should serve both i386 and amd64 chroot environments the second preconfigured network 192.168.1.0/24 could be used as well. Edit the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any other LDAP editor to inspect DNS and [...]
 </para>
 </section>
 </section>
@@ -2228,7 +2226,7 @@ XSERVER = nvidia]]></screen>
 <section id="NetworkClients--Force_all_thin_clients_to_use_LXDE_as_default_desktop_environment">
 <title>Force all thin clients to use LXDE as default desktop environment
 </title>
-<para>Make sure that LXDE is installed on the thin client server; then add a line like this below <computeroutput>[default]</computeroutput> in "lts.conf": 
+<para>Make sure that LXDE is installed on the LTSP server; then add a line like this below <computeroutput>[default]</computeroutput> in "lts.conf": 
 </para><screen><![CDATA[LDM_SESSION=/usr/bin/startlxde]]></screen>
 <para>Note, that users will still be able to select other installed desktop environments using the "Settings" feature of LDM. 
 </para>
@@ -2580,7 +2578,7 @@ logon home = ""]]></screen>
 <section id="NetworkClients--Remote_Desktop_Service">
 <title>Remote Desktop Service
 </title>
-<para>Beginning with this release, choosing the thin client server profile or the combined server profile installs xrdp, a package which uses the Remote Desktop Protocol to present a graphical login to a remote client. Microsoft Windows users can connect to the thin client server running xrdp without installing additional software - they simply start a Remote Desktop Connection on their Windows machine and connect. 
+<para>Choosing the LTSP server profile or the combined server profile also installs xrdp, a package which uses the Remote Desktop Protocol to present a graphical login to a remote client. Microsoft Windows users can connect to the LTSP server running xrdp without installing additional software - they simply start a Remote Desktop Connection on their Windows machine and connect. 
 </para>
 <para>Additionally, xrdp can connect to a VNC server or another RDP server. 
 </para>
@@ -3235,7 +3233,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <section id="Features--New_features_for_Debian_Edu_9.2B-edu0_Codename_Stretch">
 <title>New features for Debian Edu 9+edu0 Codename Stretch
 </title>
-<para>This is a <emphasis role="strong">very early ALPHA</emphasis> release of Debian Edu 9+edu0. Please report feedback to <ulink url="mailto:debian-edu at lists.debian.org">debian-edu at lists.debian.org</ulink>! 
+<para>This is a <emphasis role="strong">early ALPHA</emphasis> release of Debian Edu 9+edu0. Please report feedback to <ulink url="mailto:debian-edu at lists.debian.org">debian-edu at lists.debian.org</ulink>! 
 </para>
 
 <section id="Features--Known_issues">
@@ -3252,7 +3250,13 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </title>
 <itemizedlist>
 <listitem>
-<para>New version of debian-installer from Debian Stretch, see <ulink url="http://www.debian.org/releases/stretch/installmanual">installation manual</ulink> for more details. 
+<para>New version of debian-installer from Debian Stretch, see  its <ulink url="http://www.debian.org/releases/stretch/installmanual">installation manual</ulink> for more details. 
+</para></listitem>
+<listitem>
+<para>The "Thin-Client-Server" profile has been renamed to "LTSP-Server" profile. 
+</para></listitem>
+<listitem>
+<para>New artwork based on the <ulink url="https://wiki.debian.org/DebianArt/Themes/softWaves#">SoftWaves theme</ulink>, the default artwork for Debian 9 Stretch. 
 </para></listitem></itemizedlist>
 </section>
 
@@ -3858,7 +3862,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>LTSP diskless workstations run without any configuration. 
 </para></listitem>
 <listitem>
-<para>On the dedicated client network of thin client servers (default 192.168.0.0/24), machines run by default as diskless workstations if they are powerful enough.   
+<para>On the dedicated client network of LTSP servers (default 192.168.0.0/24), machines run by default as diskless workstations if they are powerful enough.   
 </para></listitem>
 <listitem>
 <para>GOsa gui: Now some options that seemed to be available, but are non functional, are greyed out (or are not clickable). Some tabs are completely hidden to the end user, others even to the GOsa admin. 
@@ -4282,7 +4286,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>Change KDE/Akonadi configuration to reduce the disk footprint of every user from 144 to 24 MiB.  
 </para></listitem>
 <listitem>
-<para>New tool notify-local-users to send desktop notification to all logged in users on a machine.  Useful for thin client servers. 
+<para>New tool notify-local-users to send desktop notification to all logged in users on a machine.  Useful for LTSP servers. 
 </para></listitem></itemizedlist>
 </section>
 </section>
@@ -4346,7 +4350,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>New startup menu letting users choose diskless workstation, thin client or workstation. 
 </para></listitem>
 <listitem>
-<para>A diskless workstation option is installed but not activated by default on all servers with the thin-client-server profile. 
+<para>A diskless workstation option is installed but not activated by default on all servers with the LTSP-server profile. 
 </para></listitem>
 <listitem>
 <para>Main-server is set up as a PXE server for booting thin clients and diskless workstations, and for installing to clients' hard or flash drives. 

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