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

Holger Levsen holger at layer-acht.org
Mon Feb 20 12:02:12 UTC 2017


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

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

commit e1494bcaa606e896ff7ed6a6e2b0ac1422239447
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Feb 20 13:01:50 2017 +0100

    Update Debian Edu Stretch manual from the wiki.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../debian-edu-stretch-manual.da.po                | 393 ++++++++++++++------
 .../debian-edu-stretch-manual.de.po                | 384 ++++++++++++++------
 .../debian-edu-stretch-manual.es.po                | 242 ++++++++-----
 .../debian-edu-stretch-manual.fr.po                | 387 ++++++++++++++------
 .../debian-edu-stretch-manual.it.po                | 385 ++++++++++++++------
 .../debian-edu-stretch-manual.ja.po                | 375 ++++++++++++++-----
 .../debian-edu-stretch-manual.nb.po                | 395 ++++++++++++++------
 .../debian-edu-stretch-manual.nl.po                | 397 +++++++++++++++------
 .../debian-edu-stretch-manual.pl.po                | 167 ++++-----
 .../debian-edu-stretch-manual.pot                  | 167 ++++-----
 .../debian-edu-stretch-manual.xml                  |  90 +++--
 .../debian-edu-stretch-manual.zh.po                | 167 ++++-----
 12 files changed, 2451 insertions(+), 1098 deletions(-)

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 4ffcc42..81262db 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+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"
@@ -6747,11 +6747,41 @@ msgstr ""
 "»/etc/fstab« på passende vis og kør <computeroutput>mount -a</"
 "computeroutput> for at montere de nye ressourcer."
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Now users should be able to access the files on 'nas-server.intern' "
+#| "directly by just visiting the '/tjener/nas-server/storage/' directory "
+#| "using any application on any workstation, LTSP client or LTSP server."
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 "Nye brugere bør kunne tilgå filerne på »nas-server.intern« direkte bare ved "
 "at besøge mappen »/tjener/nas-server/storage/« via ethvert program på enhver "
@@ -7151,18 +7181,29 @@ msgstr ""
 "tynde klienter."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
+#| "computeroutput> with the default value 300. So if (for example) the "
+#| "clients should only boot as diskless workstations if they have 1 GB RAM "
+#| "add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf "
+#| "(or set this in LDAP). Unlike workstations, diskless workstations run "
+#| "without any need to add them with GOsa², cause LDM is used to login and "
+#| "connect to the LTSP server.  The home directory is by default mounted "
+#| "using sshfs, and not automount and NFS.  This causes shared directories "
+#| "available via NFS to not be available on diskless workstations."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 "LTSP definerer 320 MB som minimum for RAM for diskløse arbejdsstationer. "
 "Hvis mængden af RAM er mindre, vil maskinen starte op som tynd klient. Den "
@@ -7178,38 +7219,23 @@ msgstr ""
 "arbejdsstationer."
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-"De følgende trin kan bruges til at få opførslen fra Debian Edu Squeeze "
-"tilbage, med brug af automount, NFS og en skærmhåndtering forskellig fra ldm:"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-"Tilføj <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
-"til lts.conf (eller sæt dette i LDAP). Sikr dig, at skærmhåndteringen er "
-"installeret i LTSP-chroot."
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
-msgstr "Tilføj diskløse arbejdsstationer til LDAP med GOsa²."
-
-#. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP-klientfirmware</emphasis>"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+#, fuzzy
+#| msgid ""
+#| "LTSP client boot will fail if the client's network card requires a non-"
+#| "free firmware. A PXE installation can be used for troubleshooting "
+#| "problems with netbooting a machine; if the Debian Installer complains "
+#| "about a missing XXX.bin file then non-free firmware has to be added to "
+#| "the initrd used by LTSP clients."
+msgid ""
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 "Opstart af LTSP-klient vil fejle, hvis klientens netværkskort kræver "
 "firmware der ikke er fri. En PXE-installation kan bruges til at fejlsøge "
@@ -7222,19 +7248,32 @@ msgid "In this case execute the following commands on an LTSP server."
 msgstr "I dette tilfælde så kør de følgende kommandoer på en LTSP-server."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# First get information about firmware packages\n"
+#| "apt-get update && apt-cache search ^firmware-\n"
+#| "\n"
+#| "# Decide which package has to be installed for the network card(s). \n"
+#| "# Most probably this will be firmware-linux-nonfree.\n"
+#| "# Things have to take effect in the LTSP chroot for architecture i386.\n"
+#| "ltsp-chroot -a i386 apt-get update\n"
+#| "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
+#| "\n"
+#| "# copy the new initrd to the server's tftpboot directory\n"
+#| "ltsp-update-kernels"
 msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 "# Indhent først information om firmwarepakker\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -7266,8 +7305,14 @@ msgid "LTSP client type selection"
 msgstr "LTSP-klienttypemarkering"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Each LTSP server has two ethernet cards: one configured in the main "
+#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
+#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+#| "server)."
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -7301,7 +7346,15 @@ msgstr ""
 "følgende udføres."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+#| "and replace the line\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+#| "with\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
+#| "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
+#| "(3)Execute 'ltsp-update-kernels'"
 msgid ""
 "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
@@ -7309,7 +7362,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 "(1)Åbn filen /opt/ltsp/i386/etc/ltsp/update-kernels.conf med et\n"
 "redigeringsprogram og erstat linjen\n"
@@ -7513,26 +7567,39 @@ msgstr ""
 "server."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
+#| "network, when tjener is not a combined server, follow these steps:"
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 "For at lade ltspserver00 betjene diskløse arbejdsstationer på hovednetværket "
 "(10.0.0.0/8), når tjener ikke er en kombineret server, så følg disse trin:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy the <computeroutput>ltsp</computeroutput> directory from "
+#| "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
+#| "same directory on tjener."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 "kopier mappen <computeroutput>ltsp</computeroutput> fra <computeroutput>/var/"
 "lib/tftpboot</computeroutput> på ltspserver00 til den samme mappe på tjener."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+#| "computeroutput> to the same directory on tjener."
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 "kopier <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> til den samme mappe på tjener."
@@ -7554,10 +7621,15 @@ msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/
 msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+#| "debian-edu/default-diskless.cfg</computeroutput>."
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 "sæt den symbolske henvisning i <computeroutput>/var/lib/tftpboot/pxelinux."
 "cfg</computeroutput> på tjener til at pege på <computeroutput>/var/lib/"
@@ -7696,11 +7768,16 @@ msgstr ""
 "computeroutput>. Der kan også tilføjes værtsspecifikke punkter i LDAP."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Install the package <computeroutput>ltsp-docs</computeroutput> and run "
+#| "\"man lts.conf\" to have a look at available configuration options (see "
+#| "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
+#| "detailed information about LTSP)."
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 "Installer pakken <computeroutput>ltsp-docs</computeroutput> og kør »man lts."
 "conf« for at se tilgængelige konfigurationsindstillinger (se "
@@ -8078,9 +8155,16 @@ msgstr ""
 "LTSPManual.html#printer</computeroutput> for detaljer."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Configure the printer using the web interface <computeroutput>https://"
+#| "www:631</computeroutput> on tjener; choose network printer type "
+#| "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
+#| "regardless of brand or model) and set <computeroutput>socket://<LTSP "
+#| "client ip>:9100</computeroutput> as connection URI."
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -8106,12 +8190,18 @@ msgstr ""
 "opgradere så kør disse kommandoer med brugeren root på hver LTSP-server:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
+#| "aptitude update\n"
+#| "aptitude upgrade\n"
+#| "aptitude dist-upgrade\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386  # udfører »chroot /opt/ltsp/i386« med mere, dvs. det forhindrer også dæmoner i at blive startet\n"
@@ -8133,13 +8223,20 @@ msgstr ""
 "installationen inden i chroot'et for LTSP-serveren."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386\n"
+#| "## optionally, edit the sources.list:\n"
+#| "#editor /etc/apt/sources.list\n"
+#| "aptitude update\n"
+#| "aptitude install $new_package\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
@@ -8213,9 +8310,15 @@ msgid "Joining a domain"
 msgstr "Slutte sig til et domæne"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
+#| "joined. A special service called Samba, installed on the main-server "
+#| "tjener, enables Windows clients to store profiles and user data, and also "
+#| "authenticates the users during the login."
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -8234,12 +8337,21 @@ msgstr ""
 "link>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Windows will sync the profiles of domain users on every Windows login and "
+#| "logout. Depending on how much data is stored in the profile, this could "
+#| "take some time. To minimise the time needed, deactivate things like local "
+#| "cache in browsers (you can use the Squid proxy cache installed on tjener "
+#| "instead) and save files into the H: volume rather than under \"My "
+#| "Documents\"."
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 "Windows vil synkronisere profilerne for domænebrugere ved hvert "
 "Windowslogind og -logud. Afhængig af hvor mange data der gemmes i profilen, "
@@ -8288,10 +8400,16 @@ msgstr ""
 "with GOsa² (and then show an example for the command line)"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to check user groups on Windows, you need to download the "
+#| "tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then "
+#| "you can use this for example in the logon script which resides on tjener "
+#| "in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 "Hvis du ønsker at kontrollere brugergrupper på Windows, så skal du hente "
@@ -8304,11 +8422,18 @@ msgid "XP home"
 msgstr "XP-hjem"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users bringing in their XP laptops from home can still connect to tjener "
+#| "using their skolelinux credentials, provided the workgroup is set to "
+#| "SKOLELINUX. However, they may need to disable the Windows firewall before "
+#| "tjener will appear in Network Neighbourhood (or whatever it's called now)."
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 "Brugere som har XP-bærbare hjemmefra kan stadig forbinde til tjener med "
 "deres Skolelinuxakkreditiver, såfremt at arbejdsgruppen er opsat Til "
@@ -8400,12 +8525,22 @@ msgstr ""
 "Kerberos i Wheezy også blev konfigureret for Samba!"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "You might find an example smb.conf in your preferred language delivered "
+#| "by the installation on tjener under <computeroutput>/usr/share/doc/debian-"
+#| "edu-config/examples/</computeroutput>. The source file is in English and "
+#| "is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+#| "look for a file with the appropriate code in the filename (the German "
+#| "translation, for example, will be named <computeroutput>smb-roaming-"
+#| "profiles-de.conf</computeroutput>). Inside the config file are a lot of "
+#| "explanations which you should have a look at."
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -8497,11 +8632,17 @@ msgid "Global policies for roaming profiles"
 msgstr "Globale politikker for roamingprofiler"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
+#| "computeroutput>), you can can create a Policy file (NTConfig.pol) and put "
+#| "it in your netlogon share on tjener. This has the advantage of working "
+#| "almost instantly on all Windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 "Ved at bruge det forældede politikredigeringsprogram for Windows "
 "<computeroutput>poledit.exe</computeroutput>), kan du oprette en politikfil "
@@ -8518,11 +8659,19 @@ msgstr ""
 "det er stadig tilgængeligt som en del af ORK Tools."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With <computeroutput>poledit.exe</computeroutput> you can create .pol "
+#| "files. If you put such a file on tjener as <computeroutput>/etc/samba/"
+#| "netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+#| "Windows machines and temporarily overwrite the registry, thus applying "
+#| "the changes."
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 "Med <computeroutput>poledit.exe</computeroutput> kan du oprette .pol-filer. "
 "Hvis du placerer sådan en fil på tjener som <computeroutput>/etc/samba/"
@@ -8763,12 +8912,19 @@ msgid "Disabling roaming in smb.conf"
 msgstr "Deaktivering af roaming i smb.conf"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If, perhaps, everyone has their own dedicated machine, and nobody else is "
+#| "allowed to touch it, editing the Samba configuration will let you disable "
+#| "roaming profiles for the entire network. You can alter the "
+#| "<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
+#| "\"logon path\" and \"logon home\" variables, then restart samba."
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 "Hvis for eksempel at alle har deres egen dedikerede maskine, og ingen andre "
 "må røre den, så vil redigering af Sambakonfigurationen lade dig deaktivere "
@@ -10070,9 +10226,13 @@ msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
+#| "discuss\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/> - postlister for hjælp"
@@ -10090,18 +10250,26 @@ msgid "in Norwegian"
 msgstr "på norsk"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
+#| "\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
 "> - postliste for hjælp"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+#| "linuxiskolen\"/> - mailing list for the development member organisation "
+#| "in Norway (FRISK)"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen\"/> - postliste for udviklingsorganisationen i Norge (FRISK)"
@@ -10144,14 +10312,6 @@ msgstr ""
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - postlister for "
 "hjælp"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr "på spansk"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr "<ulink url=\"http://www.skolelinux.es\"/> - spansk portal"
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr "Professionel hjælp"
@@ -13194,6 +13354,32 @@ msgstr ""
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "The following steps can be used to get back the behaviour from Debian Edu "
+#~ "Squeeze, using automount, NFS and a display manager other than ldm:"
+#~ msgstr ""
+#~ "De følgende trin kan bruges til at få opførslen fra Debian Edu Squeeze "
+#~ "tilbage, med brug af automount, NFS og en skærmhåndtering forskellig fra "
+#~ "ldm:"
+
+#~ msgid ""
+#~ "Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "to lts.conf (or set this in LDAP). Make sure, that the display manager is "
+#~ "installed in the LTSP chroot."
+#~ msgstr ""
+#~ "Tilføj <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</"
+#~ "computeroutput> til lts.conf (eller sæt dette i LDAP). Sikr dig, at "
+#~ "skærmhåndteringen er installeret i LTSP-chroot."
+
+#~ msgid "Add the diskless workstations to LDAP with GOsa²."
+#~ msgstr "Tilføj diskløse arbejdsstationer til LDAP med GOsa²."
+
+#~ msgid "in Spanish"
+#~ msgstr "på spansk"
+
+#~ msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
+#~ msgstr "<ulink url=\"http://www.skolelinux.es\"/> - spansk portal"
+
+#~ msgid ""
 #~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
 #~ "contrib now (also in jessie-backports) which can be used to build "
 #~ "libdvdcss and which makes adding the debian multimedia apt repository "
@@ -13219,10 +13405,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# fetch the deb-multimedia key insecurely:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# check securely if the key is correct and add it to the keyring used by "
+#~ "APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for "
+#~ "mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# update the list of available packages:\n"
 #~ "apt-get update"
 #~ msgstr ""
@@ -13230,10 +13420,13 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# hent nøglen for deb-multimedia usikkert:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# kontroller sikkert om nøglen er korrekt og tilføj den til nøgleringen brugt af APT hvis den er:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# kontroller sikkert om nøglen er korrekt og tilføj den til nøgleringen "
+#~ "brugt af APT hvis den er:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
 #~ "# tilføj arkiv til sources.list - kontroller hjemmesiderne for spejle!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# opdater listen over tilgængelige pakker:\n"
 #~ "apt-get update"
 
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 380bea1..d447a04 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+0000\n"
 "PO-Revision-Date: 2017-02-20 00:30+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -580,7 +580,6 @@ msgstr ""
 "(Web-Schnittstelle). Benachrichtigung per E-Mail im Fehlerfall."
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "munin, icinga and site-summary"
 msgid "Munin, Icinga and Sitesummary"
 msgstr "Munin, Icinga und Sitesummary"
 
@@ -2693,7 +2692,6 @@ msgid "KDE and Browser"
 msgstr "KDE und Browser"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/27-Tjener-MATE_Desktop.png"
 msgid "./images/27-Tjener-KDE_Desktop.png"
 msgstr "./images/27-Tjener-KDE_Desktop.png"
 
@@ -2714,7 +2712,6 @@ msgid "Diskless Workstation Login"
 msgstr "Diskless Workstation Login"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgid "./images/31-ThinClient-KDE_Desktop.png"
 msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
@@ -6259,11 +6256,41 @@ msgstr ""
 "<computeroutput>mount -a</computeroutput> aus, um die neuen Resourcen "
 "einzuhängen."
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Now users should be able to access the files on 'nas-server.intern' "
+#| "directly by just visiting the '/tjener/nas-server/storage/' directory "
+#| "using any application on any workstation, LTSP client or LTSP server."
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 "Die Benutzer sollten nun Zugang zu den Dateien des Dateiservers 'nas-server."
 "intern' haben, wenn Sie mit einer Anwendung auf das Verzeichnis '/tjener/nas-"
@@ -6561,8 +6588,6 @@ msgstr ""
 "apt install libdvd-pkg"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
 msgid ""
 "Answer the debconf questions, then run <computeroutput>dpkg-reconfigure "
 "libdvd-pkg</computeroutput>."
@@ -6646,18 +6671,29 @@ msgstr ""
 "ebenso geringem Wartungsaufwand wie Thin Clients verwenden zu können."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
+#| "computeroutput> with the default value 300. So if (for example) the "
+#| "clients should only boot as diskless workstations if they have 1 GB RAM "
+#| "add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf "
+#| "(or set this in LDAP). Unlike workstations, diskless workstations run "
+#| "without any need to add them with GOsa², cause LDM is used to login and "
+#| "connect to the LTSP server.  The home directory is by default mounted "
+#| "using sshfs, and not automount and NFS.  This causes shared directories "
+#| "available via NFS to not be available on diskless workstations."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 "LTSP definiert 320MB als das (voreingestellte) Minimum an RAM für Diskless "
 "Workstations. Wenn weniger RAM vorhanden ist, wird die Maschine als Thin "
@@ -6675,39 +6711,23 @@ msgstr ""
 "Workstations nicht zur Verfügung."
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-"Um zum Verhalten wie bei Debian-Edu Squeeze (automount, NFS, anderer "
-"Displaymanager als ldm) zurück zu gelangen,  können die folgenden Schritte "
-"durchgeführt werden: "
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-"Fügen Sie den Eintrag <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</"
-"computeroutput> in lts.conf (oder in LDAP) hinzu. Stellen Sie sicher, dass "
-"dieser Display-Manager im LTSP-Chroot installiert ist."
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
-msgstr "Tragen Sie die Diskless Workstations mit GOsa² in LDAP ein."
-
-#. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role=\"strong\">Firmware der LTSP-Clients</emphasis>"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+#, fuzzy
+#| msgid ""
+#| "LTSP client boot will fail if the client's network card requires a non-"
+#| "free firmware. A PXE installation can be used for troubleshooting "
+#| "problems with netbooting a machine; if the Debian Installer complains "
+#| "about a missing XXX.bin file then non-free firmware has to be added to "
+#| "the initrd used by LTSP clients."
+msgid ""
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 "Der Start von LTSP-Clients wird scheitern, falls für die Netzwerkkarte des "
 "Clients Firmware aus »non-free« erforderlich ist. Eine PXE-Installation "
@@ -6721,19 +6741,32 @@ msgid "In this case execute the following commands on an LTSP server."
 msgstr "Führen Sie in diesem Fall folgende Befehle auf dem LTSP-Server aus:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# First get information about firmware packages\n"
+#| "apt-get update && apt-cache search ^firmware-\n"
+#| "\n"
+#| "# Decide which package has to be installed for the network card(s). \n"
+#| "# Most probably this will be firmware-linux-nonfree.\n"
+#| "# Things have to take effect in the LTSP chroot for architecture i386.\n"
+#| "ltsp-chroot -a i386 apt-get update\n"
+#| "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
+#| "\n"
+#| "# copy the new initrd to the server's tftpboot directory\n"
+#| "ltsp-update-kernels"
 msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 "# Zunächst Informationen über Firmware-Pakete einholen.\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -6765,8 +6798,14 @@ msgid "LTSP client type selection"
 msgstr "Typ des LTSP-Client auswählen"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Each LTSP server has two ethernet cards: one configured in the main "
+#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
+#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+#| "server)."
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -6799,7 +6838,15 @@ msgstr ""
 "Workstation, wenn sie genügend RAM haben."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+#| "and replace the line\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+#| "with\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
+#| "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
+#| "(3)Execute 'ltsp-update-kernels'"
 msgid ""
 "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
@@ -6807,7 +6854,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 "(1) Öffnen Sie die Datei /opt/ltsp/i386/etc/ltsp/update-kernels.conf mit einem Editor\n"
 "und ersetzen Sie die Zeile\n"
@@ -7012,28 +7060,41 @@ msgstr ""
 "fungiert."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
+#| "network, when tjener is not a combined server, follow these steps:"
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 "Wenn Tjener kein kombinierter Server ist und mit dem ltspserver00 Diskless "
 "Workstations im Hauptnetz (10.0.0.0/8) betrieben werden sollen, sind "
 "folgende Schritte erforderlich:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy the <computeroutput>ltsp</computeroutput> directory from "
+#| "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
+#| "same directory on tjener."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 "kopieren Sie das <computeroutput>ltsp</computeroutput>-Verzeichnis aus "
 "<computeroutput>/var/lib/tftpboot</computeroutput> von ltspserver00 ins "
 "gleiche Verzeichnis auf Tjener."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+#| "computeroutput> to the same directory on tjener."
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 "kopieren Sie <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless."
 "cfg</computeroutput> ins gleiche Verzeichnis auf Tjener."
@@ -7055,10 +7116,15 @@ msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/
 msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+#| "debian-edu/default-diskless.cfg</computeroutput>."
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 "lassen sie auf Tjener den symbolischen Link in <computeroutput>/var/lib/"
 "tftpboot/pxelinux.cfg</computeroutput> auf <computeroutput>/var/lib/tftpboot/"
@@ -7194,11 +7260,16 @@ msgstr ""
 "hinzugefügt werden."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Install the package <computeroutput>ltsp-docs</computeroutput> and run "
+#| "\"man lts.conf\" to have a look at available configuration options (see "
+#| "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
+#| "detailed information about LTSP)."
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 "Installieren Sie das Paket <computeroutput>ltsp-docs</computeroutput> und "
 "führen Sie den Befehl »man lts.conf« aus, um eine Übersicht über verfügbare "
@@ -7575,9 +7646,16 @@ msgstr ""
 "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html#printer</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Configure the printer using the web interface <computeroutput>https://"
+#| "www:631</computeroutput> on tjener; choose network printer type "
+#| "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
+#| "regardless of brand or model) and set <computeroutput>socket://<LTSP "
+#| "client ip>:9100</computeroutput> as connection URI."
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -7604,12 +7682,18 @@ msgstr ""
 "die folgenden Befehle als Root auf jedem LTSP-Server ein:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
+#| "aptitude update\n"
+#| "aptitude upgrade\n"
+#| "aptitude dist-upgrade\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386  # dies bewirkt \"chroot /opt/ltsp/i386\" und verhindert dort zusätzlich den Start von Daemons\n"
@@ -7631,13 +7715,20 @@ msgstr ""
 "die Installation in der Chroot-Umgebung des LTSP-Servers durchgeführt werden."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386\n"
+#| "## optionally, edit the sources.list:\n"
+#| "#editor /etc/apt/sources.list\n"
+#| "aptitude update\n"
+#| "aptitude install $new_package\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
@@ -7712,9 +7803,15 @@ msgid "Joining a domain"
 msgstr "Einer Domäne beitreten"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
+#| "joined. A special service called Samba, installed on the main-server "
+#| "tjener, enables Windows clients to store profiles and user data, and also "
+#| "authenticates the users during the login."
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -7733,12 +7830,21 @@ msgstr ""
 "beschriebenen Schritte notwendig:"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Windows will sync the profiles of domain users on every Windows login and "
+#| "logout. Depending on how much data is stored in the profile, this could "
+#| "take some time. To minimise the time needed, deactivate things like local "
+#| "cache in browsers (you can use the Squid proxy cache installed on tjener "
+#| "instead) and save files into the H: volume rather than under \"My "
+#| "Documents\"."
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 "Windows wird das Profil des Domänenbenutzers bei jedem Anmelden und Abmelden "
 "unter Windows synchronisieren. Je nachdem, wie viele Daten in dem Profil "
@@ -7789,10 +7895,16 @@ msgstr ""
 "with GOsa² (and then show an example for the command line)"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to check user groups on Windows, you need to download the "
+#| "tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then "
+#| "you can use this for example in the logon script which resides on tjener "
+#| "in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 "Wenn Sie Benutzergruppen in Windows kontrollieren wollen, dann müssen Sie "
@@ -7806,11 +7918,18 @@ msgid "XP home"
 msgstr "XP-Home"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users bringing in their XP laptops from home can still connect to tjener "
+#| "using their skolelinux credentials, provided the workgroup is set to "
+#| "SKOLELINUX. However, they may need to disable the Windows firewall before "
+#| "tjener will appear in Network Neighbourhood (or whatever it's called now)."
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 "Benutzer/-innen, die Ihren XP-Laptop von zu Hause mitbringen, können sich "
 "mit ihren Zugangsdaten von Skolelinux mit tjener verbinden, vorausgesetzt, "
@@ -7904,12 +8023,22 @@ msgstr ""
 "seit in Wheezy auch Kerberos für Samba konfiguriert wurde!"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "You might find an example smb.conf in your preferred language delivered "
+#| "by the installation on tjener under <computeroutput>/usr/share/doc/debian-"
+#| "edu-config/examples/</computeroutput>. The source file is in English and "
+#| "is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+#| "look for a file with the appropriate code in the filename (the German "
+#| "translation, for example, will be named <computeroutput>smb-roaming-"
+#| "profiles-de.conf</computeroutput>). Inside the config file are a lot of "
+#| "explanations which you should have a look at."
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -8003,11 +8132,17 @@ msgid "Global policies for roaming profiles"
 msgstr "Globale Richtlinien für Roaming-Profile"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
+#| "computeroutput>), you can can create a Policy file (NTConfig.pol) and put "
+#| "it in your netlogon share on tjener. This has the advantage of working "
+#| "almost instantly on all Windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 "Unter Verwendung des Windows-Policy-Editors (<computeroutput>poledit.exe </"
 "computeroutput>) können Sie eine Policy-Datei (NTConfig.pol) erstellen und "
@@ -8024,11 +8159,19 @@ msgstr ""
 "ORK-Tools erhältlich."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With <computeroutput>poledit.exe</computeroutput> you can create .pol "
+#| "files. If you put such a file on tjener as <computeroutput>/etc/samba/"
+#| "netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+#| "Windows machines and temporarily overwrite the registry, thus applying "
+#| "the changes."
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 "Mit <computeroutput>poledit.exe</computeroutput> können Sie .pol-Dateien "
 "erzeugen. Wenn Sie eine solche Datei auf tjener unter dem Namen "
@@ -8273,12 +8416,19 @@ msgid "Disabling roaming in smb.conf"
 msgstr "Deaktivieren von Roaming in smb.conf"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If, perhaps, everyone has their own dedicated machine, and nobody else is "
+#| "allowed to touch it, editing the Samba configuration will let you disable "
+#| "roaming profiles for the entire network. You can alter the "
+#| "<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
+#| "\"logon path\" and \"logon home\" variables, then restart samba."
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 "Vielleicht hat jeder seinen eigenen Rechner und kein Anderer darf diesen "
 "benutzen. Dann können Sie durch Editieren der Samba-Konfiguration die "
@@ -9612,9 +9762,13 @@ msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
+#| "discuss\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\">https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
@@ -9634,19 +9788,27 @@ msgid "in Norwegian"
 msgstr "auf Norwegisch"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
+#| "\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
 "\">https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker</ulink> - "
 "Unterstützungs-Mailingliste"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+#| "linuxiskolen\"/> - mailing list for the development member organisation "
+#| "in Norway (FRISK)"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen\"/> - Mailingliste der Entwickler-Organisation in Norwegen "
@@ -9695,15 +9857,6 @@ msgstr ""
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - Unterstützungs-"
 "Mailingliste"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr "auf Spanisch"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr ""
-"<ulink url=\"http://www.skolelinux.es\"/> - Spanisches Skolelinuxportal"
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr "Professionelle Unterstützung"
@@ -10205,8 +10358,8 @@ msgstr ""
 "translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
 "Übersetzungen aktualisieren wollen."
 
-#. <remark>
-#. status ignore</remark>
+#.  <remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -12719,6 +12872,33 @@ msgstr ""
 "werden."
 
 #~ msgid ""
+#~ "The following steps can be used to get back the behaviour from Debian Edu "
+#~ "Squeeze, using automount, NFS and a display manager other than ldm:"
+#~ msgstr ""
+#~ "Um zum Verhalten wie bei Debian-Edu Squeeze (automount, NFS, anderer "
+#~ "Displaymanager als ldm) zurück zu gelangen,  können die folgenden "
+#~ "Schritte durchgeführt werden: "
+
+#~ msgid ""
+#~ "Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "to lts.conf (or set this in LDAP). Make sure, that the display manager is "
+#~ "installed in the LTSP chroot."
+#~ msgstr ""
+#~ "Fügen Sie den Eintrag <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/"
+#~ "dm</computeroutput> in lts.conf (oder in LDAP) hinzu. Stellen Sie sicher, "
+#~ "dass dieser Display-Manager im LTSP-Chroot installiert ist."
+
+#~ msgid "Add the diskless workstations to LDAP with GOsa²."
+#~ msgstr "Tragen Sie die Diskless Workstations mit GOsa² in LDAP ein."
+
+#~ msgid "in Spanish"
+#~ msgstr "auf Spanisch"
+
+#~ msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
+#~ msgstr ""
+#~ "<ulink url=\"http://www.skolelinux.es\"/> - Spanisches Skolelinuxportal"
+
+#~ msgid ""
 #~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
 #~ "contrib now (also in jessie-backports) which can be used to build "
 #~ "libdvdcss and which makes adding the debian multimedia apt repository "
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 ce2e2f0..61f946d 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+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"
@@ -6218,11 +6218,36 @@ msgid ""
 "-a</computeroutput> to mount the new resources."
 msgstr ""
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6516,33 +6541,11 @@ msgid ""
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-"Agregue <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
-"a lts.conf (o configurelo en LDAP). Asegúrese que el manejador de pantalla "
-"esté instalado en el chroot LTSP. "
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6551,11 +6554,11 @@ msgstr "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6582,14 +6585,15 @@ msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 "# Primero, obtenga información sobre los paquetes de firmware\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -6623,8 +6627,14 @@ msgid "LTSP client type selection"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Each LTSP server has two ethernet cards: one configured in the main "
+#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
+#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+#| "server)."
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -6667,7 +6677,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 "(1)Abra el archivo /opt/ltsp/i386/etc/ltsp/update-kernerl.conf con un  editor\n"
 "y reemplace la linea\n"
@@ -6830,20 +6841,28 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remove <computeroutput>/opt/ltsp/i386</computeroutput> (or "
+#| "<computeroutput>/opt/ltsp/amd64</computeroutput>, depending on your "
+#| "setup). If you have enough diskspace, consider backing it up."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
+"Elimine <computeroutput>/opt/ltsp/i386</computeroutput> (o <computeroutput>/"
+"opt/ltsp/amd64</computeroutput>, dependiendo de su configuración). Si tiene "
+"suficiente espacio en disco, considere respaldarlo."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6861,8 +6880,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6952,10 +6971,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7214,7 +7232,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -7232,12 +7250,18 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
+#| "aptitude update\n"
+#| "aptitude upgrade\n"
+#| "aptitude dist-upgrade\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386  # esto hace \"chroot /opt/ltsp/i386\" y más, también previene que los demonios inicien\n"
@@ -7257,13 +7281,20 @@ msgid ""
 msgstr ""
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386\n"
+#| "## optionally, edit the sources.list:\n"
+#| "#editor /etc/apt/sources.list\n"
+#| "aptitude update\n"
+#| "aptitude install $new_package\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
@@ -7322,7 +7353,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -7338,8 +7369,9 @@ msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -7374,7 +7406,7 @@ msgstr ""
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 
@@ -7384,10 +7416,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -7450,10 +7483,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -7527,8 +7560,8 @@ msgstr ""
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -7540,9 +7573,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -7736,8 +7770,8 @@ msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 
 #. type: CDATA
@@ -8825,10 +8859,12 @@ msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
-msgstr ""
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
+msgstr "<ulink url=\"http://www.skolelinux.es\"/> - sitio web en español"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -8841,16 +8877,17 @@ msgid "in Norwegian"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
-msgstr ""
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
+msgstr "<ulink url=\"http://www.skolelinux.es\"/> - sitio web en español"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8886,14 +8923,6 @@ msgid ""
 "list"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr "<ulink url=\"http://www.skolelinux.es\"/> - sitio web en español"
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr "Soporte profesional"
@@ -11277,6 +11306,15 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "to lts.conf (or set this in LDAP). Make sure, that the display manager is "
+#~ "installed in the LTSP chroot."
+#~ msgstr ""
+#~ "Agregue <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</"
+#~ "computeroutput> a lts.conf (o configurelo en LDAP). Asegúrese que el "
+#~ "manejador de pantalla esté instalado en el chroot LTSP. "
+
 #~ msgid "apt-get install libdvdcss2 w32codecs"
 #~ msgstr "apt-get install libdvdcss2 w32codecs"
 
@@ -11291,10 +11329,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# fetch the deb-multimedia key insecurely:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# check securely if the key is correct and add it to the keyring used by "
+#~ "APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for "
+#~ "mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# update the list of available packages:\n"
 #~ "apt-get update"
 #~ msgstr ""
@@ -11302,10 +11344,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# descargue la llave deb-multimedia:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# revise de manera segura si la llave es correcta y agreguela al keyring usado por APT:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# agregue el repositorio a  sources.list - revise el sitio web para buscar réplicas!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# revise de manera segura si la llave es correcta y agreguela al keyring "
+#~ "usado por APT:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# agregue el repositorio a  sources.list - revise el sitio web para "
+#~ "buscar réplicas!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# Actualice la lista de paquetes disponibles::\n"
 #~ "apt-get update"
 
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 daffa46..a063b57 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+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"
@@ -7032,11 +7032,41 @@ msgstr ""
 "besoins et lancez <computeroutput>mount -a</computeroutput> pour monter les "
 "nouveaux répertoires partagés."
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Now users should be able to access the files on 'nas-server.intern' "
+#| "directly by just visiting the '/tjener/nas-server/storage/' directory "
+#| "using any application on any workstation, LTSP client or LTSP server."
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 "Maintenant les utilisateurs devraient être capables d'accéder aux fichiers "
 "sur « serveur-nas.intern » directement, juste en visitant le répertoire « /"
@@ -7450,18 +7480,29 @@ msgstr ""
 "récent avec le même coût réduit de maintenance que les clients légers."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
+#| "computeroutput> with the default value 300. So if (for example) the "
+#| "clients should only boot as diskless workstations if they have 1 GB RAM "
+#| "add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf "
+#| "(or set this in LDAP). Unlike workstations, diskless workstations run "
+#| "without any need to add them with GOsa², cause LDM is used to login and "
+#| "connect to the LTSP server.  The home directory is by default mounted "
+#| "using sshfs, and not automount and NFS.  This causes shared directories "
+#| "available via NFS to not be available on diskless workstations."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 "LTSP définit à 320 Mo la quantité minimale de mémoire vive nécessaire pour "
 "une station de travail sans disque. Si la quantité de mémoire vive est "
@@ -7478,40 +7519,23 @@ msgstr ""
 "par NFS ne sont pas disponibles sur les stations de travail sans disque."
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-"Les étapes suivantes peuvent être suivies pour rétablir le comportement de "
-"Debian Edu Squeeze, et utiliser automount, NFS et un gestionnaire "
-"d'affichage autre que LDM :"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-"Ajoutez <computeroutput>DEFAULT_DISPLAY_MANAGER=/chemin/vers/"
-"gestionnaire_affichage</computeroutput> dans lts.conf (ou faites ce réglage "
-"dans LDAP). Assurez-vous que le gestionnaire d'affichage est installé dans "
-"le chroot LTSP."
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
-msgstr "ajouter des stations de travail à LDAP avec GOsa²."
-
-#. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role=\"strong\">microprogramme des clients légers</emphasis>"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP client boot will fail if the client's network card requires a non-"
+#| "free firmware. A PXE installation can be used for troubleshooting "
+#| "problems with netbooting a machine; if the Debian Installer complains "
+#| "about a missing XXX.bin file then non-free firmware has to be added to "
+#| "the initrd used by LTSP clients."
 msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 "L'amorçage du client LTSP échouera si la carte réseau du client nécessite un "
 "microprogramme (« firmware ») non libre. Une installation PXE peut être "
@@ -7525,19 +7549,32 @@ msgid "In this case execute the following commands on an LTSP server."
 msgstr "Dans ce cas, exécutez les commandes suivantes sur le serveur LTSP."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# First get information about firmware packages\n"
+#| "apt-get update && apt-cache search ^firmware-\n"
+#| "\n"
+#| "# Decide which package has to be installed for the network card(s). \n"
+#| "# Most probably this will be firmware-linux-nonfree.\n"
+#| "# Things have to take effect in the LTSP chroot for architecture i386.\n"
+#| "ltsp-chroot -a i386 apt-get update\n"
+#| "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
+#| "\n"
+#| "# copy the new initrd to the server's tftpboot directory\n"
+#| "ltsp-update-kernels"
 msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 "# D'abord renseignez-vous sur les paquets contenant les microprogrammes\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -7570,8 +7607,14 @@ msgid "LTSP client type selection"
 msgstr "Sélection du type de client léger"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Each LTSP server has two ethernet cards: one configured in the main "
+#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
+#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+#| "server)."
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -7607,7 +7650,15 @@ msgstr ""
 "suivantes sont nécessaires."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+#| "and replace the line\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+#| "with\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
+#| "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
+#| "(3)Execute 'ltsp-update-kernels'"
 msgid ""
 "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
@@ -7615,7 +7666,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 "(1) ouvrir le fichier /opt/ltsp/i386/etc/ltsp/update-kernels.conf avec un éditeur\n"
 "et remplacer la ligne\n"
@@ -7822,28 +7874,41 @@ msgstr ""
 "LTSP."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
+#| "network, when tjener is not a combined server, follow these steps:"
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 "Pour que ltspserver00 serve des stations de travail sans disque dur sur le "
 "réseau principal (10.0.0.0/8) lorsque tjener n'est pas un serveur combiné, "
 "vous devez suivre ces étapes :"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy the <computeroutput>ltsp</computeroutput> directory from "
+#| "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
+#| "same directory on tjener."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 "Copiez le répertoire <computeroutput>ltsp</computeroutput> depuis "
 "<computeroutput>/var/lib/tftpboot</computeroutput> sur ltspserver00 vers le "
 "même répertoire sur tjener."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+#| "computeroutput> to the same directory on tjener."
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 "Copiez <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> dans le même répertoire sur tjener."
@@ -7865,10 +7930,15 @@ msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/
 msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+#| "debian-edu/default-diskless.cfg</computeroutput>."
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 "Modifiez le lien symbolique <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
 "computeroutput> sur tjener pour pointer vers <computeroutput>/var/lib/"
@@ -8016,11 +8086,16 @@ msgstr ""
 "à un hôte particulier."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Install the package <computeroutput>ltsp-docs</computeroutput> and run "
+#| "\"man lts.conf\" to have a look at available configuration options (see "
+#| "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
+#| "detailed information about LTSP)."
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 " Installez le paquet <computeroutput>ltsp-docs</computeroutput> et exécutez "
 "« man lts.conf » pour connaître les options de configuration disponibles "
@@ -8415,9 +8490,16 @@ msgstr ""
 "doc/ltsp/LTSPManual.html#printer</computeroutput> pour les détails."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Configure the printer using the web interface <computeroutput>https://"
+#| "www:631</computeroutput> on tjener; choose network printer type "
+#| "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
+#| "regardless of brand or model) and set <computeroutput>socket://<LTSP "
+#| "client ip>:9100</computeroutput> as connection URI."
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -8445,12 +8527,18 @@ msgstr ""
 "commandes en tant que superutilisateur sur chaque serveur LTSP :"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
+#| "aptitude update\n"
+#| "aptitude upgrade\n"
+#| "aptitude dist-upgrade\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386  # cela fait un « chroot /opt/ltsp/i386 » et plus, comme par exemple empêcher le démarrage des démons\n"
@@ -8472,13 +8560,20 @@ msgstr ""
 "l'installation doit se faire à l'intérieur du chroot du serveur LTSP."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386\n"
+#| "## optionally, edit the sources.list:\n"
+#| "#editor /etc/apt/sources.list\n"
+#| "aptitude update\n"
+#| "aptitude install $new_package\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 "ltsp-chroot\n"
@@ -8561,9 +8656,15 @@ msgid "Joining a domain"
 msgstr "Rejoindre un domaine"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
+#| "joined. A special service called Samba, installed on the main-server "
+#| "tjener, enables Windows clients to store profiles and user data, and also "
+#| "authenticates the users during the login."
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -8586,12 +8687,21 @@ msgstr ""
 "Jessie</link>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Windows will sync the profiles of domain users on every Windows login and "
+#| "logout. Depending on how much data is stored in the profile, this could "
+#| "take some time. To minimise the time needed, deactivate things like local "
+#| "cache in browsers (you can use the Squid proxy cache installed on tjener "
+#| "instead) and save files into the H: volume rather than under \"My "
+#| "Documents\"."
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 "Windows synchronisera le profil des utilisateurs du domaine à chaque "
 "connexion et déconnexion de Windows. Selon la quantité de données "
@@ -8643,10 +8753,16 @@ msgstr ""
 "with GOsa² (and then show an example for the command line)"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to check user groups on Windows, you need to download the "
+#| "tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then "
+#| "you can use this for example in the logon script which resides on tjener "
+#| "in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 "Si vous voulez vérifier les groupes d'utilisateurs sous Windows, vous devez "
@@ -8660,11 +8776,18 @@ msgid "XP home"
 msgstr "XP home"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users bringing in their XP laptops from home can still connect to tjener "
+#| "using their skolelinux credentials, provided the workgroup is set to "
+#| "SKOLELINUX. However, they may need to disable the Windows firewall before "
+#| "tjener will appear in Network Neighbourhood (or whatever it's called now)."
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 "Les utilisateurs dont le portable est sous XP home peuvent toujours se "
 "connecter à tjener en utilisant leur compte Skolelinux, à condition que le "
@@ -8773,10 +8896,10 @@ msgstr ""
 #| "the config file are a lot of explanations which you should have a look at."
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -8872,11 +8995,17 @@ msgid "Global policies for roaming profiles"
 msgstr "Stratégies globales pour les profils itinérants"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
+#| "computeroutput>), you can can create a Policy file (NTConfig.pol) and put "
+#| "it in your netlogon share on tjener. This has the advantage of working "
+#| "almost instantly on all Windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 "En utilisant l'éditeur de stratégies standard de Windows "
 "(<computeroutput>poledit.exe</computeroutput>), vous pouvez créer un fichier "
@@ -8894,11 +9023,19 @@ msgstr ""
 "outils ORK."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With <computeroutput>poledit.exe</computeroutput> you can create .pol "
+#| "files. If you put such a file on tjener as <computeroutput>/etc/samba/"
+#| "netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+#| "Windows machines and temporarily overwrite the registry, thus applying "
+#| "the changes."
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 "Avec <computeroutput>poledit.exe</computeroutput> vous pouvez créer des "
 "fichiers .pol. Si vous déposez un tel fichier sur tjener nommé "
@@ -9144,12 +9281,19 @@ msgid "Disabling roaming in smb.conf"
 msgstr "Désactiver les profils itinérants dans smb.conf"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If, perhaps, everyone has their own dedicated machine, and nobody else is "
+#| "allowed to touch it, editing the Samba configuration will let you disable "
+#| "roaming profiles for the entire network. You can alter the "
+#| "<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
+#| "\"logon path\" and \"logon home\" variables, then restart samba."
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 "Si tout le monde a une machine dédiée et que personne d'autre n'est autorisé "
 "à y toucher, l'édition de la configuration de Samba peut vous permettre de "
@@ -10515,9 +10659,13 @@ msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
+#| "discuss\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/> — assistance par liste de diffusion"
@@ -10536,18 +10684,26 @@ msgid "in Norwegian"
 msgstr "en norvégien"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
+#| "\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
 "> — assistance par liste de diffusion"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+#| "linuxiskolen\"/> - mailing list for the development member organisation "
+#| "in Norway (FRISK)"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen\"/> — liste de diffusion pour l'organisation des membres du "
@@ -10596,14 +10752,6 @@ msgstr ""
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> — assistance par "
 "liste de diffusion"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr "en espagnol"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr "<ulink url=\"http://www.skolelinux.es\"/> — portail espagnol"
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr "Assistance professionnelle"
@@ -13778,6 +13926,33 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid ""
+#~ "The following steps can be used to get back the behaviour from Debian Edu "
+#~ "Squeeze, using automount, NFS and a display manager other than ldm:"
+#~ msgstr ""
+#~ "Les étapes suivantes peuvent être suivies pour rétablir le comportement "
+#~ "de Debian Edu Squeeze, et utiliser automount, NFS et un gestionnaire "
+#~ "d'affichage autre que LDM :"
+
+#~ msgid ""
+#~ "Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "to lts.conf (or set this in LDAP). Make sure, that the display manager is "
+#~ "installed in the LTSP chroot."
+#~ msgstr ""
+#~ "Ajoutez <computeroutput>DEFAULT_DISPLAY_MANAGER=/chemin/vers/"
+#~ "gestionnaire_affichage</computeroutput> dans lts.conf (ou faites ce "
+#~ "réglage dans LDAP). Assurez-vous que le gestionnaire d'affichage est "
+#~ "installé dans le chroot LTSP."
+
+#~ msgid "Add the diskless workstations to LDAP with GOsa²."
+#~ msgstr "ajouter des stations de travail à LDAP avec GOsa²."
+
+#~ msgid "in Spanish"
+#~ msgstr "en espagnol"
+
+#~ msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
+#~ msgstr "<ulink url=\"http://www.skolelinux.es\"/> — portail espagnol"
+
 #~ msgid "apt-get install libdvdcss2 w32codecs"
 #~ msgstr "apt-get install libdvdcss2 w32codecs"
 
@@ -13793,10 +13968,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# fetch the deb-multimedia key insecurely:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# check securely if the key is correct and add it to the keyring used by "
+#~ "APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for "
+#~ "mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# update the list of available packages:\n"
 #~ "apt-get update"
 #~ msgstr ""
@@ -13804,10 +13983,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# récupérez la clé pour le dépôt deb-multimedia de manière non sûre :\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# vérifiez avec certitude que la clé est correcte et si tel est le cas, l'ajouter au trousseau utilisé par apt :\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# ajoutez le dépôt au fichier sources.list — cherchez sur la page web un miroir près de chez vous !\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# vérifiez avec certitude que la clé est correcte et si tel est le cas, "
+#~ "l'ajouter au trousseau utilisé par apt :\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# ajoutez le dépôt au fichier sources.list — cherchez sur la page web un "
+#~ "miroir près de chez vous !\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# mettez à jour la liste des paquets disponibles :\n"
 #~ "apt-get update"
 
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 8cb3584..e4659cb 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+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"
@@ -6909,11 +6909,41 @@ msgstr ""
 "computeroutput>, modificare come necessario \"/etc/fstab\" ed eseguire "
 "<computeroutput>mount -a</computeroutput> per montare le nuove risorse."
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Now users should be able to access the files on 'nas-server.intern' "
+#| "directly by just visiting the '/tjener/nas-server/storage/' directory "
+#| "using any application on any workstation, LTSP client or LTSP server."
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 "Ora gli utenti dovrebbero essere in grado di accedere ai file su \"nas-"
 "server.intern\" direttamente nella directory \"/tjener/nas-server/storage/\" "
@@ -7317,18 +7347,29 @@ msgstr ""
 "client."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
+#| "computeroutput> with the default value 300. So if (for example) the "
+#| "clients should only boot as diskless workstations if they have 1 GB RAM "
+#| "add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf "
+#| "(or set this in LDAP). Unlike workstations, diskless workstations run "
+#| "without any need to add them with GOsa², cause LDM is used to login and "
+#| "connect to the LTSP server.  The home directory is by default mounted "
+#| "using sshfs, and not automount and NFS.  This causes shared directories "
+#| "available via NFS to not be available on diskless workstations."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 "LTSP stabilisce come minimo per le workstation senza dischi 320MB di RAM. Se "
 "la quantità di RAM è minore, la macchina si avvierà come thin client. Il "
@@ -7344,39 +7385,23 @@ msgstr ""
 "non sono disponibili dalle workstation senza disco."
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-"Le seguenti operazioni possono essere usate per ritornare al comportamento "
-"di Debian Edu Squeeze, utilizzando automount, NFS e un display manager "
-"diverso da ldm:"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-"Aggiungere <computeroutput>DEFAULT_DISPLAY_MANAGER=/percorso/a/dm</"
-"computeroutput> a lts.conf (o impostarlo in LDAP). Assicurarsi che il "
-"display manager sia installato nella chroot di LTSP."
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
-msgstr "Aggiungere workstation senza dischi con GOsa²."
-
-#. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role=\"strong\">Firmware del client LTSP</emphasis>"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP client boot will fail if the client's network card requires a non-"
+#| "free firmware. A PXE installation can be used for troubleshooting "
+#| "problems with netbooting a machine; if the Debian Installer complains "
+#| "about a missing XXX.bin file then non-free firmware has to be added to "
+#| "the initrd used by LTSP clients."
 msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 "L'avvio dei client LTSP fallirà se la scheda di rete del client richiede "
 "firmware non libero. Una installazione PXE può essere usata per risolvere i "
@@ -7389,19 +7414,32 @@ msgid "In this case execute the following commands on an LTSP server."
 msgstr "In questo caso eseguire i seguenti comandi su un server LTSP."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# First get information about firmware packages\n"
+#| "apt-get update && apt-cache search ^firmware-\n"
+#| "\n"
+#| "# Decide which package has to be installed for the network card(s). \n"
+#| "# Most probably this will be firmware-linux-nonfree.\n"
+#| "# Things have to take effect in the LTSP chroot for architecture i386.\n"
+#| "ltsp-chroot -a i386 apt-get update\n"
+#| "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
+#| "\n"
+#| "# copy the new initrd to the server's tftpboot directory\n"
+#| "ltsp-update-kernels"
 msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 "# Come prima cosa ottenere informazioni sui pacchetti firmware\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -7433,8 +7471,14 @@ msgid "LTSP client type selection"
 msgstr "Selezione del tipo di client LTSP"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Each LTSP server has two ethernet cards: one configured in the main "
+#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
+#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+#| "server)."
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -7469,7 +7513,15 @@ msgstr ""
 "thin-client, bisognerà eseguire queste istruzioni."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+#| "and replace the line\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+#| "with\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
+#| "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
+#| "(3)Execute 'ltsp-update-kernels'"
 msgid ""
 "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
@@ -7477,7 +7529,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 "(1)Aprire il file /opt/ltsp/i386/etc/ltsp/update-kernels.conf con un editor\n"
 "e sostituire la riga\n"
@@ -7682,28 +7735,41 @@ msgstr ""
 "principale come server LTSP. "
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
+#| "network, when tjener is not a combined server, follow these steps:"
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 "Per avere ltspserver00 che controlla le workstation senza dischi sulla rete "
 "principale (10.0.0.0/8), quando tjener non è un server combinato, occorre "
 "seguire i seguenti passaggi:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy the <computeroutput>ltsp</computeroutput> directory from "
+#| "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
+#| "same directory on tjener."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 "copiare la directory <computeroutput>ltsp</computeroutput> da "
 "<computeroutput>/var/lib/tftpboot</computeroutput> in ltspserver00 alla "
 "stessa directory su tjener."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+#| "computeroutput> to the same directory on tjener."
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 "copiare <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> nella stessa directory su tjener."
@@ -7725,10 +7791,15 @@ msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/
 msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+#| "debian-edu/default-diskless.cfg</computeroutput>."
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 "impostare il collegamento simbolico in <computeroutput>/var/lib/tftpboot/"
 "pxelinux.cfg</computeroutput> su tjener in modo che punti a <computeroutput>/"
@@ -7871,11 +7942,16 @@ msgstr ""
 "computeroutput>. Si possono anche aggiungere voci specifiche di host in LDAP."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Install the package <computeroutput>ltsp-docs</computeroutput> and run "
+#| "\"man lts.conf\" to have a look at available configuration options (see "
+#| "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
+#| "detailed information about LTSP)."
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 "Installare il pacchetto <computeroutput>ltsp-docs</computeroutput> ed "
 "eseguire \"man lts.conf\" per avere un'idea delle opzioni di configurazione "
@@ -8261,9 +8337,16 @@ msgstr ""
 "ltsp/LTSPManual.html#printer</computeroutput>."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Configure the printer using the web interface <computeroutput>https://"
+#| "www:631</computeroutput> on tjener; choose network printer type "
+#| "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
+#| "regardless of brand or model) and set <computeroutput>socket://<LTSP "
+#| "client ip>:9100</computeroutput> as connection URI."
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -8291,12 +8374,18 @@ msgstr ""
 "questi comandi come utente root su ogni server LTSP:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
+#| "aptitude update\n"
+#| "aptitude upgrade\n"
+#| "aptitude dist-upgrade\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386  # questo fa \"chroot /opt/ltsp/i386\" e altro, ossia evita anche che i demoni siano avviati\n"
@@ -8318,13 +8407,20 @@ msgstr ""
 "l'installazione dentro la chroot del server LTSP."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386\n"
+#| "## optionally, edit the sources.list:\n"
+#| "#editor /etc/apt/sources.list\n"
+#| "aptitude update\n"
+#| "aptitude install $new_package\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
@@ -8406,9 +8502,15 @@ msgid "Joining a domain"
 msgstr "Collegarsi al dominio"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
+#| "joined. A special service called Samba, installed on the main-server "
+#| "tjener, enables Windows clients to store profiles and user data, and also "
+#| "authenticates the users during the login."
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -8430,12 +8532,21 @@ msgstr ""
 "nell'<link linkend=\"Samba\">HowTo per Samba di Debian Edu Jessie</link>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Windows will sync the profiles of domain users on every Windows login and "
+#| "logout. Depending on how much data is stored in the profile, this could "
+#| "take some time. To minimise the time needed, deactivate things like local "
+#| "cache in browsers (you can use the Squid proxy cache installed on tjener "
+#| "instead) and save files into the H: volume rather than under \"My "
+#| "Documents\"."
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 "Windows sincronizzerà il profilo degli utenti del dominio ogni volta che si "
 "fa login e logout. Dalla quantità dei dati presenti nel profilo dipenderà il "
@@ -8484,10 +8595,16 @@ msgstr ""
 "with GOsa² (and then show an example for the command line)"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to check user groups on Windows, you need to download the "
+#| "tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then "
+#| "you can use this for example in the logon script which resides on tjener "
+#| "in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 "Se si vuole controllare i gruppi di utenti in Windows, occorre scaricare lo "
@@ -8500,11 +8617,18 @@ msgid "XP home"
 msgstr "XP home"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users bringing in their XP laptops from home can still connect to tjener "
+#| "using their skolelinux credentials, provided the workgroup is set to "
+#| "SKOLELINUX. However, they may need to disable the Windows firewall before "
+#| "tjener will appear in Network Neighbourhood (or whatever it's called now)."
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 "Gli utenti che portano i propri portatili con XP da casa, possono comunque "
 "connettersi a tjener usando le loro credenziali skolelinux se hanno "
@@ -8610,10 +8734,10 @@ msgstr ""
 #| "the config file are a lot of explanations which you should have a look at."
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -8707,11 +8831,17 @@ msgid "Global policies for roaming profiles"
 msgstr "Politiche globali per i profili mobili"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
+#| "computeroutput>), you can can create a Policy file (NTConfig.pol) and put "
+#| "it in your netlogon share on tjener. This has the advantage of working "
+#| "almost instantly on all Windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 "Se si usa il vecchio editor di politiche di Windows <computeroutput>poledit."
 "exe</computeroutput>), si può creare un file di policy (NTConfig.pol) e "
@@ -8727,11 +8857,19 @@ msgstr ""
 "Microsoft, ma è ancora disponibile come parte degli strumenti ORK."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With <computeroutput>poledit.exe</computeroutput> you can create .pol "
+#| "files. If you put such a file on tjener as <computeroutput>/etc/samba/"
+#| "netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+#| "Windows machines and temporarily overwrite the registry, thus applying "
+#| "the changes."
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 "Con <computeroutput>poledit.exe</computeroutput> si possono creare file ."
 "pol. Se si mette uno di questi file in tjener come <computeroutput>/etc/"
@@ -8974,12 +9112,19 @@ msgid "Disabling roaming in smb.conf"
 msgstr "Disabilitare i profili mobili in smb.conf"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If, perhaps, everyone has their own dedicated machine, and nobody else is "
+#| "allowed to touch it, editing the Samba configuration will let you disable "
+#| "roaming profiles for the entire network. You can alter the "
+#| "<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
+#| "\"logon path\" and \"logon home\" variables, then restart samba."
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 "Se ognuno ha una propria macchina dedicata e nessun altro può toccarla, la "
 "modifica della configurazione di Samba consente di disattivare i profili "
@@ -10308,9 +10453,13 @@ msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
+#| "discuss\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/> - mailing list di supporto"
@@ -10329,18 +10478,26 @@ msgid "in Norwegian"
 msgstr "in norvegese"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
+#| "\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
 "> - mailing list di supporto"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+#| "linuxiskolen\"/> - mailing list for the development member organisation "
+#| "in Norway (FRISK)"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen\"/> - mailing-list dell'organizzazione degli sviluppatori in "
@@ -10387,14 +10544,6 @@ msgstr ""
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - mailing list di "
 "supporto"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr "in spagnolo"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr "<ulink url=\"http://www.skolelinux.es\"/> - portale spagnolo"
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr "Supporto professionale"
@@ -13521,6 +13670,32 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "The following steps can be used to get back the behaviour from Debian Edu "
+#~ "Squeeze, using automount, NFS and a display manager other than ldm:"
+#~ msgstr ""
+#~ "Le seguenti operazioni possono essere usate per ritornare al "
+#~ "comportamento di Debian Edu Squeeze, utilizzando automount, NFS e un "
+#~ "display manager diverso da ldm:"
+
+#~ msgid ""
+#~ "Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "to lts.conf (or set this in LDAP). Make sure, that the display manager is "
+#~ "installed in the LTSP chroot."
+#~ msgstr ""
+#~ "Aggiungere <computeroutput>DEFAULT_DISPLAY_MANAGER=/percorso/a/dm</"
+#~ "computeroutput> a lts.conf (o impostarlo in LDAP). Assicurarsi che il "
+#~ "display manager sia installato nella chroot di LTSP."
+
+#~ msgid "Add the diskless workstations to LDAP with GOsa²."
+#~ msgstr "Aggiungere workstation senza dischi con GOsa²."
+
+#~ msgid "in Spanish"
+#~ msgstr "in spagnolo"
+
+#~ msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
+#~ msgstr "<ulink url=\"http://www.skolelinux.es\"/> - portale spagnolo"
+
 #~ msgid "apt-get install libdvdcss2 w32codecs"
 #~ msgstr "apt-get install libdvdcss2 w32codecs"
 
@@ -13536,10 +13711,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# fetch the deb-multimedia key insecurely:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# check securely if the key is correct and add it to the keyring used by "
+#~ "APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for "
+#~ "mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# update the list of available packages:\n"
 #~ "apt-get update"
 #~ msgstr ""
@@ -13547,10 +13726,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# recuperare in modo non sicuro la chiave di deb-multimedia:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# controllare in modo sicuro che la chiave sia corretta e, se la è, aggiungerla al portachiavi di APT:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# aggiungere il repository a sources.list; guardare nella pagina web l'elenco dei mirror!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# controllare in modo sicuro che la chiave sia corretta e, se la è, "
+#~ "aggiungerla al portachiavi di APT:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# aggiungere il repository a sources.list; guardare nella pagina web "
+#~ "l'elenco dei mirror!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# aggiornare l'elenco dei pacchetti disponibili:\n"
 #~ "apt-get update"
 
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 0e8a619..0800531 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+0000\n"
 "PO-Revision-Date: 2016-12-16 23:09+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -5936,11 +5936,41 @@ msgstr ""
 "し、「/etc/fstab」を適切に編集して <computeroutput>mount -a</computeroutput> "
 "を実行して新しいリソースをマウントします。"
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Now users should be able to access the files on 'nas-server.intern' "
+#| "directly by just visiting the '/tjener/nas-server/storage/' directory "
+#| "using any application on any workstation, LTSP client or LTSP server."
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 "これでユーザは任意のワークステーションや LTSP クライアント、LTSP サーバから任"
 "意のアプリケーションで「/tjener/nas-server/storage/」ディレクトリに行くだけで"
@@ -6304,18 +6334,29 @@ msgstr ""
 "法です。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
+#| "computeroutput> with the default value 300. So if (for example) the "
+#| "clients should only boot as diskless workstations if they have 1 GB RAM "
+#| "add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf "
+#| "(or set this in LDAP). Unlike workstations, diskless workstations run "
+#| "without any need to add them with GOsa², cause LDM is used to login and "
+#| "connect to the LTSP server.  The home directory is by default mounted "
+#| "using sshfs, and not automount and NFS.  This causes shared directories "
+#| "available via NFS to not be available on diskless workstations."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 "LTSP ではディスクレスワークステーションのRAM容量のデフォルトの最小限度を320MB"
 "と決めています。RAM容量がこれに満たない場合、そのマシンはシンクライアントとし"
@@ -6332,39 +6373,23 @@ msgstr ""
 "ん。"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-"以下の手順により自動マウント、NFS、そして LDM 以外のディスプレイマネージャー"
-"を利用する Debian Edu Squeeze の挙動に戻せます:"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-"lts.conf に <computeroutput>DEFAULT_DISPLAY_MANAGER=/DM/への/パス</"
-"computeroutput> を追加 (または LDAP でそのように設定) します。指定するディス"
-"プレイマネージャーが LTSP chroot にインストールされていることを確認してくださ"
-"い。"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
-msgstr "GOsa² を使って LDAP にディスクレスワークステーションを追加します。"
-
-#. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP クライアントのファームウェア</emphasis>"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+#, fuzzy
+#| msgid ""
+#| "LTSP client boot will fail if the client's network card requires a non-"
+#| "free firmware. A PXE installation can be used for troubleshooting "
+#| "problems with netbooting a machine; if the Debian Installer complains "
+#| "about a missing XXX.bin file then non-free firmware has to be added to "
+#| "the initrd used by LTSP clients."
+msgid ""
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 "クライアントのネットワークカードがフリーでないファームウェアを必要とする場合"
 "は LTSP クライアントのブートは失敗します。マシンのネットワークブートに関わる"
@@ -6377,19 +6402,32 @@ msgid "In this case execute the following commands on an LTSP server."
 msgstr "この場合は LTSP サーバで以下のコマンドを実行します:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# First get information about firmware packages\n"
+#| "apt-get update && apt-cache search ^firmware-\n"
+#| "\n"
+#| "# Decide which package has to be installed for the network card(s). \n"
+#| "# Most probably this will be firmware-linux-nonfree.\n"
+#| "# Things have to take effect in the LTSP chroot for architecture i386.\n"
+#| "ltsp-chroot -a i386 apt-get update\n"
+#| "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
+#| "\n"
+#| "# copy the new initrd to the server's tftpboot directory\n"
+#| "ltsp-update-kernels"
 msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 "# まずファームウェアパッケージについての情報を集めます\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -6421,8 +6459,14 @@ msgid "LTSP client type selection"
 msgstr "LTSP クライアントの種類の選択"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Each LTSP server has two ethernet cards: one configured in the main "
+#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
+#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+#| "server)."
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -6457,7 +6501,15 @@ msgstr ""
 "させるには以下を実行します。"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+#| "and replace the line\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+#| "with\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
+#| "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
+#| "(3)Execute 'ltsp-update-kernels'"
 msgid ""
 "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
@@ -6465,7 +6517,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 "(1)エディタでファイル /opt/ltsp/i386/etc/ltsp/update-kernels.conf を開いて\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
@@ -6661,27 +6714,40 @@ msgstr ""
 "用意します。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
+#| "network, when tjener is not a combined server, follow these steps:"
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 "ltspserver00 で中心ネットワーク (10.0.0.0/8) のディスクレスワークステーション"
 "を担当させ、中心サーバを複合サーバにしない場合は以下の手順を追います:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy the <computeroutput>ltsp</computeroutput> directory from "
+#| "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
+#| "same directory on tjener."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 "ltspserver00 の <computeroutput>/var/lib/tftpboot</computeroutput> から "
 "<computeroutput>ltsp</computeroutput> ディレクトリを中心サーバの同一ディレク"
 "トリにコピーします。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+#| "computeroutput> to the same directory on tjener."
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 "<computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> を中心サーバの同一ディレクトリにコピーします。"
@@ -6702,10 +6768,15 @@ msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/
 msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+#| "debian-edu/default-diskless.cfg</computeroutput>."
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 "中心サーバの <computeroutput>/var/lib/tftpboot/pxelinux.cfg</computeroutput> "
 "のシンボリックリンクが <computeroutput>/var/lib/tftpboot/debian-edu/default-"
@@ -6834,11 +6905,16 @@ msgstr ""
 "ることもできます。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Install the package <computeroutput>ltsp-docs</computeroutput> and run "
+#| "\"man lts.conf\" to have a look at available configuration options (see "
+#| "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
+#| "detailed information about LTSP)."
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 "利用可能な設定オプションの確認にはパッケージ <computeroutput>ltsp-docs</"
 "computeroutput> をインストールして「man lts.conf」を実行します (LTSP の詳細情"
@@ -7202,9 +7278,16 @@ msgstr ""
 "設定します。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Configure the printer using the web interface <computeroutput>https://"
+#| "www:631</computeroutput> on tjener; choose network printer type "
+#| "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
+#| "regardless of brand or model) and set <computeroutput>socket://<LTSP "
+#| "client ip>:9100</computeroutput> as connection URI."
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -7230,12 +7313,18 @@ msgstr ""
 "下のコマンド root で実行します:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
+#| "aptitude update\n"
+#| "aptitude upgrade\n"
+#| "aptitude dist-upgrade\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
@@ -7257,13 +7346,20 @@ msgstr ""
 "chroot 内でインストールを行う必要があります。"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386\n"
+#| "## optionally, edit the sources.list:\n"
+#| "#editor /etc/apt/sources.list\n"
+#| "aptitude update\n"
+#| "aptitude install $new_package\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
@@ -7337,9 +7433,15 @@ msgid "Joining a domain"
 msgstr "ドメインへの参加"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
+#| "joined. A special service called Samba, installed on the main-server "
+#| "tjener, enables Windows clients to store profiles and user data, and also "
+#| "authenticates the users during the login."
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -7357,12 +7459,21 @@ msgstr ""
 "Howto</link> で説明している手順を追う必要があります。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Windows will sync the profiles of domain users on every Windows login and "
+#| "logout. Depending on how much data is stored in the profile, this could "
+#| "take some time. To minimise the time needed, deactivate things like local "
+#| "cache in browsers (you can use the Squid proxy cache installed on tjener "
+#| "instead) and save files into the H: volume rather than under \"My "
+#| "Documents\"."
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 "Windows はドメインユーザのプロファイルを Windows へのログインやログアウトの度"
 "に同期します。プロファイルに保管されているデータの量によってはこれに時間が多"
@@ -7409,10 +7520,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to check user groups on Windows, you need to download the "
+#| "tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then "
+#| "you can use this for example in the logon script which resides on tjener "
+#| "in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 "Windows でユーザグループを確認したい場合は <computeroutput>IFMEMBER.EXE</"
@@ -7425,11 +7542,18 @@ msgid "XP home"
 msgstr "XP ホーム"
 
 #. type: Content of: <article><section><section><section><para>
-msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+#, fuzzy
+#| msgid ""
+#| "Users bringing in their XP laptops from home can still connect to tjener "
+#| "using their skolelinux credentials, provided the workgroup is set to "
+#| "SKOLELINUX. However, they may need to disable the Windows firewall before "
+#| "tjener will appear in Network Neighbourhood (or whatever it's called now)."
+msgid ""
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 "ユーザが外部から持ち込んだXPノートPCを skolelinux 資格情報を使って中心サーバ"
 "に接続することも、ワークグループが SKOLELINUX と設定されていれば可能です。た"
@@ -7514,12 +7638,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "You might find an example smb.conf in your preferred language delivered "
+#| "by the installation on tjener under <computeroutput>/usr/share/doc/debian-"
+#| "edu-config/examples/</computeroutput>. The source file is in English and "
+#| "is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+#| "look for a file with the appropriate code in the filename (the German "
+#| "translation, for example, will be named <computeroutput>smb-roaming-"
+#| "profiles-de.conf</computeroutput>). Inside the config file are a lot of "
+#| "explanations which you should have a look at."
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -7604,11 +7738,17 @@ msgid "Global policies for roaming profiles"
 msgstr "ローミングプロファイル向けの全体ポリシー"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
+#| "computeroutput>), you can can create a Policy file (NTConfig.pol) and put "
+#| "it in your netlogon share on tjener. This has the advantage of working "
+#| "almost instantly on all Windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 "古いポリシーエディタ (<computeroutput>poledit.exe</computeroutput>) を使って"
 "ポリシーファイル (NTConfig.pol) を作成し、中心サーバの netlogon 共有に配置で"
@@ -7624,11 +7764,19 @@ msgstr ""
 "なっています。"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With <computeroutput>poledit.exe</computeroutput> you can create .pol "
+#| "files. If you put such a file on tjener as <computeroutput>/etc/samba/"
+#| "netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+#| "Windows machines and temporarily overwrite the registry, thus applying "
+#| "the changes."
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 "<computeroutput>poledit.exe</computeroutput> で .pol ファイルを作成できます。"
 "こういったファイルを中心サーバの <computeroutput>/etc/samba/netlogon/NTLOGON."
@@ -7851,12 +7999,19 @@ msgid "Disabling roaming in smb.conf"
 msgstr "smb.conf でのローミング無効化"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If, perhaps, everyone has their own dedicated machine, and nobody else is "
+#| "allowed to touch it, editing the Samba configuration will let you disable "
+#| "roaming profiles for the entire network. You can alter the "
+#| "<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
+#| "\"logon path\" and \"logon home\" variables, then restart samba."
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 "全員が自分専用のマシンを持ち、他人が触ることがないのであれば、Samba の設定で"
 "ローミングプロファイルをネットワーク全体で無効化することもできます。中心サー"
@@ -9115,9 +9270,13 @@ msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
+#| "discuss\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/> - サポートメーリングリスト"
@@ -9135,18 +9294,26 @@ msgid "in Norwegian"
 msgstr "ノルウェー語"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
+#| "\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
 "> - サポートメーリングリスト"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+#| "linuxiskolen\"/> - mailing list for the development member organisation "
+#| "in Norway (FRISK)"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen\"/> - ノルウェーにある開発メンバー組織 (FRISK) 向けのメーリング"
@@ -9192,14 +9359,6 @@ msgstr ""
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - サポートメーリン"
 "グリスト"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr "スペイン語"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr "<ulink url=\"http://www.skolelinux.es\"/> - スペイン語ポータル"
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr ""
@@ -11879,3 +12038,29 @@ msgid ""
 msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
+
+#~ msgid ""
+#~ "The following steps can be used to get back the behaviour from Debian Edu "
+#~ "Squeeze, using automount, NFS and a display manager other than ldm:"
+#~ msgstr ""
+#~ "以下の手順により自動マウント、NFS、そして LDM 以外のディスプレイマネー"
+#~ "ジャーを利用する Debian Edu Squeeze の挙動に戻せます:"
+
+#~ msgid ""
+#~ "Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "to lts.conf (or set this in LDAP). Make sure, that the display manager is "
+#~ "installed in the LTSP chroot."
+#~ msgstr ""
+#~ "lts.conf に <computeroutput>DEFAULT_DISPLAY_MANAGER=/DM/への/パス</"
+#~ "computeroutput> を追加 (または LDAP でそのように設定) します。指定するディ"
+#~ "スプレイマネージャーが LTSP chroot にインストールされていることを確認して"
+#~ "ください。"
+
+#~ msgid "Add the diskless workstations to LDAP with GOsa²."
+#~ msgstr "GOsa² を使って LDAP にディスクレスワークステーションを追加します。"
+
+#~ msgid "in Spanish"
+#~ msgstr "スペイン語"
+
+#~ msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
+#~ msgstr "<ulink url=\"http://www.skolelinux.es\"/> - スペイン語ポータル"
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 884b0a6..9ca2761 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+0000\n"
 "PO-Revision-Date: 2017-02-05 11:34+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -6547,11 +6547,41 @@ msgstr ""
 "etc/fstab» som passende og kjør  <computeroutput>mount -a</computeroutput> "
 "for å montere de nye ressursene."
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Now users should be able to access the files on 'nas-server.intern' "
+#| "directly by just visiting the '/tjener/nas-server/storage/' directory "
+#| "using any application on any workstation, LTSP client or LTSP server."
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 "Nå skal brukerne kunne få tilgang til filene på «nas-server.intern» direkte "
 "bare ved å besøke «/tjener/nas-server/lagring/»-katalogen ved hjelp av en "
@@ -6949,18 +6979,29 @@ msgstr ""
 "lave vedlikeholdskostnader som tynne klienter."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
+#| "computeroutput> with the default value 300. So if (for example) the "
+#| "clients should only boot as diskless workstations if they have 1 GB RAM "
+#| "add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf "
+#| "(or set this in LDAP). Unlike workstations, diskless workstations run "
+#| "without any need to add them with GOsa², cause LDM is used to login and "
+#| "connect to the LTSP server.  The home directory is by default mounted "
+#| "using sshfs, and not automount and NFS.  This causes shared directories "
+#| "available via NFS to not be available on diskless workstations."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 "LTSP definerer 320 MB som standard minimum RAM for diskløse "
 "arbeidsstasjoner. Hvis mengden RAM er mindre, vil maskinen starte opp som "
@@ -6976,38 +7017,23 @@ msgstr ""
 "ikke er tilgjengelige på diskløse arbeidsstasjoner."
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-"Følgende trinn kan brukes for å få tilbake opplegget fra Debian Edu Squeeze, "
-"ved hjelp av automonter, NFS og en annen øktstyrer enn LDM:"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-"Legg <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
-"til lts.conf (eller sette denne i LDAP). Sørg for at øktstyreren er "
-"installert i LTSP-chroot-en."
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
-msgstr "Arbeidsstasjon"
-
-#. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+#, fuzzy
+#| msgid ""
+#| "LTSP client boot will fail if the client's network card requires a non-"
+#| "free firmware. A PXE installation can be used for troubleshooting "
+#| "problems with netbooting a machine; if the Debian Installer complains "
+#| "about a missing XXX.bin file then non-free firmware has to be added to "
+#| "the initrd used by LTSP clients."
+msgid ""
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 "En LTSP-klientoppstart vil mislykkes hvis klientens nettverkskort krever en "
 "ikke-fri fastvare. En PXE installasjon kan brukes til å feilsøke problemer "
@@ -7019,19 +7045,32 @@ msgid "In this case execute the following commands on an LTSP server."
 msgstr "For å installere, kjør følgende som root:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# First get information about firmware packages\n"
+#| "apt-get update && apt-cache search ^firmware-\n"
+#| "\n"
+#| "# Decide which package has to be installed for the network card(s). \n"
+#| "# Most probably this will be firmware-linux-nonfree.\n"
+#| "# Things have to take effect in the LTSP chroot for architecture i386.\n"
+#| "ltsp-chroot -a i386 apt-get update\n"
+#| "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
+#| "\n"
+#| "# copy the new initrd to the server's tftpboot directory\n"
+#| "ltsp-update-kernels"
 msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 "# Først få informasjon om fastvare pakker\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -7062,8 +7101,14 @@ msgid "LTSP client type selection"
 msgstr "Velg type installasjon"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Each LTSP server has two ethernet cards: one configured in the main "
+#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
+#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+#| "server)."
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -7096,7 +7141,15 @@ msgstr ""
 "subnett, bør kjøres som tynne klienter, må følgende gjøres."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+#| "and replace the line\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+#| "with\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
+#| "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
+#| "(3)Execute 'ltsp-update-kernels'"
 msgid ""
 "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
@@ -7104,7 +7157,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 "(1) Åpne filen /opt/ltsp/i386/etc/ltsp/update-kernels.conf  med en redigerer\n"
 " og erstatt linjen\n"
@@ -7297,27 +7351,40 @@ msgstr ""
 "separat hovedserver, som ikke virker som en LTSP-server."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
+#| "network, when tjener is not a combined server, follow these steps:"
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 "For å la Ltspserver00 betjene diskløse arbeidsstasjoner på hovednettverket "
 "(10.0.0.0 /8), når tjener ikke er en kombinert server, gjør du følgende:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy the <computeroutput>ltsp</computeroutput> directory from "
+#| "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
+#| "same directory on tjener."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 "1.) Avmonter <computeroutput>/var</computeroutput>-partisjonen. Du må "
 "avmontere <computeroutput>/var/spool/squid</computeroutput>-partisjonen også "
 "for at dette skal fungere:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+#| "computeroutput> to the same directory on tjener."
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 "Kopier <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> til den samme katalogen på tjener."
@@ -7339,10 +7406,15 @@ msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/
 msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+#| "debian-edu/default-diskless.cfg</computeroutput>."
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 "Sett symlinken i <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
 "computeroutput> på tjener for å peke på <computeroutput>/var/lib/tftpboot/"
@@ -7483,11 +7555,16 @@ msgstr ""
 "legge til vertsbestemte oppføringer i LDAP."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Install the package <computeroutput>ltsp-docs</computeroutput> and run "
+#| "\"man lts.conf\" to have a look at available configuration options (see "
+#| "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
+#| "detailed information about LTSP)."
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 "Installer pakken <computeroutput>ltsp-docs</computeroutput>, og kjør «man "
 "lts.conf» for å ta en titt på tilgjengelige konfigurasjonsalternativer (se "
@@ -7860,9 +7937,16 @@ msgstr ""
 "computeroutput> for detaljer."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Configure the printer using the web interface <computeroutput>https://"
+#| "www:631</computeroutput> on tjener; choose network printer type "
+#| "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
+#| "regardless of brand or model) and set <computeroutput>socket://<LTSP "
+#| "client ip>:9100</computeroutput> as connection URI."
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -7889,12 +7973,18 @@ msgstr ""
 "hver LTSP-tjener:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
+#| "aptitude update\n"
+#| "aptitude upgrade\n"
+#| "aptitude dist-upgrade\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
@@ -7916,13 +8006,20 @@ msgstr ""
 "installasjonen inne i chroot-en til LTSP-tjeneren."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386\n"
+#| "## optionally, edit the sources.list:\n"
+#| "#editor /etc/apt/sources.list\n"
+#| "aptitude update\n"
+#| "aptitude install $new_package\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
@@ -7995,9 +8092,15 @@ msgid "Joining a domain"
 msgstr "Bli med i domenet"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
+#| "joined. A special service called Samba, installed on the main-server "
+#| "tjener, enables Windows clients to store profiles and user data, and also "
+#| "authenticates the users during the login."
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -8015,12 +8118,21 @@ msgstr ""
 "<link linkend=\"Samba\">Debian Edu Stretch Samba Howto</link> følges."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Windows will sync the profiles of domain users on every Windows login and "
+#| "logout. Depending on how much data is stored in the profile, this could "
+#| "take some time. To minimise the time needed, deactivate things like local "
+#| "cache in browsers (you can use the Squid proxy cache installed on tjener "
+#| "instead) and save files into the H: volume rather than under \"My "
+#| "Documents\"."
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 "Windows vil synkronisere profilene til domenebrukerne på hver Windows  "
 "innlogging og utlogging. Avhengig av hvor mye data som er lagret i profilen, "
@@ -8069,10 +8181,16 @@ msgstr ""
 "Windows med GOsa² (og deretter vise et eksempel for kommandolinjen)."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to check user groups on Windows, you need to download the "
+#| "tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then "
+#| "you can use this for example in the logon script which resides on tjener "
+#| "in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 "Hvis du ønsker å sjekke brukergrupper i Windows, må du laste ned verktøyet "
@@ -8085,11 +8203,18 @@ msgid "XP home"
 msgstr "XP Home"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users bringing in their XP laptops from home can still connect to tjener "
+#| "using their skolelinux credentials, provided the workgroup is set to "
+#| "SKOLELINUX. However, they may need to disable the Windows firewall before "
+#| "tjener will appear in Network Neighbourhood (or whatever it's called now)."
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 "Brukere som tar med sin egen bærbare XP-laptop, kan likevel koble til tjener "
 "med sitt Skolelinux brukernavn og passord så lenge arbeidsgruppen/workgroup "
@@ -8181,12 +8306,22 @@ msgstr ""
 "Kerberos i Wheezy ble satt opp også for Samba!"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "You might find an example smb.conf in your preferred language delivered "
+#| "by the installation on tjener under <computeroutput>/usr/share/doc/debian-"
+#| "edu-config/examples/</computeroutput>. The source file is in English and "
+#| "is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+#| "look for a file with the appropriate code in the filename (the German "
+#| "translation, for example, will be named <computeroutput>smb-roaming-"
+#| "profiles-de.conf</computeroutput>). Inside the config file are a lot of "
+#| "explanations which you should have a look at."
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -8280,11 +8415,17 @@ msgid "Global policies for roaming profiles"
 msgstr "Globale retningslinjer for Roaming-profiler"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
+#| "computeroutput>), you can can create a Policy file (NTConfig.pol) and put "
+#| "it in your netlogon share on tjener. This has the advantage of working "
+#| "almost instantly on all Windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 "Ved å bruke Windows sin regeleditor (<computeroutput>poledit.exe</"
 "computeroutput>), kan du lage en regelfil (NTConfig.pol) og legge den i "
@@ -8304,11 +8445,19 @@ msgstr ""
 "ORK-verktøyene."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With <computeroutput>poledit.exe</computeroutput> you can create .pol "
+#| "files. If you put such a file on tjener as <computeroutput>/etc/samba/"
+#| "netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+#| "Windows machines and temporarily overwrite the registry, thus applying "
+#| "the changes."
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 "Med <computeroutput>poledit.exe</computeroutput> kan du lage .pol filer. "
 "Hvis du legger slike filer på en tjener som <computeroutput>/etc/samba/"
@@ -8548,12 +8697,19 @@ msgid "Disabling roaming in smb.conf"
 msgstr "Slå av Roaming i smb.conf"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If, perhaps, everyone has their own dedicated machine, and nobody else is "
+#| "allowed to touch it, editing the Samba configuration will let you disable "
+#| "roaming profiles for the entire network. You can alter the "
+#| "<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
+#| "\"logon path\" and \"logon home\" variables, then restart samba."
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 "Ved å endre Samba-oppsettet kan du slå av Roaming-profiler for hele "
 "nettverket. Kanskje alle har sin egen dedikerte maskin, og ingen andre får "
@@ -9860,9 +10016,13 @@ msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
+#| "discuss\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/>  - e-postliste for support"
@@ -9880,18 +10040,26 @@ msgid "in Norwegian"
 msgstr "På norsk"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
+#| "\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
 "> - e-postliste for support"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+#| "linuxiskolen\"/> - mailing list for the development member organisation "
+#| "in Norway (FRISK)"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen\"/> - e-postliste for medlemmer i utviklerorganisasjonen i "
@@ -9937,14 +10105,6 @@ msgstr ""
 "<ulink url='http://lists.debian.org/debian-edu-french'>http://lists.debian."
 "org/debian-edu-french</ulink> - e-postliste for support"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr "På spansk"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr "<ulink url=\"http://www.skolelinux.es\"/> - Spansk portal"
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr "Profesjonell support"
@@ -12983,6 +13143,31 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
 #~ msgid ""
+#~ "The following steps can be used to get back the behaviour from Debian Edu "
+#~ "Squeeze, using automount, NFS and a display manager other than ldm:"
+#~ msgstr ""
+#~ "Følgende trinn kan brukes for å få tilbake opplegget fra Debian Edu "
+#~ "Squeeze, ved hjelp av automonter, NFS og en annen øktstyrer enn LDM:"
+
+#~ msgid ""
+#~ "Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "to lts.conf (or set this in LDAP). Make sure, that the display manager is "
+#~ "installed in the LTSP chroot."
+#~ msgstr ""
+#~ "Legg <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "til lts.conf (eller sette denne i LDAP). Sørg for at øktstyreren er "
+#~ "installert i LTSP-chroot-en."
+
+#~ msgid "Add the diskless workstations to LDAP with GOsa²."
+#~ msgstr "Arbeidsstasjon"
+
+#~ msgid "in Spanish"
+#~ msgstr "På spansk"
+
+#~ msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
+#~ msgstr "<ulink url=\"http://www.skolelinux.es\"/> - Spansk portal"
+
+#~ msgid ""
 #~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
 #~ "contrib now (also in jessie-backports) which can be used to build "
 #~ "libdvdcss and which makes adding the debian multimedia apt repository "
@@ -13007,10 +13192,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# fetch the deb-multimedia key insecurely:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# check securely if the key is correct and add it to the keyring used by "
+#~ "APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for "
+#~ "mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# update the list of available packages:\n"
 #~ "apt-get update"
 #~ msgstr ""
@@ -13018,10 +13207,14 @@ msgstr ""
 #~ "aptitude install debian-keyring\n"
 #~ "# hent deb-multimedianøkkelen usikret:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# sjekk sikkert om nøkkelen er korrekt, og legg den til nøkkelingen apt benytter hvis den er det:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene for speil!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# sjekk sikkert om nøkkelen er korrekt, og legg den til nøkkelingen apt "
+#~ "benytter hvis den er det:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# legg programvarearkivet til sources.list - vennligst sjekk hjemmesidene "
+#~ "for speil!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# oppdater listen over tilgjengelige pakker:\n"
 #~ "aptitude update"
 
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 fed338c..c61fe8b 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+0000\n"
 "PO-Revision-Date: 2017-01-22 16:31+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -6758,11 +6758,41 @@ msgstr ""
 "in '/etc/fstab' door en geef de opdracht <computeroutput>mount -a</"
 "computeroutput> om de nieuwe bronnen aan te koppelen."
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Now users should be able to access the files on 'nas-server.intern' "
+#| "directly by just visiting the '/tjener/nas-server/storage/' directory "
+#| "using any application on any workstation, LTSP client or LTSP server."
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 "Gebruikers zouden nu in staat moeten zijn om rechtstreeks toegang te hebben "
 "tot de bestanden op 'nas-server.intern' door gewoon naar de map '/tjener/nas-"
@@ -7179,18 +7209,29 @@ msgstr ""
 "is bij thin clients."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
+#| "workstations. If the amount of RAM is less, the machine will boot as thin "
+#| "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
+#| "computeroutput> with the default value 300. So if (for example) the "
+#| "clients should only boot as diskless workstations if they have 1 GB RAM "
+#| "add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf "
+#| "(or set this in LDAP). Unlike workstations, diskless workstations run "
+#| "without any need to add them with GOsa², cause LDM is used to login and "
+#| "connect to the LTSP server.  The home directory is by default mounted "
+#| "using sshfs, and not automount and NFS.  This causes shared directories "
+#| "available via NFS to not be available on diskless workstations."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 "LTSP hanteert standaard een minimumvereiste van 320 MB werkgeheugen voor "
 "schijfloze werkstations. Indien het beschikbare werkgeheugen kleiner is, zal "
@@ -7209,40 +7250,24 @@ msgstr ""
 "beschikbaar zijn op schijfloze werkstations."
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-"Via de onderstaande stappen kunt u teruggaan naar hetzelfde gedrag als onder "
-"Debian Edu Squeeze, met inbegrip van het gebruik van automount en NFS en van "
-"een ander grafisch aanmeldscherm dan ldm:"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-"Voeg <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
-"toe aan lts.conf (of stel dit in LDAP in). Tevens moet u die "
-"beeldschermbeheerder installeren in de LTSP-chroot."
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
-msgstr "Voer de schijfloze werkstations in LDAP in met behulp van GOsa²."
-
-#. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr ""
 "<emphasis role=\"strong\">Fabrieksprogrammatuur voor LTSP-clients</emphasis>"
 
 #. type: Content of: <article><section><section><para>
-msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+#, fuzzy
+#| msgid ""
+#| "LTSP client boot will fail if the client's network card requires a non-"
+#| "free firmware. A PXE installation can be used for troubleshooting "
+#| "problems with netbooting a machine; if the Debian Installer complains "
+#| "about a missing XXX.bin file then non-free firmware has to be added to "
+#| "the initrd used by LTSP clients."
+msgid ""
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 "Het opstarten van de LTSP-client zal niet lukken als de netwerkkaart van de "
 "client niet-vrije fabrieksprogrammatuur vereist. Een PXE-installatie kan "
@@ -7257,19 +7282,32 @@ msgid "In this case execute the following commands on an LTSP server."
 msgstr "Geef in dat geval de volgende opdracht op een  LTSP-server."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# First get information about firmware packages\n"
+#| "apt-get update && apt-cache search ^firmware-\n"
+#| "\n"
+#| "# Decide which package has to be installed for the network card(s). \n"
+#| "# Most probably this will be firmware-linux-nonfree.\n"
+#| "# Things have to take effect in the LTSP chroot for architecture i386.\n"
+#| "ltsp-chroot -a i386 apt-get update\n"
+#| "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
+#| "\n"
+#| "# copy the new initrd to the server's tftpboot directory\n"
+#| "ltsp-update-kernels"
 msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 "# Vraag eerst informatie op over pakketten met fabrieksprogrammatuur\n"
 "apt-get update && apt-cache search ^firmware-\n"
@@ -7302,8 +7340,14 @@ msgid "LTSP client type selection"
 msgstr "De keuze van het type LTSP-client"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Each LTSP server has two ethernet cards: one configured in the main "
+#| "10.0.0.0/8 subnet (which is shared with the main server), and another "
+#| "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+#| "server)."
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -7338,7 +7382,15 @@ msgstr ""
 "clients, moet u het volgende doen."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+#| "and replace the line\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+#| "with\n"
+#| "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
+#| "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
+#| "(3)Execute 'ltsp-update-kernels'"
 msgid ""
 "(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
 "and replace the line\n"
@@ -7346,7 +7398,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 "(1)Open het bestand /opt/ltsp/i386/etc/ltsp/update-kernels.conf met een editor\n"
 "en vervang de regel\n"
@@ -7559,28 +7612,41 @@ msgstr ""
 "functie vervult van LTSP-server."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
+#| "network, when tjener is not a combined server, follow these steps:"
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 "Om er voor te zorgen dat ltspserver00 de schijfloze werkstations op het "
 "hoofdnetwerk (10.0.0.0/8) kan bedienen terwijl tjener geen gecombineerde "
 "server is, moet u het volgende doen:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy the <computeroutput>ltsp</computeroutput> directory from "
+#| "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
+#| "same directory on tjener."
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 "kopieer de map <computeroutput>ltsp</computeroutput> van <computeroutput>/"
 "var/lib/tftpboot</computeroutput> op ltspserver00 naar dezelfde map op "
 "tjener."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+#| "computeroutput> to the same directory on tjener."
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 "kopieer <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> naar dezelfde map op tjener."
@@ -7602,10 +7668,15 @@ msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/
 msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+#| "debian-edu/default-diskless.cfg</computeroutput>."
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 "doe de symbolische koppeling in <computeroutput>/var/lib/tftpboot/pxelinux."
 "cfg</computeroutput> op tjener verwijzen naar <computeroutput>/var/lib/"
@@ -7743,11 +7814,16 @@ msgstr ""
 "computer."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Install the package <computeroutput>ltsp-docs</computeroutput> and run "
+#| "\"man lts.conf\" to have a look at available configuration options (see "
+#| "<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
+#| "detailed information about LTSP)."
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 "Installeer het pakket <computeroutput>ltsp-docs</computeroutput> en geef de "
 "opdracht \"man lts.conf\" om een zicht te krijgen op de beschikbare "
@@ -8135,9 +8211,16 @@ msgstr ""
 "html#printer</computeroutput> voor de details."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Configure the printer using the web interface <computeroutput>https://"
+#| "www:631</computeroutput> on tjener; choose network printer type "
+#| "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
+#| "regardless of brand or model) and set <computeroutput>socket://<LTSP "
+#| "client ip>:9100</computeroutput> as connection URI."
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -8165,12 +8248,18 @@ msgstr ""
 "geven:"
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
+#| "aptitude update\n"
+#| "aptitude upgrade\n"
+#| "aptitude dist-upgrade\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386  # dit doet \"chroot /opt/ltsp/i386\" en meer: het verhindert namelijk ook dat achtergronddiensten opgestart worden\n"
@@ -8192,13 +8281,20 @@ msgstr ""
 "installatie uitvoeren binnen de chroot op de LTSP-server."
 
 #. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -a i386\n"
+#| "## optionally, edit the sources.list:\n"
+#| "#editor /etc/apt/sources.list\n"
+#| "aptitude update\n"
+#| "aptitude install $new_package\n"
+#| "exit"
 msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 "ltsp-chroot -a i386\n"
@@ -8277,9 +8373,15 @@ msgid "Joining a domain"
 msgstr "Toetreden tot een domein"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
+#| "joined. A special service called Samba, installed on the main-server "
+#| "tjener, enables Windows clients to store profiles and user data, and also "
+#| "authenticates the users during the login."
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -8299,12 +8401,21 @@ msgstr ""
 "\">Debian Edu Stretch Samba Howto</link>."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Windows will sync the profiles of domain users on every Windows login and "
+#| "logout. Depending on how much data is stored in the profile, this could "
+#| "take some time. To minimise the time needed, deactivate things like local "
+#| "cache in browsers (you can use the Squid proxy cache installed on tjener "
+#| "instead) and save files into the H: volume rather than under \"My "
+#| "Documents\"."
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 "Windows voert een synchronisatie uit van de profielen van de gebruikers van "
 "het Windowsdomein iedere keer iemand zich bij Windows aanmeldt of afmeldt. "
@@ -8356,10 +8467,16 @@ msgstr ""
 "with GOsa² (and then show an example for the command line)"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to check user groups on Windows, you need to download the "
+#| "tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then "
+#| "you can use this for example in the logon script which resides on tjener "
+#| "in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 "Indien u de gebruikersgroepen in Windows wenst te controleren, moet u het "
@@ -8373,11 +8490,18 @@ msgid "XP home"
 msgstr "XP-home"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Users bringing in their XP laptops from home can still connect to tjener "
+#| "using their skolelinux credentials, provided the workgroup is set to "
+#| "SKOLELINUX. However, they may need to disable the Windows firewall before "
+#| "tjener will appear in Network Neighbourhood (or whatever it's called now)."
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 "Ook gebruikers die hun persoonlijke laptop met XP als besturingssysteem "
 "meebrengen, kunnen een verbinding maken met tjener aan de hand van hun onder "
@@ -8475,12 +8599,22 @@ msgstr ""
 "aangezien kerberos in wheezy ook ingesteld was voor samba!"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "You might find an example smb.conf in your preferred language delivered "
+#| "by the installation on tjener under <computeroutput>/usr/share/doc/debian-"
+#| "edu-config/examples/</computeroutput>. The source file is in English and "
+#| "is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+#| "look for a file with the appropriate code in the filename (the German "
+#| "translation, for example, will be named <computeroutput>smb-roaming-"
+#| "profiles-de.conf</computeroutput>). Inside the config file are a lot of "
+#| "explanations which you should have a look at."
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -8576,11 +8710,17 @@ msgid "Global policies for roaming profiles"
 msgstr "Algemene beleidskeuzes in verband met mobiele profielen"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
+#| "computeroutput>), you can can create a Policy file (NTConfig.pol) and put "
+#| "it in your netlogon share on tjener. This has the advantage of working "
+#| "almost instantly on all Windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 "Als u gebruik maakt van de vroegere beleidseditor van Windows "
 "(<computeroutput>poledit.exe</computeroutput>), kunt u een beleidsbestand "
@@ -8598,11 +8738,19 @@ msgstr ""
 "als een onderdeel van de ORK-hulpmiddelen."
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With <computeroutput>poledit.exe</computeroutput> you can create .pol "
+#| "files. If you put such a file on tjener as <computeroutput>/etc/samba/"
+#| "netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+#| "Windows machines and temporarily overwrite the registry, thus applying "
+#| "the changes."
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 "Met <computeroutput>poledit.exe</computeroutput> maakt u .pol bestanden. Als "
 "u zo'n bestand op tjener plaatst als <computeroutput>/etc/samba/netlogon/"
@@ -8851,12 +8999,19 @@ msgid "Disabling roaming in smb.conf"
 msgstr "Mobiele profielen uitschakelen in smb.conf"
 
 #. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If, perhaps, everyone has their own dedicated machine, and nobody else is "
+#| "allowed to touch it, editing the Samba configuration will let you disable "
+#| "roaming profiles for the entire network. You can alter the "
+#| "<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
+#| "\"logon path\" and \"logon home\" variables, then restart samba."
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 "Indien in uw netwerk iedereen beschikt over een eigen computer waarop "
 "niemand anders mag werken, kunt u het gebruik van mobiele profielen voor het "
@@ -10206,9 +10361,13 @@ msgid "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu\"/>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
+#| "discuss\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
 "discuss\"/> - mailinglijst voor het bieden van ondersteuning"
@@ -10227,18 +10386,26 @@ msgid "in Norwegian"
 msgstr "In het Noors"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"
+#| "\"/> - support mailing list"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
 "> - mailinglijst voor het bieden van ondersteuning"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
+#| "linuxiskolen\"/> - mailing list for the development member organisation "
+#| "in Norway (FRISK)"
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 "<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
 "linuxiskolen\"/> - mailinglijst voor onze partnerorganisatie in Noorwegen "
@@ -10286,14 +10453,6 @@ msgstr ""
 "<ulink url=\"http://lists.debian.org/debian-edu-french\"/> - mailinglijst "
 "voor het bieden van ondersteuning"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr "In het Spaans"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr "<ulink url=\"http://www.skolelinux.es\"/> - Spaanstalig webportaal"
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr "Professionele ondersteuning"
@@ -13393,6 +13552,32 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "The following steps can be used to get back the behaviour from Debian Edu "
+#~ "Squeeze, using automount, NFS and a display manager other than ldm:"
+#~ msgstr ""
+#~ "Via de onderstaande stappen kunt u teruggaan naar hetzelfde gedrag als "
+#~ "onder Debian Edu Squeeze, met inbegrip van het gebruik van automount en "
+#~ "NFS en van een ander grafisch aanmeldscherm dan ldm:"
+
+#~ msgid ""
+#~ "Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "to lts.conf (or set this in LDAP). Make sure, that the display manager is "
+#~ "installed in the LTSP chroot."
+#~ msgstr ""
+#~ "Voeg <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> "
+#~ "toe aan lts.conf (of stel dit in LDAP in). Tevens moet u die "
+#~ "beeldschermbeheerder installeren in de LTSP-chroot."
+
+#~ msgid "Add the diskless workstations to LDAP with GOsa²."
+#~ msgstr "Voer de schijfloze werkstations in LDAP in met behulp van GOsa²."
+
+#~ msgid "in Spanish"
+#~ msgstr "In het Spaans"
+
+#~ msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
+#~ msgstr "<ulink url=\"http://www.skolelinux.es\"/> - Spaanstalig webportaal"
+
+#~ msgid ""
 #~ "FIXME: this has changed in 2016… there is the libdvd-pkg package in "
 #~ "contrib now (also in jessie-backports) which can be used to build "
 #~ "libdvdcss and which makes adding the debian multimedia apt repository "
@@ -13419,10 +13604,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# fetch the deb-multimedia key insecurely:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# add repository to sources.list - please check the homepages for mirrors!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# check securely if the key is correct and add it to the keyring used by "
+#~ "APT if it is:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs  "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# add repository to sources.list - please check the homepages for "
+#~ "mirrors!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# update the list of available packages:\n"
 #~ "apt-get update"
 #~ msgstr ""
@@ -13430,10 +13619,14 @@ msgstr ""
 #~ "apt-get install debian-keyring\n"
 #~ "# haal de sleutel van deb-multimedia op een onveilige manier op:\n"
 #~ "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-#~ "# ga op een veilige manier na of het een correcte sleutel is en voeg hem in voorkomend geval toe aan de sleutelbos die door APT gebruikt wordt:\n"
-#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-#~ "# voeg de pakketbron toe in het bestand sources.list - gelieve op de homepagina na te gaan of u een spiegelserver kunt gebruiken!\n"
-#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources.list\n"
+#~ "# ga op een veilige manier na of het een correcte sleutel is en voeg hem "
+#~ "in voorkomend geval toe aan de sleutelbos die door APT gebruikt wordt:\n"
+#~ "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs "
+#~ "07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+#~ "# voeg de pakketbron toe in het bestand sources.list - gelieve op de "
+#~ "homepagina na te gaan of u een spiegelserver kunt gebruiken!\n"
+#~ "echo \"deb http://deb-multimedia.org stretch main\" >> /etc/apt/sources."
+#~ "list\n"
 #~ "# werk de lijst van beschikbare pakketten bij:\n"
 #~ "apt-get update"
 
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 751e8b4..bd73f57 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+0000\n"
 "PO-Revision-Date: 2017-02-01 08:31+0000\n"
 "Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -5077,11 +5077,36 @@ msgid ""
 "-a</computeroutput> to mount the new resources."
 msgstr ""
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5358,30 +5383,11 @@ msgid ""
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5390,11 +5396,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5407,14 +5413,15 @@ msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5434,7 +5441,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -5464,7 +5471,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5609,20 +5617,20 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5640,8 +5648,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5731,10 +5739,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5993,7 +6000,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -6014,9 +6021,9 @@ msgstr ""
 #, no-wrap
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 
@@ -6036,8 +6043,8 @@ msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 
@@ -6090,7 +6097,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -6106,8 +6113,9 @@ msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -6142,7 +6150,7 @@ msgstr ""
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 
@@ -6152,10 +6160,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -6218,10 +6227,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -6295,8 +6304,8 @@ msgstr ""
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -6308,9 +6317,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -6500,8 +6510,8 @@ msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 
 #. type: CDATA
@@ -7503,8 +7513,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7519,15 +7529,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7563,14 +7572,6 @@ msgid ""
 "list"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr ""
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 8b2a31e..9195f2b 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+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"
@@ -4536,11 +4536,36 @@ msgid ""
 "-a</computeroutput> to mount the new resources."
 msgstr ""
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -4813,30 +4838,11 @@ msgid ""
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4845,11 +4851,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4862,14 +4868,15 @@ msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4889,7 +4896,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -4919,7 +4926,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5064,20 +5072,20 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5095,8 +5103,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5186,10 +5194,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5448,7 +5455,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -5469,9 +5476,9 @@ msgstr ""
 #, no-wrap
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 
@@ -5491,8 +5498,8 @@ msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 
@@ -5545,7 +5552,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -5561,8 +5568,9 @@ msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -5597,7 +5605,7 @@ msgstr ""
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 
@@ -5607,10 +5615,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -5673,10 +5682,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -5750,8 +5759,8 @@ msgstr ""
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -5763,9 +5772,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -5955,8 +5965,8 @@ msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 
 #. type: CDATA
@@ -6956,8 +6966,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6972,15 +6982,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7016,14 +7025,6 @@ msgid ""
 "list"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr ""
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 78b0b19..0c3989f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -1950,8 +1950,18 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
 </para>
 <itemizedlist><listitem override="none">
 <para>Create the mount point directories using <computeroutput>mkdir</computeroutput>, edit '/etc/fstab' as adequate and run <computeroutput>mount -a</computeroutput> to mount the new resources. 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Enable access in case diskless workstations are used. This is a special case, because sshfs is used instead of NFS and automount: 
+</para>
+<itemizedlist><listitem override="none">
+<para>Create the mount point directories in the LTSP diskless client's root (default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well.
+</para>
+<para> Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput> (example).
+</para>
+<para> Create a link in each user's home dir like 'ln -s /storage Storage' to help users find the resources. 
 </para></listitem></itemizedlist></listitem></itemizedlist>
-<para>Now users should be able to access the files on 'nas-server.intern' directly by just visiting the '/tjener/nas-server/storage/' directory using any application on any workstation, LTSP client or LTSP server. 
+<para>Now users should be able to access the files on 'nas-server.intern' directly by just visiting the '/tjener/nas-server/storage/' directory using any application on any workstation, LTSP thin client or LTSP server, and visiting ~/Storage in case an LTSP diskless client is used. 
 </para>
 </section>
 
@@ -2079,40 +2089,32 @@ apt install libdvd-pkg]]></screen>
 </para>
 <para>A diskless workstation runs all software locally. The client machines boot directly from the LTSP server without a local hard drive. Software is administered and maintained on the LTSP server (inside of the LTSP chroot), but it runs on the diskless workstation. Home directories and system settings are stored on the server too. Diskless workstations are an excellent way of reusing older (but powerful) hardware with the same low maintenance cost as with thin clients.  
 </para>
-<para>LTSP defines 320MB as the default minimum amount of RAM for diskless workstations. If the amount of RAM is less, the machine will boot as thin client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</computeroutput> with the default value 300. So if (for example) the clients should only boot as diskless workstations if they have 1 GB RAM add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set this in LDAP). Unlike workstations, diskless works [...]
-</para>
-<para>The following steps can be used to get back the behaviour from Debian Edu Squeeze, using automount, NFS and a display manager other than ldm: 
+<para>LTSP defines 320MB as the default minimum amount of RAM for diskless workstations. If the amount of RAM is less, the machine will boot as thin client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</computeroutput> with the default value 300. So if (for example) the clients should only boot as diskless workstations if they have 1 GB RAM, add <computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set this in LDAP). Unlike workstations diskless works [...]
 </para>
-<itemizedlist>
-<listitem>
-<para>Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to lts.conf (or set this in LDAP). Make sure, that the display manager is installed in the LTSP chroot. 
-</para></listitem>
-<listitem>
-<para>Add the diskless workstations to LDAP with GOsa².   
-</para></listitem></itemizedlist>
 <para><emphasis role="strong">LTSP client firmware</emphasis> 
 </para>
-<para>LTSP client boot will fail if the client's network card requires a non-free firmware. A PXE installation can be used for troubleshooting problems with netbooting a machine; if the Debian Installer complains about a missing XXX.bin file then non-free firmware has to be added to the initrd used by LTSP clients. 
+<para>LTSP client boot will fail if the client's network interface requires a non-free firmware. A PXE installation can be used for troubleshooting problems with netbooting a machine; if the Debian Installer complains about a missing XXX.bin file then non-free firmware has to be added to the initrd used by LTSP clients. 
 </para>
 <para>In this case execute the following commands on an LTSP server. 
 </para><screen><![CDATA[# First get information about firmware packages
 apt-get update && apt-cache search ^firmware-
 
-# Decide which package has to be installed for the network card(s). 
+# Decide which package has to be installed for the network interface(s). 
 # Most probably this will be firmware-linux-nonfree.
 # Things have to take effect in the LTSP chroot for architecture i386.
 ltsp-chroot -a i386 apt-get update
 ltsp-chroot -d -a i386 apt-get -y -q install <package name>
 
-# copy the new initrd to the server's tftpboot directory
-ltsp-update-kernels]]></screen>
+# copy the new initrd to the server's tftpboot directory and update the NBD image.
+ltsp-update-kernels
+ltsp-update-image]]></screen>
 <para>As a shorter alternative -- installing all available firmware and updating the tftpboot directory -- you could execute: 
 </para><screen><![CDATA[/usr/share/debian-edu-config/tools/ltsp-addfirmware]]></screen>
 
 <section id="NetworkClients--LTSP_client_type_selection">
 <title>LTSP client type selection
 </title>
-<para>Each LTSP server has two ethernet cards: one configured in the main 10.0.0.0/8 subnet (which is shared with the main server), and another forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP server).  
+<para>Each LTSP server has two ethernet interfaces: one configured in the main 10.0.0.0/8 subnet (which is shared with the main server), and another forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP server).  
 </para>
 <para>On the main subnet the complete PXE menu is provided; the separate subnet for each LTSP server allows only diskless and thin LTSP client selection.  
 </para>
@@ -2123,7 +2125,8 @@ CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp quiet"
 with
 CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet"
 (2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'
-(3)Execute 'ltsp-update-kernels']]></screen>
+(3)Execute 'ltsp-update-kernels'
+(4)Execute 'ltsp-update-image']]></screen>
 </section>
 </section>
 
@@ -2177,21 +2180,21 @@ d-i     apt-setup/local1/key    string          http://example.org/key.asc]]></s
 </title>
 <para>For performance and security considerations it might be desired to set up a separate main server which doesn't act as LTSP server.  
 </para>
-<para>To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) network, when tjener is not a combined server, follow these steps: 
+<para>To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) network, when the main server is not a combined server, follow these steps: 
 </para>
 <itemizedlist>
 <listitem>
-<para>copy the <computeroutput>ltsp</computeroutput> directory from <computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the same directory on tjener. 
+<para>copy the <computeroutput>ltsp</computeroutput> directory from <computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the same directory on the main server. 
 </para></listitem>
 <listitem>
-<para>copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput> to the same directory on tjener. 
+<para>copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput> to the same directory on the main server. 
 </para></listitem>
 <listitem>
 <para>edit <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput> to use the IP address of ltspserver00; the following example uses 10.0.2.10 for the IP address of ltspserver00 on the main network: 
 </para></listitem></itemizedlist><screen><![CDATA[ DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2]]></screen>
 <itemizedlist>
 <listitem>
-<para>set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput>. 
+<para>set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</computeroutput> on the main server to point to <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput>. 
 </para></listitem></itemizedlist>
 <para>As an alternative, you could use <computeroutput>ldapvi</computeroutput>, search for 'next server tjener' and replace tjener with ltspserver00. 
 </para>
@@ -2229,7 +2232,7 @@ d-i     apt-setup/local1/key    string          http://example.org/key.asc]]></s
 </para>
 <para>The default values in LDAP are defined in the <computeroutput>cn=ltspConfigDefault,ou=ltsp,dc=skole,dc=skolelinux,dc=no</computeroutput> LDAP object using the <computeroutput>ltspConfig</computeroutput> attribute.  One can also add host specific entries in LDAP. 
 </para>
-<para>Install the package <computeroutput>ltsp-docs</computeroutput> and run "man lts.conf" to have a look at available configuration options (see <computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for detailed information about LTSP). 
+<para>Run <computeroutput>man lts.conf</computeroutput> to have a look at available configuration options (see <computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for detailed information about LTSP). 
 </para>
 <para>The default values are defined under <computeroutput>[default]</computeroutput>; to configure one client, specify it in terms of its MAC address or IP address like this: <computeroutput>[192.168.0.10]</computeroutput>. 
 </para>
@@ -2333,7 +2336,7 @@ XSERVER = nvidia]]></screen>
 <para>Configure this machine to run a printer in lts.conf (default location: <computeroutput>/opt/ltsp/i386/etc/lts.conf</computeroutput>, see the LTSP manual <computeroutput>/usr/share/doc/ltsp/LTSPManual.html#printer</computeroutput> for details. 
 </para></listitem>
 <listitem>
-<para>Configure the printer using the web interface <computeroutput>https://www:631</computeroutput> on tjener; choose network printer type <computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers regardless of brand or model) and set <computeroutput>socket://<LTSP client ip>:9100</computeroutput> as connection URI. 
+<para>Configure the printer using the web interface <computeroutput>https://www:631</computeroutput> on the main server; choose network printer type <computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers regardless of brand or model) and set <computeroutput>socket://<LTSP client ip>:9100</computeroutput> as connection URI. 
 </para></listitem></itemizedlist>
 </section>
 
@@ -2342,9 +2345,9 @@ XSERVER = nvidia]]></screen>
 </title>
 <para>It is useful to upgrade the LTSP environment with new packages fairly often, to make sure security fixes and improvements are made available.  To upgrade, run these commands as user root on each LTSP server: 
 </para><screen><![CDATA[ltsp-chroot -a i386  # this does "chroot /opt/ltsp/i386" and more, ie it also prevents daemons from being started
-aptitude update
-aptitude upgrade
-aptitude dist-upgrade
+apt update
+apt upgrade
+apt full-upgrade
 exit]]></screen>
 
 <section id="NetworkClients--Installing_additional_software_in_the_LTSP_environment">
@@ -2354,8 +2357,8 @@ exit]]></screen>
 </para><screen><![CDATA[ltsp-chroot -a i386
 ## optionally, edit the sources.list:
 #editor /etc/apt/sources.list
-aptitude update
-aptitude install $new_package
+apt update
+apt install $new_package
 exit]]></screen>
 </section>
 </section>
@@ -2379,11 +2382,11 @@ exit]]></screen>
 <section id="NetworkClients--Joining_a_domain">
 <title>Joining a domain
 </title>
-<para>For Windows clients the Windows domain "SKOLELINUX" is available to be joined. A special service called Samba, installed on the main-server tjener, enables Windows clients to store profiles and user data, and also authenticates the users during the login. 
+<para>For Windows clients the Windows domain "SKOLELINUX" is available to be joined. A special service called Samba, installed on the main server, enables Windows clients to store profiles and user data, and also authenticates the users during the login. 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Joining a domain with a Windows client requires the steps described in the <link linkend="Samba">Debian Edu Stretch Samba Howto</link>. 
 </para>
-<para>Windows will sync the profiles of domain users on every Windows login and logout. Depending on how much data is stored in the profile, this could take some time. To minimise the time needed, deactivate things like local cache in browsers (you can use the Squid proxy cache installed on tjener instead) and save files into the H: volume rather than under "My Documents". 
+<para>Windows will sync the profiles of domain users on every Windows login and logout. Depending on how much data is stored in the profile, this could take some time. To minimise the time needed, deactivate things like local cache in browsers (you can use the Squid proxy cache installed on the main server instead) and save files into the H: volume rather than under "My Documents". 
 </para>
 
 <section id="NetworkClients--User_groups_in_Windows">
@@ -2396,7 +2399,7 @@ exit]]></screen>
 <para>
 FIXME: It would be even better to first/also explain user groups for Windows  with GOsa² (and then show an example for the command line) 
 </para>
-<para>If you want to check user groups on Windows, you need to download the tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can use this for example in the logon script which resides on tjener in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>. 
+<para>If you want to check user groups on Windows, you need to download the tool <computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can use this for example in the logon script which resides on the main server in <computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>. 
 </para>
 </section>
 </section>
@@ -2404,7 +2407,7 @@ FIXME: It would be even better to first/also explain user groups for Windows  wi
 <section id="NetworkClients--XP_home">
 <title>XP home
 </title>
-<para>Users bringing in their XP laptops from home can still connect to tjener using their skolelinux credentials, provided the workgroup is set to SKOLELINUX. However, they may need to disable the Windows firewall before tjener will appear in Network Neighbourhood (or whatever it's called now). 
+<para>Users bringing in their XP laptops from home can still connect to the main server using their skolelinux credentials, provided the workgroup is set to SKOLELINUX. However, they may need to disable the Windows firewall before the main server will appear in Network Neighbourhood (or whatever it's called now). 
 </para>
 </section>
 
@@ -2428,7 +2431,7 @@ FIXME: Maybe it is better to purge the examples. People who want to use roaming
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role="strong">Note</emphasis> The examples are outdated since in wheezy kerberos was configured for samba too!
 </para>
-<para>You might find an example smb.conf in your preferred language delivered by the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-config/examples/</computeroutput>. The source file is in English and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look for a file with the appropriate code in the filename (the German translation, for example, will be named <computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside the config fi [...]
+<para>You might find an example smb.conf in your preferred language delivered by the installation on the main server under <computeroutput>/usr/share/doc/debian-edu-config/examples/</computeroutput>. The source file is in English and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look for a file with the appropriate code in the filename (the German translation, for example, will be named <computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside the  [...]
 </para>
 </section>
 
@@ -2477,11 +2480,11 @@ FIXME: Maybe it is better to purge the examples. People who want to use roaming
 <section id="NetworkClients--Global_policies_for_roaming_profiles">
 <title>Global policies for roaming profiles
 </title>
-<para>By using the legacy Windows policy editor (<computeroutput>poledit.exe</computeroutput>), you can can create a Policy file (NTConfig.pol) and put it in your netlogon share on tjener. This has the advantage of working almost instantly on all Windows machines.  
+<para>By using the legacy Windows policy editor (<computeroutput>poledit.exe</computeroutput>), you can can create a Policy file (NTConfig.pol) and put it in your netlogon share on the main server. This has the advantage of working almost instantly on all Windows machines.  
 </para>
 <para>For some time, the policy editor standalone download has been removed from the Microsoft web site, but it's still available as part of the ORK Tools.  
 </para>
-<para>With <computeroutput>poledit.exe</computeroutput> you can create .pol files. If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/NTLOGON.POL</computeroutput> it will automatically be read by Windows machines and temporarily overwrite the registry, thus applying the changes. 
+<para>With <computeroutput>poledit.exe</computeroutput> you can create .pol files. If you put such a file on the main server as <computeroutput>/etc/samba/netlogon/NTLOGON.POL</computeroutput> it will automatically be read by Windows machines and temporarily overwrite the registry, thus applying the changes. 
 </para>
 <para>To make sensible use of <computeroutput>poledit.exe</computeroutput> you also need to download appropriate .adm files for your operating system and applications; otherwise you cannot define many settings in <computeroutput>poledit.exe</computeroutput>. 
 </para>
@@ -2590,7 +2593,7 @@ FIXME: describe roaming profile key for the global policy editor here
 <section id="NetworkClients--Disabling_roaming_in_smb.conf">
 <title>Disabling roaming in smb.conf
 </title>
-<para>If, perhaps, everyone has their own dedicated machine, and nobody else is allowed to touch it, editing the Samba configuration will let you disable roaming profiles for the entire network. You can alter the <computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "logon path" and "logon home" variables, then restart samba. 
+<para>If, perhaps, everyone has their own dedicated machine, and nobody else is allowed to touch it, editing the Samba configuration will let you disable roaming profiles for the entire network. You can alter the <computeroutput>smb.conf</computeroutput> file on the main server, unsetting the "logon path" and "logon home" variables, then restart samba. 
 </para><screen><![CDATA[logon path = ""
 logon home = ""]]></screen>
 </section>
@@ -3187,7 +3190,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para><ulink url="http://wiki.debian.org/DebianEdu"/> 
 </para></listitem>
 <listitem>
-<para><ulink url="https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-discuss"/> - support mailing list 
+<para><ulink url="https://lists.skolelinux.org/listinfo/admin-discuss"/> - support mailing list 
 </para></listitem>
 <listitem>
 <para>#debian-edu on irc.debian.org - IRC channel, mostly development related; do not expect real time support even though it frequently happens <inlinemediaobject><imageobject><imagedata fileref="./images/smile.png"/></imageobject><textobject><phrase>:-)</phrase></textobject></inlinemediaobject> 
@@ -3199,10 +3202,10 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </title>
 <itemizedlist>
 <listitem>
-<para><ulink url="https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker"/> - support mailing list 
+<para><ulink url="https://lists.skolelinux.org/listinfo/bruker"/> - support mailing list 
 </para></listitem>
 <listitem>
-<para><ulink url="https://init.linpro.no/mailman/skolelinux.no/listinfo/linuxiskolen"/> - mailing list for the development member organisation in Norway (FRISK) 
+<para><ulink url="https://lists.skolelinux.org/listinfo/linuxiskolen"/> - mailing list for the development member organisation in Norway (FRISK) 
 </para></listitem>
 <listitem>
 <para>#skolelinux on irc.debian.org - IRC channel to support Norwegian users 
@@ -3232,15 +3235,6 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para><ulink url="http://lists.debian.org/debian-edu-french"/> - support mailing list 
 </para></listitem></itemizedlist>
 </section>
-
-<section id="Support--in_Spanish">
-<title>in Spanish
-</title>
-<itemizedlist>
-<listitem>
-<para><ulink url="http://www.skolelinux.es"/> - Spanish portal 
-</para></listitem></itemizedlist>
-</section>
 </section>
 
 <section id="Support--Professional_support">
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
index ddefed6..1240924 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-02-19 13:09+0000\n"
+"POT-Creation-Date: 2017-02-20 11:59+0000\n"
 "PO-Revision-Date: 2016-12-24 00:48+0800\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
@@ -5263,11 +5263,36 @@ msgid ""
 "-a</computeroutput> to mount the new resources."
 msgstr ""
 
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"Enable access in case diskless workstations are used. This is a special "
+"case, because sshfs is used instead of NFS and automount:"
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create the mount point directories in the LTSP diskless client's root "
+"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add a line containing 'LOCAL_APPS_EXTRAMOUNTS=/storage' to <computeroutput>/"
+"opt/ltsp/i386/etc/lts.conf</computeroutput> (example)."
+msgstr ""
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Create a link in each user's home dir like 'ln -s /storage Storage' to help "
+"users find the resources."
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Now users should be able to access the files on 'nas-server.intern' directly "
 "by just visiting the '/tjener/nas-server/storage/' directory using any "
-"application on any workstation, LTSP client or LTSP server."
+"application on any workstation, LTSP thin client or LTSP server, and "
+"visiting ~/Storage in case an LTSP diskless client is used."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5546,30 +5571,11 @@ msgid ""
 "workstations. If the amount of RAM is less, the machine will boot as thin "
 "client. The related LTSP parameter is <computeroutput>FAT_RAM_THRESHOLD</"
 "computeroutput> with the default value 300. So if (for example) the clients "
-"should only boot as diskless workstations if they have 1 GB RAM add "
+"should only boot as diskless workstations if they have 1 GB RAM, add "
 "<computeroutput>FAT_RAM_THRESHOLD=1000</computeroutput> to lts.conf (or set "
-"this in LDAP). Unlike workstations, diskless workstations run without any "
-"need to add them with GOsa², cause LDM is used to login and connect to the "
-"LTSP server.  The home directory is by default mounted using sshfs, and not "
-"automount and NFS.  This causes shared directories available via NFS to not "
-"be available on diskless workstations."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"The following steps can be used to get back the behaviour from Debian Edu "
-"Squeeze, using automount, NFS and a display manager other than ldm:"
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid ""
-"Add <computeroutput>DEFAULT_DISPLAY_MANAGER=/path/to/dm</computeroutput> to "
-"lts.conf (or set this in LDAP). Make sure, that the display manager is "
-"installed in the LTSP chroot."
-msgstr ""
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Add the diskless workstations to LDAP with GOsa²."
+"this in LDAP). Unlike workstations diskless workstations run without any "
+"need to add them with GOsa², because LDM is used to login and connect to the "
+"LTSP server."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5578,11 +5584,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"LTSP client boot will fail if the client's network card requires a non-free "
-"firmware. A PXE installation can be used for troubleshooting problems with "
-"netbooting a machine; if the Debian Installer complains about a missing XXX."
-"bin file then non-free firmware has to be added to the initrd used by LTSP "
-"clients."
+"LTSP client boot will fail if the client's network interface requires a non-"
+"free firmware. A PXE installation can be used for troubleshooting problems "
+"with netbooting a machine; if the Debian Installer complains about a missing "
+"XXX.bin file then non-free firmware has to be added to the initrd used by "
+"LTSP clients."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5595,14 +5601,15 @@ msgid ""
 "# First get information about firmware packages\n"
 "apt-get update && apt-cache search ^firmware-\n"
 "\n"
-"# Decide which package has to be installed for the network card(s). \n"
+"# Decide which package has to be installed for the network interface(s). \n"
 "# Most probably this will be firmware-linux-nonfree.\n"
 "# Things have to take effect in the LTSP chroot for architecture i386.\n"
 "ltsp-chroot -a i386 apt-get update\n"
 "ltsp-chroot -d -a i386 apt-get -y -q install <package name>\n"
 "\n"
-"# copy the new initrd to the server's tftpboot directory\n"
-"ltsp-update-kernels"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
+"ltsp-update-kernels\n"
+"ltsp-update-image"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -5622,7 +5629,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Each LTSP server has two ethernet cards: one configured in the main "
+"Each LTSP server has two ethernet interfaces: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
 "forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
 "server)."
@@ -5652,7 +5659,8 @@ msgid ""
 "with\n"
 "CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
 "(2)Execute 'ltsp-chroot -a i386 /usr/share/ltsp/update-kernels'\n"
-"(3)Execute 'ltsp-update-kernels'"
+"(3)Execute 'ltsp-update-kernels'\n"
+"(4)Execute 'ltsp-update-image'"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5797,20 +5805,20 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "To have ltspserver00 serve diskless workstations on the main (10.0.0.0/8) "
-"network, when tjener is not a combined server, follow these steps:"
+"network, when the main server is not a combined server, follow these steps:"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
-"same directory on tjener."
+"same directory on the main server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
-"computeroutput> to the same directory on tjener."
+"computeroutput> to the same directory on the main server."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5828,8 +5836,8 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
-"computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
-"debian-edu/default-diskless.cfg</computeroutput>."
+"computeroutput> on the main server to point to <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -5919,10 +5927,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Install the package <computeroutput>ltsp-docs</computeroutput> and run \"man "
-"lts.conf\" to have a look at available configuration options (see "
-"<computeroutput>/usr/share/doc/ltsp/LTSPManual.html</computeroutput> for "
-"detailed information about LTSP)."
+"Run <computeroutput>man lts.conf</computeroutput> to have a look at "
+"available configuration options (see <computeroutput>/usr/share/doc/ltsp/"
+"LTSPManual.html</computeroutput> for detailed information about LTSP)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6181,7 +6188,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Configure the printer using the web interface <computeroutput>https://"
-"www:631</computeroutput> on tjener; choose network printer type "
+"www:631</computeroutput> on the main server; choose network printer type "
 "<computeroutput>AppSocket/HP JetDirect</computeroutput> (for all printers "
 "regardless of brand or model) and set <computeroutput>socket://<LTSP "
 "client ip>:9100</computeroutput> as connection URI."
@@ -6202,9 +6209,9 @@ msgstr ""
 #, no-wrap
 msgid ""
 "ltsp-chroot -a i386  # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
-"aptitude update\n"
-"aptitude upgrade\n"
-"aptitude dist-upgrade\n"
+"apt update\n"
+"apt upgrade\n"
+"apt full-upgrade\n"
 "exit"
 msgstr ""
 
@@ -6224,8 +6231,8 @@ msgid ""
 "ltsp-chroot -a i386\n"
 "## optionally, edit the sources.list:\n"
 "#editor /etc/apt/sources.list\n"
-"aptitude update\n"
-"aptitude install $new_package\n"
+"apt update\n"
+"apt install $new_package\n"
 "exit"
 msgstr ""
 
@@ -6278,7 +6285,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-"joined. A special service called Samba, installed on the main-server tjener, "
+"joined. A special service called Samba, installed on the main server, "
 "enables Windows clients to store profiles and user data, and also "
 "authenticates the users during the login."
 msgstr ""
@@ -6294,8 +6301,9 @@ msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
 "some time. To minimise the time needed, deactivate things like local cache "
-"in browsers (you can use the Squid proxy cache installed on tjener instead) "
-"and save files into the H: volume rather than under \"My Documents\"."
+"in browsers (you can use the Squid proxy cache installed on the main server "
+"instead) and save files into the H: volume rather than under \"My Documents"
+"\"."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
@@ -6330,7 +6338,7 @@ msgstr ""
 msgid ""
 "If you want to check user groups on Windows, you need to download the tool "
 "<computeroutput>IFMEMBER.EXE</computeroutput> from Microsoft. Then you can "
-"use this for example in the logon script which resides on tjener in "
+"use this for example in the logon script which resides on the main server in "
 "<computeroutput>/etc/samba/netlogon/LOGON.BAT</computeroutput>."
 msgstr ""
 
@@ -6340,10 +6348,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Users bringing in their XP laptops from home can still connect to tjener "
-"using their skolelinux credentials, provided the workgroup is set to "
+"Users bringing in their XP laptops from home can still connect to the main "
+"server using their skolelinux credentials, provided the workgroup is set to "
 "SKOLELINUX. However, they may need to disable the Windows firewall before "
-"tjener will appear in Network Neighbourhood (or whatever it's called now)."
+"the main server will appear in Network Neighbourhood (or whatever it's "
+"called now)."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -6406,10 +6415,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "You might find an example smb.conf in your preferred language delivered by "
-"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
-"config/examples/</computeroutput>. The source file is in English and is "
-"called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; look "
-"for a file with the appropriate code in the filename (the German "
+"the installation on the main server under <computeroutput>/usr/share/doc/"
+"debian-edu-config/examples/</computeroutput>. The source file is in English "
+"and is called <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
+"look for a file with the appropriate code in the filename (the German "
 "translation, for example, will be named <computeroutput>smb-roaming-profiles-"
 "de.conf</computeroutput>). Inside the config file are a lot of explanations "
 "which you should have a look at."
@@ -6483,8 +6492,8 @@ msgstr ""
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
-"in your netlogon share on tjener. This has the advantage of working almost "
-"instantly on all Windows machines."
+"in your netlogon share on the main server. This has the advantage of working "
+"almost instantly on all Windows machines."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -6496,9 +6505,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
-"If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
-"NTLOGON.POL</computeroutput> it will automatically be read by Windows "
-"machines and temporarily overwrite the registry, thus applying the changes."
+"If you put such a file on the main server as <computeroutput>/etc/samba/"
+"netlogon/NTLOGON.POL</computeroutput> it will automatically be read by "
+"Windows machines and temporarily overwrite the registry, thus applying the "
+"changes."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
@@ -6688,8 +6698,8 @@ msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
 "roaming profiles for the entire network. You can alter the "
-"<computeroutput>smb.conf</computeroutput> file on tjener, unsetting the "
-"\"logon path\" and \"logon home\" variables, then restart samba."
+"<computeroutput>smb.conf</computeroutput> file on the main server, unsetting "
+"the \"logon path\" and \"logon home\" variables, then restart samba."
 msgstr ""
 
 #. type: CDATA
@@ -7689,8 +7699,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/admin-"
-"discuss\"/> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/admin-discuss\"/> - "
+"support mailing list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7705,15 +7715,14 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/bruker\"/"
-"> - support mailing list"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/bruker\"/> - support "
+"mailing list"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"<ulink url=\"https://init.linpro.no/mailman/skolelinux.no/listinfo/"
-"linuxiskolen\"/> - mailing list for the development member organisation in "
-"Norway (FRISK)"
+"<ulink url=\"https://lists.skolelinux.org/listinfo/linuxiskolen\"/> - "
+"mailing list for the development member organisation in Norway (FRISK)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7749,14 +7758,6 @@ msgid ""
 "list"
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "in Spanish"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://www.skolelinux.es\"/> - Spanish portal"
-msgstr ""
-
 #. type: Content of: <article><section><section><title>
 msgid "Professional support"
 msgstr ""

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



More information about the debian-edu-commits mailing list