[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Buster manual from the wiki.
Holger Levsen
holger at layer-acht.org
Wed Apr 11 23:18:29 BST 2018
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 17438aa17afb1268dbf43d355c15b8d468589359
Author: Holger Levsen <holger at layer-acht.org>
Date: Wed Apr 11 22:17:46 2018 +0000
Update Debian Edu Buster manual from the wiki.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
.../debian-edu-buster-manual.da.po | 221 ++++++++++++---
.../debian-edu-buster-manual.de.po | 313 ++++++++++++++++-----
.../debian-edu-buster-manual.es.po | 212 +++++++++++---
.../debian-edu-buster-manual.fr.po | 221 ++++++++++++---
.../debian-edu-buster-manual.it.po | 235 +++++++++++++---
.../debian-edu-buster-manual.ja.po | 228 ++++++++++++---
.../debian-edu-buster-manual.nb.po | 235 +++++++++++++---
.../debian-edu-buster-manual.nl.po | 237 +++++++++++++---
.../debian-edu-buster-manual.pl.po | 157 +++++++++--
.../debian-edu-buster/debian-edu-buster-manual.pot | 150 ++++++++--
.../debian-edu-buster/debian-edu-buster-manual.xml | 101 +++++--
.../debian-edu-buster-manual.zh.po | 202 ++++++++++---
documentation/debian-edu-buster/fixme-status.txt | 6 +-
13 files changed, 2030 insertions(+), 488 deletions(-)
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.da.po b/documentation/debian-edu-buster/debian-edu-buster-manual.da.po
index 6067860..2e9e887 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.da.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2016-10-06 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -135,9 +135,10 @@ msgstr ""
#| "setup, which can be extended easily and almost endlessly via the Debian "
#| "universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"Flere undervisningsprogramer såsom celestia, drgeo, gcompris, kalzium, "
"kgeography, solfege og scratch er inkluderet i skrivebordets "
@@ -913,11 +914,18 @@ msgid "Thin clients"
msgstr "Tynde klienter"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"En opsætning for tynde klienter muliggør at normale pc'er kan fungere som "
"(X-)terminaler. Dette betyder at maskinen starter op fra en diskette eller "
@@ -1823,9 +1831,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
"Når du foretager en installation af Debian Edu, så har du nogle få "
"indstillinger at vælge mellem. Lad det ikke afskrække dig; der er ikke "
@@ -1905,7 +1912,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1921,7 +1928,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1929,11 +1936,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1950,6 +1957,40 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
+#| msgid "Remote Desktop Service"
+msgid "Desktop choice"
+msgstr "Tjeneste for fjernskrivebord"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+#, fuzzy
#| msgid "Installation and download options"
msgid "Installation types and options"
msgstr "Indstillinger for installation og hentning"
@@ -2194,8 +2235,10 @@ msgstr ""
#| "parameters."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
"For at installere <emphasis role=\"strong\">GNOME</emphasis>-skrivebordet i "
"stedet for <emphasis role=\"strong\">KDE »Plasma«</emphasis>-skrivebordet så "
@@ -2205,15 +2248,14 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
#| "parameters."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
-"For at installere <emphasis role=\"strong\">LXDE</emphasis>-skrivebordet i "
+"For at installere <emphasis role=\"strong\">Xfce</emphasis>-skrivebordet i "
"stedet for så tilføj <computeroutput>desktop=lxde</computeroutput> til "
"kerneopstartsparametrene."
@@ -2224,8 +2266,8 @@ msgstr ""
#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
#| "parameters."
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
"For at installere <emphasis role=\"strong\">Xfce</emphasis>-skrivebordet i "
"stedet for så tilføj <computeroutput>desktop=lxde</computeroutput> til "
@@ -4119,6 +4161,12 @@ msgid "shutdown-at-night-hosts"
msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "shutdown-at-night-hosts"
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr "shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr "winstation-hosts"
@@ -5393,8 +5441,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -5473,7 +5521,9 @@ msgstr ""
"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+#, fuzzy
+#| msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr "Genskabelse af en LTSP-chroot"
#. type: Content of: <article><section><section><section><para>
@@ -5510,6 +5560,43 @@ msgstr ""
"computeroutput> (eller <computeroutput>debian-edu-ltsp --arch amd64</"
"computeroutput>) som root."
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "sudo service kdm restart"
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr "sudo service kdm restart"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
#, fuzzy
#| msgid ""
@@ -7891,32 +7978,55 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
+#| "<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+#| "computeroutput>) can be used to change audio volume."
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
+"På tynde klienter kan <computeroutput>pavucontrol</computeroutput> eller "
+"<computeroutput>alsamixer</computeroutput> (men ikke <computeroutput>kmix</"
+"computeroutput>) bruges til at ændre lydstyrken."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid "sudo service kdm restart"
-msgid "Run \"service isc-dhcp-server restart\"."
-msgstr "sudo service kdm restart"
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
+msgstr "Kør <computeroutput>service ssh restart</computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+#, fuzzy
+#| msgid ""
+#| "and then run <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
+#| "computeroutput> once."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
+"og kør så <computeroutput>/usr/sbin/debian-edu-pxeinstall</computeroutput> "
+"en gang."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
-msgstr ""
+#, fuzzy
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
+msgstr "Kør <computeroutput>service ssh restart</computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
@@ -9734,6 +9844,17 @@ msgid ""
"Debian 10 Buster."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "KDE desktop environment version 3.5.5"
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr "KDE-skrivebordsmiljø version 3.5.5"
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Programopdateringer"
@@ -9888,10 +10009,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Other changes compared to the previous release"
-msgid "FIXME: describe other changes compared to Stretch here."
-msgstr "Andre ændringer sammenlignet med den forrige udgivelse"
+msgid "New GOsa²-Plugin Password Management."
+msgstr ""
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
@@ -11780,6 +11899,25 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, fuzzy
+#~| msgid ""
+#~| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop "
+#~| "instead, add <computeroutput>desktop=lxde</computeroutput> to the kernel "
+#~| "boot parameters."
+#~ msgid ""
+#~ "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#~ "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP "
+#~ "is intended to be used.)"
+#~ msgstr ""
+#~ "For at installere <emphasis role=\"strong\">LXDE</emphasis>-skrivebordet "
+#~ "i stedet for så tilføj <computeroutput>desktop=lxde</computeroutput> til "
+#~ "kerneopstartsparametrene."
+
+#, fuzzy
+#~| msgid "Other changes compared to the previous release"
+#~ msgid "FIXME: describe other changes compared to Stretch here."
+#~ msgstr "Andre ændringer sammenlignet med den forrige udgivelse"
+
#~ msgid ""
#~ "In order to simplify the standard setup of Skolelinux, the Internet "
#~ "connection runs over a separate router. It is possible to set up Debian "
@@ -14212,9 +14350,6 @@ msgstr ""
#~ msgid "X.org version 7.1."
#~ msgstr "X.org version 7.1."
-#~ msgid "KDE desktop environment version 3.5.5"
-#~ msgstr "KDE-skrivebordsmiljø version 3.5.5"
-
#~ msgid "OpenOffice.org version 2.0."
#~ msgstr "OpenOffice.org version 2.0."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.de.po b/documentation/debian-edu-buster/debian-edu-buster-manual.de.po
index b88f93e..49b9ced 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.de.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2018-04-09 12:49+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -120,10 +120,16 @@ msgstr ""
"wie traditionelle Thin Clients - ist dadurch verfügbar."
#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Several educational applications like gcompris, kalzium, kgeography, "
+#| "solfege and scratch are included in the default desktop setup, which can "
+#| "be extended easily and almost endlessly via the Debian universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"Mehrere für den Unterricht geeignete Anwendungen wie Gcompris, Kalzium, "
"Kgeography, Solfege und Scratch sind in der Standardversion der graphischen "
@@ -830,11 +836,18 @@ msgid "Thin clients"
msgstr "Thin Clients"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
@@ -1660,15 +1673,24 @@ msgid "Installing Debian Edu"
msgstr "Die Installation von Debian Edu"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When you do a Debian Edu installation, you have a few options to choose "
+#| "from. Don't be afraid; there aren't many. We have done a good job of "
+#| "hiding the complexity of Debian during the installation and beyond. "
+#| "However, Debian Edu is Debian, and if you want there are more than 52,000 "
+#| "packages to choose from and a billion configuration options. For the "
+#| "majority of our users, our defaults should be fine. One exception: if "
+#| "LTSP is intended to be used, choose a lightweight desktop environment. "
+#| "(LXDE comes with the smallest footprint; see details below how to set it)."
msgid ""
"When you do a Debian Edu installation, you have a few options to choose "
"from. Don't be afraid; there aren't many. We have done a good job of hiding "
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
"Wenn Sie Debian Edu installieren, haben Sie verschiedene Varianten zur "
"Auswahl. Aber keine Angst, es sind nicht sehr viele. Es wurde versucht, die "
@@ -1760,9 +1782,13 @@ msgstr ""
"Internet-Verbindung :"
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "As soon as the automatic network configuration fails (due to missing "
+#| "DHCP), choose manual network configuration"
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
"Nach dem Scheitern der automatischen Einrichtung des Netzwerks (wegen "
"fehlendem DHCP) manuelle Konfiguration auswählen"
@@ -1780,7 +1806,9 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr "Als Nameserver-IP-Adresse 8.8.8.8 eingeben (oder eine bekannte andere)"
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+#, fuzzy
+#| msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr "Der Hauptserver sollte nach dem ersten Start funktionieren."
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1788,11 +1816,15 @@ msgid "Offline (no Internet connection):"
msgstr "Offline (keine Internet-Verbindung):"
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+#, fuzzy
+#| msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr "Das USB-ISO-Image verwenden"
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+#, fuzzy
+#| msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
"Sicherstellen, dass alle (realen/virtuellen) Netzwerkverbindungen gekappt "
"sind."
@@ -1814,6 +1846,40 @@ msgstr ""
"mit Internet-Zugang gestartet wurde."
#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Remote Desktop Service"
+msgid "Desktop choice"
+msgstr "Remote-Desktop-Service"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
msgid "Installation types and options"
msgstr "Installationsarten und Optionen"
@@ -1991,10 +2057,18 @@ msgstr ""
"der Proxy des Hauptservers benutzt wird."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, "
+#| "replace kde with gnome in the <computeroutput>desktop=kde</"
+#| "computeroutput> parameter."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
"Um den <emphasis role=\"strong\">GNOME</emphasis>-Desktop anstatt des "
"vorgegebenen <emphasis role=\"strong\">KDE-Plasma</emphasis>-Desktops zu "
@@ -2002,19 +2076,25 @@ msgstr ""
"computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
-"Um alternativ den <emphasis role=\"strong\">LXDE</emphasis>-Desktop zu "
-"installieren, verwenden Sie <computeroutput>desktop=lxde</computeroutput>. "
-"(Empfohlen, falls die Verwendung von LTSP beabsichtigt wird.)"
+"Um alternativ den <emphasis role=\"strong\">Xfce</emphasis>-Desktop zu "
+"installieren, verwenden Sie <computeroutput>desktop=xfce</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
"Um alternativ den <emphasis role=\"strong\">Xfce</emphasis>-Desktop zu "
"installieren, verwenden Sie <computeroutput>desktop=xfce</computeroutput>."
@@ -3739,6 +3819,12 @@ msgid "shutdown-at-night-hosts"
msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "shutdown-at-night-hosts"
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr "shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr "winstation-hosts"
@@ -4002,6 +4088,7 @@ msgstr ""
"ist). "
#. type: CDATA
+#, no-wrap
msgid ""
"LC_ALL=C apt-get update ; LC_ALL=C TMP= TMPDIR= ltsp-chroot apt-get update\n"
"LC_ALL=C apt-get upgrade -y\n"
@@ -4784,6 +4871,7 @@ msgid "Get the new Debian Edu Buster artwork:"
msgstr "Das neue Artwork für Debian Edu Buster installieren:"
#. type: CDATA
+#, no-wrap
msgid ""
"apt install debian-edu-artwork-softwaves # \n"
"FIXME: adjust theme"
@@ -4886,9 +4974,13 @@ msgstr ""
"muss, werden zusätzliche 4 GiB für eine temporäre Datei benötigt, "
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Also please note that the default LTSP architecture was i386 for "
+#| "Stretch. FIXME: add pointer how to create amd64 chroots?"
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
"Also please note that the default LTSP architecture was i386 for Stretch. "
"FIXME: add pointer how to create amd64 chroots?"
@@ -4947,7 +5039,9 @@ msgstr ""
"computeroutput>."
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+#, fuzzy
+#| msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr "Eine LTSP-Chroot-Umgebung neu erzeugen"
#. type: Content of: <article><section><section><section><para>
@@ -4982,6 +5076,53 @@ msgstr ""
"ltsp --arch i386</computeroutput> (oder <computeroutput>debian-edu-ltsp --"
"arch amd64</computeroutput>) als Root ausführen."
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+"Führen Sie »ltsp-build-client --arch amd64« aus, um Chroot und NBD-Image zu "
+"erzeugen."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp "
+#| "statements in LDAP for one dedicated network)."
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+"Verwenden Sie »ldapvi -ZD '(cn=admin)'« um amd64 durch i386 für ein "
+"ausgewähltes Netzwerk zu ersetzen (DHCP-Angaben in LDAP)."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr "Führen Sie »service isc-dhcp-server restart« aus."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+"Bearbeiten Sie /etc/debian-edu/pxeinstall.conf (ltsparch=amd64 setzen)."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+"Führen Sie »debian-edu-pxeinstall« aus, um das PXE-Menü zu regenerieren."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+"Führen Sie »service nbd-service restart« aus, damit die neue NBD-Datei "
+"verwendet wird."
+
#. type: Content of: <article><section><section><title>
msgid ""
"Upgrades from older Debian Edu / Skolelinux installations (before Stretch)"
@@ -6807,6 +6948,7 @@ msgid "In this case execute the following commands on an LTSP server."
msgstr "Führen Sie in diesem Fall folgende Befehle auf dem LTSP-Server aus:"
#. type: CDATA
+#, no-wrap
msgid ""
"# First get information about firmware packages\n"
"apt-get update && apt-cache search ^firmware-\n"
@@ -6817,19 +6959,16 @@ msgid ""
"ltsp-chroot -a amd64 apt-get update\n"
"ltsp-chroot -d -a amd64 apt-get -y -q install <package name>\n"
"\n"
-"# copy the new initrd to the server's tftpboot directory and update the NBD "
-"image.\n"
+"# copy the new initrd to the server's tftpboot directory and update the NBD image.\n"
"ltsp-update-kernels\n"
"ltsp-update-image"
msgstr ""
"# Zunächst Informationen über Firmware-Pakete einholen.\n"
"apt-get update && apt-cache search ^firmware-\n"
"\n"
-"# Entscheiden Sie, welches Paket für die Netzwerkschnittstelle(n) "
-"erforderlich ist.\n"
+"# Entscheiden Sie, welches Paket für die Netzwerkschnittstelle(n) erforderlich ist.\n"
"# Höchstwahrscheinlich wird es das Paket firmware-linux-nonfree sein.\n"
-"# Die Änderungen müssen im LTSP-Chroot für die Architektur i386 vorgenommen "
-"werden.\n"
+"# Die Änderungen müssen im LTSP-Chroot für die Architektur i386 vorgenommen werden.\n"
"ltsp-chroot -a amd64 apt-get update\n"
"ltsp-chroot -d -a amd64 apt-get -y -q install <package name>\n"
"\n"
@@ -6889,9 +7028,9 @@ msgstr ""
"Workstation, wenn sie genügend RAM haben."
#. type: CDATA
+#, no-wrap
msgid ""
-"(1)Open the file /opt/ltsp/amd64/etc/ltsp/update-kernels.conf with an "
-"editor\n"
+"(1)Open the file /opt/ltsp/amd64/etc/ltsp/update-kernels.conf with an editor\n"
"and replace the line\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"with\n"
@@ -6900,8 +7039,7 @@ msgid ""
"(3)Execute 'ltsp-update-kernels'\n"
"(4)Execute 'ltsp-update-image'"
msgstr ""
-"(1) Öffnen Sie die Datei /opt/ltsp/amd64/etc/ltsp/update-kernels.conf mit "
-"einem Editor\n"
+"(1) Öffnen Sie die Datei /opt/ltsp/amd64/etc/ltsp/update-kernels.conf mit einem Editor\n"
"und ersetzen Sie die Zeile\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"durch\n"
@@ -7143,12 +7281,9 @@ msgstr ""
"ltspserver00 im Hauptnetzwerk:"
#. type: CDATA
-msgid ""
-"DEFAULT ltsp/amd64/vmlinuz initrd=ltsp/amd64/initrd.img nfsroot=10.0.2.10:/"
-"opt/ltsp/amd64 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
-msgstr ""
-"DEFAULT ltsp/amd64/vmlinuz initrd=ltsp/amd64/initrd.img nfsroot=10.0.2.10:/"
-"opt/ltsp/amd64 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
+#, no-wrap
+msgid "DEFAULT ltsp/amd64/vmlinuz initrd=ltsp/amd64/initrd.img nfsroot=10.0.2.10:/opt/ltsp/amd64 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
+msgstr "DEFAULT ltsp/amd64/vmlinuz initrd=ltsp/amd64/initrd.img nfsroot=10.0.2.10:/opt/ltsp/amd64 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -7207,35 +7342,60 @@ msgstr ""
"zusätzlicher Plattenplatz für /opt sind dann erforderlich."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+#, fuzzy
+#| msgid ""
+#| "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
"Führen Sie »ltsp-build-client --arch amd64« aus, um Chroot und NBD-Image zu "
"erzeugen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp "
+#| "statements in LDAP for one dedicated network)."
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
"Verwenden Sie »ldapvi -ZD '(cn=admin)'« um amd64 durch i386 für ein "
"ausgewähltes Netzwerk zu ersetzen (DHCP-Angaben in LDAP)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"service isc-dhcp-server restart\"."
-msgstr "Führen Sie »service isc-dhcp-server restart« aus."
+#, fuzzy
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
+msgstr "<computeroutput>service ssh restart</computeroutput> ausführen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+#, fuzzy
+#| msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
"Bearbeiten Sie /etc/debian-edu/pxeinstall.conf (ltsparch=amd64 setzen)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
-"Führen Sie »debian-edu-pxeinstall« aus, um das PXE-Menü zu regenerieren."
+"Führen Sie <computeroutput>ltsp-update-image</computeroutput> aus, um die "
+"NBD-Image-Datei(en) zu aktualisieren."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
+#, fuzzy
+#| msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
msgstr ""
"Führen Sie »service nbd-service restart« aus, damit die neue NBD-Datei "
"verwendet wird."
@@ -7749,17 +7909,16 @@ msgstr ""
"die folgenden Befehle als Root auf jedem LTSP-Server ein:"
#. type: CDATA
+#, no-wrap
msgid ""
-"ltsp-chroot -a amd64 # this does \"chroot /opt/ltsp/amd64\" and more, ie it "
-"also prevents daemons from being started\n"
+"ltsp-chroot -a amd64 # this does \"chroot /opt/ltsp/amd64\" and more, ie it also prevents daemons from being started\n"
"apt update\n"
"apt upgrade\n"
"apt full-upgrade\n"
"exit\n"
"ltsp-update-image"
msgstr ""
-"ltsp-chroot -a amd64 # dies bewirkt \"chroot /opt/ltsp/amd64\" und "
-"verhindert dort zusätzlich den Start von Daemons\n"
+"ltsp-chroot -a amd64 # dies bewirkt \"chroot /opt/ltsp/amd64\" und verhindert dort zusätzlich den Start von Daemons\n"
"aptitude update\n"
"aptitude upgrade\n"
"aptitude dist-upgrade\n"
@@ -7779,6 +7938,7 @@ msgstr ""
"die Installation in der Chroot-Umgebung des LTSP-Servers durchgeführt werden."
#. type: CDATA
+#, no-wrap
msgid ""
"ltsp-chroot -a amd64\n"
"## optionally, edit the sources.list:\n"
@@ -8411,6 +8571,7 @@ msgstr ""
"erforderlich."
#. type: CDATA
+#, no-wrap
msgid ""
"# Run on a combi server (and on each additional ltsp server):\n"
"apt update\n"
@@ -8418,10 +8579,8 @@ msgid ""
"ltsp-chroot -m --arch amd64 apt update\n"
"ltsp-chroot -m --arch amd64 apt install epoptes-client\n"
"ltsp-chroot -m --arch amd64 apt install ssvnc\n"
-"ltsp-chroot -m --arch amd64 sed -i 's/test -f/#test -f/' /etc/init.d/epoptes-"
-"client \n"
-"ltsp-chroot -m --arch amd64 sed -i 's/grep -qs/#grep -qs/' /etc/init.d/"
-"epoptes-client \n"
+"ltsp-chroot -m --arch amd64 sed -i 's/test -f/#test -f/' /etc/init.d/epoptes-client \n"
+"ltsp-chroot -m --arch amd64 sed -i 's/grep -qs/#grep -qs/' /etc/init.d/epoptes-client \n"
"# If diskspace matters, use 'ltsp-update-image -n' instead.\n"
"ltsp-update-image"
msgstr ""
@@ -8431,10 +8590,8 @@ msgstr ""
"ltsp-chroot -m --arch amd64 apt update\n"
"ltsp-chroot -m --arch amd64 apt install epoptes-client\n"
"ltsp-chroot -m --arch amd64 apt install ssvnc\n"
-"ltsp-chroot -m --arch amd64 sed -i 's/test -f/#test -f/' /etc/init.d/epoptes-"
-"client \n"
-"ltsp-chroot -m --arch amd64 sed -i 's/grep -qs/#grep -qs/' /etc/init.d/"
-"epoptes-client \n"
+"ltsp-chroot -m --arch amd64 sed -i 's/test -f/#test -f/' /etc/init.d/epoptes-client \n"
+"ltsp-chroot -m --arch amd64 sed -i 's/grep -qs/#grep -qs/' /etc/init.d/epoptes-client \n"
"# Bei wenig Plattenplatz 'ltsp-update-image -n' benutzen.\n"
"ltsp-update-image"
@@ -8931,6 +9088,15 @@ msgstr ""
"org/DebianArt/Themes/softWaves#\">Theme »soft Waves«</ulink>, dem "
"vorgegebenen Theme für Debian 10 Buster."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Aktualisierte Software"
@@ -9053,8 +9219,8 @@ msgstr ""
"betreute Implementierung »Gnash« zu streichen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: describe other changes compared to Stretch here."
-msgstr "FIXME: describe other changes compared to Stretch here."
+msgid "New GOsa²-Plugin Password Management."
+msgstr ""
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
@@ -9376,8 +9542,8 @@ msgstr ""
"translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre "
"Sprache anlegen und wie Übersetzungen aktualisiert werden."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -10830,3 +10996,16 @@ msgstr ""
"Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+
+#~ msgid ""
+#~ "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#~ "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP "
+#~ "is intended to be used.)"
+#~ msgstr ""
+#~ "Um alternativ den <emphasis role=\"strong\">LXDE</emphasis>-Desktop zu "
+#~ "installieren, verwenden Sie <computeroutput>desktop=lxde</"
+#~ "computeroutput>. (Empfohlen, falls die Verwendung von LTSP beabsichtigt "
+#~ "wird.)"
+
+#~ msgid "FIXME: describe other changes compared to Stretch here."
+#~ msgstr "FIXME: describe other changes compared to Stretch here."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.es.po b/documentation/debian-edu-buster/debian-edu-buster-manual.es.po
index e1c1c8f..819c465 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.es.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2015-03-30 22:30+0000\n"
"Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -139,9 +139,10 @@ msgstr ""
#| "setup, which can be extended easily and almost endlessly via the Debian "
#| "universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"Múltiples aplicaciones educativas como celestia, drgeo, gcompris, kalzium, "
"kgeography, solfege y scratch, han sido incluidas en el escritorio "
@@ -926,11 +927,18 @@ msgid "Thin clients"
msgstr "Clientes ligeros"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"Una configuración de cliente ligero permite a un PC ordinario funcionar como "
"un terminal (X). Esto significa que la computadora arranca desde un disquete "
@@ -1825,9 +1833,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1900,7 +1907,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1916,7 +1923,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1924,11 +1931,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1944,6 +1951,38 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
+msgid "Desktop choice"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
#, fuzzy
#| msgid "Installation and download options"
msgid "Installation types and options"
@@ -2191,8 +2230,10 @@ msgstr ""
#| "parameters."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
"Para instalar el escritorio <emphasis role=\"strong\">GNOME</emphasis> en "
"lugar del escritorio <emphasis role=\"strong\">KDE Plasma</emphasis>, "
@@ -2202,16 +2243,15 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
#| "parameters."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
-"Para instalar el escritorio <emphasis role=\"strong\">LXDE</emphasis>, "
-"agregue <computeroutput>desktop=lxde</computeroutput> a los parámetros de "
+"Para instalar el escritorio <emphasis role=\"strong\">Xfce</emphasis>, "
+"agregue <computeroutput>desktop=xfce</computeroutput> a los parámetros de "
"carga del kernel."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2221,8 +2261,8 @@ msgstr ""
#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
#| "parameters."
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
"Para instalar el escritorio <emphasis role=\"strong\">Xfce</emphasis>, "
"agregue <computeroutput>desktop=xfce</computeroutput> a los parámetros de "
@@ -3971,6 +4011,12 @@ msgid "shutdown-at-night-hosts"
msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "shutdown-at-night-hosts"
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr "shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr "winstation-hosts"
@@ -5060,8 +5106,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -5106,7 +5152,9 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+#, fuzzy
+#| msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr "Recrear un chroot LTSP"
#. type: Content of: <article><section><section><section><para>
@@ -5134,6 +5182,41 @@ msgid ""
"computeroutput>) as root."
msgstr ""
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
#, fuzzy
#| msgid ""
@@ -6967,30 +7050,59 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
+#| "<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+#| "computeroutput>) can be used to change audio volume."
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
+"En clientes ligeros, <computeroutput>pavucontrol</computeroutput> o "
+"<computeroutput>alsamixer</computeroutput> (pero no <computeroutput>kmix</"
+"computeroutput>) puede ser usado para ajustar el volumen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"service isc-dhcp-server restart\"."
-msgstr ""
+#, fuzzy
+#| msgid "<computeroutput>git pull</computeroutput>"
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
+msgstr "<computeroutput>git pull</computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+#, fuzzy
+#| msgid ""
+#| "and then run <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
+#| "computeroutput> once."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
+"y luego ejecute una vez <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
+"computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
+#, fuzzy
+#| msgid ""
+#| "and then run <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
+#| "computeroutput> once."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
msgstr ""
+"y luego ejecute una vez <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
+"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
@@ -8304,6 +8416,17 @@ msgid ""
"Debian 10 Buster."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "KDE desktop environment version 3.5.5"
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr "Ambiente gráfico KDE 3.5.5"
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Actualizaciones de software"
@@ -8425,7 +8548,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: describe other changes compared to Stretch here."
+msgid "New GOsa²-Plugin Password Management."
msgstr ""
#. type: Content of: <article><section><title>
@@ -9822,6 +9945,20 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, fuzzy
+#~| msgid ""
+#~| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop "
+#~| "instead, add <computeroutput>desktop=lxde</computeroutput> to the kernel "
+#~| "boot parameters."
+#~ msgid ""
+#~ "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#~ "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP "
+#~ "is intended to be used.)"
+#~ msgstr ""
+#~ "Para instalar el escritorio <emphasis role=\"strong\">LXDE</emphasis>, "
+#~ "agregue <computeroutput>desktop=lxde</computeroutput> a los parámetros "
+#~ "de carga del kernel."
+
#~ msgid ""
#~ "In order to simplify the standard setup of Skolelinux, the Internet "
#~ "connection runs over a separate router. It is possible to set up Debian "
@@ -10503,9 +10640,6 @@ msgstr ""
#~ msgid "X.org version 7.1."
#~ msgstr "Versión de X 7.1."
-#~ msgid "KDE desktop environment version 3.5.5"
-#~ msgstr "Ambiente gráfico KDE 3.5.5"
-
#~ msgid "OpenOffice.org version 2.0."
#~ msgstr "OpenOffice versión 2.0"
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po b/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
index 9a77ce6..d6643e4 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2015-06-22 10:34+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -139,9 +139,10 @@ msgstr ""
#| "setup, which can be extended easily and almost endlessly via the Debian "
#| "universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"Plusieurs applications éducatives telles que celestia, drgeo, gcompris, "
"kalzium, kgeography et solfege sont incluses dans la configuration de bureau "
@@ -934,11 +935,18 @@ msgid "Thin clients"
msgstr "Clients légers"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"La configuration en client léger permet aux PC ordinaires de fonctionner en "
"terminaux (X). Cela signifie que la machine s'amorce depuis une disquette ou "
@@ -1878,9 +1886,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
"Lors de l'installation de Debian Edu, vous devez faire quelques choix. Mais "
"n'ayez pas peur, il y en a peu. Nous nous sommes attachés à cacher la "
@@ -1959,7 +1966,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1975,7 +1982,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1983,11 +1990,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -2004,6 +2011,40 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
+#| msgid "Remote Desktop Service"
+msgid "Desktop choice"
+msgstr "Service de Bureaux distants"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+#, fuzzy
#| msgid "Installation and download options"
msgid "Installation types and options"
msgstr "Options de téléchargement et d'installation"
@@ -2250,8 +2291,10 @@ msgstr ""
#| "parameters."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
"Pour installer le bureau <emphasis role=\"strong\">GNOME</emphasis> au lieu "
"de <emphasis role=\"strong\">KDE « Plasma »</emphasis>, ajoutez "
@@ -2261,13 +2304,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
#| "parameters."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
"Pour installer le bureau <emphasis role=\"strong\">LXDE</emphasis> à la "
"place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
@@ -2280,8 +2322,8 @@ msgstr ""
#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
#| "parameters."
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
"Pour installer le bureau <emphasis role=\"strong\">LXDE</emphasis> à la "
"place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux paramètres "
@@ -4243,6 +4285,12 @@ msgid "shutdown-at-night-hosts"
msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "shutdown-at-night-hosts"
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr "shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr "winstation-hosts"
@@ -5556,8 +5604,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -5636,7 +5684,9 @@ msgstr ""
"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+#, fuzzy
+#| msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr "Recréer un chroot LTSP"
#. type: Content of: <article><section><section><section><para>
@@ -5674,6 +5724,43 @@ msgstr ""
"arch i386</computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
"computeroutput>) en tant que superutilisateur."
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "sudo service kdm restart"
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr "sudo service kdm restart"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
#, fuzzy
#| msgid ""
@@ -8119,32 +8206,53 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
-msgstr ""
+#, fuzzy
+#| msgid "run <computeroutput>apt-get update</computeroutput>"
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
+msgstr "exécutez <computeroutput>apt-get update</computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
+#| "<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+#| "computeroutput>) can be used to change audio volume."
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
+"Sur les clients légers, <computeroutput>pavucontrol</computeroutput> et "
+"<computeroutput>alsamixer</computeroutput> (mais pas <computeroutput>kmix</"
+"computeroutput>) peuvent être utilisés pour changer le volume sonore."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid "sudo service kdm restart"
-msgid "Run \"service isc-dhcp-server restart\"."
-msgstr "sudo service kdm restart"
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
+msgstr "Exécutez <computeroutput>service ssh restart</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
-msgstr ""
+#, fuzzy
+#| msgid "run <computeroutput>apt-get update</computeroutput>"
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
+msgstr "exécutez <computeroutput>apt-get update</computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
-msgstr ""
+#, fuzzy
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
+msgstr "Exécutez <computeroutput>service ssh restart</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
@@ -10019,6 +10127,17 @@ msgid ""
"Debian 10 Buster."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "KDE desktop environment version 3.5.5"
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr "Environnement de bureau KDE version 3.5.5"
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Mises à jour des logiciels"
@@ -10171,10 +10290,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Other changes compared to the previous release"
-msgid "FIXME: describe other changes compared to Stretch here."
-msgstr "Autres changements depuis la dernière publication"
+msgid "New GOsa²-Plugin Password Management."
+msgstr ""
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
@@ -12079,6 +12196,25 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#, fuzzy
+#~| msgid ""
+#~| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop "
+#~| "instead, add <computeroutput>desktop=lxde</computeroutput> to the kernel "
+#~| "boot parameters."
+#~ msgid ""
+#~ "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#~ "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP "
+#~ "is intended to be used.)"
+#~ msgstr ""
+#~ "Pour installer le bureau <emphasis role=\"strong\">LXDE</emphasis> à la "
+#~ "place, ajoutez <computeroutput>desktop=lxde</computeroutput> aux "
+#~ "paramètres d'initialisation du noyau."
+
+#, fuzzy
+#~| msgid "Other changes compared to the previous release"
+#~ msgid "FIXME: describe other changes compared to Stretch here."
+#~ msgstr "Autres changements depuis la dernière publication"
+
#~ msgid ""
#~ "In order to simplify the standard setup of Skolelinux, the Internet "
#~ "connection runs over a separate router. It is possible to set up Debian "
@@ -14732,9 +14868,6 @@ msgstr ""
#~ msgid "X.org version 7.1."
#~ msgstr "X.org version 7.1."
-#~ msgid "KDE desktop environment version 3.5.5"
-#~ msgstr "Environnement de bureau KDE version 3.5.5"
-
#~ msgid "OpenOffice.org version 2.0."
#~ msgstr "OpenOffice.org version 2.0."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.it.po b/documentation/debian-edu-buster/debian-edu-buster-manual.it.po
index 7c42ec0..beb4b00 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.it.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2018-01-20 18:05+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -136,9 +136,10 @@ msgstr ""
#| "setup, which can be extended easily and almost endlessly via the Debian "
#| "universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"Diverse applicazioni didattiche come celestia, drgeo, gcompris, kalzium, "
"kgeography, solfege e scratch sono incluse nella configurazione predefinita "
@@ -845,11 +846,18 @@ msgid "Thin clients"
msgstr "Thin-client"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"La configurazione dei thin-client permette a un PC di funzionare come un "
"terminale (X). Questo significa che la macchina si avvia attraverso un "
@@ -1736,9 +1744,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
"Quando si fa un'installazione Debian Edu ci sono poche opzioni tra cui "
"scegliere. Non ci si deve preoccupare, non sono molte. Abbiamo dedicato "
@@ -1818,7 +1825,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1834,7 +1841,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1842,11 +1849,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1862,6 +1869,40 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Remote Desktop Service"
+msgid "Desktop choice"
+msgstr "Servizio di desktop remoto"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
msgid "Installation types and options"
msgstr "Tipi di installazione e opzioni"
@@ -2053,10 +2094,18 @@ msgstr ""
"utilizzerà automaticamente il proxy del server principale."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, "
+#| "replace kde with gnome in the <computeroutput>desktop=kde</"
+#| "computeroutput> parameter."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
"Per installare il desktop <emphasis role=\"strong\">GNOME</emphasis> al "
"posto del desktop di default <emphasis role=\"strong\">KDE Plasma</"
@@ -2064,19 +2113,25 @@ msgstr ""
"computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
-"Per installare invece il desktop <emphasis role=\"strong\">LXDE</emphasis>, "
-"usare <computeroutput>desktop=lxde</computeroutput> (consigliato se si vuole "
-"utilizzare LTSP)."
+"Per installare il desktop <emphasis role=\"strong\">Xfce</emphasis>, usare "
+"<computeroutput>desktop=xfce</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
"Per installare il desktop <emphasis role=\"strong\">Xfce</emphasis>, usare "
"<computeroutput>desktop=xfce</computeroutput>."
@@ -3906,6 +3961,12 @@ msgid "shutdown-at-night-hosts"
msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "shutdown-at-night-hosts"
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr "shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr "winstation-hosts"
@@ -5107,8 +5168,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -5173,7 +5234,9 @@ msgstr ""
"<computeroutput>man ltsp-update-image</computeroutput>."
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+#, fuzzy
+#| msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr "Ricreare un chroot LTSP"
#. type: Content of: <article><section><section><section><para>
@@ -5212,6 +5275,43 @@ msgstr ""
"computeroutput> (o <computeroutput>debian-edu-ltsp --arch amd64</"
"computeroutput>) come root."
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "sudo service kdm restart"
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr "sudo service kdm restart"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
#, fuzzy
#| msgid ""
@@ -7436,32 +7536,61 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
+"Eseguire <computeroutput>ltsp-update-image</computeroutput> per rigenerare "
+"l'immagine NBD."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
+#| "<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+#| "computeroutput>) can be used to change audio volume."
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
+"Sui thin-client possono essere usati per cambiare il volume "
+"<computeroutput>pavucontrol</computeroutput>, <computeroutput>alsamixer</"
+"computeroutput> (ma non <computeroutput>kmix</computeroutput>)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid "sudo service kdm restart"
-msgid "Run \"service isc-dhcp-server restart\"."
-msgstr "sudo service kdm restart"
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
+msgstr "Eseguire <computeroutput>service ssh restart</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
+"Eseguire <computeroutput>ltsp-update-image</computeroutput> per rigenerare "
+"l'immagine NBD."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
-msgstr ""
+#, fuzzy
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
+msgstr "Eseguire <computeroutput>service ssh restart</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
@@ -9275,6 +9404,17 @@ msgstr ""
"Themes/softWaves#\">\"tema soft Waves\"</ulink>, è quella di default per "
"Debian 9 Stretch."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "KDE desktop environment version 3.5.5"
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr "KDE ambiente desktop versione 3.5.5"
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Aggiornamenti software"
@@ -9432,10 +9572,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Other changes compared to the previous release"
-msgid "FIXME: describe other changes compared to Stretch here."
-msgstr "Altre modifiche rispetto alla versione precedente"
+msgid "New GOsa²-Plugin Password Management."
+msgstr ""
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
@@ -11304,6 +11442,20 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#~ "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP "
+#~ "is intended to be used.)"
+#~ msgstr ""
+#~ "Per installare invece il desktop <emphasis role=\"strong\">LXDE</"
+#~ "emphasis>, usare <computeroutput>desktop=lxde</computeroutput> "
+#~ "(consigliato se si vuole utilizzare LTSP)."
+
+#, fuzzy
+#~| msgid "Other changes compared to the previous release"
+#~ msgid "FIXME: describe other changes compared to Stretch here."
+#~ msgstr "Altre modifiche rispetto alla versione precedente"
+
+#~ msgid ""
#~ "In order to simplify the standard setup of Skolelinux, the Internet "
#~ "connection runs over a separate router. It is possible to set up Debian "
#~ "with both a modem and an ISDN connection; however, no attempt is made to "
@@ -13900,9 +14052,6 @@ msgstr ""
#~ msgid "X.org version 7.1."
#~ msgstr "X.org version 7.1."
-#~ msgid "KDE desktop environment version 3.5.5"
-#~ msgstr "KDE ambiente desktop versione 3.5.5"
-
#~ msgid "OpenOffice.org version 2.0."
#~ msgstr "OpenOffice.org versione 2.0."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po b/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
index cfe89fb..027d7a0 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2017-10-09 05:36+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -133,9 +133,10 @@ msgstr ""
#| "setup, which can be extended easily and almost endlessly via the Debian "
#| "universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"celestia、drgeo、gcompris、kalzium、kgeography、solfege、scratch といった複数"
"の教育向けアプリケーションがデスクトップにデフォルトで収録されますが、これは "
@@ -822,11 +823,18 @@ msgid "Thin clients"
msgstr "シンクライアント"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"シンクライアントの設定で普通のPCを(X-)端末として機能させることもできます。つ"
"まり、マシンはローカルクライアントのハードドライブを利用せず、ディスケット、"
@@ -1683,9 +1691,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
"Debian Edu のインストールを行う際に、選択できることがいくつかあります。それほ"
"ど多くはありませんので安心してください。穿いてますよ。Debian インストールやそ"
@@ -1764,7 +1771,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1780,7 +1787,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1788,11 +1795,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1808,6 +1815,40 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Remote Desktop Service"
+msgid "Desktop choice"
+msgstr "リモートデスクトップサービス"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
msgid "Installation types and options"
msgstr "インストール方法と選択肢"
@@ -1996,10 +2037,18 @@ msgstr ""
"に利用します。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, "
+#| "replace kde with gnome in the <computeroutput>desktop=kde</"
+#| "computeroutput> parameter."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
"<emphasis role=\"strong\">GNOME</emphasis> デスクトップに代えて <emphasis "
"role=\"strong\">KDE Plasma</emphasis> デスクトップをインストールするにはカー"
@@ -2007,19 +2056,25 @@ msgstr ""
"を「gnome」に置き換えます。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
-"代わりに <emphasis role=\"strong\">LXDE</emphasis> デスクトップをインストール"
-"するには <computeroutput>desktop=lxde</computeroutput> を使いします (LTSP 用"
-"に推奨)。"
+"代わりに <emphasis role=\"strong\">Xfce</emphasis> デスクトップをインストール"
+"するには <computeroutput>desktop=xfce</computeroutput> を使います。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
"代わりに <emphasis role=\"strong\">Xfce</emphasis> デスクトップをインストール"
"するには <computeroutput>desktop=xfce</computeroutput> を使います。"
@@ -3811,6 +3866,12 @@ msgid "shutdown-at-night-hosts"
msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "shutdown-at-night-hosts"
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr "shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr "winstation-hosts"
@@ -4975,8 +5036,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -5041,7 +5102,9 @@ msgstr ""
"computeroutput> を見てください。"
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+#, fuzzy
+#| msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr "LTSP chroot の再生成"
#. type: Content of: <article><section><section><section><para>
@@ -5078,6 +5141,41 @@ msgstr ""
"<computeroutput>debian-edu-ltsp --arch amd64</computeroutput>) を実行し、"
"chroot を再生成します。"
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
#, fuzzy
#| msgid ""
@@ -7232,30 +7330,61 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
+"<computeroutput>ltsp-update-image</computeroutput> を実行して NBD イメージを"
+"再生成します。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
+#| "<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+#| "computeroutput>) can be used to change audio volume."
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
+"シンクライアントでは <computeroutput>pavucontrol</computeroutput> や "
+"<computeroutput>alsamixer</computeroutput> (<computeroutput>kmix</"
+"computeroutput> は使えません) を使って音量を変更できます。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"service isc-dhcp-server restart\"."
-msgstr ""
+#, fuzzy
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
+msgstr "<computeroutput>service ssh restart</computeroutput> を実行します。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
+"<computeroutput>ltsp-update-image</computeroutput> を実行して NBD イメージを"
+"再生成します。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
-msgstr ""
+#, fuzzy
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
+msgstr "<computeroutput>service ssh restart</computeroutput> を実行します。"
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
@@ -8929,6 +9058,15 @@ msgid ""
"Debian 10 Buster."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "ソフトウェアの更新"
@@ -9083,10 +9221,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Other changes compared to the previous release"
-msgid "FIXME: describe other changes compared to Stretch here."
-msgstr "前のリリースからの他の変更点"
+msgid "New GOsa²-Plugin Password Management."
+msgstr ""
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
@@ -10759,6 +10895,20 @@ msgstr ""
"skolelinux.no/info/cdbygging/news.html\"/> にあります。"
#~ msgid ""
+#~ "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#~ "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP "
+#~ "is intended to be used.)"
+#~ msgstr ""
+#~ "代わりに <emphasis role=\"strong\">LXDE</emphasis> デスクトップをインス"
+#~ "トールするには <computeroutput>desktop=lxde</computeroutput> を使いします "
+#~ "(LTSP 用に推奨)。"
+
+#, fuzzy
+#~| msgid "Other changes compared to the previous release"
+#~ msgid "FIXME: describe other changes compared to Stretch here."
+#~ msgstr "前のリリースからの他の変更点"
+
+#~ msgid ""
#~ "In order to simplify the standard setup of Skolelinux, the Internet "
#~ "connection runs over a separate router. It is possible to set up Debian "
#~ "with both a modem and an ISDN connection; however, no attempt is made to "
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po b/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
index 2a50a09..dec5cc9 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
@@ -21,7 +21,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2018-04-02 21:38+0000\n"
"Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -137,9 +137,10 @@ msgstr ""
#| "setup, which can be extended easily and almost endlessly via the Debian "
#| "universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"Flere pedagogiske programmer som celestia, drgeo, gcompris, kalzium, "
"kgeography, solfege og scratch er inkludert i standardoppsettet for "
@@ -834,11 +835,18 @@ msgid "Thin clients"
msgstr "Tynnklienter"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som "
"(X-)terminaler. Dette betyr at maskinen starter opp fra en diskett, eller "
@@ -1698,9 +1706,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
"Når du gjør en installasjon av en Debian Edu, har du noen få valg du må "
"gjøre, men vær ikke redd; det er ikke mange. Vi har gjort en god jobb med å "
@@ -1779,7 +1786,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1795,7 +1802,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1803,11 +1810,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1823,6 +1830,40 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Remote Desktop Service"
+msgid "Desktop choice"
+msgstr "Tjeneste for skrivebordsomgivelse via nett"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
msgid "Installation types and options"
msgstr "Installasjonstyper og valg"
@@ -2008,10 +2049,18 @@ msgstr ""
"mellomlageret i hovedtjeneren."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, "
+#| "replace kde with gnome in the <computeroutput>desktop=kde</"
+#| "computeroutput> parameter."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
"For å installere skrivebordsmiljøet <emphasis role=\"strong\">GNOME</"
"emphasis> i stedet for det forhåndsvalgte <emphasis role=\"strong\">KDE "
@@ -2019,19 +2068,25 @@ msgstr ""
"computeroutput> i kjernens oppstartsparametere."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
-"For å installere <emphasis role=\"strong\">LXDE</emphasis>-skrivebordsmiljø "
-"i stedet, bruk <computeroutput>desktop=lxde</computeroutput>. (Anbefalt hvis "
-"det er ønskelig å bruke LTSP.)"
+"For å installere <emphasis role=\"strong\">Xfce</emphasis>-skrivebordsmiljø "
+"i stedet, bruk <computeroutput>desktop=xfce</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
"For å installere <emphasis role=\"strong\">Xfce</emphasis>-skrivebordsmiljø "
"i stedet, bruk <computeroutput>desktop=xfce</computeroutput>."
@@ -3793,6 +3848,12 @@ msgid "shutdown-at-night-hosts"
msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "shutdown-at-night-hosts"
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr "shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr "winstation-hosts"
@@ -4957,8 +5018,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -5015,7 +5076,9 @@ msgstr ""
"computeroutput>."
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+#, fuzzy
+#| msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr "Gjenoppretter LTSP-chroot"
#. type: Content of: <article><section><section><section><para>
@@ -5052,6 +5115,43 @@ msgstr ""
"i386</computeroutput> (eller <computeroutput>debian-edu-ltsp --arch amd64</"
"computeroutput>) som rot."
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "sudo service kdm restart"
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr "sudo service kdm restart"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid ""
"Upgrades from older Debian Edu / Skolelinux installations (before Stretch)"
@@ -7235,32 +7335,61 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
+"Kjør <computeroutput>ltsp-update-image</computeroutput> for å regenerere NBD-"
+"bilde(ne)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
+#| "<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+#| "computeroutput>) can be used to change audio volume."
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
+"På tynne klienter, <computeroutput>pavucontrol</computeroutput> eller "
+"<computeroutput>alsamixer</computeroutput> (men ikke <computeroutput>kmix</"
+"computeroutput>) kan brukes til å endre volumet."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid "sudo service kdm restart"
-msgid "Run \"service isc-dhcp-server restart\"."
-msgstr "sudo service kdm restart"
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
+msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
+"Kjør <computeroutput>ltsp-update-image</computeroutput> for å regenerere NBD-"
+"bilde(ne)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
-msgstr ""
+#, fuzzy
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
+msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
@@ -9024,6 +9153,17 @@ msgstr ""
"Themes/softWaves#\">«soft Waves»-temaet</ulink>, den nye visuelle "
"standardprofilen for Debian 10 Buster."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "KDE desktop environment version 3.5.5"
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr "KDE skrivebordsmiljø versjon 3.5.5"
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Programvareoppdateringer"
@@ -9174,10 +9314,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Other changes compared to the previous release"
-msgid "FIXME: describe other changes compared to Stretch here."
-msgstr "Andre endringer sammenlignet med den forrige utgivelsen"
+msgid "New GOsa²-Plugin Password Management."
+msgstr ""
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
@@ -10968,6 +11106,20 @@ msgstr ""
"skolelinux.no/info/cdbygging/news.html</ulink>."
#~ msgid ""
+#~ "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#~ "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP "
+#~ "is intended to be used.)"
+#~ msgstr ""
+#~ "For å installere <emphasis role=\"strong\">LXDE</emphasis>-"
+#~ "skrivebordsmiljø i stedet, bruk <computeroutput>desktop=lxde</"
+#~ "computeroutput>. (Anbefalt hvis det er ønskelig å bruke LTSP.)"
+
+#, fuzzy
+#~| msgid "Other changes compared to the previous release"
+#~ msgid "FIXME: describe other changes compared to Stretch here."
+#~ msgstr "Andre endringer sammenlignet med den forrige utgivelsen"
+
+#~ msgid ""
#~ "In order to simplify the standard setup of Skolelinux, the Internet "
#~ "connection runs over a separate router. It is possible to set up Debian "
#~ "with both a modem and an ISDN connection; however, no attempt is made to "
@@ -13516,9 +13668,6 @@ msgstr ""
#~ msgid "X.org version 7.1."
#~ msgstr "X.org versjon 7.1."
-#~ msgid "KDE desktop environment version 3.5.5"
-#~ msgstr "KDE skrivebordsmiljø versjon 3.5.5"
-
#~ msgid "OpenOffice.org version 2.0."
#~ msgstr "OpenOffice.org versjon 2.0."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po b/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
index 9339032..5845ad7 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-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: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2018-03-08 21:04+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"
@@ -125,9 +125,10 @@ msgstr ""
#| "setup, which can be extended easily and almost endlessly via the Debian "
#| "universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"Diverse educatieve toepassingen, zoals celestia, drgeo, gcompris, kalzium, "
"kgeography, solfege en scratch, maken deel uit van een standaardinstallatie. "
@@ -852,11 +853,18 @@ msgid "Thin clients"
msgstr "Thin-clients"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"Een thin-clientopstelling laat toe om eenvoudige PC's te gebruiken als "
"(X-)terminals. Dit houdt in dat de machine wordt opgestart met een diskette "
@@ -1752,9 +1760,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
"Wanneer u een installatie van Debian Edu uitvoert, heeft u enkele "
"keuzemogelijkheden. Wees niet bevreesd. Het zijn er niet veel. We hebben "
@@ -1834,7 +1841,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1850,7 +1857,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1858,11 +1865,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1878,6 +1885,40 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Remote Desktop Service"
+msgid "Desktop choice"
+msgstr "De dienst extern bureaublad (Remote Desktop Service)"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
msgid "Installation types and options"
msgstr "Installatietypes en downloadopties"
@@ -2066,10 +2107,18 @@ msgstr ""
"de proxydienst van de hoofdserver gebruikt."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead "
+#| "of the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, "
+#| "replace kde with gnome in the <computeroutput>desktop=kde</"
+#| "computeroutput> parameter."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
"Om de bureaubladomgeving van <emphasis role=\"strong\">GNOME</emphasis> in "
"plaats van de standaard <emphasis role=\"strong\">KDE Plasma</emphasis> te "
@@ -2077,19 +2126,26 @@ msgstr ""
"computeroutput> kde veranderen in gnome."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
-"Om in plaats daarvan de bureaubladomgeving <emphasis role=\"strong\">LXDE</"
-"emphasis> te installeren, gebruikt u <computeroutput>desktop=lxde</"
-"computeroutput>. (Is aanbevolen als u van plan bent LTSP te gebruiken.)"
+"Om in plaats daarvan de bureaubladomgeving <emphasis role=\"strong\">Xfce</"
+"emphasis> te installeren, gebruikt u <computeroutput>desktop=xfce</"
+"computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
"Om in plaats daarvan de bureaubladomgeving <emphasis role=\"strong\">Xfce</"
"emphasis> te installeren, gebruikt u <computeroutput>desktop=xfce</"
@@ -3877,6 +3933,12 @@ msgid "shutdown-at-night-hosts"
msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "shutdown-at-night-hosts"
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr "shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr "winstation-hosts"
@@ -5088,8 +5150,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -5146,7 +5208,9 @@ msgstr ""
"update-image</computeroutput>."
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+#, fuzzy
+#| msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr "Een LTSP-chroot opnieuw aanmaken"
#. type: Content of: <article><section><section><section><para>
@@ -5185,6 +5249,43 @@ msgstr ""
"<computeroutput>debian-edu-ltsp --arch i386</computeroutput> (of "
"<computeroutput>debian-edu-ltsp --arch amd64</computeroutput>) uit te voeren."
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "sudo service kdm restart"
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr "sudo service kdm restart"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid ""
"Upgrades from older Debian Edu / Skolelinux installations (before Stretch)"
@@ -7475,32 +7576,61 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
+"Voer het commando <computeroutput>ltsp-update-image</computeroutput> uit om "
+"de NBD-image(s) opnieuw te genereren."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
+#| "<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+#| "computeroutput>) can be used to change audio volume."
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
+"Op thin clients kunt u <computeroutput>pavucontrol</computeroutput> of "
+"<computeroutput>alsamixer</computeroutput> (maar niet <computeroutput>kmix</"
+"computeroutput>) gebruiken om het geluidsvolume te regelen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
-#| msgid "sudo service kdm restart"
-msgid "Run \"service isc-dhcp-server restart\"."
-msgstr "sudo service kdm restart"
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
+msgstr "Geef de opdracht <computeroutput>service ssh restart</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
+"Voer het commando <computeroutput>ltsp-update-image</computeroutput> uit om "
+"de NBD-image(s) opnieuw te genereren."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
-msgstr ""
+#, fuzzy
+#| msgid "Execute <computeroutput>service ssh restart</computeroutput>."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
+msgstr "Geef de opdracht <computeroutput>service ssh restart</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
@@ -9347,6 +9477,17 @@ msgstr ""
"debian.org/DebianArt/Themes/softWaves#\">thema \"soft Waves\"</ulink>, de "
"standaardillustraties voor Debian 10 Buster."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "KDE desktop environment version 3.5.5"
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr "KDE bureaubladomgeving versie 3.5.5"
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr "Bijwerkingen van programmatuur"
@@ -9467,10 +9608,8 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "FIXME: describe other changes compasred to Stretch here."
-msgid "FIXME: describe other changes compared to Stretch here."
-msgstr "FIXME: describe other changes compasred to Stretch here."
+msgid "New GOsa²-Plugin Password Management."
+msgstr ""
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
@@ -11271,6 +11410,21 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#~ "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP "
+#~ "is intended to be used.)"
+#~ msgstr ""
+#~ "Om in plaats daarvan de bureaubladomgeving <emphasis role=\"strong"
+#~ "\">LXDE</emphasis> te installeren, gebruikt u "
+#~ "<computeroutput>desktop=lxde</computeroutput>. (Is aanbevolen als u van "
+#~ "plan bent LTSP te gebruiken.)"
+
+#, fuzzy
+#~| msgid "FIXME: describe other changes compasred to Stretch here."
+#~ msgid "FIXME: describe other changes compared to Stretch here."
+#~ msgstr "FIXME: describe other changes compasred to Stretch here."
+
+#~ msgid ""
#~ "In order to simplify the standard setup of Skolelinux, the Internet "
#~ "connection runs over a separate router. It is possible to set up Debian "
#~ "with both a modem and an ISDN connection; however, no attempt is made to "
@@ -13956,9 +14110,6 @@ msgstr ""
#~ msgid "X.org version 7.1."
#~ msgstr "X.org versie 7.1."
-#~ msgid "KDE desktop environment version 3.5.5"
-#~ msgstr "KDE bureaubladomgeving versie 3.5.5"
-
#~ msgid "OpenOffice.org version 2.0."
#~ msgstr "OpenOffice.org versie 2.0."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po b/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
index 99f948d..abbe710 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2017-06-05 08:57+0000\n"
"Last-Translator: Stanisław Krukowski <stdf021 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -139,9 +139,10 @@ msgstr ""
#| "setup, which can be extended easily and almost endlessly via the Debian "
#| "universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"W domyślnej konfiguracji \"biurkowej\" zawartych jest wiele programów "
"edukacyjnych, takich jak celestia, drgeo, gcompris, kalzium, kgeography, "
@@ -955,11 +956,18 @@ msgstr "Cienkie klienty"
# type: Content of: <article><section><section><section><para>
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"Zainstalowanie cienkiego klienta sprawia, że zwykły komputer klasy PC może "
"funkcjonować jako (X-)terminal. Oznacza to, że maszyna startuje z dyskietki "
@@ -1813,9 +1821,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1886,7 +1893,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1902,7 +1909,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1910,11 +1917,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1930,6 +1937,38 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
+msgid "Desktop choice"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
msgid "Installation types and options"
msgstr ""
@@ -2088,21 +2127,22 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3441,6 +3481,10 @@ msgid "shutdown-at-night-hosts"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr ""
@@ -4263,8 +4307,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -4308,7 +4352,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -4333,6 +4377,41 @@ msgid ""
"computeroutput>) as root."
msgstr ""
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid ""
"Upgrades from older Debian Edu / Skolelinux installations (before Stretch)"
@@ -5913,29 +5992,36 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"service isc-dhcp-server restart\"."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -7149,6 +7235,15 @@ msgid ""
"Debian 10 Buster."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr ""
@@ -7263,7 +7358,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: describe other changes compared to Stretch here."
+msgid "New GOsa²-Plugin Password Management."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.pot b/documentation/debian-edu-buster/debian-edu-buster-manual.pot
index e3b3375..d9dda0d 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.pot
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,9 +82,10 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -630,9 +631,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -1220,9 +1221,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1287,7 +1287,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1303,7 +1303,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1311,11 +1311,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1331,6 +1331,38 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
+msgid "Desktop choice"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
msgid "Installation types and options"
msgstr ""
@@ -1474,21 +1506,22 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2744,6 +2777,10 @@ msgid "shutdown-at-night-hosts"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "winstation-hosts"
msgstr ""
@@ -3553,8 +3590,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -3598,7 +3635,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -3623,6 +3660,41 @@ msgid ""
"computeroutput>) as root."
msgstr ""
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid ""
"Upgrades from older Debian Edu / Skolelinux installations (before Stretch)"
@@ -5196,29 +5268,36 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"service isc-dhcp-server restart\"."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -6414,6 +6493,15 @@ msgid ""
"Debian 10 Buster."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr ""
@@ -6517,7 +6605,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: describe other changes compared to Stretch here."
+msgid "New GOsa²-Plugin Password Management."
msgstr ""
#. type: Content of: <article><section><title>
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.xml b/documentation/debian-edu-buster/debian-edu-buster-manual.xml
index 189380e..c971952 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.xml
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.xml
@@ -23,7 +23,7 @@
</para>
<para>After installation of a main server all services needed for a school network are set up and the system is ready to be used. Only users and machines need to be added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment using PXE has also been prepared, so after initial installation of the main server from CD, Blu-ray disc or USB flash drive all other machines can be installed via the network, this includes "roaming workstations" (ones that can be taken [...]
</para>
-<para>Several educational applications like gcompris, kalzium, kgeography, solfege and scratch are included in the default desktop setup, which can be extended easily and almost endlessly via the Debian universe.
+<para>Several educational applications like GeoGebra, GCompris, Kalzium, KGeography, GNU Solfege and Scratch are included in the default desktop setup, which can be extended easily and almost endlessly via the Debian universe.
</para>
<section id="AboutDebianEdu--Some_history_and_why_two_names">
@@ -252,7 +252,7 @@ FIXME: explain how here or add link to somewhere else.
<section id="Architecture--Thin_clients">
<title>Thin clients
</title>
-<para>A thin client setup enables ordinary PCs to function as (X-)terminals. This means that the machine boots from a diskette or directly from the server using network-PROM (or PXE) without using the local client hard drive. The thin client setup used is that of the Linux Terminal Server Project (LTSP).
+<para>A thin client setup enables ordinary PCs to function as (X-)terminals. This means that the machine boots directly from the server using PXE without using the local client hard drive. The thin client setup used is that of the Linux Terminal Server Project (LTSP).
</para>
<para>Thin clients are a good way to make use of older, weaker machines as they effectively run all programs on the LTSP server. This works as follows: the service uses DHCP and TFTP to connect to the network and boot from the network. Next, the file system is mounted from the LTSP server using NBD, and finally the X Window System is started. The display manager (LDM) connects to the LTSP server via SSH with X-forwarding. This way all data is encrypted on the network.
</para>
@@ -536,12 +536,12 @@ FIXME: explain how here or add link to somewhere else.
<section id="Installation--Installing_Debian_Edu">
<title>Installing Debian Edu
</title>
-<para>When you do a Debian Edu installation, you have a few options to choose from. Don't be afraid; there aren't many. We have done a good job of hiding the complexity of Debian during the installation and beyond. However, Debian Edu is Debian, and if you want there are more than 52,000 packages to choose from and a billion configuration options. For the majority of our users, our defaults should be fine. One exception: if LTSP is intended to be used, choose a lightweight desktop enviro [...]
+<para>When you do a Debian Edu installation, you have a few options to choose from. Don't be afraid; there aren't many. We have done a good job of hiding the complexity of Debian during the installation and beyond. However, Debian Edu is Debian, and if you want there are more than 52,000 packages to choose from and a billion configuration options. For the majority of our users, our defaults should be fine. Please note: if LTSP is intended to be used, choose a lightweight desktop environment.
</para>
<section id="Installation--Main_server_installation_scenarios">
<title>Main server installation scenarios
-</title><orderedlist numeration="loweralpha">
+</title><orderedlist numeration="upperalpha">
<listitem>
<para>Typical school or home network with Internet access through a router providing DHCP:
</para>
@@ -573,7 +573,7 @@ FIXME: explain how here or add link to somewhere else.
</para>
<itemizedlist>
<listitem>
-<para>As soon as the automatic network configuration fails (due to missing DHCP), choose manual network configuration
+<para>As soon as the automatic network configuration fails (due to missing DHCP), choose manual network configuration.
</para>
<itemizedlist>
<listitem>
@@ -586,17 +586,17 @@ FIXME: explain how here or add link to somewhere else.
<para>Enter 8.8.8.8 as nameserver IP unless you know better
</para></listitem></itemizedlist></listitem>
<listitem>
-<para>The main server should just work after the first boot
+<para>The main server should just work after the first boot.
</para></listitem></itemizedlist></listitem>
<listitem>
<para>Offline (no Internet connection):
</para>
<itemizedlist>
<listitem>
-<para>Use the USB ISO image
+<para>Use the USB ISO image.
</para></listitem>
<listitem>
-<para>Make sure all (real/virtual) network cables are unplugged
+<para>Make sure all (real/virtual) network cables are unplugged.
</para></listitem>
<listitem>
<para>Choose 'Do not configure the network at this time' (after DHCP failed to configure the network and you pressed 'Continue').
@@ -606,6 +606,26 @@ FIXME: explain how here or add link to somewhere else.
</para></listitem></itemizedlist></listitem></orderedlist>
</section>
+<section id="Installation--Desktop_choice">
+<title>Desktop choice
+</title>
+<itemizedlist>
+<listitem>
+<para>KDE and GNOME both have good language support, but too big a footprint for both older computers and for LTSP clients.
+</para></listitem>
+<listitem>
+<para>MATE is lighter than the two above, but is missing good language support for several countries.
+</para></listitem>
+<listitem>
+<para>LXDE has the smallest footprint and supports 35 languages.
+</para></listitem>
+<listitem>
+<para>Xfce has a slightly bigger footprint than LXDE but a very good language support (106 languages).
+</para></listitem></itemizedlist>
+<para>Debian Edu as an international project has chosen to use Xfce as the default desktop; see below how to set a different one.
+</para>
+</section>
+
<section id="Installation--Installation_types_and_options">
<title>Installation types and options
</title>
@@ -665,13 +685,13 @@ FIXME: explain how here or add link to somewhere else.
<para>If you have already installed the main server profile on a machine, further installations should be done via PXE, as this will automatically use the proxy of the main server.
</para></listitem>
<listitem>
-<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the default <emphasis role="strong">KDE Plasma</emphasis> desktop, replace kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter.
+<para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the default <emphasis role="strong">Xfce</emphasis> desktop, replace <computeroutput>xfce</computeroutput> with <computeroutput>gnome</computeroutput> in the <computeroutput>desktop=xfce</computeroutput> parameter.
</para></listitem>
<listitem>
-<para>To install the <emphasis role="strong">LXDE</emphasis> desktop instead, use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is intended to be used.)
+<para>To install the <emphasis role="strong">LXDE</emphasis> desktop instead, use <computeroutput>desktop=lxde</computeroutput>.
</para></listitem>
<listitem>
-<para>To install the <emphasis role="strong">Xfce</emphasis> desktop instead, use <computeroutput>desktop=xfce</computeroutput>.
+<para>To install the <emphasis role="strong">KDE Plasma</emphasis> desktop instead, use <computeroutput>desktop=kde</computeroutput>.
</para></listitem>
<listitem>
<para>And to install the <emphasis role="strong">MATE</emphasis> desktop instead, use <computeroutput>desktop=mate</computeroutput>.
@@ -1237,6 +1257,9 @@ enter password: ]]></screen>
<para>shutdown-at-night-hosts
</para></listitem>
<listitem>
+<para>shutdown-at-night-wakeup-hosts-blacklist
+</para></listitem>
+<listitem>
<para>winstation-hosts
</para></listitem>
<listitem>
@@ -1594,8 +1617,7 @@ service nslcd start]]></screen>
</title>
<para>Make sure you have enough disk space. LTSP uses Network Block Device (NBD). The NBD image file size is about 4 GiB (default installation). If the image is updated, another 4 GiB for a temporary file are needed.
</para>
-<para>Also please note that the default LTSP architecture was i386 for Stretch.
-FIXME: add pointer how to create amd64 chroots?
+<para>Also please note that the default LTSP architecture was i386 for Stretch. See below how to create a chroot for 64-bit-PCs (amd64).
</para><screen><![CDATA[ltsp-chroot -m -a i386 apt update
ltsp-chroot -m -a i386 apt -y full-upgrade
sed -i 's/stretch/buster/g' /opt/ltsp/i386/etc/apt/sources.list
@@ -1617,16 +1639,42 @@ ltsp-update-image]]></screen>
</para>
</section>
-<section id="Upgrades--Recreating_an_LTSP_chroot">
-<title>Recreating an LTSP chroot
+<section id="Upgrades--Creating_an_LTSP_chroot">
+<title>Creating an LTSP chroot
</title>
<para>On the LTSP server(s) the LTSP chroot could also be recreated. The new chroot will still support both thin-clients and diskless workstations. Please note: As of Buster, the LTSP chroot arch defaults to the one used for the server side.
</para>
<para>Remove <computeroutput>/opt/ltsp/i386</computeroutput> (or <computeroutput>/opt/ltsp/amd64</computeroutput>, depending on your setup). If you have enough diskspace, consider backing it up.
</para>
-<para>Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</computeroutput>) as root.
+<para>Recreate the chroot by running <computeroutput>debian-edu-ltsp --arch i386</computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</computeroutput>) as root.
</para>
</section>
+
+<section id="Upgrades--Add_support_for_64-bit-PC_clients_to_the_LTSP_chroot">
+<title>Add support for 64-bit-PC clients to the LTSP chroot
+</title>
+<para>At least 20 GiB additional disk space on /opt is required.
+</para>
+<itemizedlist>
+<listitem>
+<para>Run "ltsp-build-client --arch amd64" to create chroot and NBD image.
+</para></listitem>
+<listitem>
+<para>Use "ldapvi -ZD '(cn=admin)'" to replace <computeroutput>i386</computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements in LDAP for one dedicated network).
+</para></listitem>
+<listitem>
+<para>Run "service isc-dhcp-server restart".
+</para></listitem>
+<listitem>
+<para>Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64).
+</para></listitem>
+<listitem>
+<para>Run 'debian-edu-pxeinstall' to regenerate the PXE menu.
+</para></listitem>
+<listitem>
+<para>Run 'service nbd-service restart' to serve the new NBD file.
+</para></listitem></itemizedlist>
+</section>
</section>
<section id="Upgrades--Upgrades_from_older_Debian_Edu_.2BAC8_Skolelinux_installations_.28before_Stretch.29">
@@ -2356,22 +2404,22 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s
</para>
<itemizedlist>
<listitem>
-<para>Run "ltsp-build-client --arch amd64" to create chroot and NBD image.
+<para>Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to create chroot and NBD image.
</para></listitem>
<listitem>
-<para>Use "ldapvi -ZD '(cn=admin)'" to replace amd64 with i386 (dhcp statements in LDAP for one dedicated network).
+<para>Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace <computeroutput>amd64</computeroutput> with <computeroutput>i386</computeroutput> (dhcp statements in LDAP for one dedicated network).
</para></listitem>
<listitem>
-<para>Run "service isc-dhcp-server restart".
+<para>Run <computeroutput>service isc-dhcp-server restart</computeroutput>.
</para></listitem>
<listitem>
-<para>Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64).
+<para>Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386).
</para></listitem>
<listitem>
-<para>Run 'debian-edu-pxeinstall' to regenerate the PXE menu.
+<para>Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the PXE menu.
</para></listitem>
<listitem>
-<para>Run 'service nbd-service restart' to serve the new NBD file.
+<para>Run <computeroutput>service nbd-service restart</computeroutput> to serve the new NBD file.
</para></listitem></itemizedlist>
</section>
</section>
@@ -3013,6 +3061,12 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
</para></listitem>
<listitem>
<para>New artwork based on the <ulink url="https://wiki.debian.org/DebianArt/Themes/softWaves#">"soft Waves" theme</ulink>, the default artwork for Debian 10 Buster.
+</para></listitem>
+<listitem>
+<para>New configuration management Cfengine3 (replacing unmaintained Cfengine2).
+</para></listitem>
+<listitem>
+<para>New default desktop environment Xfce (replacing KDE).
</para></listitem></itemizedlist>
</section>
@@ -3091,8 +3145,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
<para>Support for nonfree flash has been dropped from the Firefox ESR browser. We have also decided to drop the free but unmaintained gnash implementation.
</para></listitem>
<listitem>
-<para>
-FIXME: describe other changes compared to Stretch here.
+<para>New GOsa²-Plugin Password Management.
</para></listitem></itemizedlist>
</section>
</section>
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po b/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
index 7e6453a..8a52924 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-04-08 10:35+0000\n"
+"POT-Creation-Date: 2018-04-11 21:57+0000\n"
"PO-Revision-Date: 2018-04-08 00:35+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -129,9 +129,10 @@ msgstr ""
#| "setup, which can be extended easily and almost endlessly via the Debian "
#| "universe."
msgid ""
-"Several educational applications like gcompris, kalzium, kgeography, solfege "
-"and scratch are included in the default desktop setup, which can be extended "
-"easily and almost endlessly via the Debian universe."
+"Several educational applications like GeoGebra, GCompris, Kalzium, "
+"KGeography, GNU Solfege and Scratch are included in the default desktop "
+"setup, which can be extended easily and almost endlessly via the Debian "
+"universe."
msgstr ""
"一些教学应用如 celestia, dirgeo, gcompris, kalzium, kgeography, solfege 和 "
"scratch 包含在缺省桌面设置中，通过 Debian 世界可以容易地几乎无尽扩展。"
@@ -814,11 +815,18 @@ msgid "Thin clients"
msgstr "瘦客户端"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A thin client setup enables ordinary PCs to function as (X-)terminals. "
+#| "This means that the machine boots from a diskette or directly from the "
+#| "server using network-PROM (or PXE) without using the local client hard "
+#| "drive. The thin client setup used is that of the Linux Terminal Server "
+#| "Project (LTSP)."
msgid ""
"A thin client setup enables ordinary PCs to function as (X-)terminals. This "
-"means that the machine boots from a diskette or directly from the server "
-"using network-PROM (or PXE) without using the local client hard drive. The "
-"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
+"means that the machine boots directly from the server using PXE without "
+"using the local client hard drive. The thin client setup used is that of the "
+"Linux Terminal Server Project (LTSP)."
msgstr ""
"瘦客户端设置普通个人计算机能具有 (X) 终端的功能。这意味着该机器从软盘或者直接"
"从服务器使用网络 PROM （即 PXE）引导而不使用本地客户端的硬盘驱动器。瘦客户端"
@@ -1644,9 +1652,8 @@ msgid ""
"the complexity of Debian during the installation and beyond. However, Debian "
"Edu is Debian, and if you want there are more than 52,000 packages to choose "
"from and a billion configuration options. For the majority of our users, our "
-"defaults should be fine. One exception: if LTSP is intended to be used, "
-"choose a lightweight desktop environment. (LXDE comes with the smallest "
-"footprint; see details below how to set it)."
+"defaults should be fine. Please note: if LTSP is intended to be used, choose "
+"a lightweight desktop environment."
msgstr ""
"在你安装 Debian Edu 时，你有一些要选择的选项。不要畏惧；那不多。我们很好地做"
"到隐藏安装期间及以外 Debian 的复杂性。无论如何，Debian Edu 就是 Debian，而你"
@@ -1723,7 +1730,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
-"choose manual network configuration"
+"choose manual network configuration."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1739,7 +1746,7 @@ msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "The main server should just work after the first boot"
+msgid "The main server should just work after the first boot."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
@@ -1747,11 +1754,11 @@ msgid "Offline (no Internet connection):"
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Use the USB ISO image"
+msgid "Use the USB ISO image."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
-msgid "Make sure all (real/virtual) network cables are unplugged"
+msgid "Make sure all (real/virtual) network cables are unplugged."
msgstr ""
#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1767,6 +1774,38 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
+msgid "Desktop choice"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"KDE and GNOME both have good language support, but too big a footprint for "
+"both older computers and for LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"MATE is lighter than the two above, but is missing good language support for "
+"several countries."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "LXDE has the smallest footprint and supports 35 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Xfce has a slightly bigger footprint than LXDE but a very good language "
+"support (106 languages)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Debian Edu as an international project has chosen to use Xfce as the default "
+"desktop; see below how to set a different one."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
msgid "Installation types and options"
msgstr "安装类型和选项"
@@ -1956,8 +1995,10 @@ msgstr ""
#| "parameters."
msgid ""
"To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
-"the default <emphasis role=\"strong\">KDE Plasma</emphasis> desktop, replace "
-"kde with gnome in the <computeroutput>desktop=kde</computeroutput> parameter."
+"the default <emphasis role=\"strong\">Xfce</emphasis> desktop, replace "
+"<computeroutput>xfce</computeroutput> with <computeroutput>gnome</"
+"computeroutput> in the <computeroutput>desktop=xfce</computeroutput> "
+"parameter."
msgstr ""
"安装 <emphasis role=\"strong\">GNOME</emphasis> 桌面代替 <emphasis role="
"\"strong\">KDE \"Plasma\"</emphasis> 桌面，加入 "
@@ -1966,21 +2007,23 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters."
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
"To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-"use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP is "
-"intended to be used.)"
+"use <computeroutput>desktop=lxde</computeroutput>."
msgstr ""
-"替代安装 <emphasis role=\"strong\">LXDE</emphasis> 桌面，加入 "
-"<computeroutput>desktop=lxde</computeroutput> 到内核引导参数。"
+"替代安装 <emphasis role=\"strong\">Xfce</emphasis> 桌面，使用 "
+"<computeroutput>desktop=xfce</computeroutput>。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
+#| "use <computeroutput>desktop=xfce</computeroutput>."
msgid ""
-"To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-"use <computeroutput>desktop=xfce</computeroutput>."
+"To install the <emphasis role=\"strong\">KDE Plasma</emphasis> desktop "
+"instead, use <computeroutput>desktop=kde</computeroutput>."
msgstr ""
"替代安装 <emphasis role=\"strong\">Xfce</emphasis> 桌面，使用 "
"<computeroutput>desktop=xfce</computeroutput>。"
@@ -3689,6 +3732,12 @@ msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
+#| msgid "shutdown-at-night-hosts"
+msgid "shutdown-at-night-wakeup-hosts-blacklist"
+msgstr "shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
msgid "winstation-hosts"
msgstr "winstation-hosts"
@@ -4736,8 +4785,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Also please note that the default LTSP architecture was i386 for Stretch. "
-"FIXME: add pointer how to create amd64 chroots?"
+"Also please note that the default LTSP architecture was i386 for Stretch. "
+"See below how to create a chroot for 64-bit-PCs (amd64)."
msgstr ""
#. type: CDATA
@@ -4802,7 +4851,9 @@ msgstr ""
"computeroutput>。"
#. type: Content of: <article><section><section><section><title>
-msgid "Recreating an LTSP chroot"
+#, fuzzy
+#| msgid "Recreating an LTSP chroot"
+msgid "Creating an LTSP chroot"
msgstr "重建 LTSP chroot"
#. type: Content of: <article><section><section><section><para>
@@ -4839,6 +4890,41 @@ msgstr ""
"computeroutput>（或 <computeroutput>debian-edu-ltsp --arch amd64</"
"computeroutput>）重新创建 chroot。"
+#. type: Content of: <article><section><section><section><title>
+msgid "Add support for 64-bit-PC clients to the LTSP chroot"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "At least 20 GiB additional disk space on /opt is required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Use \"ldapvi -ZD '(cn=admin)'\" to replace <computeroutput>i386</"
+"computeroutput> with <computeroutput>amd64</computeroutput> (dhcp statements "
+"in LDAP for one dedicated network)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run \"service isc-dhcp-server restart\"."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Run 'service nbd-service restart' to serve the new NBD file."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
#, fuzzy
#| msgid ""
@@ -6578,30 +6664,52 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"ltsp-build-client --arch amd64\" to create chroot and NBD image."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>ltsp-build-client --arch amd64</computeroutput> to "
+"create chroot and NBD image."
msgstr ""
+"运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映像。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Use \"ldapvi -ZD '(cn=admin)'\" to replace amd64 with i386 (dhcp statements "
-"in LDAP for one dedicated network)."
+"Use <computeroutput>ldapvi -ZD '(cn=admin)'</computeroutput> to replace "
+"<computeroutput>amd64</computeroutput> with <computeroutput>i386</"
+"computeroutput> (dhcp statements in LDAP for one dedicated network)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run \"service isc-dhcp-server restart\"."
+msgid "Run <computeroutput>service isc-dhcp-server restart</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=amd64)."
+msgid "Edit /etc/debian-edu/pxeinstall.conf (set ltsparch=i386)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'debian-edu-pxeinstall' to regenerate the PXE menu."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>debian-edu-pxeinstall</computeroutput> to regenerate the "
+"PXE menu."
msgstr ""
+"运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映像。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Run 'service nbd-service restart' to serve the new NBD file."
+#, fuzzy
+#| msgid ""
+#| "Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
+#| "NBD image(s)."
+msgid ""
+"Run <computeroutput>service nbd-service restart</computeroutput> to serve "
+"the new NBD file."
msgstr ""
+"运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映像。"
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
@@ -7811,6 +7919,15 @@ msgid ""
"Debian 10 Buster."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"New configuration management Cfengine3 (replacing unmaintained Cfengine2)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New default desktop environment Xfce (replacing KDE)."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Software updates"
msgstr ""
@@ -7923,7 +8040,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: describe other changes compared to Stretch here."
+msgid "New GOsa²-Plugin Password Management."
msgstr ""
#. type: Content of: <article><section><title>
@@ -9245,6 +9362,19 @@ msgstr ""
"更旧发行版本相关的更多信息可以在 <ulink url=\"http://developer.skolelinux.no/"
"info/cdbygging/news.html\"/> 找到。"
+#, fuzzy
+#~| msgid ""
+#~| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop "
+#~| "instead, add <computeroutput>desktop=lxde</computeroutput> to the kernel "
+#~| "boot parameters."
+#~ msgid ""
+#~ "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
+#~ "use <computeroutput>desktop=lxde</computeroutput>. (Recommended if LTSP "
+#~ "is intended to be used.)"
+#~ msgstr ""
+#~ "替代安装 <emphasis role=\"strong\">LXDE</emphasis> 桌面，加入 "
+#~ "<computeroutput>desktop=lxde</computeroutput> 到内核引导参数。"
+
#~ msgid ""
#~ "In order to simplify the standard setup of Skolelinux, the Internet "
#~ "connection runs over a separate router. It is possible to set up Debian "
diff --git a/documentation/debian-edu-buster/fixme-status.txt b/documentation/debian-edu-buster/fixme-status.txt
index b2d4926..3f9bbfc 100644
--- a/documentation/debian-edu-buster/fixme-status.txt
+++ b/documentation/debian-edu-buster/fixme-status.txt
@@ -7,13 +7,9 @@ FIXME: list promps about package configuration here.
FIXME: adjust theme]]></screen>
FIXME: adjust kernel version]]></screen>
FIXME: check if needed
-FIXME: add pointer how to create amd64 chroots?
----------------------------------
https://wiki.debian.org/DebianEdu/Documentation/Buster//HowTo/Administration
FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> are either user- or developer-specific. Let's move the user-specific HowTos over here (and delete them over there)! (But first ask the authors (see the history of those pages to find them) if they are fine with moving the howto and putting it under the GPL.)
-----------------------------------
-https://wiki.debian.org/DebianEdu/Documentation/Buster//Features
-FIXME: describe other changes compared to Stretch here.
====================
-8 FIXMEs left to fix
+6 FIXMEs left to fix
====================
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list