[debian-edu-commits] debian-edu/ 01/02: Merge stretch related documentation and translation updates from the debian-edu-doc package in sid:
Holger Levsen
holger at layer-acht.org
Sun Oct 1 14:32:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch stretch
in repository debian-edu-doc.
commit 0d09252159abe2fd7403c5ae4f23486c0fbd878e
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Oct 1 15:17:43 2017 +0200
Merge stretch related documentation and translation updates from the debian-edu-doc package in sid:
* Update Debian Edu Stretch manual from the wiki.
[ Wolfgang Schweer ]
* Replace existing boot menu screenshots with recent ones from the wiki.
* documentation/debian-edu-stretch: Add Debian_Edu_Network_Stretch.odg
as source for the related (en|fr|de) PNG files.
[ Stretch Manual translation updates ]
* Simplified Chinese: Ma Yong.
* Italian: Claudio Carboncini.
* German: Wolfgang Schweer.
* Japanese: Victory, also provided screenshots in Japanese.
* Norwegian Bokmål: Petter Reinholdtsen.
* Dutch: Frans Spiesschaert.
---
debian/changelog | 21 ++
.../debian-edu-stretch-manual.da.po | 64 +++-
.../debian-edu-stretch-manual.de.po | 74 ++--
.../debian-edu-stretch-manual.es.po | 57 ++-
.../debian-edu-stretch-manual.fr.po | 64 +++-
.../debian-edu-stretch-manual.it.po | 127 ++++---
.../debian-edu-stretch-manual.ja.po | 264 ++++++--------
.../debian-edu-stretch-manual.nb.po | 68 ++--
.../debian-edu-stretch-manual.nl.po | 73 ++--
.../debian-edu-stretch-manual.pl.po | 49 ++-
.../debian-edu-stretch-manual.pot | 35 +-
.../debian-edu-stretch-manual.xml | 17 +-
.../debian-edu-stretch-manual.zh.po | 402 ++++++++++++++++-----
.../images/01-Installer_64bit_boot_menu.png | Bin 13376 -> 11765 bytes
.../01a-Installer_64bit_advanced_options.png | Bin 13088 -> 12245 bytes
.../images/01b-Installer_32bit_boot_menu.png | Bin 13137 -> 11860 bytes
.../images/ja/02-select_a_language.png | Bin 0 -> 40440 bytes
.../images/ja/03-select_your_location.png | Bin 0 -> 54019 bytes
.../images/ja/04-Configure_the_keyboard.png | Bin 0 -> 43726 bytes
.../images/ja/05-Detect_and_mount_CD-ROM.png | Bin 0 -> 31223 bytes
.../ja/06-Load_installer_components_from_CD.png | Bin 0 -> 28586 bytes
.../images/ja/07-Detect_network_hardware.png | Bin 0 -> 29610 bytes
.../images/ja/08-Choose_Debian_Edu_profile.png | Bin 0 -> 75947 bytes
...-Really_use_the_automatic_partitioning_tool.png | Bin 0 -> 48824 bytes
...lly_use_the_automatic_partitioning_tool-Yes.png | Bin 0 -> 48804 bytes
.../11-Participate_in_the_package_usage_survey.png | Bin 0 -> 63067 bytes
.../images/ja/12-Set_up_users_and_passwords.png | Bin 0 -> 78763 bytes
.../images/ja/12a-Set_up_users_and_passwords.png | Bin 0 -> 48546 bytes
.../images/ja/12b-Set_up_users_and_passwords.png | Bin 0 -> 41183 bytes
.../images/ja/12c-Set_up_users_and_passwords.png | Bin 0 -> 47889 bytes
.../images/ja/12d-Setting-up-the-partitioner.png | Bin 0 -> 27804 bytes
.../images/ja/13-Install+the+base+system.png | Bin 0 -> 27982 bytes
.../images/ja/14-Select_and_install_software.png | Bin 0 -> 29549 bytes
.../images/ja/Debian_Edu_Network_Stretch.png | Bin 0 -> 201347 bytes
.../images/source/Debian_Edu_Network_Stretch.odg | Bin 0 -> 329057 bytes
35 files changed, 843 insertions(+), 472 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8db17af..20b28eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+debian-edu-doc (1.921~20170603+deb9u2) UNRELEASED; urgency=medium
+
+ * Merge stretch related documentation and translation updates from the
+ debian-edu-doc package in sid:
+ * Update Debian Edu Stretch manual from the wiki.
+
+ [ Wolfgang Schweer ]
+ * Replace existing boot menu screenshots with recent ones from the wiki.
+ * documentation/debian-edu-stretch: Add Debian_Edu_Network_Stretch.odg
+ as source for the related (en|fr|de) PNG files.
+
+ [ Stretch Manual translation updates ]
+ * Simplified Chinese: Ma Yong.
+ * Italian: Claudio Carboncini.
+ * German: Wolfgang Schweer.
+ * Japanese: Victory, also provided screenshots in Japanese.
+ * Norwegian Bokmål: Petter Reinholdtsen.
+ * Dutch: Frans Spiesschaert.
+
+ -- Holger Levsen <holger at debian.org> Sun, 01 Oct 2017 15:16:22 +0200
+
debian-edu-doc (1.921~20170603+deb9u1) stretch; urgency=medium
[ Holger Levsen ]
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index a3a94c2..8cf96a8 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"POT-Creation-Date: 2017-09-29 11:41+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"
@@ -1191,6 +1191,13 @@ msgstr ""
"Formålet med forskellige profiler er forklaret i kapitlet <link linkend="
"\"Architecture\">netværksarkitektur</link>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
@@ -1213,16 +1220,21 @@ msgstr ""
#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
#| "recommended for the main and thin client server profiles."
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
"Mindst 2 GiB RAM for 30 klienter og 4 GiB RAM for 50-60 klienter anbefales "
"til profilerne for hovedserveren og serveren for tynde klienter."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+#| "possible, though 256 MiB RAM or more and faster processors are "
+#| "recommended."
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
"Tynde klienter kan køre på så lidt som 64 MiB RAM og 133 MHz på 32-bit "
"processorer, dog anbefales 256 MiB RAM eller mere og hurtigere processorer."
@@ -1248,10 +1260,15 @@ msgstr ""
"dem for swap, da det er langt hurtigere end netværksswapping."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For workstations, diskless workstations and standalone systems, 800 MHz "
+#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
+#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
"For arbejdsstationer, diskløse arbejdsstationer og uafhængige systemer, er "
"800 MHz, 512 MiB RAM minimumskrav. For afvikling af moderne internetbrowsere "
@@ -5327,10 +5344,11 @@ msgstr "klik avanceret konfiguration"
#. type: CDATA
#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
@@ -7200,12 +7218,19 @@ msgid "A note for more complex setups"
msgstr "En bemærkning vedrørende mere komplekse opsætninger"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
+#| "server or LTSP cluster setup) things would be even more complicated and "
+#| "maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
+#| "identifier together with apropriate PAM configuration would allow to "
+#| "disable internal ssh login."
msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
"Hvis LTSP-klienter blev tilføjet til backbone-netværket 10.0.0.0/8 "
"(kombiserver eller LTSP-klyngeopsætning) er tingene endnu mere kompliceret "
@@ -9780,16 +9805,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "på siden for Systemegenskaber, klik på »Ændr ...«"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Efter genstarten, når du logger ind første gang, så klik på knappen for "
-"»Indstillinger >>« og vælg domænet SKOLELINUX i stedet for det lokale "
-"domæne (»denne computer«)"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Første domænelogind"
@@ -12562,6 +12577,15 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Efter genstarten, når du logger ind første gang, så klik på knappen for "
+#~ "»Indstillinger >>« og vælg domænet SKOLELINUX i stedet for det "
+#~ "lokale domæne (»denne computer«)"
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "For at installere disse pakker så kør den følgende kommando som "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index 912b410..77820b3 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
-"PO-Revision-Date: 2017-06-28 18:44+0200\n"
+"POT-Creation-Date: 2017-09-29 11:41+0000\n"
+"PO-Revision-Date: 2017-09-29 17:27+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
"Language: de\n"
@@ -26,7 +26,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.0.2\n"
+"X-Generator: Poedit 2.0.4\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -1100,6 +1100,16 @@ msgstr ""
"Die Bedeutung der verschiedenen Profile wird im Kapitel <link linkend="
"\"Architecture\">Netzwerk-Architektur</link> erläutert."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+"Falls LTSP zum Einsatz kommen soll, finden Sie auf der (englischsprachigen) "
+"<ulink url=\"https://wiki.debian.org/LTSP/Ltsp%20Hardware%20Requirements"
+"\">LTSP Hardware Requirements wiki page</ulink> weitere Informationen."
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
@@ -1112,20 +1122,19 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
-"Mindestens 2 GiB RAM für 30 Clients und 4 GiB RAM für 50-60 Clients werden "
-"für die Profile »Hauptserver« und »LTSP-Server« empfohlen."
+"Mindestens 12 GiB RAM für 30 Thin Clients und 20 GiB RAM für 50-60 Thin "
+"Clients werden für die Profile »Hauptserver« und »LTSP-Server« empfohlen."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
-"Thin Clients mit nur 64 MiB RAM und einem 133 MHz 32-Bit-Prozessor sind "
-"möglich, es werden aber 256 MiB RAM oder mehr und schnellere Prozessoren "
-"empfohlen."
+"Thin Clients mit nur 256 MiB RAM und 400 MHz sind möglich, es werden aber "
+"mehr RAM und schnellere Prozessoren empfohlen."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -1151,13 +1160,13 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
"Für Arbeitsplatzrechner, Diskless Workstations und Einzelplatzrechner sind "
-"mindestens 512 MiB RAM und 800 MHz Taktfrequenz das absolute Minimum. Um "
-"moderne Webbrowser und LibreOffice nutzen zu können, werden 1024 MiB RAM "
+"mindestens 1000 Mhz und 512 MiB RAM das absolute Minimum. Um moderne "
+"Webbrowser und LibreOffice nutzen zu können, werden mindestens 1024 MiB RAM "
"empfohlen."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -4869,19 +4878,21 @@ msgstr "Die Konfiguration anwenden und anpassen:"
#. type: CDATA
#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
msgstr ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
@@ -6687,8 +6698,8 @@ msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
"Noch komplizierter wird es, falls LTSP-Clients an das Hauptnetzwerk "
"10.0.0.0/8 angeschlossen werden (wie bei Kombiservern oder einem LTSP-"
@@ -9061,16 +9072,6 @@ msgid "on the System Properties page, click on \"Change...\""
msgstr ""
"klicken Sie auf der Seite mit den Systemeigenschaften auf »Ändern...«. "
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Wenn Sie sich nach dem Neustart erstmals anmelden, klicken Sie auf den "
-"Button »Optionen >>« und wählen Sie die Domäne SKOLELINUX statt der lokalen "
-"Domäne (»dieser Computer«)"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Erste Anmeldung an der Domäne"
@@ -10431,8 +10432,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 "
@@ -11697,6 +11698,15 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Wenn Sie sich nach dem Neustart erstmals anmelden, klicken Sie auf den "
+#~ "Button »Optionen >>« und wählen Sie die Domäne SKOLELINUX statt der "
+#~ "lokalen Domäne (»dieser Computer«)"
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Um diese Pakete zu installieren, führen Sie folgendes Kommando als Root "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index 661df7b..18c4bc3 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"POT-Creation-Date: 2017-09-29 11:41+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"
@@ -1210,6 +1210,13 @@ msgstr ""
"El propósito de los diferentes perfiles es explicado en el capítulo <link "
"linkend=\"Architecture\">Arquitecturas de red</link>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
@@ -1229,14 +1236,19 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+#| "possible, though 256 MiB RAM or more and faster processors are "
+#| "recommended."
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
"Los clientes delgados pueden funcionar con 64 MB de RAM y 133 MHZ de "
"procesador, aunque se recomienda 256 MB de RAM y procesadores de mayor "
@@ -1263,10 +1275,15 @@ msgstr ""
"red."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For workstations, diskless workstations and standalone systems, 800 MHz "
+#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
+#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
"Para estaciones de trabajo, terminales tontas e instalaciones individuales, "
"PC's con velocidad de 800 MHz y 512 Mb de RAM son los requerimientos "
@@ -5081,10 +5098,11 @@ msgstr "Configuración del acceso al sistema de archivos"
#. type: CDATA
#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
@@ -6570,8 +6588,8 @@ msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
#. type: Content of: <article><section><title>
@@ -8417,16 +8435,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Después del reinicio, cuando ingresa por primera vez, haga clic en el botón "
-"\"Opciones >>\" y seleccione el dominio SKOLELINUX en lugar del "
-"dominio local (\"esta computadora\"). "
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr ""
@@ -10521,6 +10529,15 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Después del reinicio, cuando ingresa por primera vez, haga clic en el "
+#~ "botón \"Opciones >>\" y seleccione el dominio SKOLELINUX en lugar "
+#~ "del dominio local (\"esta computadora\"). "
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Para instalar estos paquetes, ejecute el siguiente comando como root:"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index 4659cf1..d8d44d9 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"POT-Creation-Date: 2017-09-29 11:41+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"
@@ -1241,6 +1241,13 @@ msgstr ""
"La signification des différents profils est expliquée dans le chapitre <link "
"linkend=\"Architecture\">architecture réseau</link>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
@@ -1264,17 +1271,22 @@ msgstr ""
#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
#| "recommended for the main and thin client server profiles."
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
"Il est recommandé d'avoir pour les profils de serveur principal et de "
"serveur de clients légérs un minimum de 2 Gio de mémoire vive pour "
"30 clients et 4 Gio pour 50-60 clients."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+#| "possible, though 256 MiB RAM or more and faster processors are "
+#| "recommended."
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
"Faire fonctionner des clients légers avec 64 Mio de mémoire vive et une "
"fréquence de 133 MHz sur un processeur 32 bits est possible. Cependant, "
@@ -1302,10 +1314,15 @@ msgstr ""
"réseau."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For workstations, diskless workstations and standalone systems, 800 MHz "
+#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
+#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
"Pour les stations de travail (avec ou sans disque) ainsi que les systèmes "
"autonomes, 512 Mio de mémoire vive et une fréquence de processeur de 800 MHz "
@@ -5536,10 +5553,11 @@ msgstr "cliquez sur configuration avancée"
#. type: CDATA
#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
@@ -7468,12 +7486,19 @@ msgid "A note for more complex setups"
msgstr "Une remarque pour les configurations plus complexes"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
+#| "server or LTSP cluster setup) things would be even more complicated and "
+#| "maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
+#| "identifier together with apropriate PAM configuration would allow to "
+#| "disable internal ssh login."
msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
"Si les clients légers sont attachés sur le réseau principal 10.0.0.0/8 "
"(configuration de serveur combiné ou de grappe LTSP), les affaires se "
@@ -10133,16 +10158,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "Sur la page « Propriétés système », cliquez sur « Modifier... »."
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Après le redémarrage, lorsque vous vous connectez pour la première fois, "
-"cliquez sur le bouton « Options >> » et sélectionnez le domaine "
-"SKOLELINUX au lieu du domaine local (« cet ordinateur »)."
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Première connexion au domaine"
@@ -13006,6 +13021,15 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Après le redémarrage, lorsque vous vous connectez pour la première fois, "
+#~ "cliquez sur le bouton « Options >> » et sélectionnez le domaine "
+#~ "SKOLELINUX au lieu du domaine local (« cet ordinateur »)."
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Pour l'installer, exécutez la commande suivante en tant que "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index 5e317b5..7a14562 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
-"PO-Revision-Date: 2017-06-22 19:51+0100\n"
+"POT-Creation-Date: 2017-09-29 11:41+0000\n"
+"PO-Revision-Date: 2017-09-28 09:53+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
"Language: it\n"
@@ -1078,6 +1078,13 @@ msgstr ""
"Lo scopo dei diversi profili è spiegato nella sezione sulla <link linkend="
"\"Architecture\">architettura della rete</link>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
@@ -1090,17 +1097,26 @@ msgstr ""
"processori x86."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and LTSP server profiles."
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
"Sono consigliati per i profili server principale e server LTSP almeno 2 GiB "
"RAM per 30 client e 4 GiB RAM per 50-60 client."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+#| "possible, though 256 MiB RAM or more and faster processors are "
+#| "recommended."
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
"I thin client con solo 64 MiB di RAM e con un processore a 133 MHz possono "
"funzionare, sebbene 256 MiB di RAM o più e processori più veloci sono "
@@ -1127,10 +1143,15 @@ msgstr ""
"memoria di swap in quanto più veloce dell'uso dello swap in rete."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For workstations, diskless workstations and standalone systems, 800 MHz "
+#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
+#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
"Per le workstation senza dischi e per i sistemi standalone sono richiesti "
"come minimo 800 MHz e 512 MiB di RAM. Per l'esecuzione dei più recenti "
@@ -2011,10 +2032,10 @@ msgstr ""
"sarà anche un server LTSP e potrà essere usato come una workstation. Questa "
"è la scelta predefinita, dal momento che si pensa che la maggioranza delle "
"persone, in seguito, installerà <link linkend=\"Installation--"
-"Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">. "
-"Notare che occorre installare 2 schede di rete nella macchina che funzionerà "
-"da server principale combinato o come server LTSP, che saranno utili dopo "
-"l'installazione."
+"Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
+"PXE</link>. Notare che occorre installare 2 schede di rete nella macchina "
+"che funzionerà da server principale combinato o come server LTSP, che "
+"saranno utili dopo l'installazione."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4603,7 +4624,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid "Don't use X, use a virtual console, log in as root."
-msgstr ""
+msgstr "Non usare X, ma una console virtuale e collegarsi come root."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4689,18 +4710,11 @@ msgstr ""
"<return> per scorrere verso il basso, <q> per lasciare."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Don't use X, use a virtual console, log in as root. Read all debconf "
-#| "information carefully, choose 'keep your currently-installed version' "
-#| "unless stated differently below; in most cases hitting return will be "
-#| "fine."
msgid ""
"Read all debconf information carefully, choose 'keep your currently-"
"installed version' unless stated differently below; in most cases hitting "
"return will be fine."
msgstr ""
-"Non usare X, ma utilizzare una console virtuale e accedere come root. "
"Occorre leggere con attenzione tutte le informazioni di debconf, scegliere "
"'keep your currently-installed version' a meno che non sia indicato "
"diversamente in seguito: nella maggior parte dei casi funzionerà."
@@ -4807,27 +4821,24 @@ msgid "Apply and adjust configuration:"
msgstr "Applicare e regolare la configurazione:"
#. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "cfengine-debian-edu -D installation\n"
-#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
-#| "rm /etc/apache2/mods-enabled/userdir.conf\n"
-#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
-#| "service squid start\n"
-#| "service apache2 restart"
+#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
msgstr ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -4862,18 +4873,16 @@ msgid ""
"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
"from Broadwell in QEMU might help."
msgstr ""
+"Se l'aggiornamento del sistema non riesce a eseguire qemu/kvm, vedere <ulink "
+"url=\"https://bugs.debian.org/844446#\">844446</ulink>. Cambiare "
+"l'architettura da Broadwell a QEMU dovrebbe aiutare."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr "Dopo il riavvio, fare un po' di pulizia:"
#. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "apt purge linux-image-3.16.0-4-amd64 \n"
-#| "apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-#| "dpkg -P php5-imagick\n"
-#| "rm -rf /etc/php5"
+#, no-wrap
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
@@ -4882,7 +4891,7 @@ msgid ""
msgstr ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6596,14 +6605,14 @@ msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
-"Se i client LTSP sono stati collegati alla rete backbone 10.0.0.0/8 "
-"(combiserver o server con configurazione LTSP cluster) sarebbe ancora più "
-"complicato eforse solo una configurazione DHCP sofisticata (in LDAP) con il "
+"Se i client LTSP sono stati collegati alla rete backbone 10.0.0.0/8 (combi "
+"server o server con configurazione LTSP cluster) sarebbe ancora più "
+"complicato e forse solo una configurazione DHCP sofisticata (in LDAP) con il "
"controllo del vendor-class-identifier insieme a una configurazione PAM "
-"appropriata permetterebbe di disabilitareil login ssh interno."
+"appropriata permetterebbe di disabilitare il login ssh interno."
#. type: Content of: <article><section><title>
msgid "HowTos for the desktop"
@@ -6762,7 +6771,7 @@ msgid ""
"libdvd-pkg</computeroutput>."
msgstr ""
"Rispondere alle domande di debconf, quindi eseguire <computeroutput>dpkg-"
-"reconfigure libdvd-pkg</ computeroutput>."
+"reconfigure libdvd-pkg</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Handwriting fonts"
@@ -8942,16 +8951,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "nella pagina delle Proprietà del sistema, fare clic su \"Cambia...\""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Dopo il riavvio, quando si fa il login per la prima volta, fare clic sul "
-"pulsante \"Opzioni >>\" e selezionare il dominio SKOLELINUX al posto "
-"del dominio locale (\"questo computer\")"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Primo accesso al dominio"
@@ -9820,10 +9819,8 @@ msgstr ""
"sceglierne un altro."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Firefox 45.8 ESR and Chromium 57"
msgid "Firefox 45.9 ESR and Chromium 59"
-msgstr "Firefox 45.8 ESR e Chromium 57"
+msgstr "Firefox 45.9 ESR e Chromium 59"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Iceweasel has been re-renamed to Firefox!"
@@ -10350,12 +10347,13 @@ msgid "Appendix A - The GNU General Public License"
msgstr "Appendix A - La GNU Public Licence"
#. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "Note to translators: there is no need to translate the GPL license text. Translations are available at https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
+#, no-wrap
msgid ""
"Note to translators: there is no need to translate the GPL license text.\n"
"Translations are available at https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
-msgstr "Nota per i traduttori: non c'è bisogno di tradurre il testo della licenza GPL. Le traduzioni sono disponibili presso https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
+msgstr ""
+"Nota per i traduttori: non c'è bisogno di tradurre il testo della licenza GPL.\n"
+"Le traduzioni sono disponibili presso https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -11563,6 +11561,15 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Dopo il riavvio, quando si fa il login per la prima volta, fare clic sul "
+#~ "pulsante \"Opzioni >>\" e selezionare il dominio SKOLELINUX al "
+#~ "posto del dominio locale (\"questo computer\")"
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Per installare questi pacchetti eseguire il seguente comando come root:"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index abd142f..7d41e1e 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
-"PO-Revision-Date: 2017-02-24 06:55+0900\n"
+"POT-Creation-Date: 2017-09-29 11:41+0000\n"
+"PO-Revision-Date: 2017-09-29 20:41+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
"Language: ja\n"
@@ -1042,6 +1042,16 @@ msgstr ""
"様々なプロファイルの目的については<link linkend=\"Architecture\">ネットワーク"
"構成</link>の章で説明しています。"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+"LTSP を利用するつもりであれば <ulink url=\"https://wiki.debian.org/LTSP/Ltsp"
+"%20Hardware%20Requirements\">LTSP ハードウェア要件の wiki ページ</ulink>に目"
+"を通してください。"
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
@@ -1054,19 +1064,19 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
-"中心サーバ及び LTSP サーバプロファイルでは、30 クライアントで最低 2 GiB、"
-"50-60 クライアントでは最低 4 GiB の RAM 容量を推奨します。"
+"中心サーバ及び LTSP サーバプロファイルでは、30 シンクライアントで最低 12 "
+"GiB、50-60 シンクライアントでは最低 20 GiB の RAM 容量を推奨します。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
-"シンクライアントは RAM が 64 MiB しかない 133 MHz の 32ビットプロセッサでも可"
-"能ですが、256 MiB 以上の RAM ともっと高速なプロセッサを勧めます。"
+"シンクライアントは RAM が 256 MiB、400 MHz でも可能ですが、それ以上の RAM、よ"
+"り高速なプロセッサを勧めます。"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -1091,11 +1101,11 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
-"ワークステーション、ディスクレスワークステーション、単独システムでは800MHzの"
+"ワークステーション、ディスクレスワークステーション、単独システムでは1000MHzの"
"CPUと512MiBのRAMが絶対的な最低限度の要件となります。最近のウェブブラウザや "
"LibreOffice を使う場合には1024MiB以上のRAMを推奨します。"
@@ -1295,11 +1305,12 @@ msgstr "ホスト名を恒久的に「gateway」に変更します。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "Enable IP forwarding and NAT for the 10.0.0.0/8 network."
-msgstr ""
+msgstr "10.0.0.0/8 向けのIP転送とNATを有効にします。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "As an option install a firewall and / or a traffic shaping tool."
msgstr ""
+"オプションでファイアウォールやトラフィック調整ツールをインストールします。"
#. type: CDATA
#, no-wrap
@@ -1337,10 +1348,11 @@ msgstr ""
" service networking start\n"
" sed -i 's#NAT=#NAT=\"10.0.0.0/8\"#' /etc/default/enable-nat \n"
" service enable-nat restart\n"
-" # You might want a firewall (shorewall or ufw) and traffic shaping.\n"
+" # ファイアウォール (shorewall や ufw) やトラフィック調整\n"
+" # ツールをインストールするのもいいかもしれません。\n"
" #apt update\n"
" #apt install shorewall\n"
-" # or\n"
+" # または\n"
" #apt install ufw\n"
" #apt install wondershaper"
@@ -1489,8 +1501,8 @@ msgstr ""
"シンへのインストールに利用できます。netinstall イメージと同様に十分なサイズ"
"の USB フラッシュドライブやディスクメディアで使えます。「LTSP サーバ」プロ"
"ファイルを選択した場合はインストール時にインターネットへのアクセスが必要とな"
-"ることに注意してください 他と同様 FTP や HTTP、rsync 経由でダウンロードできま"
-"す:"
+"ることに注意してください。他と同様 FTP や HTTP、rsync 経由でダウンロードでき"
+"ます:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -2218,6 +2230,8 @@ msgid ""
"To install a desktop environment of your choice instead of the default one, "
"press TAB and edit the kernel boot options (like explained above)."
msgstr ""
+"デフォルト以外のデスクトップ環境をインストールするにはタブキーを押してカーネ"
+"ルブートオプションを (前述のように) 編集します。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2646,6 +2660,9 @@ msgid ""
"File_system_access_configuration\">file system access configuration</link> "
"before adding users."
msgstr ""
+"ユーザを追加する前に Debian Edu 特有の情報について <link linkend="
+"\"Architecture--File_system_access_configuration\">ファイルシステムのアクセス"
+"設定</link>を読んでください。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3677,18 +3694,6 @@ msgid "Printer Management"
msgstr "プリンタ管理"
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "For Printer Management point your web browser to <ulink url=\"https://"
-#| "www:631\"/>. This is the normal CUPS management interface where you can "
-#| "add/delete/modify your printers and can clean up the printing queue. By "
-#| "default only root is allowed but this can be changed: Open /etc/cups/cups-"
-#| "files.conf with an editor and add one or more valid group names matching "
-#| "your site policy to the line containing <computeroutput>SystemGroup "
-#| "lpadmin</computeroutput>. Existing GOsa² groups that might be used are "
-#| "<computeroutput>gosa-admins</computeroutput> (with the first user as "
-#| "member), <computeroutput>teachers</computeroutput> and "
-#| "<computeroutput>jradmins</computeroutput> (no members after installation)."
msgid ""
"For Printer Management point your web browser to <ulink url=\"https://"
"www:631\"/> and accept the self-signed certificate. This is the normal CUPS "
@@ -3703,15 +3708,17 @@ msgid ""
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
"プリンタを管理するにはウェブブラウザで <ulink url=\"https://www:631\"/> にア"
-"クセスします。これは普通の CUPS 管理インターフェイスで、プリンタの追加/削除/"
-"変更や印刷キューの掃除ができるようになっています。デフォルトで許可されている"
-"のは root だけですがこれは変更できます: エディタで /etc/cups/cups-files.conf "
-"を開き、サイトのポリシーに合う有効なグループ名を <computeroutput>SystemGroup "
-"lpadmin</computeroutput> の行に追加します。これに指定されることが多いであろう"
-"既存の GOsa² グループとしては <computeroutput>gosa-admins</computeroutput> "
-"(メンバーとして最初のユーザ)、 <computeroutput>teachers</computeroutput>、 "
-"<computeroutput>jradmins</computeroutput> (インストールしただけの状態ではメン"
-"バーはいません) があります。"
+"クセスし、自己署名の証明書を受け入れます。これは普通の CUPS 管理インターフェ"
+"イスで、プリンタの追加/削除/変更や印刷キューの掃除ができるようになっていま"
+"す。デフォルトで許可されているのは root だけですがこれは変更できます: エディ"
+"タで /etc/cups/cups-files.conf を開き、サイトのポリシーに合う有効なグループ名"
+"を <computeroutput>SystemGroup lpadmin</computeroutput> の行に追加します。こ"
+"れに指定されることが多いであろう既存の GOsa² グループとしては "
+"<computeroutput>gosa-admins</computeroutput> や <computeroutput>printer-"
+"admins</computeroutput> (どちらもメンバーとして最初のユーザ)、 "
+"<computeroutput>teachers</computeroutput>、 <computeroutput>jradmins</"
+"computeroutput> (インストールしただけの状態ではメンバーはいません) がありま"
+"す。"
#. type: Content of: <article><section><title>
msgid "Clock synchronisation"
@@ -4228,13 +4235,6 @@ msgstr ""
"更新することも忘れないようにしてください。"
#. type: Content of: <article><section><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you do not want to manually upgrade packages and trust Debian to do a "
-#| "good job with new versions, you can install the "
-#| "<computeroutput>unattended-upgrades</computeroutput> package and "
-#| "configure it to automatically upgrade all new packages every night. This "
-#| "will not upgrade the LTSP chroots."
msgid ""
"If you do not want to manually upgrade packages and trust Debian to do a "
"good job with new versions, you can configure <computeroutput>unattended-"
@@ -4474,6 +4474,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
+"X を使わないようにし、仮想コンソールを使って root でログインしてください。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4519,12 +4520,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleanup the package cache:"
-msgstr ""
+msgstr "パッケージキャッシュの掃除:"
#. type: CDATA
#, no-wrap
msgid "apt-get clean"
-msgstr ""
+msgstr "apt-get clean"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Prepare and start the upgrade to Stretch:"
@@ -4557,40 +4558,37 @@ msgid ""
"return> to scroll down, <q> to leave the pager."
msgstr ""
"apt-list-changes: 読むべき NEWS が大量にあることを覚悟してください。ペー"
-"ジャーのスクロールを進めるには <enter> を終了させるには <q> を押"
-"します。"
+"ジャーのスクロールを進めるには <enter> を、終了させるには <q> を"
+"押します。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Don't use X, use a virtual console, log in as root. Read all debconf "
-#| "information carefully, choose 'keep your currently-installed version' "
-#| "unless stated differently below; in most cases hitting return will be "
-#| "fine."
msgid ""
"Read all debconf information carefully, choose 'keep your currently-"
"installed version' unless stated differently below; in most cases hitting "
"return will be fine."
msgstr ""
-"X を使わないでください。仮想コンソールを使って root でログインしてください。"
"debconf の情報を全て注意深く読み、以下で特に言及していない限り「現在インス"
"トールされているローカルバージョンを維持」を選択するようにしてください。ほと"
"んどの場合「Enter」を押せばいいはずです。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
-msgstr ""
+msgstr "パッケージ設定についていくらか聞いてくるものがあります:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
msgstr ""
+"icinga-cgi: icingaadmin のパスワード (nagiosadmin で使っているものと同一) を"
+"提供してください。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Just in case several display managers are installed: display-manager: Choose "
"<computeroutput>lightdm</computeroutput>."
msgstr ""
+"ディスプレイマネージャを複数インストールしている場合のみ: display-manager: "
+"<computeroutput>lightdm</computeroutput> を選択してください。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -4605,25 +4603,26 @@ msgid ""
"Configuring icinga-common: Use external commands with Icinga: Choose <"
"Yes>."
msgstr ""
+"icinga-common の設定: 外部 コマンドを Icinga で利用しますか?: <Yes> を"
+"選択してください。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
"\"https://bugs.debian.org/789667#\">789667</ulink>)"
msgstr ""
+"tftp (etc/inetd.conf): <Yes> を選択してください (atftpd バグ <ulink "
+"url=\"https://bugs.debian.org/789667#\">789667</ulink>) 参照。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "/etc/default/ldap2zone: Choose Y."
msgstr "/etc/default/ldap2zone: Y を選択してください。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "/etc/gosa/gosa.conf Choose N. (Never accept a new gosa.conf version!)"
msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
-"/etc/gosa/gosa.conf N を選択してください。 (新しい gosa.conf で上書きしないよ"
-"うに!)"
+"/etc/gosa/gosa.conf: N を選択してください。 (新しい gosa.conf で上書きしない"
+"ように!)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cope with the Squid3 to Squid renaming:"
@@ -4672,27 +4671,24 @@ msgid "Apply and adjust configuration:"
msgstr "設定の適用と調整:"
#. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "cfengine-debian-edu -D installation\n"
-#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
-#| "rm /etc/apache2/mods-enabled/userdir.conf\n"
-#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
-#| "service squid start\n"
-#| "service apache2 restart"
+#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
msgstr ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -4713,9 +4709,8 @@ msgstr ""
"apt install education-ltsp-server # 'LTSP-Server' のプロファイルをインストールしている場合のみ"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
msgid "Get the new Debian Edu Stretch artwork:"
-msgstr "Debian Edu Stretch の新機能"
+msgstr "新しい Debian Edu Stretch アートワークの取得:"
#. type: CDATA
#, no-wrap
@@ -4728,18 +4723,16 @@ msgid ""
"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
"from Broadwell in QEMU might help."
msgstr ""
+"QEMU/KVM でアップグレードしたシステムがブートに失敗する場合は <ulink url="
+"\"https://bugs.debian.org/844446#\">844446</ulink> を見てください。QEMU では"
+"アーキテクチャを Broadwell 以外にすると助けになるかもしれません。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
-msgstr ""
+msgstr "再起動後さらにいくらか掃除します:"
#. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "apt purge linux-image-3.16.0-4-amd64 \n"
-#| "apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-#| "dpkg -P php5-imagick\n"
-#| "rm -rm /etc/php5"
+#, no-wrap
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
@@ -4747,9 +4740,9 @@ msgid ""
"rm -rf /etc/php5"
msgstr ""
"apt purge linux-image-3.16.0-4-amd64 \n"
-"apt purge debian-edu-artwork-lines # この代替テーマが不要な場合のみ\n"
-"dpkg -P php5-imagick\n"
-"rm -rm /etc/php5"
+"apt purge debian-edu-artwork-lines # この代替テーマが不要の場合のみ\n"
+"dpkg -P php5-imagick # このパッケージがインストールされていない場合があります\n"
+"rm -rf /etc/php5"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Enable otherwise broken PHP 7.0 support:"
@@ -4765,18 +4758,16 @@ msgstr ""
"service apache2 restart"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Check if the upgraded system works."
msgid "Check if the upgraded system works:"
-msgstr "アップグレードしたシステムが機能するか確認します"
+msgstr "アップグレードしたシステムが機能するか確認します:"
#. type: Content of: <article><section><section><section><para>
msgid "Reboot; log in as first user and test"
-msgstr ""
+msgstr "再起動して最初のユーザとしてログインし、"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if the GOsa² gui is working,"
-msgstr ""
+msgstr "GOsa² GUI が機能しているか、"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one is able to connect LTSP clients and workstations,"
@@ -4784,19 +4775,19 @@ msgstr "LTSP クライアントやワークステーションに接続できる
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one can add/remove a netgroup membership of a system,"
-msgstr ""
+msgstr "システムのネットグループのメンバーを追加/削除できるか、"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one can send and receive internal email,"
-msgstr ""
+msgstr "内部メールを送受信できるか、"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one can manage printers,"
-msgstr ""
+msgstr "プリンターを管理できるか、"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "and if other site specific things are working."
-msgstr ""
+msgstr "その他サイト特有の事項について機能するかテストしてください。"
#. type: Content of: <article><section><section><section><title>
msgid "Upgrading a workstation"
@@ -4812,7 +4803,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "To enable LDAP connection, renew the server certificate:"
-msgstr ""
+msgstr "LDAP 接続を有効化するにはサーバ証明書を新しくします:"
#. type: CDATA
#, no-wrap
@@ -4837,6 +4828,9 @@ msgid ""
"(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."
msgstr ""
+"ディスクの空き容量が十分にあることを確認してください。LTSP はNBDを使うように"
+"なっています。NBDイメージファイルのサイズはデフォルトで4GiB程度になります。イ"
+"メージ更新時には一時ファイル用としてさらに4GiB必要となります。"
#. type: CDATA
#, no-wrap
@@ -5545,14 +5539,6 @@ msgid "Automatic installation of security upgrades"
msgstr "セキュリティ更新の自動インストール"
#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
-#| "which will install security (and other) updates automatically. If you "
-#| "plan to use it, you should have some means to monitor your systems, such "
-#| "as installing the <computeroutput>apt-listchanges</computeroutput> "
-#| "package and configuring it to send you emails about updates. And there is "
-#| "always <computeroutput>/var/log/dpkg.log</computeroutput>."
msgid ""
"<computeroutput>unattended-upgrades</computeroutput> is a Debian package "
"which will install security (and other) upgrades automatically. The package "
@@ -5562,11 +5548,11 @@ msgid ""
"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
"<computeroutput>unattended-upgrades</computeroutput> はセキュリティその他の更"
-"新を自動的にインストールする Debian パッケージです。これを利用する場合は "
-"<computeroutput>apt-listchanges</computeroutput> パッケージをインストールして"
-"更新についてメールを送るように設定する等、システムを監視するなんらかの方策を"
-"用意しておくべきです。また、<computeroutput>/var/log/dpkg.log</"
-"computeroutput> は常にあります。"
+"新を自動的にインストールする Debian パッケージです。デフォルトでこのパッケー"
+"ジがインストールされ、セキュリティ更新をインストールするように設定されます。"
+"ログは <computeroutput>/var/log/unattended-upgrades/</computeroutput> に置か"
+"れます。また、<computeroutput>/var/log/dpkg.log</computeroutput> と "
+"<computeroutput>/var/log/apt/</computeroutput> は常にあります。"
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
@@ -6261,12 +6247,17 @@ msgid ""
"Enable access in case diskless workstations are used. This is a special "
"case, because sshfs is used instead of NFS and automount:"
msgstr ""
+"ディスクレスワークステーションを使っている場合はアクセスを有効化します。NFS "
+"と automount に代えて sshfs を使うようになったためこれは特別な状況です:"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Create the mount point directories in the LTSP diskless client's root "
"(default <computeroutput>/opt/ltsp/i386/</computeroutput>) as well."
msgstr ""
+"同様に LTSP ディスクレスクライアントの root にマウントポイントのディレクトリ "
+"(デフォルトでは <computeroutput>/opt/ltsp/i386/</computeroutput>) も作成しま"
+"す。"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -6411,8 +6402,8 @@ msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
#. type: Content of: <article><section><title>
@@ -8215,11 +8206,11 @@ msgid ""
"connect."
msgstr ""
"LTSP サーバや複合サーバのプロファイルを選択した場合には xrdp もインストールす"
-"るようになっています。このパッケージwhich uses theは RDP (Remote Desktop "
-"Protocol) を利用してリモートクライアントにグラフィカルなログイン画面を提示し"
-"ます。Microsoft Windows のユーザは追加ソフトウェアをインストールすることなく "
-"xrdp の動作している LTSP サーバに接続できます - 単に Windows マシンから "
-"Remote Desktop Connection を起動して接続するだけです。"
+"るようになっています。このパッケージは RDP (Remote Desktop Protocol) を利用し"
+"てリモートクライアントにグラフィカルなログイン画面を提示します。Microsoft "
+"Windows のユーザは追加ソフトウェアをインストールすることなく xrdp の動作して"
+"いる LTSP サーバに接続できます - 単に Windows マシンから Remote Desktop "
+"Connection を起動して接続するだけです。"
#. type: Content of: <article><section><section><section><para>
msgid "Additionally, xrdp can connect to a VNC server or another RDP server."
@@ -8658,16 +8649,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "「システムのプロパティ」のページで「変更(C)...」をクリックします"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"再起動後の初回ログイン時に「オプション >>」ボタンをクリックし、「ログオ"
-"ン先」にローカルドメイン (「このコンピュータ」) ではなく SKOLELINUX ドメイン"
-"を選択します"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "ドメインへの最初のログオン"
@@ -9124,6 +9105,8 @@ msgid ""
"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
"GSSAPI'; adjust if not detected automatically"
msgstr ""
+"IMAP でも SMTP でも設定では「STARTTLS'」と「Kerberos/GSSAPI」を選択します。自"
+"動的に検出されない場合は調整してください。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Click 'Done'"
@@ -9489,10 +9472,8 @@ msgstr ""
"境選択についてはこのマニュアルを見てください。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Firefox 45.8 ESR and Chromium 57"
msgid "Firefox 45.9 ESR and Chromium 59"
-msgstr "Firefox 45.8 ESR 及び Chromium 57"
+msgstr "Firefox 45.9 ESR 及び Chromium 59"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Iceweasel has been re-renamed to Firefox!"
@@ -9630,6 +9611,8 @@ msgid ""
"Concurrent logins of the same user on LTSP server and LTSP thin client are "
"no longer allowed."
msgstr ""
+"LTSP サーバと LTSP シンクライアントへの同一ユーザによる同時ログインは許可され"
+"なくなっています。"
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
@@ -9761,7 +9744,7 @@ msgstr "この文書の翻訳方法"
#. type: Content of: <article><section><section><section><title>
msgid "Translate using PO files"
-msgstr ""
+msgstr "POファイルを使った翻訳"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -9902,8 +9885,9 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
+#, fuzzy
msgid "Translate online using a web browser"
-msgstr ""
+msgstr "POファイルを使った翻訳"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -9911,6 +9895,9 @@ msgid ""
"\"https://hosted.weblate.org/projects/debian-edu-documentation/debian-edu-"
"stretch/\"/> for more information."
msgstr ""
+"言語チームによっては Weblate 経由で翻訳している場合があります。さらなる情報に"
+"ついては <ulink url=\"https://hosted.weblate.org/projects/debian-edu-"
+"documentation/debian-edu-stretch/\"/> を見てください。"
#. type: Content of: <article><section><section><section><para>
msgid "Please report any problems."
@@ -11089,20 +11076,3 @@ msgid ""
msgstr ""
"もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
"skolelinux.no/info/cdbygging/news.html\"/> にあります。"
-
-#~ msgid "To install these packages run the following command as root:"
-#~ msgstr "パッケージのインストールには root で以下のコマンドを実行します:"
-
-#~ msgid "apt-get install unattended-upgrades apt-listchanges"
-#~ msgstr "apt-get install unattended-upgrades apt-listchanges"
-
-#~ msgid ""
-#~ "This is a <emphasis role=\"strong\">ALPHA</emphasis> release of Debian "
-#~ "Edu 9+edu0. <emphasis role=\"strong\">Do not use in production yet.</"
-#~ "emphasis> Please report feedback to <ulink url=\"mailto:debian-edu at lists."
-#~ "debian.org\">debian-edu at lists.debian.org</ulink>!"
-#~ msgstr ""
-#~ "これは Debian Edu 9+edu0 の <emphasis role=\"strong\">ALPHA</emphasis> リ"
-#~ "リースです。<emphasis role=\"strong\">実際の運用環境ではまだ使わないでくだ"
-#~ "さい。</emphasis> フィードバックを <ulink url=\"mailto:debian-edu at lists."
-#~ "debian.org\">debian-edu at lists.debian.org</ulink> に報告してください。!"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index b26f657..cd431a5 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,8 +21,8 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
-"PO-Revision-Date: 2017-07-11 11:47+0000\n"
+"POT-Creation-Date: 2017-09-29 11:41+0000\n"
+"PO-Revision-Date: 2017-09-25 05:08+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
"edu-documentation/debian-edu-stretch/nb/>\n"
@@ -31,7 +31,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.16-dev\n"
+"X-Generator: Weblate 2.17-dev\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -1078,6 +1078,13 @@ msgstr ""
"Egenskapene til de ulike profilene forklares i kapittelet <link url="
"\"Architecture\">nettverksarkitektur</link>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
@@ -1089,17 +1096,26 @@ msgstr ""
"klassen), eller 64-bit (Debian-arkitektur «AMD64»)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and LTSP server profiles."
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
"Det er anbefalt minst 2 GiB RAM for 30 klienter og 4 GiB RAM for 50-60 "
"klienter for hovedtjener- og LTSP-tjenerprofiler."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+#| "possible, though 256 MiB RAM or more and faster processors are "
+#| "recommended."
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
"Tynne klienter med bare 64 MiB RAM og 133 MHz på 32 bit prosessorer er "
"mulig, men 256 MiB RAM eller mer, og raskere prosessorer anbefales."
@@ -1125,10 +1141,15 @@ msgstr ""
"(nettverksbytte)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For workstations, diskless workstations and standalone systems, 800 MHz "
+#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
+#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
"For arbeidsstasjoner, tynnklienter og frittstående systemer, er 800 MHz og "
"512 MiB RAM absolutte minimumskrav. For å kjøre moderne nettlesere og "
@@ -4752,19 +4773,21 @@ msgstr "Aktiver og juster oppsett:"
#. type: CDATA
#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
msgstr ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
@@ -6514,8 +6537,8 @@ msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
"Om LTSP-klientene ble satt opp i stamnettet 10.0.0.8/8 (oppsett med "
"kombinert tjener eller LTSP-klynge), så blir ting enda mer komplisert som "
@@ -8831,16 +8854,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "På siden Systemegenskaper, klikk på «Endre ...»"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Etter omstart, når du har logget inn første gang, klikk på «Alternativer>"
-">»-knappen, og velg domenet SKOLELINUX i stedet for det lokale domenet "
-"(«denne datamaskinen»)."
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "Første Domenepålogging"
@@ -11424,6 +11437,15 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Etter omstart, når du har logget inn første gang, klikk på "
+#~ "«Alternativer>>»-knappen, og velg domenet SKOLELINUX i stedet for "
+#~ "det lokale domenet («denne datamaskinen»)."
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr "For å installere, kjør følgende som rot:"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index 2626ffc..551f5d4 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
"Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
-"PO-Revision-Date: 2017-07-12 14:57+0200\n"
+"POT-Creation-Date: 2017-09-29 11:41+0000\n"
+"PO-Revision-Date: 2017-09-23 20:22+0200\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"
"Language: nl\n"
@@ -1112,6 +1112,13 @@ msgstr ""
"De betekenis van de verschillende profielen werd verduidelijkt in het "
"hoofdstuk <link linkend=\"Architecture\">Architectuur van het netwerk</link>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
@@ -1124,17 +1131,26 @@ msgstr ""
"type x86 hebben."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and LTSP server profiles."
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
"Minstens 2 GiB RAM bij 30 clients en 4 GiB RAM bij 50-60 clients wordt "
"aanbevolen voor de profielen hoofdserver en LTSP-server."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+#| "possible, though 256 MiB RAM or more and faster processors are "
+#| "recommended."
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
"Bij een 32-bits processor kan een thin client al functioneren met slechts 64 "
"MB RAM en een processorsnelheid van 133 MHz, hoewel 256 MB RAM of meer en "
@@ -1164,10 +1180,15 @@ msgstr ""
"netwerk."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For workstations, diskless workstations and standalone systems, 800 MHz "
+#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
+#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
"Voor werkstations, schijfloze werkstations en autonome PC's gelden als "
"absolute minimumvereisten: 800 MHz processorsnelheid en 512 MB RAM. Maar om "
@@ -4958,19 +4979,21 @@ msgstr "Pas de configuratie aan en pas ze toe:"
#. type: CDATA
#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
msgstr ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
@@ -6803,12 +6826,19 @@ msgid "A note for more complex setups"
msgstr "Een noot over meer complexe opstellingen"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
+#| "server or LTSP cluster setup) things would be even more complicated and "
+#| "maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
+#| "identifier together with apropriate PAM configuration would allow to "
+#| "disable internal ssh login."
msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
"Indien er LTSP-clients aangekoppeld zijn op het hoofdnetwerk 10.0.0.0/8 (bij "
"een combiserver- of LTSP-cluster-opstelling) worden de zaken zelfs nog "
@@ -9236,16 +9266,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr "op de pagina Systeemeigenschappen, klikt u op \"Wijzigen...\""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-"Nadat de computer opnieuw opgestart werd, klikt u bij de eerstvolgende "
-"aanmelding op de knop \"Opties >>\" en vervolgens kiest u het domein "
-"SKOLELINUX in plaats van het lokale domein (\"deze computer\")"
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr "De eerste aanmelding op het domein"
@@ -11904,6 +11924,15 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "After the reboot, when you login the first time, click on the \"Options "
+#~ ">>\" button and select the domain SKOLELINUX instead of the local "
+#~ "domain (\"this computer\")"
+#~ msgstr ""
+#~ "Nadat de computer opnieuw opgestart werd, klikt u bij de eerstvolgende "
+#~ "aanmelding op de knop \"Opties >>\" en vervolgens kiest u het "
+#~ "domein SKOLELINUX in plaats van het lokale domein (\"deze computer\")"
+
#~ msgid "To install these packages run the following command as root:"
#~ msgstr ""
#~ "Om deze pakketten te installeren geeft u als systeembeheerder de volgende "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index de9df8f..2ff8b6f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"POT-Creation-Date: 2017-09-29 11:41+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-"
@@ -1197,6 +1197,13 @@ msgstr ""
"Cele różnych profili są wyjaśnione w rozdziale <link linkend=\"Architecture"
"\">architektura sieciowa</link>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
@@ -1209,17 +1216,26 @@ msgstr ""
"Debiana 'amd64')."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and LTSP server profiles."
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
"Dla profilu serwera głównego i serwera LTSP zalecane jest przynajmniej 2 GB "
"RAM dla 30 klientów, i 4 GB RAM dla 50-60 klientów."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+#| "possible, though 256 MiB RAM or more and faster processors are "
+#| "recommended."
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
"Możliwe są cienkie klienty z 64 MB pamięci RAM i procesory 32-bitowe z "
"szybkością taktowania 133 MHz, chociaż zalecane jest 256 MB lub więcej "
@@ -1247,10 +1263,15 @@ msgstr ""
"szybsze, niż ustawienie przestrzeni wymiany poprzez sieć."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For workstations, diskless workstations and standalone systems, 800 MHz "
+#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
+#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
"Dla stacji roboczych, bezdyskowych stacji roboczych i systemów "
"autonomicznych — 800 MHz i 512 MB pamięci RAM to bezwzględne minimum. Aby "
@@ -4073,10 +4094,11 @@ msgstr "Zastosuj i dostosuj konfigurację:"
#. type: CDATA
#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
@@ -5383,8 +5405,8 @@ msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
#. type: Content of: <article><section><title>
@@ -7056,13 +7078,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 328f8f2..28323ec 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"POT-Creation-Date: 2017-09-29 11:41+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"
@@ -801,6 +801,13 @@ msgid ""
"\"Architecture\">network architecture</link> chapter."
msgstr ""
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
@@ -810,14 +817,14 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -836,9 +843,9 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -3556,10 +3563,11 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
@@ -4865,8 +4873,8 @@ msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
#. type: Content of: <article><section><title>
@@ -6534,13 +6542,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 5a744cc..2b402cb 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -311,15 +311,17 @@
</title>
<para>The purpose of the different profiles is explained in the <link linkend="Architecture">network architecture</link> chapter.
</para>
+<para>If LTSP is intended to be used, take a look at the <ulink url="https://wiki.debian.org/LTSP/Ltsp%20Hardware%20Requirements">LTSP Hardware Requirements wiki page</ulink>.
+</para>
<itemizedlist>
<listitem>
<para>The computers running Debian Edu / Skolelinux must have either 32 bit (Debian architecture 'i386', oldest supported processors are 686 class ones) or 64 bit (Debian architecture 'amd64') x86 processors.
</para></listitem>
<listitem>
-<para>At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are recommended for the main and LTSP server profiles.
+<para>At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin clients are recommended for the main and LTSP server profiles.
</para></listitem>
<listitem>
-<para>Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are possible, though 256 MiB RAM or more and faster processors are recommended.
+<para>Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM and faster processors are recommended.
</para>
<itemizedlist>
<listitem>
@@ -329,7 +331,7 @@
<para>If your diskless workstations have hard drives, it is recommended to use them for swap as it is a lot faster than network swapping.
</para></listitem></itemizedlist></listitem>
<listitem>
-<para>For workstations, diskless workstations and standalone systems, 800 MHz and 512 MiB RAM are the absolute minimum requirements. For running modern webbrowsers and LibreOffice 1024 MiB RAM is recommended.
+<para>For workstations, diskless workstations and standalone systems, 1000 MHz and 512 MiB RAM are the absolute minimum requirements. For running modern webbrowsers and LibreOffice at least 1024 MiB RAM is recommended.
</para>
<itemizedlist>
<listitem>
@@ -1494,10 +1496,11 @@ Search for 'sudoHost :tjener', replace 'tjener' with 'tjener.intern'
<itemizedlist>
<listitem>
<para>Apply and adjust configuration:
-</para></listitem></itemizedlist><screen><![CDATA[cfengine-debian-edu -D installation
+</para></listitem></itemizedlist><screen><![CDATA[service autofs stop
+cfengine-debian-edu -D installation
rm /etc/apache2/conf-enabled/nagios3.conf
a2dismod userdir
-ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load
+ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load
a2enmod debian-edu-userdir
sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)
service squid start
@@ -2142,7 +2145,7 @@ FIXME: The HowTos from <ulink url="http://wiki.debian.org/DebianEdu/HowTo/"/> ar
<section id="AdvancedAdministration--A_note_for_more_complex_setups">
<title>A note for more complex setups
</title>
-<para>If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi server or LTSP cluster setup) things would be even more complicated and maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-identifier together with apropriate PAM configuration would allow to disable internal ssh login.
+<para>If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi server or LTSP cluster setup) things would be even more complicated and maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-identifier together with appropriate PAM configuration would allow to disable internal ssh login.
</para>
</section>
</section>
@@ -2920,7 +2923,7 @@ logon home = ""]]></screen>
<listitem>
<para>a confirmation pop up box will welcome you to the SKOLELINUX domain. Clicking on "OK", will result in having another message informing that a reboot for the machine is required to apply the changes. Click on "OK"
</para></listitem></orderedlist>
-<para>After the reboot, when you login the first time, click on the "Options >>" button and select the domain SKOLELINUX instead of the local domain ("this computer")
+<para>After the reboot, when you login the first time, click on the "Options >>" button and select the domain SKOLELINUX instead of the local domain ("this computer").
</para>
<para>If joining the domain has been successful you should then be able to view the host details within GOsa² (under the menu section "Systems").
</para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
index b370755..69db5c1 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-07-15 13:14+0000\n"
-"PO-Revision-Date: 2017-07-10 09:41+0000\n"
+"POT-Creation-Date: 2017-09-29 11:41+0000\n"
+"PO-Revision-Date: 2017-09-30 20:14+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
"documentation/debian-edu-stretch/zh/>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.16-dev\n"
+"X-Generator: Weblate 2.17-dev\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -1010,6 +1010,13 @@ msgstr ""
"不同profile的目的在 <link linkend=\"Architecture\">network architecture</"
"link> 章中解释。"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If LTSP is intended to be used, take a look at the <ulink url=\"https://wiki."
+"debian.org/LTSP/Ltsp%20Hardware%20Requirements\">LTSP Hardware Requirements "
+"wiki page</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"The computers running Debian Edu / Skolelinux must have either 32 bit "
@@ -1020,17 +1027,26 @@ msgstr ""
"陈旧被支持的处理器是 686 级）或者 64 位（Debian 架构 'amd64'）x86 处理器。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
+#| "recommended for the main and LTSP server profiles."
msgid ""
-"At least 2 GiB RAM for 30 clients and 4 GiB RAM for 50-60 clients are "
-"recommended for the main and LTSP server profiles."
+"At least 12 GiB RAM for 30 thin clients and 20 GiB RAM for 50-60 thin "
+"clients are recommended for the main and LTSP server profiles."
msgstr ""
"建议主服务器和 LTSP 服务器的配置对于 30 客户端至少 2 GiB 而 50-60 客户端为 4 "
"GiB。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
+#| "possible, though 256 MiB RAM or more and faster processors are "
+#| "recommended."
msgid ""
-"Thin clients with only 64 MiB RAM and 133 MHz on 32 bit processors are "
-"possible, though 256 MiB RAM or more and faster processors are recommended."
+"Thin clients with only 256 MiB RAM and 400 MHz are possible, though more RAM "
+"and faster processors are recommended."
msgstr ""
"瘦客户端能够仅以 64 MiB RAM 和 133 MHz 的 32 位处理器，但推荐 256 MiB RAM 或"
"更多内存和更快处理器。"
@@ -1054,10 +1070,15 @@ msgstr ""
"如果你的无盘工作站有硬盘驱动器，建议使用它们作为比网络交换快不少的交换区。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "For workstations, diskless workstations and standalone systems, 800 MHz "
+#| "and 512 MiB RAM are the absolute minimum requirements. For running modern "
+#| "webbrowsers and LibreOffice 1024 MiB RAM is recommended."
msgid ""
-"For workstations, diskless workstations and standalone systems, 800 MHz and "
+"For workstations, diskless workstations and standalone systems, 1000 MHz and "
"512 MiB RAM are the absolute minimum requirements. For running modern "
-"webbrowsers and LibreOffice 1024 MiB RAM is recommended."
+"webbrowsers and LibreOffice at least 1024 MiB RAM is recommended."
msgstr ""
"对于工作站，无盘工作站和独立使用的系统，800 MHz 和 512 MiB RAM 绝对是最低限度"
"的需求。为运行最新的网络浏览器和 Libre)ffice 建议 1024 MiB RAM。"
@@ -3909,6 +3930,12 @@ msgid ""
"root on the sitesummary server (normally the main server). This will update "
"the <computeroutput>/etc/munin/munin.conf</computeroutput> file."
msgstr ""
+"使用 Munin 监控的机器列表，是根据报告到 sitesummary 的主机列表自动生成的。"
+"Munin 监控所有安装了 munin-node 软件包的主机。从安装机器直到 Munin 监控启动正"
+"常地要一天，因为执行 cron 排序的工作。要加速这个过程，以 root 在 sitesummary "
+"服务器（正常是主服务器）上运行 <computeroutput>sitesummary-update-munin</"
+"computeroutput>。这将更新 <computeroutput>/etc/munin/munin.conf</"
+"computeroutput> 文件。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3918,6 +3945,10 @@ msgid ""
"munin/plugins/</computeroutput> and symlinks the relevant ones to "
"<computeroutput>/etc/munin/plugins/</computeroutput>."
msgstr ""
+"收集的一组测量数据是在使用 <computeroutput>munin-node-configure</"
+"computeroutput> 程序的每台机器上自动生成而那些探测器插件从 <computeroutput>/"
+"usr/share/munin/plugins/</computeroutput> 可以得到并符号链接相关的那些到 "
+"<computeroutput>/etc/munin/plugins/</computeroutput>。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3928,7 +3959,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
msgid "Icinga"
-msgstr ""
+msgstr "Icinga"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3941,6 +3972,11 @@ msgid ""
"<computeroutput>nagios-nrpe-server</computeroutput> package on the "
"workstation."
msgstr ""
+"Icinga 系统和服务监控可从 <ulink url=\"https://www/icinga/\"/> 得到。这组自动"
+"生成被监控机器和服务使用 sitesummary 系统汇集的信息。有主服务器和 LTSP 服务器"
+"配置的机器受到完全的监控，同时工作站和瘦客户端受到简单的监控。要在工作站上启"
+"用完全监控，在该工作站上安装 <computeroutput>nagios-nrpe-server</"
+"computeroutput> 软件包。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3949,11 +3985,14 @@ msgid ""
"reasons, avoid using the same password as root. To change the password you "
"can run the following command as root:"
msgstr ""
+"这个用户名是 <computeroutput>icingaadmin</computeroutput> 而其默认密码是 "
+"<computeroutput>skolelinux</computeroutput>。出于安全原因，避免使用与 root 相"
+"同的密码。可以作为 root 运行以下命令来变更密码："
#. type: CDATA
#, no-wrap
msgid "htpasswd /etc/icinga/htpasswd.users icingaadmin"
-msgstr ""
+msgstr "htpasswd /etc/icinga/htpasswd.users icingaadmin"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3963,6 +4002,11 @@ msgid ""
"computeroutput> in the file <computeroutput>/etc/icinga/sitesummary-template-"
"contacts.cfg</computeroutput>."
msgstr ""
+"在默认情况下 Icinga 不发送电子邮件。这可以在 <computeroutput>/etc/icinga/"
+"sitesummary-template-contacts.cfg</computeroutput> 中用 <computeroutput>host-"
+"notify-by-email</computeroutput> 和 <computeroutput>notify-by-email</"
+"computeroutput> 替换 <computeroutput>notify-by-nothing</computeroutput> 来改"
+"变。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3971,6 +4015,9 @@ msgid ""
"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
+"Icinga 配置文件使用的是 <computeroutput>/etc/icinga/sitesummary.cfg</"
+"computeroutput>。sitesummary cron job 生成有主机和服务监控列表的 "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput>。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3984,18 +4031,20 @@ msgid ""
"Information about Icinga is available from <ulink url=\"https://www.icinga."
"com/\"/> or in the <computeroutput>icinga-doc</computeroutput> package."
msgstr ""
+"有关 Icinga 的信息可以从 <ulink url=\"https://www.icinga.com/\"/> 或者在 "
+"<computeroutput>icinga-doc</computeroutput> 软件包中获得。"
#. type: Content of: <article><section><section><section><section><title>
msgid "Common Icinga warnings and how to handle them"
-msgstr ""
+msgstr "一般的 Icinga 通知以及如何处理它们"
#. type: Content of: <article><section><section><section><section><para>
msgid "Here are instructions on how to handle the most common Icinga warnings."
-msgstr ""
+msgstr "以下是如何处理最常见的 Icinga 警告的说明。"
#. type: Content of: <article><section><section><section><section><section><title>
msgid "DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):"
-msgstr ""
+msgstr "DISK CRITICAL - free space: /usr 309 MB (5% inode=47%):"
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4009,10 +4058,16 @@ msgid ""
"host in question can be added to the <computeroutput>fsautoresize-hosts</"
"computeroutput> netgroup."
msgstr ""
+"该分区（示例中的 /usr/）太满。这一般有两个方法来处理：（1）移除一些文件或者"
+"（2）增加该分区的大小。如果该分区是 /var/，叫 <computeroutput>apt-get clean</"
+"computeroutput> 清理 APT 贮藏可以移除一些文件。如果在 LVM 卷组中有更多空间可"
+"以获得，运行 <computeroutput>debian-edu-fsautoresize</computeroutput> 程序可"
+"以帮助扩展该分区。要在每天自动运行这个程序，可以添加提及的主机到 "
+"<computeroutput>fsautoresize-hosts</computeroutput> 网络组。"
#. type: Content of: <article><section><section><section><section><section><title>
msgid "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
-msgstr ""
+msgstr "APT CRITICAL: 13 packages available for upgrade (13 critical updates)."
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4023,6 +4078,10 @@ msgid ""
"chroot apt-get update && ltsp-chroot apt-get upgrade</"
"computeroutput>."
msgstr ""
+"可以获得升级的新软件包。必要的一些正常安全修正。要升级，以 root 在终端或者通"
+"过 ssh 登录运行 'apt-get upgrade && apt-get dist-upgrade'。在 LTSP 服"
+"务器，也要记着使用 <computeroutput>ltsp-chroot apt-get update &<sp-"
+"chroot apt-get upgrade</computeroutput> 更新 LTSP chroot。"
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4031,6 +4090,9 @@ msgid ""
"upgrades</computeroutput> to automatically upgrade all new packages every "
"night. This will not upgrade the LTSP chroots."
msgstr ""
+"如果不想手工升级软件包并且信任 Debian 对于新版本所做的优秀工作，可以配置 "
+"<computeroutput>unattended-upgrades</computeroutput> 在每个夜晚自动升级所有新"
+"软件包。这将不会升级 LTSP chroot。"
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4040,12 +4102,18 @@ msgid ""
"argument to ltsp-chroot. It is a good idea to update the chroot when "
"updating the host system."
msgstr ""
+"要升级 LTSP chroot，可以使用 <computeroutput>ltsp-chroot apt-get update &"
+"& ltsp-chroot apt-get upgrade</computeroutput>。在 64 位服务器上，将需要"
+"添加 <computeroutput>-a i386</computeroutput> 作为一个参数到 ltsp-chroot。在"
+"升更新这一主系统时更新该 chroot 是个好主意。"
#. type: Content of: <article><section><section><section><section><section><title>
msgid ""
"WARNING - Reboot required : running kernel = 2.6.32-37.81.0, installed "
"kernel = 2.6.32-38.83.0"
msgstr ""
+"WARNING - Reboot required : running kernel = 2.6.32-37.81.0, installed "
+"kernel = 2.6.32-38.83.0"
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4054,10 +4122,12 @@ msgid ""
"fairly urgent, as new kernels normally show up in Debian Edu to fix security "
"issues."
msgstr ""
+"运行中的内核比最新安装的内核旧，需要重启来激活最新安装的内核。这通常相当急"
+"迫，作为新内核通常显示在 Debian Edu 修正的安全发布中。"
#. type: Content of: <article><section><section><section><section><section><title>
msgid "WARNING: CUPS queue size - 61"
-msgstr ""
+msgstr "WARNING: CUPS queue size - 61"
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4073,7 +4143,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
msgid "Sitesummary"
-msgstr ""
+msgstr "Sitesummary"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4083,22 +4153,30 @@ msgid ""
"<computeroutput>/usr/lib/sitesummary/</computeroutput> are available to "
"generate reports."
msgstr ""
+"Sitesummary 用于从每台计算机收集信息并将其提交给中央服务器。这一汇集的信息可"
+"从 <computeroutput>/var/lib/sitesummary/entries/</computeroutput> 中获得。"
+"<computeroutput>/usr/lib/sitesummary/</computeroutput> 中的脚本可以得到生成的"
+"报告。"
#. type: Content of: <article><section><section><section><para>
msgid ""
"A simple report from sitesummary without any details is available from "
"<ulink url=\"https://www/sitesummary/\"/>."
msgstr ""
+"一个来自 sitesummary 的没有任何细节的简单报告可以从 <ulink url=\"https://www/"
+"sitesummary/\"/> 获得。"
#. type: Content of: <article><section><section><section><para>
msgid ""
"Some documentation on sitesummary is available from <ulink url=\"http://wiki."
"debian.org/DebianEdu/HowTo/SiteSummary\"/>"
msgstr ""
+"一些关于 sitesummary 的文档可从 <ulink url=\"http://wiki.debian.org/"
+"DebianEdu/HowTo/SiteSummary\"/> 获得"
#. type: Content of: <article><section><section><title>
msgid "More information about Debian Edu customisations"
-msgstr ""
+msgstr "更多有关 Debian Edu 定制的信息"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4107,10 +4185,13 @@ msgid ""
"\">Administration Howto chapter</link> and in the <link linkend="
"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
msgstr ""
+"更多有关 Debian Edu 定制的信息可以在<link linkend=\"Administration\">如何管理"
+"章节</link>和<link linkend=\"AdvancedAdministration\">高级管理如何做章节</"
+"link>中找到"
#. type: Content of: <article><section><title>
msgid "Upgrades"
-msgstr ""
+msgstr "升级"
#. type: Content of: <article><section><para>
msgid ""
@@ -4126,10 +4207,12 @@ msgid ""
"Stretch</link> chapter of this manual completely before attempting to "
"upgrade."
msgstr ""
+"在试图升级之前请完整阅读本手册的这一章和 <link linkend=\"Features\">Stretch "
+"的新特性</link>一章。"
#. type: Content of: <article><section><section><title>
msgid "General notes on upgrading"
-msgstr ""
+msgstr "升级的一般说明"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4148,6 +4231,9 @@ msgid ""
"haven't modified it. If you have, the chroot is basically a workstation "
"chroot anyway, so rather easy to upgrade."
msgstr ""
+"一般来说，升级服务器比工作站更加困难，主服务器是最难升级的。无盘机器是容易"
+"的，如果未修改过作为它们的 chroot 环境，可以删除并重建它。如果有，这个 "
+"chroot 基本上相当工作站 chroot，如此也相当容易升级。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4163,6 +4249,8 @@ msgid ""
"release in its <ulink url=\"http://www.debian.org/releases/stable/"
"installmanual\">installation manual</ulink>."
msgstr ""
+"确定也要阅读 Debian <ulink url=\"http://www.debian.org/releases/stable/"
+"installmanual\">安装手册</ulink>中有关其当前稳定发布版的信息。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4173,16 +4261,21 @@ msgid ""
"url=\"http://www.debian.org/security/faq#lifespan\">ceases support for "
"Oldstable</ulink>, Debian Edu will necessarily do the same."
msgstr ""
+"保持运行旧的稳定版数周长而等待一段时间也是明智的，那样其他人可以测试升级并提"
+"供他们测验的任何问题的文档。Debian Edu 旧稳定版在接下来的稳定版发布之后会受到"
+"继续支持一段时间，但当 Debian <ulink url=\"http://www.debian.org/security/"
+"faq#lifespan\">终止对旧稳定版的支持</ulink>时，Debian Edu 必然会同样做。"
#. type: Content of: <article><section><section><title>
msgid "Upgrades from Debian Edu Jessie"
-msgstr ""
+msgstr "从 Debian Edu Jessie 升级"
#. type: Content of: <article><section><section><para>
msgid ""
"Be prepared: make sure you have tested the upgrade from Jessie in a test "
"environment or have backups ready to be able to go back."
msgstr ""
+"准备：确保已在测试环境中测试了从 Jessie 升级或者准备好了可以恢复的备份。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4194,7 +4287,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid "Don't use X, use a virtual console, log in as root."
-msgstr ""
+msgstr "不要使用 X，使用虚拟控制台，以 root 登录。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4204,6 +4297,10 @@ msgid ""
"<computeroutput>apt</computeroutput> removes them from the cache (after "
"successful installation)."
msgstr ""
+"请注意在 Stretch 中 <computeroutput>apt</computeroutput> 和 "
+"<computeroutput>apt-get</computeroutput> 之间的一个区别：默认下 "
+"<computeroutput>apt-get</computeroutput> 保留下载的软件包，"
+"<computeroutput>apt</computeroutput> 从仓库移除它们（在成功安装之后）。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4211,6 +4308,9 @@ msgid ""
"it and/or run <computeroutput>apt -f install</computeroutput> and then "
"<computeroutput>apt -y full-upgrade</computeroutput> once again."
msgstr ""
+"如果 <computeroutput>apt</computeroutput> 有错误而结束，尝试修正和/或运行 "
+"<computeroutput>apt -f install</computeroutput> 然后再一次 "
+"<computeroutput>apt -y full-upgrade</computeroutput>。"
#. type: Content of: <article><section><section><section><title>
#, fuzzy
@@ -4220,7 +4320,7 @@ msgstr "运行在主服务器上的服务"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Start by making sure the current system is up-to-date:"
-msgstr ""
+msgstr "首先确保当前系统是最新的："
#. type: CDATA
#, no-wrap
@@ -4228,19 +4328,21 @@ msgid ""
"apt update\n"
"apt full-upgrade"
msgstr ""
+"apt update\n"
+"apt full-upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleanup the package cache:"
-msgstr ""
+msgstr "清理软件包仓库："
#. type: CDATA
#, no-wrap
msgid "apt-get clean"
-msgstr ""
+msgstr "apt-get clean"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Prepare and start the upgrade to Stretch:"
-msgstr ""
+msgstr "准备并开始升级到 Stretch："
#. type: CDATA
#, no-wrap
@@ -4254,12 +4356,22 @@ msgid ""
"apt update\n"
"apt full-upgrade"
msgstr ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
+"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+"apt update\n"
+"apt full-upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"apt-list-changes: be prepared for a lot of NEWS to read; press <"
"return> to scroll down, <q> to leave the pager."
msgstr ""
+"apt-list-changes：准备好阅读大量的消息；按 < 返回 > 向下滚动，<"
+"q> 离开这一页面。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4270,7 +4382,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
-msgstr ""
+msgstr "你将看到有关包配置的一些提示："
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -4300,10 +4412,12 @@ msgid ""
"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
"\"https://bugs.debian.org/789667#\">789667</ulink>)"
msgstr ""
+"tftp (etc/inetd.conf)：选择 <Yes>。（参看 atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>）"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "/etc/default/ldap2zone: Choose Y."
-msgstr ""
+msgstr "/etc/default/ldap2zone：选择 Y。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
@@ -4325,6 +4439,14 @@ msgid ""
"rm /etc/squid3 -rf\n"
"rm /etc/default/squid3 -rf"
msgstr ""
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
@@ -4338,6 +4460,10 @@ msgid ""
"Search for 'sudoHost :tjener', replace 'tjener' with 'tjener.intern'\n"
"(Enter 'y' to modify the LDAP data base.)"
msgstr ""
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace 'tjener' with 'tjener.intern'\n"
+"(Enter 'y' to modify the LDAP data base.)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
@@ -4346,17 +4472,35 @@ msgid "Apply and adjust configuration:"
msgstr "文件系统存取配置"
#. type: CDATA
-#, no-wrap
-msgid ""
+#, fuzzy, no-wrap
+#| msgid ""
+#| "cfengine-debian-edu -D installation\n"
+#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
+#| "a2dismod userdir\n"
+#| "ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
+#| "a2enmod debian-edu-userdir\n"
+#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
+#| "service squid start\n"
+#| "service apache2 restart"
+msgid ""
+"service autofs stop\n"
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
"a2dismod userdir\n"
-"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load\n"
"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
msgstr ""
+"cfengine-debian-edu -D installation\n"
+"rm /etc/apache2/conf-enabled/nagios3.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
+"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
+"service squid start\n"
+"service apache2 restart"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Install renamed metapackages:"
@@ -4369,15 +4513,18 @@ msgid ""
"apt install education-networked-common\n"
"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
msgstr ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Get the new Debian Edu Stretch artwork:"
-msgstr ""
+msgstr "获得新的 Debian Edu Stretch 插图："
#. type: CDATA
#, no-wrap
msgid "apt install debian-edu-artwork-softwaves"
-msgstr ""
+msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4388,7 +4535,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
-msgstr ""
+msgstr "重新启动后，再进行一些清理："
#. type: CDATA
#, no-wrap
@@ -4398,6 +4545,10 @@ msgid ""
"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
+"apt purge linux-image-3.16.0-4-amd64 \n"
+"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
+"rm -rf /etc/php5"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Enable otherwise broken PHP 7.0 support:"
@@ -4409,22 +4560,24 @@ msgid ""
"a2enmod php7.0 \n"
"service apache2 restart"
msgstr ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works:"
-msgstr ""
+msgstr "检查升级系统是否正常工作："
#. type: Content of: <article><section><section><section><para>
msgid "Reboot; log in as first user and test"
-msgstr ""
+msgstr "重启；以首个用户登录并测试"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if the GOsa² gui is working,"
-msgstr ""
+msgstr "如果 GOsa² 图形用户界面正在工作，"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one is able to connect LTSP clients and workstations,"
-msgstr ""
+msgstr "如果能够连接 LTSP 客户端和工作站，"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one can add/remove a netgroup membership of a system,"
@@ -4432,19 +4585,19 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one can send and receive internal email,"
-msgstr ""
+msgstr "如果可以发送和接收内部电子邮件，"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one can manage printers,"
-msgstr ""
+msgstr "如果可以管理打印机，"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "and if other site specific things are working."
-msgstr ""
+msgstr "如果其他网站特定的事正在工作。"
#. type: Content of: <article><section><section><section><title>
msgid "Upgrading a workstation"
-msgstr ""
+msgstr "升级工作站"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4454,7 +4607,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "To enable LDAP connection, renew the server certificate:"
-msgstr ""
+msgstr "要启用 LDAP 连接，更新服务器证书："
#. type: CDATA
#, no-wrap
@@ -4464,10 +4617,14 @@ msgid ""
"service fetch-ldap-cert restart\n"
"service nslcd start"
msgstr ""
+"rm /etc/ldap/ssl/ldap-server-pubkey.pem\n"
+"service nslcd stop\n"
+"service fetch-ldap-cert restart\n"
+"service nslcd start"
#. type: Content of: <article><section><section><section><title>
msgid "Upgrading LTSP chroots (default arch i386)"
-msgstr ""
+msgstr "升级 LTSP chroot（默认架构 i386）"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4475,6 +4632,8 @@ msgid ""
"(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."
msgstr ""
+"确保有充足的磁盘空间。LTSP 现在使用网络块设备（NBD）。NBD 镜像文件大小大约是 "
+"4 GiB（默认安装）。如果更新该镜像，需要为临时文件再多一个 4 GiB。"
#. type: CDATA
#, no-wrap
@@ -4487,19 +4646,26 @@ msgid ""
"ltsp-chroot -m -a i386 apt -f install\n"
"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleaning up:"
-msgstr ""
+msgstr "清理："
#. type: CDATA
#, no-wrap
msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
-msgstr ""
+msgstr "ltsp-chroot -m -a i386 apt --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Update LTSP support on the server side:"
-msgstr ""
+msgstr "在服务器端更新 LTSP 支持："
#. type: CDATA
#, no-wrap
@@ -4508,6 +4674,9 @@ msgid ""
"ltsp-update-sshkeys\n"
"ltsp-update-image"
msgstr ""
+"ltsp-update-kernels\n"
+"ltsp-update-sshkeys\n"
+"ltsp-update-image"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4515,16 +4684,21 @@ msgid ""
"could be used instead; see <computeroutput>man ltsp-update-image</"
"computeroutput>."
msgstr ""
+"为节省磁盘空间，可改为使用 <computeroutput>ltsp-update-image -n</"
+"computeroutput>；参阅 <computeroutput>man ltsp-update-image</"
+"computeroutput>。"
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
-msgstr ""
+msgstr "重建 LTSP chroot"
#. type: Content of: <article><section><section><section><para>
msgid ""
"On the LTSP server(s) the LTSP chroot could also be recreated. The new "
"chroot will still support both thin-clients and diskless workstations."
msgstr ""
+"在 LTSP 服务器上还可以重新创建 LTSP chroot。新的 chroot 仍将支持瘦客户端和无"
+"盘工作站二者。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4532,6 +4706,9 @@ msgid ""
"opt/ltsp/amd64</computeroutput>, depending on your setup). If you have "
"enough diskspace, consider backing it up."
msgstr ""
+"移除 <computeroutput>/opt/ltsp/i386</computeroutput>（或 <computeroutput>/"
+"opt/ltsp/amd64</computeroutput>，取决于你的设置）。如果有充裕的磁盘空间，考虑"
+"备份它。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4539,11 +4716,14 @@ msgid ""
"computeroutput> (or <computeroutput>debian-edu-ltsp --arch amd64</"
"computeroutput>) as root."
msgstr ""
+"以 root 运行 <computeroutput>debian-edu-ltsp --arch i386</"
+"computeroutput>（或 <computeroutput>debian-edu-ltsp --arch amd64</"
+"computeroutput>）重新创建 chroot。"
#. type: Content of: <article><section><section><title>
msgid ""
"Upgrades from older Debian Edu / Skolelinux installations (before Jessie)"
-msgstr ""
+msgstr "从较旧的 Debian Edu / Skolelinux 安装（Jessie 之前）升级"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4554,45 +4734,50 @@ msgid ""
"ulink> about how to upgrade to Jessie from the previous release, Wheezy. "
"Likewise the Wheezy manual describes how to upgrade from Squeeze."
msgstr ""
+"要从任何旧版本升级，需要首先升级到基于 Jessie 的 Debian Edu 版本，然后才能按"
+"照上述说明进行操作。在 <ulink url=\"https://wiki.debian.org/DebianEdu/"
+"Documentation/Jessie#\">Debian Edu Jessie 手册</ulink>中给出了有关如何从先前"
+"的发布版，Wheezy 升级到 Jessie 的说明。同样 Wheezy 手册叙述了如何从 Squeeze "
+"升级。"
#. type: Content of: <article><section><title>
msgid "HowTo"
-msgstr ""
+msgstr "HowTo"
#. type: Content of: <article><section><itemizedlist><listitem><para>
msgid ""
"HowTos for <link linkend=\"Administration\">general administration</link>"
-msgstr ""
+msgstr "<link linkend=\"Administration\">一般管理</link> HowTo"
#. type: Content of: <article><section><itemizedlist><listitem><para>
msgid ""
"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
"link>"
-msgstr ""
+msgstr "<link linkend=\"AdvancedAdministration\">高级管理</link> HowTo"
#. type: Content of: <article><section><itemizedlist><listitem><para>
msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
-msgstr ""
+msgstr "<link linkend=\"Desktop\">桌面</link> HowTo"
#. type: Content of: <article><section><itemizedlist><listitem><para>
msgid "HowTos for <link linkend=\"NetworkClients\">networked clients</link>"
-msgstr ""
+msgstr "<link linkend=\"NetworkClients\">网络客户端</link> HowTo"
#. type: Content of: <article><section><itemizedlist><listitem><para>
msgid "HowTos for <link linkend=\"Samba\">Samba</link>"
-msgstr ""
+msgstr "<link linkend=\"Samba\">Samba</link> HowTo"
#. type: Content of: <article><section><itemizedlist><listitem><para>
msgid "HowTos for <link linkend=\"TeachAndLearn\">teaching and learning</link>"
-msgstr ""
+msgstr "<link linkend=\"TeachAndLearn\">教学</link> HowTo"
#. type: Content of: <article><section><itemizedlist><listitem><para>
msgid "HowTos for <link linkend=\"Users\">users</link>"
-msgstr ""
+msgstr "<link linkend=\"Users\">用户</link> HowTo"
#. type: Content of: <article><section><title>
msgid "HowTos for general administration"
-msgstr ""
+msgstr "一般管理 HowTo"
#. type: Content of: <article><section><para>
msgid ""
@@ -4601,11 +4786,14 @@ msgid ""
"started with Debian Edu and how to do the basic maintenance work. The howtos "
"in this chapter have some more \"advanced\" tips and tricks."
msgstr ""
+"<link linkend=\"GettingStarted\">起步</link>和<link linkend=\"Maintenance\">"
+"维护</link>章节讲述 Debian Edu 如何开始以及如何做基本的维护工作。在这一章的叙"
+"述中有更多“进一步”的提示和技巧。"
#. type: Content of: <article><section><section><title>
msgid ""
"Configuration history: tracking /etc/ using the git version control system"
-msgstr ""
+msgstr "配置的历史：使用 git 版本控制系统跟踪 /etc/"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4615,6 +4803,10 @@ msgid ""
"<computeroutput>/etc/</computeroutput> are tracked using <ulink url=\"http://"
"www.git-scm.com/\">git</ulink> as a version control system."
msgstr ""
+"在 Debian Edu Squeeze 中引进的 <computeroutput>etckeeper</computeroutput>（以"
+"前版本使用的 <computeroutput>etcinsvk</computeroutput> 已从 Debian 中移除），"
+"使用 <ulink url=\"http://www.git-scm.com/\">git</ulink> 作为版本控制系统跟踪 "
+"<computeroutput>/etc/</computeroutput> 中的所有文件。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4622,12 +4814,14 @@ msgid ""
"well as what was changed if the file is a text file. The git repository is "
"stored in <computeroutput>/etc/.git/</computeroutput>."
msgstr ""
+"这可以查看文件何时添加，更改和删除，以及文件如果是文本文件时发生的改变。这个 "
+"git 存储信息的仓库是在 <computeroutput>/etc/.git/</computeroutput> 中。"
#. type: Content of: <article><section><section><para>
msgid ""
"Every hour, any changes are automatically recorded, allowing configuration "
"history to be extracted and reviewed."
-msgstr ""
+msgstr "每个小时，任何更改都会自动记录，从而允许提取和审核配置历史记录。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4636,16 +4830,19 @@ msgid ""
"time, a command like <computeroutput>etckeeper vcs diff </computeroutput> "
"can be used."
msgstr ""
+"在该历史中查看，使用 <computeroutput>etckeeper vcs log</computeroutput> 命"
+"令。检查两个时间点之间的差异，可以使用如 <computeroutput>etckeeper vcs diff</"
+"computeroutput> 的命令。"
#. type: Content of: <article><section><section><para>
msgid ""
"See the output of <computeroutput>man etckeeper</computeroutput> for more "
"information."
-msgstr ""
+msgstr "更多的信息参看 <computeroutput>man etckeeper</computeroutput> 的输出。"
#. type: Content of: <article><section><section><para>
msgid "List of useful commands:"
-msgstr ""
+msgstr "常用命令列表："
#. type: CDATA
#, no-wrap
@@ -4657,44 +4854,50 @@ msgid ""
"etckeeper vcs commit -a\n"
"man etckeeper"
msgstr ""
+"etckeeper vcs log\n"
+"etckeeper vcs status\n"
+"etckeeper vcs diff\n"
+"etckeeper vcs add .\n"
+"etckeeper vcs commit -a\n"
+"man etckeeper"
#. type: Content of: <article><section><section><section><title>
msgid "Usage examples"
-msgstr ""
+msgstr "用法示例"
#. type: Content of: <article><section><section><section><para>
msgid ""
"On a freshly installed system, try this to see all changes done since the "
"system was installed:"
-msgstr ""
+msgstr "在新安装的系统上，尝试从系统安装后看到所做的所有更改："
#. type: CDATA
#, no-wrap
msgid "etckeeper vcs log"
-msgstr ""
+msgstr "etckeeper vcs log"
#. type: Content of: <article><section><section><section><para>
msgid "See which files are currently not tracked and which are not up-to-date:"
-msgstr ""
+msgstr "查看目前哪些文件没有被跟踪而哪些文件不是最新的："
#. type: CDATA
#, no-wrap
msgid "etckeeper vcs status"
-msgstr ""
+msgstr "etckeeper vcs status"
#. type: Content of: <article><section><section><section><para>
msgid ""
"To manually commit a file, because you don't want to wait up to an hour:"
-msgstr ""
+msgstr "因为不想等待一小时，而要手工提交文件："
#. type: CDATA
#, no-wrap
msgid "etckeeper vcs commit -a /etc/resolv.conf"
-msgstr ""
+msgstr "etckeeper vcs commit -a /etc/resolv.conf"
#. type: Content of: <article><section><section><title>
msgid "Resizing Partitions"
-msgstr ""
+msgstr "调整分区大小"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4704,6 +4907,9 @@ msgid ""
"mounted. Shrinking partitions still needs to happen while the partition is "
"unmounted."
msgstr ""
+"在 Debian Edu 中，除了 <computeroutput>/boot/</computeroutput> 分区之外的所有"
+"分区是在逻辑 LVM 卷上。从 Linux 内核 2.6.10 以来，可以在它们被挂载时扩展分"
+"区。缩减分区仍然需要在该分区被卸载时发生。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4713,6 +4919,9 @@ msgid ""
"It is better, if possible, to create several smaller partitions than one "
"very large one."
msgstr ""
+"避免创建非常大的分区（如，20GiB），因为在其上运行 <computeroutput>fsck</"
+"computeroutput> 或者当需要从备份恢复它们时需要时间。最好，如果可能，创建比一"
+"个很大分区较小的若干分区。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4727,12 +4936,20 @@ msgid ""
"<computeroutput>-n</computeroutput> is needed to actually execute these "
"commands to extend the file systems."
msgstr ""
+"提供了助理脚本 <computeroutput>debian-edu-fsautoresize</computeroutput> "
+"使其更易于扩展占满的分区。当应用时，它从 <computeroutput>/usr/share/debian-edu-config/fsautoresiz"
+"etab</computeroutput>，<computeroutput>/site/etc/fsautoresizetab</computeroutp"
+"ut> 和 <computeroutput>/etc/fsautoresizetab</computeroutput> "
+"得到配置信息。它依照这些文件中提供的值，在出现太小的自由空间时建议扩展分区。当不用参数运行它时，将仅显示该命令需要扩展这个文件系统。需要参数 "
+"<computeroutput>-n</computeroutput> 来实际执行这些命令扩展这个文件系统。"
#. type: Content of: <article><section><section><para>
msgid ""
"The script is executed automatically every hour on every client listed in "
"the <computeroutput>fsautoresize-hosts</computeroutput> netgroup."
msgstr ""
+"这个脚本每小时在列于 <computeroutput>fsautoresize-hosts</computeroutput> "
+"网络组中的每个客户端被自动执行。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4747,7 +4964,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
msgid "Logical Volume Management"
-msgstr ""
+msgstr "逻辑卷管理"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4755,6 +4972,8 @@ msgid ""
"are mounted and in use. You can learn more about LVM from the <ulink url="
"\"http://www.tldp.org/HOWTO/LVM-HOWTO/\">LVM HowTo</ulink>."
msgstr ""
+"逻辑卷管理 (LVM) 能够使被挂载并在使用的分区重分划大小。可以从 <ulink url=\"http://www.tldp.org/HOWTO"
+"/LVM-HOWTO/\">LVM HowTo</ulink> 中学到更多有关 LVM。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4763,6 +4982,8 @@ msgid ""
"grow to. For example, to extend home0 to 30GiB you use the following "
"commands:"
msgstr ""
+"简单地指令 <computeroutput>lvextend</computeroutput> 命令需要增加多大来手动扩展一个逻辑卷。例如，"
+"使用下述命令来扩展 home0 到 30GiB："
#. type: CDATA
#, no-wrap
@@ -4770,14 +4991,16 @@ msgid ""
"lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
"resize2fs /dev/vg_system/skole+tjener+home0"
msgstr ""
+"lvextend -L30G /dev/vg_system/skole+tjener+home0\n"
+"resize2fs /dev/vg_system/skole+tjener+home0"
#. type: Content of: <article><section><section><section><para>
msgid "To extend home0 by additional 30GiB, you insert a '+' (-L+30G)"
-msgstr ""
+msgstr "通过附加 30GiB 来扩展 home0，插入一个“+”（-L+30G）"
#. type: Content of: <article><section><section><title>
msgid "Installing a graphical environment on the main-server to use GOsa²"
-msgstr ""
+msgstr "在主服务器上安装图形环境来使用 GOsa²"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4787,6 +5010,8 @@ msgid ""
"shell as the user you created during the main server's installation (first "
"user):"
msgstr ""
+"如果（大概意外地）安装了一个纯主服务器 profile 而没有一个便于使用的 web "
+"浏览器的客户端，作为这一主服务器安装时创建的用户（第一个用户）在（非图形）shell 中使用这个命令序列在该主服务器上安装一个最小桌面是容易的："
#. type: CDATA
#, no-wrap
@@ -4796,25 +5021,31 @@ msgid ""
" # after installation, start a graphical session for the first user \n"
" $ startx"
msgstr ""
+"$ sudo apt-get update\n"
+" $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
+" # after installation, start a graphical session for the first user \n"
+" $ startx"
#. type: Content of: <article><section><section><title>
msgid "Using ldapvi"
-msgstr ""
+msgstr "使用 ldapvi"
#. type: Content of: <article><section><section><para>
msgid ""
"<ulink url=\"http://www.lichteblau.com/ldapvi/manual/\">ldapvi</ulink> is a "
"tool to edit the LDAP database with a normal text editor on the commandline."
msgstr ""
+"<ulink url=\"http://www.lichteblau.com/ldapvi/manual/\">ldapvi</ulink> "
+"是一个在命令行中以常规文本编辑器编辑 LDAP 数据库的工具。"
#. type: Content of: <article><section><section><para>
msgid "The following needs to be executed:"
-msgstr ""
+msgstr "下面需要执行："
#. type: CDATA
#, no-wrap
msgid "ldapvi --ldap-conf -ZD '(cn=admin)'"
-msgstr ""
+msgstr "ldapvi --ldap-conf -ZD '(cn=admin)'"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4836,10 +5067,12 @@ msgid ""
"careful and don't mess up the LDAP database, same warning applies for "
"JXplorer."
msgstr ""
+"提醒：<computeroutput>ldapvi</computeroutput> 是一个强有力的工具。当心而不弄乱 LDAP 数据库，"
+"同样的提醒适用于 JXplorer。"
#. type: Content of: <article><section><section><title>
msgid "JXplorer, an LDAP GUI"
-msgstr ""
+msgstr "JXplorer，一个 LDAP 图形用户界面"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4862,7 +5095,7 @@ msgstr ""
#. type: Content of: <article><section><section><title>
msgid "ldap-createuser-krb, a command-line tool"
-msgstr ""
+msgstr "ldap-createuser-krb，一个命令行工具"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4870,6 +5103,8 @@ msgid ""
"tool to create LDAP users and set their passwords in Kerberos. It's mostly "
"useful for testing, though."
msgstr ""
+"<computeroutput>ldap-createuser-krb</computeroutput> 是一个在 Kerberos 里创建 LDAP "
+"用户和设置其密码的小命令行工具。虽然，几乎是用于测试。"
#. type: Content of: <article><section><section><title>
msgid "Using stable-updates"
@@ -5657,8 +5892,8 @@ msgid ""
"If LTSP clients were attached to the backbone network 10.0.0.0/8 (combi "
"server or LTSP cluster setup) things would be even more complicated and "
"maybe only a sophisticated DHCP setup (in LDAP) checking the vendor-class-"
-"identifier together with apropriate PAM configuration would allow to disable "
-"internal ssh login."
+"identifier together with appropriate PAM configuration would allow to "
+"disable internal ssh login."
msgstr ""
#. type: Content of: <article><section><title>
@@ -7332,13 +7567,6 @@ msgstr ""
msgid "on the System Properties page, click on \"Change...\""
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"After the reboot, when you login the first time, click on the \"Options >"
-">\" button and select the domain SKOLELINUX instead of the local domain "
-"(\"this computer\")"
-msgstr ""
-
#. type: Content of: <article><section><section><title>
msgid "First Domain Logon"
msgstr ""
diff --git a/documentation/debian-edu-stretch/images/01-Installer_64bit_boot_menu.png b/documentation/debian-edu-stretch/images/01-Installer_64bit_boot_menu.png
index 9590b5c..5d86d5a 100644
Binary files a/documentation/debian-edu-stretch/images/01-Installer_64bit_boot_menu.png and b/documentation/debian-edu-stretch/images/01-Installer_64bit_boot_menu.png differ
diff --git a/documentation/debian-edu-stretch/images/01a-Installer_64bit_advanced_options.png b/documentation/debian-edu-stretch/images/01a-Installer_64bit_advanced_options.png
index 63d148e..2776e23 100644
Binary files a/documentation/debian-edu-stretch/images/01a-Installer_64bit_advanced_options.png and b/documentation/debian-edu-stretch/images/01a-Installer_64bit_advanced_options.png differ
diff --git a/documentation/debian-edu-stretch/images/01b-Installer_32bit_boot_menu.png b/documentation/debian-edu-stretch/images/01b-Installer_32bit_boot_menu.png
index c0eb731..63e1df6 100644
Binary files a/documentation/debian-edu-stretch/images/01b-Installer_32bit_boot_menu.png and b/documentation/debian-edu-stretch/images/01b-Installer_32bit_boot_menu.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/02-select_a_language.png b/documentation/debian-edu-stretch/images/ja/02-select_a_language.png
new file mode 100644
index 0000000..9bec0c4
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/02-select_a_language.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/03-select_your_location.png b/documentation/debian-edu-stretch/images/ja/03-select_your_location.png
new file mode 100644
index 0000000..60ccda5
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/03-select_your_location.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/04-Configure_the_keyboard.png b/documentation/debian-edu-stretch/images/ja/04-Configure_the_keyboard.png
new file mode 100644
index 0000000..8bed043
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/04-Configure_the_keyboard.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/05-Detect_and_mount_CD-ROM.png b/documentation/debian-edu-stretch/images/ja/05-Detect_and_mount_CD-ROM.png
new file mode 100644
index 0000000..7fd1f57
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/05-Detect_and_mount_CD-ROM.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/06-Load_installer_components_from_CD.png b/documentation/debian-edu-stretch/images/ja/06-Load_installer_components_from_CD.png
new file mode 100644
index 0000000..756cd88
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/06-Load_installer_components_from_CD.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/07-Detect_network_hardware.png b/documentation/debian-edu-stretch/images/ja/07-Detect_network_hardware.png
new file mode 100644
index 0000000..61472ac
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/07-Detect_network_hardware.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/08-Choose_Debian_Edu_profile.png b/documentation/debian-edu-stretch/images/ja/08-Choose_Debian_Edu_profile.png
new file mode 100644
index 0000000..e3e6cd6
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/08-Choose_Debian_Edu_profile.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/09-Really_use_the_automatic_partitioning_tool.png b/documentation/debian-edu-stretch/images/ja/09-Really_use_the_automatic_partitioning_tool.png
new file mode 100644
index 0000000..4c5701b
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/09-Really_use_the_automatic_partitioning_tool.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/10-Really_use_the_automatic_partitioning_tool-Yes.png b/documentation/debian-edu-stretch/images/ja/10-Really_use_the_automatic_partitioning_tool-Yes.png
new file mode 100644
index 0000000..221d4cb
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/10-Really_use_the_automatic_partitioning_tool-Yes.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/11-Participate_in_the_package_usage_survey.png b/documentation/debian-edu-stretch/images/ja/11-Participate_in_the_package_usage_survey.png
new file mode 100644
index 0000000..9926de8
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/11-Participate_in_the_package_usage_survey.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/12-Set_up_users_and_passwords.png b/documentation/debian-edu-stretch/images/ja/12-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..af671da
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/12-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/12a-Set_up_users_and_passwords.png b/documentation/debian-edu-stretch/images/ja/12a-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..1b2329f
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/12a-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/12b-Set_up_users_and_passwords.png b/documentation/debian-edu-stretch/images/ja/12b-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..7cf3d8d
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/12b-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/12c-Set_up_users_and_passwords.png b/documentation/debian-edu-stretch/images/ja/12c-Set_up_users_and_passwords.png
new file mode 100644
index 0000000..f9bb99b
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/12c-Set_up_users_and_passwords.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/12d-Setting-up-the-partitioner.png b/documentation/debian-edu-stretch/images/ja/12d-Setting-up-the-partitioner.png
new file mode 100644
index 0000000..e6f3be9
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/12d-Setting-up-the-partitioner.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/13-Install+the+base+system.png b/documentation/debian-edu-stretch/images/ja/13-Install+the+base+system.png
new file mode 100644
index 0000000..53fd48f
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/13-Install+the+base+system.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/14-Select_and_install_software.png b/documentation/debian-edu-stretch/images/ja/14-Select_and_install_software.png
new file mode 100644
index 0000000..78205b9
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/14-Select_and_install_software.png differ
diff --git a/documentation/debian-edu-stretch/images/ja/Debian_Edu_Network_Stretch.png b/documentation/debian-edu-stretch/images/ja/Debian_Edu_Network_Stretch.png
new file mode 100644
index 0000000..5c28a4a
Binary files /dev/null and b/documentation/debian-edu-stretch/images/ja/Debian_Edu_Network_Stretch.png differ
diff --git a/documentation/debian-edu-stretch/images/source/Debian_Edu_Network_Stretch.odg b/documentation/debian-edu-stretch/images/source/Debian_Edu_Network_Stretch.odg
new file mode 100644
index 0000000..e695978
Binary files /dev/null and b/documentation/debian-edu-stretch/images/source/Debian_Edu_Network_Stretch.odg differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list