[debian-edu-commits] debian-edu/ 01/03: updated from the wiki and after building

[Holger Levsen]

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

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

commit c0e895df2a87d726d9a43ba50b45753e54f8e622
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jan 7 14:16:49 2017 +0100

    updated from the wiki and after building
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../debian-edu-stretch-manual.nl.po                |  209 +---
 .../debian-edu-stretch-manual.zh.po                | 1134 ++++++++++++++------
 2 files changed, 778 insertions(+), 565 deletions(-)

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 596ed01..fc565fa 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2016-12-16 15:09+0100\n"
+"POT-Creation-Date: 2017-01-07 13:40+0100\n"
 "PO-Revision-Date: 2016-12-28 20:34+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -190,16 +190,6 @@ msgid "The Debian Edu network topology"
 msgstr "Netwerktopologie van Debian Edu"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The figure is a sketch of the assumed network topology. The default setup "
-#| "of a Skolelinux network assumes that there is one (and only one) main-"
-#| "server, while allowing the inclusion of both normal workstations and thin-"
-#| "client-servers (with associated thin-clients and/or diskless "
-#| "workstations). The number of workstations can be as large or small as you "
-#| "want (starting from none to a lot). The same goes for the thin-client "
-#| "servers, each of which is on a separate network so that the traffic "
-#| "between the clients and the thin-client server doesn't affect the rest of "
-#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
@@ -301,12 +291,6 @@ msgid "Main server (tjener)"
 msgstr "De hoofdserver (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A Skolelinux network needs one main server (also called \"tjener\" which "
-#| "is Norwegian and means \"server\") which per default has the IP address "
-#| "10.0.2.2 and is installed by selecting the main server profile. It's "
-#| "possible (but not required) to also select and install the thin-client-"
-#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
@@ -325,17 +309,6 @@ msgid "Services running on the main server"
 msgstr "De diensten op de hoofdserver"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "With the exception of the control of the thin-clients, all services are "
-#| "initially set up on one central computer (the main server). For "
-#| "performance reasons, the thin-client-server should be a separate machine "
-#| "(though it is possible to install both the main server and thin-client "
-#| "server profiles on the same machine). All services are allocated a "
-#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
-#| "DNS name makes it easy to move individual services from the main-server "
-#| "to a different machine, by simply stopping the service on the main-"
-#| "server, and changing the DNS configuration to point to the new location "
-#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
@@ -572,7 +545,6 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "Web Server"
 msgid "LTSP Server/s"
 msgstr "LTSP-server/s"
 
@@ -653,13 +625,6 @@ msgstr ""
 "te houden over de toegang tot het internet van individuele machines."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.0.0/8, while thin clients are connected to the corresponding thin-"
-#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
-#| "that the network traffic of the thin clients doesn't interfere with the "
-#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
@@ -767,12 +732,6 @@ msgstr ""
 "tijdsaanduiding binnen het ganse netwerk."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Printers are connected where convenient, either directly onto the main "
-#| "network, or connected to a server, workstation or thin-client-server. "
-#| "Access to printers can be controlled for individual users according to "
-#| "the groups they belong to; this will be achieved by using quota and "
-#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
 "network, or connected to a server, workstation or LTSP-server. Access to "
@@ -792,9 +751,6 @@ msgid "LTSP server(s)"
 msgstr "LTSP-server(s)"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (also called thin client "
-#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
 "A Skolelinux network can have many LTSP servers (which we called \"thin "
 "client servers\" in releases before Stretch), which are installed by "
@@ -805,9 +761,6 @@ msgstr ""
 "server op door bij de installatie het profiel LTSP-server te selecteren."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The thin client servers are set up to receive syslog from the thin "
-#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
 "The LTSP servers are set up to receive syslog from thin clients and "
 "workstations, and forward these messages to the central syslog recipient."
@@ -993,13 +946,6 @@ msgstr ""
 "tijdens het installatieproces."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The installation should not ask any questions, with the exception of "
-#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
-#| "profile (server, workstation, thin client server). All other "
-#| "configuration will be set up automatically with reasonable values, to be "
-#| "changed from a central location by the system administrator subsequent to "
-#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
@@ -1162,9 +1108,6 @@ msgstr ""
 "type x86 hebben."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
 "recommended for the main and LTSP server profiles."
@@ -1234,9 +1177,6 @@ msgstr ""
 "profiel:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "main server + thin client server: 70 GiB. As usual with disk space on a "
-#| "main server, \"the bigger the better\"."
 msgid ""
 "combined main server + LTSP server: 70 GiB. As usual with disk space on a "
 "main server, \"the bigger the better\"."
@@ -1245,7 +1185,6 @@ msgstr ""
 "schijfruimte op een hoofdserver, geldt \"hoe meer, hoe beter\"."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "thin client server: 50 GiB."
 msgid "LTSP server: 50 GiB."
 msgstr "LTSP-server: 50 GiB."
 
@@ -1254,9 +1193,6 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "werkstations en autonome computers: 30 GiB."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Thin client servers need two network cards when using the default network "
-#| "architecture:"
 msgid ""
 "LTSP servers need two network cards when using the default network "
 "architecture:"
@@ -1889,11 +1825,6 @@ msgid "The installation process"
 msgstr "Het installatieproces"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-#| "Stretch/Requirements\">system requirements</ulink> and make sure you have "
-#| "at least two network cards (NICs) if you plan on setting up a thin client "
-#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
@@ -1928,12 +1859,6 @@ msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr "<emphasis role=\"strong\">Hoofdserver</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "This is the main server (tjener) for your school providing all services "
-#| "pre-configured to work out of the box. You must only install one main "
-#| "server per school! This profile does not include a graphical user "
-#| "interface. If you want a graphical user interface, then select "
-#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
@@ -1986,20 +1911,10 @@ msgstr ""
 "'autonome computer'."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP-server</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "A thin client (and diskless workstation) server, also called a LTSP "
-#| "server. Clients without hard drives boot and run software from this "
-#| "server. This computer needs two network cards, a lot of memory, and "
-#| "ideally more than one processor or core. See the chapter about <link "
-#| "linkend=\"NetworkClients\">networked clients</link> for more information "
-#| "on this subject. Choosing this profile also enables the workstation "
-#| "profile (even if it is not selected) - a thin client server can always be "
-#| "used as a workstation, too."
 msgid ""
 "A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
@@ -2050,20 +1965,6 @@ msgstr ""
 "manueel daarnaartoe verhuist."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
-#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
-#| "Client Server</emphasis> profiles are preselected. These profiles can be "
-#| "installed on one machine together if you want to install a so called "
-#| "<emphasis>combined main server</emphasis>. This means the main server "
-#| "will be a thin client server and also be used as a workstation. This is "
-#| "the default choice, since we assume most people will install <link "
-#| "linkend=\"Installation--"
-#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
-#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
-#| "cards installed in a machine which is going to be installed as a combined "
-#| "main server or as a thin client server to become usefull after the "
-#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
 "\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP Server</"
@@ -2135,10 +2036,6 @@ msgstr ""
 "mee helpen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "Wait. If the selected profiles include Thin-client-server then the "
-#| "installer will spend quite some time at the end, \"Finishing the "
-#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
 "Wait. If the selected profiles include LTSP-server then the installer will "
 "spend quite some time at the end, \"Finishing the installation - Running "
@@ -2255,17 +2152,11 @@ msgstr ""
 "verschillende keren gedownload wordt."
 
 #. type: Content of: <article><section><section><section><section><title>
-#| msgid "A note on thin-client-server installations"
 msgid "A note on LTSP-server installations using only Thin-Clients"
 msgstr ""
 "Een noot bij installaties van LTSP-servers die enkel thin clients bedienen"
 
 #. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-#| "client</computeroutput> makes it possible to skip the step which converts "
-#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
-#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
 "client</computeroutput> makes it possible to skip one step which converts "
@@ -2376,10 +2267,6 @@ msgid "width=400"
 msgstr "width=400"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
 "Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
@@ -2565,11 +2452,6 @@ msgstr ""
 "grafische modus niet te gebruiken."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "So here is a screenshot tour through a graphical 64-bit Main-Server + "
-#| "Workstation + Thin Client Server installation and how it looks at the "
-#| "first boot of the tjener, a PXE boot on the workstation network and on "
-#| "the thinclient network:"
 msgid ""
 "So here is a screenshot tour through a graphical 64-bit Main-Server + "
 "Workstation + LTSP Server installation and how it looks at the first boot of "
@@ -2954,15 +2836,6 @@ msgid "DHCP Administration"
 msgstr "Het DHCP-beheer"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "For GOsa² access you need the Skolelinux main server and a (client) "
-#| "system with a web browser installed which can be the main server itself "
-#| "if it was installed as a so called combined server (main server + thin "
-#| "client server + workstation). If all of the mentioned before is not "
-#| "available, see: <link linkend=\"Administration--"
-#| "Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
-#| "\">Installing a graphical environment on the main-server to use GOsa²</"
-#| "link>."
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
@@ -3049,14 +2922,6 @@ msgstr ""
 "specifieke pagina van GOsa² u zich bevindt."
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "In Debian Edu, account, group, and system information is stored in an "
-#| "LDAP directory. This data is used not only by the main server, but also "
-#| "by the (diskless) workstations, the thin client servers and the Windows "
-#| "machines on the network. With LDAP, account information about students, "
-#| "pupils, teachers, etc. only needs to be entered once. After information "
-#| "has been provided in LDAP, the information will be available to all "
-#| "systems on the whole Skolelinux network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
@@ -3654,18 +3519,6 @@ msgstr ""
 "passend icoon koppelen."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If the machines have booted as thin clients/diskless workstations or have "
-#| "been installed using any of the networked profiles, the "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
-#| "to automatically add machines to GOsa², "
-#| "<computeroutput>sitesummary2ldapdhcp -h</computeroutput> shows usage "
-#| "information. Please note, that the IP addresses shown after usage of "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
-#| "dynamic IP range. These systems can then be modified though to suit your "
-#| "network: rename each new system, activate DHCP and DNS, add it to "
-#| "netgroups, if needed; reboot the system afterwards.  The following "
-#| "screenshots show how this looks in practice:"
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
@@ -4393,15 +4246,6 @@ msgid "Nagios"
 msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Nagios system and service monitoring is available from <ulink url="
-#| "\"https://www/nagios3/\"/>. The set of machines and services being "
-#| "monitored is automatically generated using information collected by the "
-#| "sitesummary system. The machines with the profile Main-server and Thin-"
-#| "client-server receive full monitoring, while workstations and thin "
-#| "clients receive simple monitoring. To enable full monitoring on a "
-#| "workstation, install the <computeroutput>nagios-nrpe-server</"
-#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
@@ -4527,13 +4371,6 @@ msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
 
 #. type: Content of: <article><section><section><section><section><section><para>
-#| msgid ""
-#| "New package are available for upgrades.  The critical ones are normally "
-#| "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-#| "upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-#| "client servers, remember to also update the LTSP chroot using "
-#| "<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-#| "upgrade</computeroutput>."
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
@@ -4794,12 +4631,6 @@ msgstr ""
 "naar de oorspronkelijke situatie kunt terugkeren."
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Please note that the following recipe applies to a default Debian Edu "
-#| "main server installation (desktop=kde, profiles Main-Server, Workstation, "
-#| "Thin-Client-Server). (For a general overview concerning jessie to stretch "
-#| "upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-#| "releasenotes\"/>)"
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
 "server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
@@ -7299,15 +7130,6 @@ msgid "Use a different LTSP client network"
 msgstr "Gebruik een verschillend LTSP clientnetwerk"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "192.168.0.0/24 is the default LTSP client network if a machine is "
-#| "installed using the Thin-Client-Server profile. If lots of LTSP clients "
-#| "are used or if different LTSP servers should serve both i386 and amd64 "
-#| "chroot environments the second preconfigured network 192.168.1.0/24 could "
-#| "be used as well. Edit the file <computeroutput>/etc/network/interfaces</"
-#| "computeroutput> and adjust the eth1 settings accordingly. Use "
-#| "<computeroutput>ldapvi</computeroutput> or any other LDAP editor to "
-#| "inspect DNS and DHCP configuration."
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
 "using the LTSP profile. If lots of LTSP clients are used or if different "
@@ -7517,10 +7339,6 @@ msgid "Force all thin clients to use LXDE as default desktop environment"
 msgstr "LXDE voor alle thin clients standaard instellen als bureaubladomgeving"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Make sure that LXDE is installed on the thin client server; then add a "
-#| "line like this below <computeroutput>[default]</computeroutput> in \"lts."
-#| "conf\":"
 msgid ""
 "Make sure that LXDE is installed on the LTSP server; then add a line like "
 "this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
@@ -8570,13 +8388,6 @@ msgid "Remote Desktop Service"
 msgstr "De dienst extern bureaublad (Remote Desktop Service)"
 
 #. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Beginning with this release, choosing the thin client server profile or "
-#| "the combined server profile installs xrdp, a package which uses the "
-#| "Remote Desktop Protocol to present a graphical login to a remote client. "
-#| "Microsoft Windows users can connect to the thin client server running "
-#| "xrdp without installing additional software - they simply start a Remote "
-#| "Desktop Connection on their Windows machine and connect."
 msgid ""
 "Choosing the LTSP server profile or the combined server profile also "
 "installs xrdp, a package which uses the Remote Desktop Protocol to present a "
@@ -10009,10 +9820,6 @@ msgid "New features for Debian Edu 9+edu0 Codename Stretch"
 msgstr "Nieuwe functionaliteit voor Debian Edu 9+edu0 codenaam Stretch"
 
 #. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release "
-#| "of Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:"
-#| "debian-edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgid ""
 "This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
 "Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
@@ -10039,10 +9846,6 @@ msgid "Installation changes"
 msgstr "Veranderingen aan het installatieproces"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "New version of debian-installer from Debian Stretch, see <ulink url="
-#| "\"http://www.debian.org/releases/stretch/installmanual\">installation "
-#| "manual</ulink> for more details."
 msgid ""
 "New version of debian-installer from Debian Stretch, see its <ulink url="
 "\"http://www.debian.org/releases/stretch/installmanual\">installation "
@@ -11632,10 +11435,6 @@ msgstr ""
 "Schijfloze werkstations van LTSP functioneren zonder bijkomende configuratie."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "On the dedicated client network of thin client servers (default "
-#| "192.168.0.0/24), machines run by default as diskless workstations if they "
-#| "are powerful enough."
 msgid ""
 "On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
 "machines run by default as diskless workstations if they are powerful enough."
@@ -12520,9 +12319,6 @@ msgstr ""
 "schijfvoetafdruk van elke gebruiker verminderde van 144 naar 24 MB."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "New tool notify-local-users to send desktop notification to all logged in "
-#| "users on a machine.  Useful for thin client servers."
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
 "users on a machine.  Useful for LTSP servers."
@@ -12698,9 +12494,6 @@ msgstr ""
 "werkstation, thin client of werkstation."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "A diskless workstation option is installed but not activated by default "
-#| "on all servers with the thin-client-server profile."
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
 "all servers with the LTSP-server profile."
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 fcadbac..77c6f6a 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: 2016-10-09 13:55+0200\n"
+"POT-Creation-Date: 2017-01-07 13:40+0100\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"
@@ -28,9 +28,15 @@ msgstr "Debian Edu / Skolelinux Stretch 9+edu0 手册"
 msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
 msgstr "对于 Debian Edu 9+edu0 别名 Stretch 的手册"
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:23-Tjener-KDM_Login.png}}"
-msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/23-Tjener-Login.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu login"
+msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid "This is the manual for the Debian Edu Stretch 9+edu0 release."
@@ -166,15 +172,26 @@ msgid "The Debian Edu network topology"
 msgstr "Debian Edu 网络拓扑"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The figure is a sketch of the assumed network topology. The default setup "
+#| "of a Skolelinux network assumes that there is one (and only one) main-"
+#| "server, while allowing the inclusion of both normal workstations and thin-"
+#| "client-servers (with associated thin-clients and/or diskless "
+#| "workstations). The number of workstations can be as large or small as you "
+#| "want (starting from none to a lot). The same goes for the thin-client "
+#| "servers, each of which is on a separate network so that the traffic "
+#| "between the clients and the thin-client server doesn't affect the rest of "
+#| "the network services."
 msgid ""
 "The figure is a sketch of the assumed network topology. The default setup of "
 "a Skolelinux network assumes that there is one (and only one) main-server, "
-"while allowing the inclusion of both normal workstations and thin-client-"
-"servers (with associated thin-clients and/or diskless workstations). The "
-"number of workstations can be as large or small as you want (starting from "
-"none to a lot). The same goes for the thin-client servers, each of which is "
-"on a separate network so that the traffic between the clients and the thin-"
-"client server doesn't affect the rest of the network services."
+"while allowing the inclusion of both normal workstations and LTSP-servers "
+"(with associated thin-clients and/or diskless workstations). The number of "
+"workstations can be as large or small as you want (starting from none to a "
+"lot). The same goes for the LTSP servers, each of which is on a separate "
+"network so that the traffic between the clients and the LTSP server doesn't "
+"affect the rest of the network services."
 msgstr ""
 "该图是假设网络拓扑草图。缺省设置的 Skolelinux 网络假设一个（并且只一个）主服"
 "务器，允许包含常规工作站和瘦客户端服务器（以连接瘦客户端和/或无盘工作站）两"
@@ -251,12 +268,19 @@ msgid "Main server (tjener)"
 msgstr "主服务器 (tjener)"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network needs one main server (also called \"tjener\" which "
+#| "is Norwegian and means \"server\") which per default has the IP address "
+#| "10.0.2.2 and is installed by selecting the main server profile. It's "
+#| "possible (but not required) to also select and install the thin-client-"
+#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
 "10.0.2.2 and is installed by selecting the main server profile. It's "
-"possible (but not required) to also select and install the thin-client-"
-"server and workstation profiles in addition to the main server profile."
+"possible (but not required) to also select and install the LTSP-server and "
+"workstation profiles in addition to the main server profile."
 msgstr ""
 "一个 Skolelinux 网络需要一个主服务器（也称作 \"tjener\" 是挪威语“服务器”的意"
 "思）预先缺省 IP 地址为 10.0.2.2 并由选择主服务器profile而安装。除了主服务器"
@@ -267,17 +291,29 @@ msgid "Services running on the main server"
 msgstr "运行在主服务器上的服务"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "With the exception of the control of the thin-clients, all services are "
+#| "initially set up on one central computer (the main server). For "
+#| "performance reasons, the thin-client-server should be a separate machine "
+#| "(though it is possible to install both the main server and thin-client "
+#| "server profiles on the same machine). All services are allocated a "
+#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
+#| "DNS name makes it easy to move individual services from the main-server "
+#| "to a different machine, by simply stopping the service on the main-"
+#| "server, and changing the DNS configuration to point to the new location "
+#| "of the service (which should be set up on that machine first, of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
-"reasons, the thin-client-server should be a separate machine (though it is "
-"possible to install both the main server and thin-client server profiles on "
-"the same machine). All services are allocated a dedicated DNS-name and are "
-"offered exclusively over IPv4. The allocated DNS name makes it easy to move "
-"individual services from the main-server to a different machine, by simply "
-"stopping the service on the main-server, and changing the DNS configuration "
-"to point to the new location of the service (which should be set up on that "
-"machine first, of course)."
+"reasons, the LTSP-server(s) should be separate (though it is possible to "
+"install both the main server and LTSP server profiles on the same machine). "
+"All services are allocated a dedicated DNS-name and are offered exclusively "
+"over IPv4. The allocated DNS name makes it easy to move individual services "
+"from the main-server to a different machine, by simply stopping the service "
+"on the main-server, and changing the DNS configuration to point to the new "
+"location of the service (which should be set up on that machine first, of "
+"course)."
 msgstr ""
 "以瘦客户端管理为例外，所有服务最初设置在一个中央计算机（主服务器）上。由于性"
 "能的原因，瘦客户端服务器会是一台独立的机器（不过在同一机器上既能安装主服务器"
@@ -492,8 +528,10 @@ msgid "cfengine"
 msgstr "cfengine"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Thin Client Server/s"
-msgstr "瘦客户端服务器"
+#, fuzzy
+#| msgid "Web Server"
+msgid "LTSP Server/s"
+msgstr "Web 服务器"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "LTSP"
@@ -557,13 +595,20 @@ msgstr ""
 "器上一同做路由上限制的 web 流量与互联网访问的控制。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Network configuration on the clients is done automatically using DHCP. "
+#| "Normal clients are allocated IP addresses in the private subnet "
+#| "10.0.0.0/8, while thin clients are connected to the corresponding thin-"
+#| "client-server via the separate subnet 192.168.0.0/24 (this is to ensure "
+#| "that the network traffic of the thin clients doesn't interfere with the "
+#| "rest of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
-"while thin clients are connected to the corresponding thin-client-server via "
-"the separate subnet 192.168.0.0/24 (this is to ensure that the network "
-"traffic of the thin clients doesn't interfere with the rest of the network "
-"services)."
+"while thin clients are connected to the corresponding LTSP-server via the "
+"separate subnet 192.168.0.0/24 (this is to ensure that the network traffic "
+"of the thin clients doesn't interfere with the rest of the network services)."
 msgstr ""
 "在客户端的网络配置使用 DHCP 自动完成。常规客户端在私有子网 10.0.0.0/8 分配 "
 "IP 地址，而瘦客户端通过分开的子网 192.168.0.0/24 连接到相符的瘦客户端服务器"
@@ -643,11 +688,18 @@ msgstr ""
 "证整个网络有准确时间。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Printers are connected where convenient, either directly onto the main "
+#| "network, or connected to a server, workstation or thin-client-server. "
+#| "Access to printers can be controlled for individual users according to "
+#| "the groups they belong to; this will be achieved by using quota and "
+#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
-"network, or connected to a server, workstation or thin-client-server. Access "
-"to printers can be controlled for individual users according to the groups "
-"they belong to; this will be achieved by using quota and access control for "
+"network, or connected to a server, workstation or LTSP-server. Access to "
+"printers can be controlled for individual users according to the groups they "
+"belong to; this will be achieved by using quota and access control for "
 "printers."
 msgstr ""
 "打印机便于连接，或是直接连到主网，或者连接到服务器，工作站抑或瘦客户端服务"
@@ -655,21 +707,30 @@ msgstr ""
 "使用控制做到。"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "LTSP server(s) (Thin client server(s))"
-msgstr "LTSP 服务器（瘦客户端服务器）"
+msgid "LTSP server(s)"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A Skolelinux network can have many LTSP servers (also called thin client "
+#| "servers), which are installed by selecting the Thin client server profile."
 msgid ""
-"A Skolelinux network can have many LTSP servers (also called thin client "
-"servers), which are installed by selecting the Thin client server profile."
+"A Skolelinux network can have many LTSP servers (which we called \"thin "
+"client servers\" in releases before Stretch), which are installed by "
+"selecting the LTSP server profile."
 msgstr ""
 "一个 Skolelinux 网络上可以有许多 LTSP 服务器（亦称瘦客户端服务器），是由选择"
 "瘦客户端服务器profile而安装。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The thin client servers are set up to receive syslog from the thin "
+#| "clients, and forward these messages to the central syslog recipient."
 msgid ""
-"The thin client servers are set up to receive syslog from the thin clients, "
-"and forward these messages to the central syslog recipient."
+"The LTSP servers are set up to receive syslog from thin clients and "
+"workstations, and forward these messages to the central syslog recipient."
 msgstr ""
 "瘦客户端服务器设置接收来自瘦客户端的日志，并转递这些信息到中央日志接受者。"
 
@@ -821,12 +882,20 @@ msgid ""
 msgstr "仅是网络安装镜像在安装的时候需要访问互联网。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "The installation should not ask any questions, with the exception of "
+#| "desired language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine "
+#| "profile (server, workstation, thin client server). All other "
+#| "configuration will be set up automatically with reasonable values, to be "
+#| "changed from a central location by the system administrator subsequent to "
+#| "the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
-"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (server, "
-"workstation, thin client server). All other configuration will be set up "
-"automatically with reasonable values, to be changed from a central location "
-"by the system administrator subsequent to the installation."
+"language (e.g. Norwegian Bokmål, Nynorsk, Sami) and machine profile (main "
+"server, workstation, LTSP server, ...). All other configuration will be set "
+"up automatically with reasonable values, to be changed from a central "
+"location by the system administrator subsequent to the installation."
 msgstr ""
 "除了想要的语言（如挪威布克莫尔语，Nynorsk, Sami）和机器profile（服务器，工作"
 "站，瘦客户端服务器）之外，安装不会问到任何问题。所有其他配置以合理值自动设"
@@ -949,9 +1018,13 @@ msgstr ""
 "陈旧被支持的处理器是 686 级）或者 64 位（Debian 架构 'amd64'）x86 处理器。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and thin client server profiles."
 msgid ""
 "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and thin client server profiles."
+"recommended for the main and LTSP server profiles."
 msgstr ""
 "建议主服务器和瘦客户端服务器profile对于 30 客户端至少 2 GiB 而 50-60 客户端"
 "为 4 GiB。"
@@ -1006,15 +1079,21 @@ msgid ""
 msgstr "最低限度的磁盘空间需求取决于所安装的profile："
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "main server + thin client server: 70 GiB. As usual with disk space on a "
+#| "main server, \"the bigger the better\"."
 msgid ""
-"main server + thin client server: 70 GiB. As usual with disk space on a main "
-"server, \"the bigger the better\"."
+"combined main server + LTSP server: 70 GiB. As usual with disk space on a "
+"main server, \"the bigger the better\"."
 msgstr ""
 "主服务器 + 瘦客户端服务器：70 GiB。像通常一样在主服务器上的磁盘空间，“越多越"
 "好”。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "thin client server: 50 GiB."
+#, fuzzy
+#| msgid "thin client server: 50 GiB."
+msgid "LTSP server: 50 GiB."
 msgstr "瘦客户端服务器：50 GiB。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1022,8 +1101,12 @@ msgid "workstation or standalone: 30 GiB."
 msgstr "工作站或独立系统：30 GiB。"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin client servers need two network cards when using the default network "
+#| "architecture:"
 msgid ""
-"Thin client servers need two network cards when using the default network "
+"LTSP servers need two network cards when using the default network "
 "architecture:"
 msgstr "瘦客户端服务器在使用缺省网络架构时需要两个网卡："
 
@@ -1367,29 +1450,26 @@ msgstr ""
 "户，我们的缺省配置将是高质量的。"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Select type of installation"
-msgstr "选择安装类型"
-
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:01-Installer_boot_menu.png}}"
-msgstr "{{attachment:01-Installer_boot_menu.png}}"
+#, fuzzy
+#| msgid "Installation and download options"
+msgid "Installation types and options"
+msgstr "安装和下载选项"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Install</emphasis> is the default text mode "
-"installation on i386 and amd64."
+#. type: Content of: <article><section><section><section><para>
+msgid "<emphasis>Installer boot menu on 64-bit Hardware</emphasis>"
 msgstr ""
-"<emphasis role=\"strong\">Install</emphasis> 是安装 i386 和 amd64 的缺省文本"
-"模式。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
-"install."
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/01-Installer_64bit_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "64-bit Installer boot menu"
 msgstr ""
-"<emphasis role=\"strong\">64 bit install</emphasis> amd64 文本模式安装。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1397,195 +1477,186 @@ msgstr ""
 "<emphasis role=\"strong\">Graphical install</emphasis> 使用图形界面安装程序而"
 "你可以使用鼠标。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
-"GTK installer where you can use the mouse."
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-"
+#| "mode install."
+msgid "<emphasis role=\"strong\">Install</emphasis> uses text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical install</emphasis> 使用 amd64 图形"
-"界面安装程序你可以使用鼠标。"
+"<emphasis role=\"strong\">64 bit install</emphasis> amd64 文本模式安装。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub "
+#| "menu with more detailed options to choose"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
-"with more detailed options to choose"
+"with more detailed options to choose."
 msgstr ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> 给予更多详细选项来"
 "选择的子菜单"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
+#| "installation on i386 and amd64."
+msgid ""
+"<emphasis role=\"strong\">32-bit install options ></emphasis> allows a 32-"
+"bit installation on 64-bit hardware."
+msgstr ""
+"<emphasis role=\"strong\">Install</emphasis> 是安装 i386 和 amd64 的缺省文本"
+"模式。"
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
+#| "installer"
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
-"installer"
+"installer; see screenshot below."
 msgstr ""
 "<emphasis role=\"strong\">Help</emphasis> 给予所使用的安装程序的一些提示"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_a.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:Installer_advanced_options_a.png}}"
+msgid "./images/01a-Installer_64bit_advanced_options.png"
 msgstr "{{attachment:Installer_advanced_options_a.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "64-bit Installer advanced options screen 1"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr "<emphasis role=\"strong\">Back..</emphasis> 返回到主菜单。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Graphical expert install</emphasis> gives "
+#| "access to all available questions in graphical mode."
 msgid ""
-"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
-"available questions in text mode."
+"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
+"to all available questions, mouse usable."
 msgstr ""
-"<emphasis role=\"strong\">Expert install</emphasis> 给予访问在文本模式中所有"
-"的问题。"
+"<emphasis role=\"strong\">Graphical expert install</emphasis> 在图形模式中给"
+"予访问所有的问题。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">Rescue mode</emphasis> makes this install medium "
-"become a rescue disk for emergency tasks."
+"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
 "<emphasis role=\"strong\">Rescue mode</emphasis> 让这个安装介质成为紧急任务的"
 "救援盘。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
+"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
+"preseed file."
 msgstr ""
-"<emphasis role=\"strong\">Automated install</emphasis> 需要preseed文件。"
+"<emphasis role=\"strong\">Graphical automated install</emphasis> 需要preseed"
+"文件。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
-"all available questions in text mode on amd64."
+"<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
+"available questions in text mode."
 msgstr ""
-"<emphasis role=\"strong\">64 bit expert install</emphasis> 在 amd64 文本模式"
-"中给予访问所有的问题。"
+"<emphasis role=\"strong\">Expert install</emphasis> 给予访问在文本模式中所有"
+"的问题。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Rescue mode</emphasis> makes this install "
+#| "medium become a rescue disk for emergency tasks."
 msgid ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this install "
-"medium become a rescue disk for emergency tasks on amd64."
+"<emphasis role=\"strong\">Rescue mode</emphasis> text mode; makes this "
+"install medium become a rescue disk for emergency tasks."
 msgstr ""
-"<emphasis role=\"strong\">64 bit rescue mode</emphasis> 使这个安装介质成为 "
-"amd64 紧急任务救援盘。"
+"<emphasis role=\"strong\">Rescue mode</emphasis> 让这个安装介质成为紧急任务的"
+"救援盘。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed "
+#| "file."
 msgid ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+"<emphasis role=\"strong\">Automated install</emphasis> text mode; needs a "
 "preseed file."
 msgstr ""
-"<emphasis role=\"strong\">64 bit automated install</emphasis> 需要preseed文"
-"件。"
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_advanced_options_b.png}}"
-msgstr "{{attachment:Installer_advanced_options_b.png}}"
+"<emphasis role=\"strong\">Automated install</emphasis> 需要preseed文件。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
-"to all available questions in graphical mode."
+#. type: Content of: <article><section><section><section><para>
+msgid "<emphasis>Installer boot menu on 32-bit Hardware</emphasis>"
 msgstr ""
-"<emphasis role=\"strong\">Graphical expert install</emphasis> 在图形模式中给"
-"予访问所有的问题。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks with a graphical GTK "
-"look."
-msgstr ""
-"<emphasis role=\"strong\">Graphical rescue mode</emphasis> 使这个安装介质成为"
-"可视图形界面的紧急任务救援盘。"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "./images/01b-Installer_32bit_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
-"preseed file."
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "32-bit Installer boot menu"
 msgstr ""
-"<emphasis role=\"strong\">Graphical automated install</emphasis> 需要preseed"
-"文件。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
-"access to all available questions in graphical mode on amd64."
+#. type: Content of: <article><section><section><section><para>
+msgid "Explanations are similar to those for 64-bit hardware."
 msgstr ""
-"<emphasis role=\"strong\">64 bit graphical expert install</emphasis> 给予 "
-"amd64 图形模式的所有问题的访问。"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes this "
-"install medium become a rescue disk for emergency tasks on amd64 with a "
-"graphical GTK look."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> 使这个安装"
-"介质成为 amd64 可视图形界面的紧急任务救援盘。"
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Minimal</emphasis>"
+msgid "<emphasis>Help screen</emphasis>"
+msgstr "<emphasis role=\"strong\">最小安装</emphasis>"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
-"needs a preseed file."
-msgstr ""
-"<emphasis role=\"strong\">64 bit graphical automated install</emphasis> 需要"
-"preseed文件。"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/01c-Installer_help.png"
+msgstr "./images/alert.png"
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "{{attachment:Installer_help.png}}"
-msgstr "{{attachment:Installer_help.png}}"
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Installer help screen"
+msgstr ""
 
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "This Help screen is self explaining and enables the <F>-keys on the "
 "keyboard for getting more detailed help on the topics described."
 msgstr ""
 "帮助屏幕是自己说明并能用键盘上的 <F>-键获得更多题目解释中的细节。"
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid "Additional boot parameters for installations"
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "Additional boot parameters for installations"
+msgid "<emphasis>Additional boot parameters for installations</emphasis>"
 msgstr "另外的安装引导参数"
 
-#. type: Content of: <article><section><section><section><section><para>
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On i386/amd64, boot options can be edited by pressing the TAB key in the "
+#| "boot menu."
 msgid ""
-"On i386/amd64, boot options can be edited by pressing the TAB key in the "
+"In both cases, boot options can be edited by pressing the TAB key in the "
 "boot menu."
 msgstr "在 i386/amd64 中，以在引导菜单中按 TAB 键可以编辑引导选项。"
 
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
-"using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
-"machines."
-msgstr ""
-"多架构 USB 闪存 / 蓝光盘镜像缺省在 64-bit x86 机器上使用 amd64-installgui，而"
-"在 32-bit x86 机器上是 installgui。"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the amd64 text mode with the multi-architecture image, "
-"that would be <computeroutput>amd64-install</computeroutput>."
-msgstr ""
-"如果你需要以多架构镜像引导 amd64 文本模式，那会是 <computeroutput>amd64-"
-"install</computeroutput>。"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> to "
-"get the GUI version on amd64."
-msgstr ""
-"同样地你可以选择 <computeroutput>amd64-expertgui</computeroutput> 得到 amd64 "
-"版的图形用户界面。"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"If you want to boot the i386 mode with the multi-arch image on an amd64 "
-"machine you need to manually select <computeroutput>install</computeroutput> "
-"(text mode) or <computeroutput>expertgui</computeroutput> (graphical mode)."
-msgstr ""
-"如果你需要在 amd64 机器上用多架构镜像引导 i386 模式你需要手动选择 "
-"<computeroutput>install</computeroutput> （文本模式）或 "
-"<computeroutput>expertgui</computeroutput> （图形模式）。"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "You can use an existing HTTP proxy service on the network to speed up the "
 "installation of the main server profile from CD. Add <computeroutput>mirror/"
@@ -1596,7 +1667,7 @@ msgstr ""
 "<computeroutput>mirror/http/proxy=http://10.0.2.2:3128/</computeroutput> 作为"
 "附加的引导参数。"
 
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you have already installed the main server profile on a machine, further "
 "installations should be done via PXE, as this will automatically use the "
@@ -1605,17 +1676,23 @@ msgstr ""
 "如果你在一台机器上已经有安装好的主服务器profile，后续的安装会通过 PXE 完成，"
 "而这将自动使用主服务器代理。"
 
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
+#| "<computeroutput>desktop=gnome</computeroutput> to the kernel boot "
+#| "parameters."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
+"the <emphasis role=\"strong\">MATE</emphasis> desktop, add "
 "<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
 msgstr ""
 "安装 <emphasis role=\"strong\">GNOME</emphasis> 桌面代替 <emphasis role="
 "\"strong\">KDE \"Plasma\"</emphasis> 桌面，加入 "
 "<computeroutput>desktop=gnome</computeroutput> 到内核引导参数。"
 
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
@@ -1624,7 +1701,7 @@ msgstr ""
 "替代安装 <emphasis role=\"strong\">LXDE</emphasis> 桌面，加入 "
 "<computeroutput>desktop=lxde</computeroutput> 到内核引导参数。"
 
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
@@ -1633,11 +1710,16 @@ msgstr ""
 "替代安装 <emphasis role=\"strong\">Xfce</emphasis> 桌面，加入 "
 "<computeroutput>desktop=xfce</computeroutput> 到内核引导参数。"
 
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
+#| "instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
+#| "boot parameters."
 msgid ""
-"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
-"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
-"boot parameters."
+"And to install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, add <computeroutput>desktop=kde</computeroutput> to the kernel boot "
+"parameters."
 msgstr ""
 "而改为安装 <emphasis role=\"strong\">MATE</emphasis> 桌面，加入 "
 "<computeroutput>desktop=mate</computeroutput> 到内核引导参数。"
@@ -1647,11 +1729,16 @@ msgid "The installation process"
 msgstr "安装过程"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#| "Stretch/Requirements\">system requirements</ulink> and make sure you have "
+#| "at least two network cards (NICs) if you plan on setting up a thin client "
+#| "server."
 msgid ""
 "Remember the <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Stretch/Requirements\">system requirements</ulink> and make sure you have at "
-"least two network cards (NICs) if you plan on setting up a thin client "
-"server."
+"least two network cards (NICs) if you plan on setting up an LTSP server."
 msgstr ""
 "记着如果你计划设置瘦客户端服务器<ulink url=\"http://wiki.debian.org/"
 "DebianEdu/Documentation/Stretch/Requirements\">系统需求</ulink>你确保至少有两"
@@ -1678,12 +1765,19 @@ msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "This is the main server (tjener) for your school providing all services "
+#| "pre-configured to work out of the box. You must only install one main "
+#| "server per school! This profile does not include a graphical user "
+#| "interface. If you want a graphical user interface, then select "
+#| "Workstation or Thin-Client-Server in addition to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
 "school! This profile does not include a graphical user interface. If you "
-"want a graphical user interface, then select Workstation or Thin-Client-"
-"Server in addition to this one."
+"want a graphical user interface, then select Workstation or LTSP-Server in "
+"addition to this one."
 msgstr ""
 "这是为你的学校提供所有服务的预配置开箱即可工作的主服务器 (tjener)。每一个学校"
 "只可安装一台主服务器！这个profile不包括图形用户界面。如果你需要图形用户界面，"
@@ -1720,18 +1814,30 @@ msgstr ""
 "不选择“工作站”或“独立安装”。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
-msgstr "<emphasis role=\"strong\">瘦客户端</emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
+msgid "<emphasis role=\"strong\">LTSP-Server</emphasis>"
+msgstr "<emphasis role=\"strong\">主服务器</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"A thin client (and diskless workstation) server, also called a LTSP server. "
+#, fuzzy
+#| msgid ""
+#| "A thin client (and diskless workstation) server, also called a LTSP "
+#| "server. Clients without hard drives boot and run software from this "
+#| "server. This computer needs two network cards, a lot of memory, and "
+#| "ideally more than one processor or core. See the chapter about <link "
+#| "linkend=\"NetworkClients\">networked clients</link> for more information "
+#| "on this subject. Choosing this profile also enables the workstation "
+#| "profile (even if it is not selected) - a thin client server can always be "
+#| "used as a workstation, too."
+msgid ""
+"A thin client (and diskless workstation) server, is called an LTSP server. "
 "Clients without hard drives boot and run software from this server. This "
 "computer needs two network cards, a lot of memory, and ideally more than one "
 "processor or core. See the chapter about <link linkend=\"NetworkClients"
 "\">networked clients</link> for more information on this subject. Choosing "
 "this profile also enables the workstation profile (even if it is not "
-"selected) - a thin client server can always be used as a workstation, too."
+"selected) - an LTSP server can always be used as a workstation, too."
 msgstr ""
 "一个瘦客户（和无盘工作站）服务器，也称为 LTSP 服务器。客户端没有硬盘驱动器而"
 "是从服务器引导和运行软件。这台计算机需要两个网卡，大量的内存，适合更多的处理"
@@ -1765,18 +1871,33 @@ msgstr ""
 "用。它用作从主服务器手工移出单一服务的平台。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role="
+#| "\"strong\">Workstation</emphasis> and <emphasis role=\"strong\">Thin "
+#| "Client Server</emphasis> profiles are preselected. These profiles can be "
+#| "installed on one machine together if you want to install a so called "
+#| "<emphasis>combined main server</emphasis>. This means the main server "
+#| "will be a thin client server and also be used as a workstation. This is "
+#| "the default choice, since we assume most people will install <link "
+#| "linkend=\"Installation--"
+#| "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients"
+#| "\">via PXE</link> afterwards. Please note that you must have 2 network "
+#| "cards installed in a machine which is going to be installed as a combined "
+#| "main server or as a thin client server to become usefull after the "
+#| "installation."
 msgid ""
 "The <emphasis role=\"strong\">Main Server</emphasis>, <emphasis role=\"strong"
-"\">Workstation</emphasis> and <emphasis role=\"strong\">Thin Client Server</"
+"\">Workstation</emphasis> and <emphasis role=\"strong\">LTSP Server</"
 "emphasis> profiles are preselected. These profiles can be installed on one "
 "machine together if you want to install a so called <emphasis>combined main "
-"server</emphasis>. This means the main server will be a thin client server "
-"and also be used as a workstation. This is the default choice, since we "
-"assume most people will install <link linkend=\"Installation--"
+"server</emphasis>. This means the main server will be an LTSP server and "
+"also be used as a workstation. This is the default choice, since we assume "
+"most people will install <link linkend=\"Installation--"
 "Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
 "PXE</link> afterwards. Please note that you must have 2 network cards "
 "installed in a machine which is going to be installed as a combined main "
-"server or as a thin client server to become usefull after the installation."
+"server or as an LTSP server to become usefull after the installation."
 msgstr ""
 "<emphasis role=\"strong\">主服务器</emphasis>，<emphasis role=\"strong\">工作"
 "站</emphasis>和<emphasis role=\"strong\">瘦客户端服务器</emphasis>profiles已"
@@ -1823,10 +1944,15 @@ msgstr ""
 "方法。"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Wait. If the selected profiles include Thin-client-server then the "
+#| "installer will spend quite some time at the end, \"Finishing the "
+#| "installation - Running debian-edu-profile-udeb...\""
 msgid ""
-"Wait. If the selected profiles include Thin-client-server then the installer "
-"will spend quite some time at the end, \"Finishing the installation - "
-"Running debian-edu-profile-udeb...\""
+"Wait. If the selected profiles include LTSP-server then the installer will "
+"spend quite some time at the end, \"Finishing the installation - Running "
+"debian-edu-profile-udeb...\""
 msgstr ""
 "等待。如果你选择的profile包含瘦客户端服务器其后安装程序在最后会用相当的时"
 "间，“完成安装 - 运行 debian-edu-profile-udeb...”"
@@ -1916,31 +2042,27 @@ msgid ""
 "downloading the same package several times from the net."
 msgstr ""
 "网络安装（那是我们的 CD 所提供的安装类型）会从 CD 中取出一些软件包而其余的从"
-"网上取得。从网上取得的软件包数量从profile到profile而变化但维持在低于gigabyte"
-"（除非你选择安装所有可用的桌面）。一旦你安装了主服务器（无论单纯的主服务器或"
-"组合服务器不成问题），其后的安装会使用它自己的代理来避免从网上多次下载相同的"
-"软件包。"
+"网上取得。从网上取得的软件包数量从profile到profile而变化但维持在低于"
+"gigabyte（除非你选择安装所有可用的桌面）。一旦你安装了主服务器（无论单纯的主"
+"服务器或组合服务器不成问题），其后的安装会使用它自己的代理来避免从网上多次下"
+"载相同的软件包。"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on thin-client-server installations"
+#, fuzzy
+#| msgid "A note on thin-client-server installations"
+msgid "A note on LTSP-server installations using only Thin-Clients"
 msgstr "瘦客户端服务器安装的注释"
 
 #. type: Content of: <article><section><section><section><section><para>
-msgid ""
-"First of all, this profile name is confusing for historic reasons. Currently "
-"this profile actually installs an LTSP server environment for thin-clients "
-"and for diskless workstations. Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> has been filed to change the name of the "
-"profile into a better suited one."
-msgstr ""
-"首先，这个profile名称由于历史原因是含糊的。当前这个profile实际为瘦客户端和无"
-"盘工作站安装 LTSP 服务器环境。Debian bug <ulink url=\"https://bugs.debian."
-"org/588510#\">588510</ulink> 是被提交的这个profile名称更改为更合适的一个。"
-
-#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
+#| "client</computeroutput> makes it possible to skip the step which converts "
+#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
+#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
-"client</computeroutput> makes it possible to skip the step which converts "
+"client</computeroutput> makes it possible to skip one step which converts "
 "the LTSP chroot from a thin-client chroot into a combined thin-client/"
 "diskless workstation chroot."
 msgstr ""
@@ -2024,21 +2146,34 @@ msgstr ""
 "这是仅有<emphasis role=\"strong\">主服务器</emphasis> profile PXE 菜单看到的"
 "样子："
 
-#. type: Content of: <article><section><section><section><para>
-msgid "{{attachment:pxe-tjener.png}}"
-msgstr "{{attachment:pxe-tjener.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
+#| "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
+#| "emphasis> profiles:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
-"Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
-"emphasis> profiles:"
+"Server</emphasis> and <emphasis role=\"strong\">LTSP-Server</emphasis> "
+"profiles:"
 msgstr ""
 "这是有<emphasis role=\"strong\">主服务器</emphasis>和<emphasis role=\"strong"
 "\">瘦客户端服务器</emphasis> profile PXE 菜单的样子："
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2189,128 +2324,261 @@ msgstr ""
 "然看着最宜人并且更新颖。除非用图形方式硬件有困难，那没有理由不使用它。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "So here is a screenshot tour through a graphical Main-Server + "
+#| "Workstation + Thin Client Server installation and how it looks at the "
+#| "first boot of the tjener, a PXE boot on the workstation network and on "
+#| "the thinclient network:"
 msgid ""
-"So here is a screenshot tour through a graphical Main-Server + Workstation + "
-"Thin Client Server installation and how it looks at the first boot of the "
-"tjener, a PXE boot on the workstation network and on the thinclient network:"
+"So here is a screenshot tour through a graphical 64-bit Main-Server + "
+"Workstation + LTSP Server installation and how it looks at the first boot of "
+"the tjener, a PXE boot on the workstation network and on the thinclient "
+"network:"
 msgstr ""
 "那么这里是自始至终的主服务器 + 工作站 + 瘦客户端服务器的图形安装以及所看到的 "
 "tjener 第一次引导，在工作站网络和瘦客户端网络上 PXE 引导的屏幕快照观览："
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:02-select_a_language.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:01-Installer_boot_menu.png}}"
+msgid "01-Installer_64bit_boot_menu.png"
+msgstr "{{attachment:01-Installer_boot_menu.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/02-select_a_language.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "02-select_a_language.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:03-select_your_location.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/03-select_your_location.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "03-select_your_location.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:04-Configure_the_keyboard.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/04-Configure_the_keyboard.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:05-Detect_and_mount_CD-ROM.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "04-Configure_the_keyboard.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:06-Load_installer_components_from_CD.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/05-Detect_and_mount_CD-ROM.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:07-Detect_network_hardware.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:08-Choose_Debian_Edu_profile.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/06-Load_installer_components_from_CD.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:09-Really_use_the_automatic_partitioning_tool.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "06-Load_installer_components_from_CD.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/Debian_Edu_Network_Stretch.png"
+msgid "./images/07-Detect_network_hardware.png"
+msgstr "./images/Debian_Edu_Network_Stretch.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "07-Detect_network_hardware.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/Debian_Edu_Network_Stretch.png"
+msgid "./images/08-Choose_Debian_Edu_profile.png"
+msgstr "./images/Debian_Edu_Network_Stretch.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "08-Choose_Debian_Edu_profile.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12a-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12b-Set_up_users_and_passwords.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12c-Set_up_users_and_passwords.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12d-Setting-up-the-partitioner.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:12e-creating_ext4.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:13-Install the base system.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:14-Select_and_install_software.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:17-Select_and_install_software.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:18-Build LTSP chroot.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12a-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:20-Finish_the_Installation.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12b-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:21-Finish_the_Installation-Installation_complete.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:22-Tjener_GRUB_boot_menu.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12c-Set_up_users_and_passwords.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:24-Tjener-KDE_Start.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:26-Tjener-KDE_Desktop_Browser.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "12d-Setting-up-the-partitioner.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:27-Tjener-KDE_Desktop.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/13-Install+the+base+system.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:29-Diskless-WS-LDM_Login.png}}"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "13-Install the base system.png"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
-msgid "{{attachment:31-ThinClient-KDE_Desktop.png}}"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/14-Select_and_install_software.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "14-Select_and_install_software.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/17-Select_and_install_software.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "17-Select_and_install_software.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/18-Build+LTSP+chroot.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "18-Build LTSP chroot.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/20-Finish_the_Installation.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "20-Finish_the_Installation.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/21-Finish_the_Installation-Installation_complete.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "21-Finish_the_Installation-Installation_complete.png"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "tjener KDM Login"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/26-Tjener-MATE_Desktop_Browser.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE and Browser"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/alert.png"
+msgid "./images/27-Tjener-MATE_Desktop.png"
+msgstr "./images/alert.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "KDE Desktop"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "{{attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png}}"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/29-Diskless-WS-LDM_Login.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Diskless workstations"
+msgid "Diskless Workstation Login"
+msgstr "无盘工作站"
+
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/31-ThinClient-MATE_Desktop.png"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -2381,6 +2649,10 @@ msgid ""
 "and some frequently asked questions."
 msgstr ""
 
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Debian Edu MATE desktop"
+msgstr ""
+
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "There are several services running on the main server which can be managed "
@@ -2422,7 +2694,7 @@ msgstr ""
 msgid ""
 "For GOsa² access you need the Skolelinux main server and a (client) system "
 "with a web browser installed which can be the main server itself if it was "
-"installed as a so called combined server (main server + thin client server + "
+"installed as a so called combined server (main server + LTSP server + "
 "workstation). If all of the mentioned before is not available, see: <link "
 "linkend=\"Administration--Installing_a_graphical_environment_on_the_main-"
 "server_to_use_GOsa.2BALI-\">Installing a graphical environment on the main-"
@@ -2482,11 +2754,11 @@ msgstr ""
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
-"(diskless) workstations, the thin client servers and the Windows machines on "
-"the network. With LDAP, account information about students, pupils, "
-"teachers, etc. only needs to be entered once. After information has been "
-"provided in LDAP, the information will be available to all systems on the "
-"whole Skolelinux network."
+"(diskless) workstations, the LTSP servers and the Windows machines on the "
+"network. With LDAP, account information about students, pupils, teachers, "
+"etc. only needs to be entered once. After information has been provided in "
+"LDAP, the information will be available to all systems on the whole "
+"Skolelinux network."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2895,13 +3167,15 @@ msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
 "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used to "
-"automatically add machines to GOsa², <computeroutput>sitesummary2ldapdhcp -"
-"h</computeroutput> shows usage information. Please note, that the IP "
-"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
-"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suit your network: rename each new system, activate DHCP "
-"and DNS, add it to netgroups, if needed; reboot the system afterwards.  The "
-"following screenshots show how this looks in practice:"
+"automatically add machines to GOsa². For simple machines it will work out of "
+"the box, for machines with more than one mac address the actually used one "
+"has to be chosen, <computeroutput>sitesummary2ldapdhcp -h</computeroutput> "
+"shows usage information. Please note, that the IP addresses shown after "
+"usage of <computeroutput>sitesummary2ldapdhcp</computeroutput> belong to the "
+"dynamic IP range. These systems can then be modified though to suit your "
+"network: rename each new system, activate DHCP and DNS, add it to netgroups, "
+"if needed; reboot the system afterwards. The following screenshots show how "
+"this looks in practice:"
 msgstr ""
 
 #. type: CDATA
@@ -3400,8 +3674,8 @@ msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
 "automatically generated using information collected by the sitesummary "
-"system. The machines with the profile Main-server and Thin-client-server "
-"receive full monitoring, while workstations and thin clients receive simple "
+"system. The machines with the profile Main-server and LTSP-server receive "
+"full monitoring, while workstations and thin clients receive simple "
 "monitoring. To enable full monitoring on a workstation, install the "
 "<computeroutput>nagios-nrpe-server</computeroutput> package on the "
 "workstation."
@@ -3483,10 +3757,10 @@ msgstr ""
 msgid ""
 "New package are available for upgrades.  The critical ones are normally "
 "security fixes.  To upgrade, run 'apt-get upgrade && apt-get dist-"
-"upgrade' as root in a terminal or log in via ssh to do the same.  On thin "
-"client servers, remember to also update the LTSP chroot using "
-"<computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get "
-"upgrade</computeroutput>."
+"upgrade' as root in a terminal or log in via ssh to do the same.  On LTSP "
+"servers, remember to also update the LTSP chroot using <computeroutput>ltsp-"
+"chroot apt-get update && ltsp-chroot apt-get upgrade</"
+"computeroutput>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><section><para>
@@ -3652,10 +3926,9 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please note that the following recipe applies to a default Debian Edu main "
-"server installation (desktop=kde, profiles Main-Server, Workstation, Thin-"
-"Client-Server). (For a general overview concerning jessie to stretch "
-"upgrade, see: <ulink url=\"https://www.debian.org/releases/stretch/"
-"releasenotes\"/>)"
+"server installation (desktop=kde, profiles Main-Server, Workstation, LTSP-"
+"Server). (For a general overview concerning jessie to stretch upgrade, see: "
+"<ulink url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4901,17 +5174,19 @@ msgid "HowTos for the desktop"
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Using KDE \"Plasma\", GNOME, LXDE, Xfce and/or MATE together"
+msgid "Using MATE, GNOME, LXDE, Xfce and/or KDE Plasma together"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"To install other desktop environments after installation, simply use apt-get:"
+"To install other desktop environments after installation, simply use apt:"
 msgstr ""
 
 #. type: CDATA
 #, no-wrap
-msgid "apt-get install gnome lxde xfce4 mate-desktop"
+msgid ""
+"apt update\n"
+" apt install gnome lxde xfce4 kde-standard"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -4929,10 +5204,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"If you don't want to do installations with the default desktop KDE \"Plasma"
-"\", you can also <link linkend=\"Installation--The_installation_process"
-"\">install with one of the four alternative desktops, GNOME, LXDE, Xfce or "
-"MATE</link> directly."
+"If you don't want to do installations with the default desktop MATE, you can "
+"also <link linkend=\"Installation--The_installation_process\">install with "
+"one of the four alternative desktops, GNOME, LXDE, Xfce or KDE</link> "
+"directly."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5021,7 +5296,7 @@ msgid ""
 "# 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 jessie main\" >> /etc/apt/sources.list\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 ""
@@ -5385,12 +5660,12 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "192.168.0.0/24 is the default LTSP client network if a machine is installed "
-"using the Thin-Client-Server profile. If lots of LTSP clients are used or if "
-"different LTSP servers should serve both i386 and amd64 chroot environments "
-"the second preconfigured network 192.168.1.0/24 could be used as well. Edit "
-"the file <computeroutput>/etc/network/interfaces</computeroutput> and adjust "
-"the eth1 settings accordingly. Use <computeroutput>ldapvi</computeroutput> "
-"or any other LDAP editor to inspect DNS and DHCP configuration."
+"using the LTSP profile. If lots of LTSP clients are used or if different "
+"LTSP servers should serve both i386 and amd64 chroot environments the second "
+"preconfigured network 192.168.1.0/24 could be used as well. Edit the file "
+"<computeroutput>/etc/network/interfaces</computeroutput> and adjust the eth1 "
+"settings accordingly. Use <computeroutput>ldapvi</computeroutput> or any "
+"other LDAP editor to inspect DNS and DHCP configuration."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -5525,8 +5800,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Make sure that LXDE is installed on the thin client server; then add a line "
-"like this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
+"Make sure that LXDE is installed on the LTSP server; then add a line like "
+"this below <computeroutput>[default]</computeroutput> in \"lts.conf\":"
 msgstr ""
 
 #. type: CDATA
@@ -6249,12 +6524,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Beginning with this release, choosing the thin client server profile or the "
-"combined server profile installs xrdp, a package which uses the Remote "
-"Desktop Protocol to present a graphical login to a remote client. Microsoft "
-"Windows users can connect to the thin client server running xrdp without "
-"installing additional software - they simply start a Remote Desktop "
-"Connection on their Windows machine and connect."
+"Choosing the LTSP server profile or the combined server profile also "
+"installs xrdp, a package which uses the Remote Desktop Protocol to present a "
+"graphical login to a remote client. Microsoft Windows users can connect to "
+"the LTSP server running xrdp without installing additional software - they "
+"simply start a Remote Desktop Connection on their Windows machine and "
+"connect."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -7317,9 +7592,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release of "
-"Debian Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-"
-"edu at lists.debian.org\">debian-edu at lists.debian.org</ulink>!"
+"This is a <emphasis role=\"strong\">early ALPHA</emphasis> release of Debian "
+"Edu 9+edu0. Please report feedback to <ulink url=\"mailto:debian-edu at lists."
+"debian.org\">debian-edu at lists.debian.org</ulink>!"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -7337,10 +7612,30 @@ msgid "Installation changes"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Even more information about the Debian Stretch release is available in "
+#| "its <ulink url=\"http://www.debian.org/releases/stretch/installmanual"
+#| "\">installation manual</ulink>."
 msgid ""
-"New version of debian-installer from Debian Stretch, see <ulink url=\"http://"
-"www.debian.org/releases/stretch/installmanual\">installation manual</ulink> "
-"for more details."
+"New version of debian-installer from Debian Stretch, see its <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">installation "
+"manual</ulink> for more details."
+msgstr ""
+"还有更多关于 Debian Stretch 发行版的信息可以在其<ulink url=\"http://www."
+"debian.org/releases/stretch/installmanual\">安装手册</ulink>中获得。"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The \"Thin-Client-Server\" profile has been renamed to \"LTSP-Server\" "
+"profile."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New artwork based on the <ulink url=\"https://wiki.debian.org/DebianArt/"
+"Themes/softWaves#\">\"soft Waves\" theme</ulink>, the default artwork for "
+"Debian 9 Stretch."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -8478,9 +8773,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"On the dedicated client network of thin client servers (default "
-"192.168.0.0/24), machines run by default as diskless workstations if they "
-"are powerful enough."
+"On the dedicated client network of LTSP servers (default 192.168.0.0/24), "
+"machines run by default as diskless workstations if they are powerful enough."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9120,7 +9414,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "New tool notify-local-users to send desktop notification to all logged in "
-"users on a machine.  Useful for thin client servers."
+"users on a machine.  Useful for LTSP servers."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -9240,7 +9534,7 @@ msgstr ""
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid ""
 "A diskless workstation option is installed but not activated by default on "
-"all servers with the thin-client-server profile."
+"all servers with the LTSP-server profile."
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -9520,3 +9814,129 @@ msgid ""
 "More information on even older releases can be found at <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgstr ""
+
+#~ msgid "{{attachment:23-Tjener-KDM_Login.png}}"
+#~ msgstr "{{attachment:23-Tjener-KDM_Login.png}}"
+
+#~ msgid "Thin Client Server/s"
+#~ msgstr "瘦客户端服务器"
+
+#~ msgid "LTSP server(s) (Thin client server(s))"
+#~ msgstr "LTSP 服务器（瘦客户端服务器）"
+
+#~ msgid "Select type of installation"
+#~ msgstr "选择安装类型"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the "
+#~ "amd64 GTK installer where you can use the mouse."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical install</emphasis> 使用 amd64 "
+#~ "图形界面安装程序你可以使用鼠标。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access "
+#~ "to all available questions in text mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit expert install</emphasis> 在 amd64 文本模"
+#~ "式中给予访问所有的问题。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit rescue mode</emphasis> 使这个安装介质成"
+#~ "为 amd64 紧急任务救援盘。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
+#~ "preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit automated install</emphasis> 需要preseed"
+#~ "文件。"
+
+#~ msgid "{{attachment:Installer_advanced_options_b.png}}"
+#~ msgstr "{{attachment:Installer_advanced_options_b.png}}"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> makes this "
+#~ "install medium become a rescue disk for emergency tasks with a graphical "
+#~ "GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Graphical rescue mode</emphasis> 使这个安装介质"
+#~ "成为可视图形界面的紧急任务救援盘。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> "
+#~ "gives access to all available questions in graphical mode on amd64."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> 给予 "
+#~ "amd64 图形模式的所有问题的访问。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> makes "
+#~ "this install medium become a rescue disk for emergency tasks on amd64 "
+#~ "with a graphical GTK look."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical rescue mode</emphasis> 使这个安"
+#~ "装介质成为 amd64 可视图形界面的紧急任务救援盘。"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
+#~ "needs a preseed file."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> 需"
+#~ "要preseed文件。"
+
+#~ msgid "{{attachment:Installer_help.png}}"
+#~ msgstr "{{attachment:Installer_help.png}}"
+
+#~ msgid ""
+#~ "The multi-architecture USB flash drive / Blu-ray disc image defaults to "
+#~ "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit "
+#~ "x86 machines."
+#~ msgstr ""
+#~ "多架构 USB 闪存 / 蓝光盘镜像缺省在 64-bit x86 机器上使用 amd64-"
+#~ "installgui，而在 32-bit x86 机器上是 installgui。"
+
+#~ msgid ""
+#~ "If you want to boot the amd64 text mode with the multi-architecture "
+#~ "image, that would be <computeroutput>amd64-install</computeroutput>."
+#~ msgstr ""
+#~ "如果你需要以多架构镜像引导 amd64 文本模式，那会是 <computeroutput>amd64-"
+#~ "install</computeroutput>。"
+
+#~ msgid ""
+#~ "Likewise you can choose <computeroutput>amd64-expertgui</computeroutput> "
+#~ "to get the GUI version on amd64."
+#~ msgstr ""
+#~ "同样地你可以选择 <computeroutput>amd64-expertgui</computeroutput> 得到 "
+#~ "amd64 版的图形用户界面。"
+
+#~ msgid ""
+#~ "If you want to boot the i386 mode with the multi-arch image on an amd64 "
+#~ "machine you need to manually select <computeroutput>install</"
+#~ "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
+#~ "(graphical mode)."
+#~ msgstr ""
+#~ "如果你需要在 amd64 机器上用多架构镜像引导 i386 模式你需要手动选择 "
+#~ "<computeroutput>install</computeroutput> （文本模式）或 "
+#~ "<computeroutput>expertgui</computeroutput> （图形模式）。"
+
+#~ msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
+#~ msgstr "<emphasis role=\"strong\">瘦客户端</emphasis>"
+
+#~ msgid ""
+#~ "First of all, this profile name is confusing for historic reasons. "
+#~ "Currently this profile actually installs an LTSP server environment for "
+#~ "thin-clients and for diskless workstations. Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/588510#\">588510</ulink> has been filed to "
+#~ "change the name of the profile into a better suited one."
+#~ msgstr ""
+#~ "首先，这个profile名称由于历史原因是含糊的。当前这个profile实际为瘦客户端和"
+#~ "无盘工作站安装 LTSP 服务器环境。Debian bug <ulink url=\"https://bugs."
+#~ "debian.org/588510#\">588510</ulink> 是被提交的这个profile名称更改为更合适"
+#~ "的一个。"
+
+#~ msgid "{{attachment:pxe-tjener.png}}"
+#~ msgstr "{{attachment:pxe-tjener.png}}"

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