[debian-edu-commits] debian-edu/ 01/02: import changes from master branch…
Holger Levsen
holger at layer-acht.org
Sat Jul 15 14:01:34 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 ecd73e6445e97b798b31beec41c1d9e67b5f2a3e
Author: Holger Levsen <holger at layer-acht.org>
Date: Sat Jul 15 15:50:32 2017 +0200
import changes from master branch…
* Update Debian Edu Stretch manual from the wiki.
* Polish: Stanisław Krukowski.
* Simplified Chinese: Ma Yong.
* German: Wolfgang Schweer.
* Norwegian Bokmål: Petter Reinholdtsen.
* Italian: Claudio Carboncini.
* Dutch: Frans Spiesschaert.
---
debian/changelog | 18 ++
.../debian-edu-stretch-manual.da.po | 146 +++++----
.../debian-edu-stretch-manual.de.po | 171 ++++++-----
.../debian-edu-stretch-manual.es.po | 98 +++---
.../debian-edu-stretch-manual.fr.po | 147 +++++----
.../debian-edu-stretch-manual.it.po | 194 +++++++-----
.../debian-edu-stretch-manual.ja.po | 154 +++++++---
.../debian-edu-stretch-manual.nb.po | 173 ++++++-----
.../debian-edu-stretch-manual.nl.po | 161 +++++-----
.../debian-edu-stretch-manual.pl.po | 98 +++---
.../debian-edu-stretch-manual.pot | 84 ++---
.../debian-edu-stretch-manual.xml | 37 ++-
.../debian-edu-stretch-manual.zh.po | 342 +++++++++++++++------
.../debian-edu-stretch/images/de/worldmap.png | Bin 383415 -> 383411 bytes
.../debian-edu-stretch/images/es/worldmap.png | Bin 383563 -> 383574 bytes
.../debian-edu-stretch/images/fr/worldmap.png | Bin 383491 -> 383489 bytes
.../debian-edu-stretch/images/worldmap.png | Bin 383489 -> 383489 bytes
17 files changed, 1127 insertions(+), 696 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8cd789c..baaaa5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+debian-edu-doc (1.921~20170603+deb9u1) UNRELEASED; urgency=medium
+
+ [ Holger Levsen ]
+ * Update Debian Edu Stretch manual from the wiki.
+
+ [ Wolfgang Schweer ]
+ * Update Debian Edu Stretch manual from the wiki.
+
+ [ Stretch Manual translation updates ]
+ * Polish: Stanisław Krukowski.
+ * Simplified Chinese: Ma Yong.
+ * German: Wolfgang Schweer.
+ * Norwegian Bokmål: Petter Reinholdtsen.
+ * Italian: Claudio Carboncini.
+ * Dutch: Frans Spiesschaert.
+
+ -- Holger Levsen <holger at debian.org> Sat, 15 Jul 2017 15:48:59 +0200
+
debian-edu-doc (1.921~20170603) unstable; urgency=medium
* Update Debian Edu Stretch manual from the wiki.
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 c232e40..a3a94c2 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-06-03 19:42+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+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"
@@ -4233,15 +4233,28 @@ msgid "Printer Management"
msgstr "Printerhåndtering"
#. 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\"/>. 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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
@@ -4871,11 +4884,18 @@ msgstr ""
"&& ltsp-chroot apt-get upgrade</computeroutput>."
#. 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 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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
"Hvis du ikke ønsker at opgradere pakker manuelt og stoler på at Debian gør "
"et godt arbejde med nye versioner, så kan du installere pakken "
@@ -5121,21 +5141,8 @@ msgstr ""
"releasenotes\"/>)"
#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Don't use X, use a virtual console, log in as root. Read all debconf "
-#| "information carefully, choose 'keep the local version currently "
-#| "installed'; in most cases hitting return will be fine. Press 'q' to quit "
-#| "the apt-listchanges pager once you've read the information."
-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 "Don't use X, use a virtual console, log in as root."
msgstr ""
-"Brug ikke X, brug en virtuel konsol, log ind som root. Læs al debconf-"
-"information omhyggeligt, vælg »bevar den lokalt installeret version«; i de "
-"fleste tilfælde vil et tryk på retur være okay. Tryk »q« for at afslutte apt-"
-"listchanges-tekstsøgeren når du har læst informationen."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -5220,6 +5227,23 @@ msgid ""
msgstr ""
#. 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 the local version currently "
+#| "installed'; in most cases hitting return will be fine. Press 'q' to quit "
+#| "the apt-listchanges pager once you've read the information."
+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 ""
+"Brug ikke X, brug en virtuel konsol, log ind som root. Læs al debconf-"
+"information omhyggeligt, vælg »bevar den lokalt installeret version«; i de "
+"fleste tilfælde vil et tryk på retur være okay. Tryk »q« for at afslutte apt-"
+"listchanges-tekstsøgeren når du har læst informationen."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -5261,7 +5285,7 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr ""
#. 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!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5305,7 +5329,9 @@ msgstr "klik avanceret konfiguration"
msgid ""
"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"
@@ -5335,6 +5361,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -5343,8 +5376,8 @@ msgstr ""
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"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
+"rm -rf /etc/php5"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5359,16 +5392,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+#, fuzzy
+#| msgid "Check if the upgraded system works."
+msgid "Check if the upgraded system works:"
msgstr "Kontroller om det opgraderede system fungerer."
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
+msgid "Reboot; log in as first user and test"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
+msgid "if the GOsa² gui is working,"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6217,13 +6251,21 @@ msgid "Automatic installation of security upgrades"
msgstr "Automatisk installatoin af sikkerhedsopgraderinger"
#. 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) 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>."
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
"<computeroutput>unattended-upgrades</computeroutput> er en Debianpakke som "
"vil installere sikkerhed (og andre) opdateringer automatisk. Hvis du "
@@ -6233,17 +6275,6 @@ msgstr ""
"opdateringer. Og der er altid <computeroutput>/var/log/dpkg.log</"
"computeroutput>."
-#. type: Content of: <article><section><section><para>
-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 "
-"administrator (root):"
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
-msgstr "apt-get install unattended-upgrades apt-listchanges"
-
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
msgstr "Automatisk nedlukning af maskiner om natten"
@@ -10684,7 +10715,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid "the browsers Firefox 47 ESR and Chromium 50"
-msgid "Firefox 45.8 ESR and Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
msgstr "Internetbrowserne Firefox 47 ESR og Chromium 50"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -11304,8 +11335,11 @@ msgid "Appendix A - The GNU General Public License"
msgstr "Appendiks A - The GNU General Public License"
#. type: CDATA
-#, 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."
+#, 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."
+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 "Til oversættere: Der er ikke behov for at oversætte GPL-licensteksten. Oversættelser er tilgængelige på https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
#. type: Content of: <article><section><section><para>
@@ -12528,6 +12562,14 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ 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 "
+#~ "administrator (root):"
+
+#~ msgid "apt-get install unattended-upgrades apt-listchanges"
+#~ msgstr "apt-get install unattended-upgrades apt-listchanges"
+
#, fuzzy
#~| msgid ""
#~| "This is a <emphasis role=\"strong\">very early ALPHA</emphasis> release "
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 1805a77..912b410 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-06-03 19:42+0000\n"
-"PO-Revision-Date: 2017-05-28 22:55+0200\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"PO-Revision-Date: 2017-06-28 18:44+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 1.8.11\n"
+"X-Generator: Poedit 2.0.2\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -3849,28 +3849,30 @@ msgstr "Druckerverwaltung"
#. type: Content of: <article><section><para>
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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
-"Um Drucker zu verwalten, öffnen Sie <ulink url=\"https://www:631\"/>. Dies "
-"ist die CUPS-Verwaltungsseite, auf der Sie Drucker hinzufügen, löschen oder "
-"deren Einstellungen ändern sowie Jobs aus der Warteschlange löschen können. "
+"Um Drucker zu verwalten, öffnen Sie <ulink url=\"https://www:631\"/> und "
+"akzeptieren Sie das selbstsignierte Zertifikat. Dies ist die normale CUPS-"
+"Verwaltungsseite, auf der Sie Drucker hinzufügen, löschen oder deren "
+"Einstellungen ändern sowie Jobs aus der Warteschlange löschen können. "
"Voreingestellt darf dies nur der Benutzer »root«, doch das lässt sich "
"ändern: Öffnen Sie die Datei /etc/cups/cups-files.conf mit einem Editor und "
"fügen Sie in der Zeile mit dem Eintrag <computeroutput>SystemGroup lpadmin</"
"computeroutput> eine oder mehrere für Ihr Setup geeignete Gruppennamen "
"hinzu . Diese in GOsa² vorhandenen Gruppen könnten geeignet sein: "
-"<computeroutput>gosa-admins</computeroutput> (mit dem Erstbenutzer als "
-"Mitglied), <computeroutput>teachers</computeroutput> und "
-"<computeroutput>jradmins</computeroutput> (keine Mitglieder nach der "
-"Installation)."
+"<computeroutput>gosa-admins</computeroutput> und <computeroutput>printer-"
+"admins</computeroutput> (beide mit dem Erstbenutzer als Mitglied), "
+"<computeroutput>teachers</computeroutput> und <computeroutput>jradmins</"
+"computeroutput> (keine Mitglieder nach der Installation)."
#. type: Content of: <article><section><title>
msgid "Clock synchronisation"
@@ -4412,16 +4414,15 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
"Falls Sie keine manuellen Upgrades von Paketen vornehmen wollen und Debian "
-"zutrauen, mit neuen Versionen gut umzugehen, dann können Sie das Paket "
-"<computeroutput>unattended-upgrades</computeroutput> installieren und dieses "
-"so konfigurieren, dass jede Nacht ein automatisches Upgrade neuer Pakete "
-"erfolgt. In LTSP-Chroots werden auf diese Weise aber keine Upgrades "
-"vorgenommen."
+"zutrauen, mit neuen Versionen gut umzugehen, dann können Sie "
+"<computeroutput>unattended-upgrades</computeroutput> so konfigurieren, dass "
+"jede Nacht ein automatisches Upgrade neuer Pakete erfolgt. In LTSP-Chroots "
+"werden auf diese Weise aber keine Upgrades vorgenommen."
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4664,16 +4665,10 @@ msgstr ""
"\"https://www.debian.org/releases/stretch/releasenotes\"/>"
#. type: Content of: <article><section><section><para>
-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 "Don't use X, use a virtual console, log in as root."
msgstr ""
-"Benutzen Sie nicht X, sondern eine virtuelle Konsole, melden Sie sich als "
-"root an. Lesen Sie alle Debconf-Informationen sorgfätig durch, wählen Sie "
-"»Die momentan installierte Version beibehalten« - bis auf die unten "
-"aufgeführten Fälle; in den meisten Fällen wird das Drücken von »Enter« "
-"richtig sein."
+"Benutzen Sie keine graphische Arbeitsumgebung; wechseln Sie zu einer "
+"virtuellen Konsole und melden Sie sich als root an."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4761,6 +4756,16 @@ msgstr ""
"Anzeigeprogramm zu beenden."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
+"Lesen Sie alle Debconf-Informationen sorgfältig durch, wählen Sie »Die "
+"momentan installierte Version beibehalten« - bis auf die unten aufgeführten "
+"Fälle; in den meisten Fällen wird das Drücken von »Enter« richtig sein."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr "Sie werden einige Aufforderungen für Paketkonfigurationen erhalten:"
@@ -4808,9 +4813,9 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr "/etc/default/ldap2zone: Y wählen."
#. 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!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
-"/etc/gosa/gosa.conf N wählen. (Niemals eine neue Version von gosa.conf "
+"/etc/gosa/gosa.conf: N wählen. (Niemals eine neue Version von gosa.conf "
"akzeptieren!)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4866,14 +4871,18 @@ msgstr "Die Konfiguration anwenden und anpassen:"
msgid ""
"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"
msgstr ""
"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"
@@ -4903,6 +4912,16 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+"Falls das System unter qemu/kvm nach dem Upgrade nicht bootet: siehe <ulink "
+"url=\"https://bugs.debian.org/844446#\">844446</ulink>. Es könnte helfen, in "
+"QEMU eine andere Architektur als Broadwell einzustellen."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr "Nach einem Neustart weiter aufräumen:"
@@ -4911,13 +4930,13 @@ msgstr "Nach einem Neustart weiter aufräumen:"
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"
+"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 # Nur, falls nicht als alternatives Thema gewünscht.\n"
-"dpkg -P php5-imagick\n"
-"rm -rm /etc/php5"
+"dpkg -P php5-imagick # Das Paket könnte in manchen Fällen nicht installiert sein. \n"
+"rm -rf /etc/php5"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Enable otherwise broken PHP 7.0 support:"
@@ -4933,19 +4952,16 @@ msgstr ""
"service apache2 restart"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "Check if the upgraded system works:"
msgstr "Kontrollieren, ob das System nach dem Upgrade funktioniert:"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
-msgstr ""
-"Einen Neustart durchführen und testen, ob es wie zuvor funktioniert: Als "
-"'Erstbenutzer' anmelden und testen, ob"
+msgid "Reboot; log in as first user and test"
+msgstr "Einen Neustart durchführen; als 'Erstbenutzer' anmelden und testen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
-msgstr "die GOsa²-Webseite funktioniert,"
+msgid "if the GOsa² gui is working,"
+msgstr "ob die GOsa²-Webseite funktioniert,"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one is able to connect LTSP clients and workstations,"
@@ -5098,7 +5114,7 @@ msgid ""
msgstr ""
"Erzeugen Sie die Chroot-Umgebung neu, indem Sie <computeroutput>debian-edu-"
"ltsp --arch i386</computeroutput> (oder <computeroutput>debian-edu-ltsp --"
-"arch amd64</computeroutput> als Root ausführen."
+"arch amd64</computeroutput>) als Root ausführen."
#. type: Content of: <article><section><section><title>
msgid ""
@@ -5754,30 +5770,19 @@ msgstr "Automatische Installation von Sicherheitsaktualisierungen"
#. type: Content of: <article><section><section><para>
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>."
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
"<computeroutput>unattended-upgrades</computeroutput> ist ein Debian-Paket, "
-"das automatisch Sicherheitsaktualisierungen (und auch andere "
-"Aktualisierungen) installieren wird. Falls Sie dessen Einsatz planen, dann "
-"sollten Sie über einige Mittel zur Systemüberwachung verfügen; installieren "
-"Sie beispielsweise das Paket <computeroutput>apt-listchanges</"
-"computeroutput> und konfigurieren Sie es so, dass es Ihnen E-Mails über "
-"Updates schickt. Und es gibt auf jeden Fall <computeroutput>/var/log/dpkg."
-"log</computeroutput>."
-
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr ""
-"Um diese Pakete zu installieren, führen Sie folgendes Kommando als Root aus:"
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
-msgstr "apt-get install unattended-upgrades apt-listchanges"
+"das automatisch Sicherheitsaktualisierungen (und andere Aktualisierungen) "
+"installieren kann. Es ist standardmäßig installiert und so vorkonfiguriert, "
+"dass Sicherheitsaktualisierungen erfolgen. Die Log-Dateien gibt es in "
+"<computeroutput>/var/log/unattended-upgrades/</computeroutput>; außerdem "
+"gibt es immer <computeroutput>/var/log/dpkg.log</computeroutput> und "
+"<computeroutput>/var/log/apt/</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
@@ -9948,8 +9953,8 @@ msgstr ""
"nach, um eine der anderen zu installieren."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Firefox 45.8 ESR and Chromium 57"
-msgstr "die Webbrowser Firefox 45.8 ESR und Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
+msgstr "die Webbrowser Firefox 45.9 ESR und Chromium 59"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Iceweasel has been re-renamed to Firefox!"
@@ -10485,8 +10490,12 @@ msgstr "Anhang A - The GNU General Public Licence"
#. type: CDATA
#, 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."
-msgstr "Hinweis für Übersetzer: Der Text der GPL-Lizenz muss nicht übersetzt werden. Unter https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html stehen Übersetzungen zur Verfügung."
+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 ""
+"Hinweis für Übersetzer: Der Text der GPL-Lizenz muss nicht übersetzt werden. \n"
+"Unter https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html stehen Übersetzungen zur Verfügung."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -11688,6 +11697,14 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid "To install these packages run the following command as root:"
+#~ msgstr ""
+#~ "Um diese Pakete zu installieren, führen Sie folgendes Kommando als Root "
+#~ "aus:"
+
+#~ 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.</"
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 45730b4..661df7b 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-06-03 19:42+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+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"
@@ -4124,13 +4124,14 @@ msgstr ""
#. type: Content of: <article><section><para>
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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
@@ -4668,11 +4669,18 @@ msgstr ""
"computeroutput>."
#. 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 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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
"Si usted no quiere actualizar paquetes manualmente y confía en que Debian "
"hace un buen trabajo con las nuevas versiones, puede instalar el paquete "
@@ -4905,10 +4913,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-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 "Don't use X, use a virtual console, log in as root."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -4990,6 +4995,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -5027,7 +5039,7 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr ""
#. 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!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5071,7 +5083,9 @@ msgstr "Configuración del acceso al sistema de archivos"
msgid ""
"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"
@@ -5101,6 +5115,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -5109,8 +5130,8 @@ msgstr ""
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"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
+"rm -rf /etc/php5"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5125,16 +5146,15 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "Check if the upgraded system works:"
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
+msgid "Reboot; log in as first user and test"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
+msgid "if the GOsa² gui is working,"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5841,22 +5861,13 @@ msgstr "Instalación automática de actualizaciones de seguridad"
#. type: Content of: <article><section><section><para>
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>."
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr "Para instalar estos paquetes, ejecute el siguiente comando como root:"
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
-msgstr "apt-get install unattended-upgrades apt-listchanges"
-
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
msgstr "Apagado automático de las computadoras durante la noche"
@@ -9158,7 +9169,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Firefox 45.8 ESR and Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9555,7 +9566,9 @@ msgstr ""
#. type: CDATA
#, 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."
+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 ""
#. type: Content of: <article><section><section><para>
@@ -10508,6 +10521,13 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "To install these packages run the following command as root:"
+#~ msgstr ""
+#~ "Para instalar estos paquetes, ejecute el siguiente comando como root:"
+
+#~ msgid "apt-get install unattended-upgrades apt-listchanges"
+#~ msgstr "apt-get install unattended-upgrades apt-listchanges"
+
#~ msgid ""
#~ "More information about Debian Squeeze 6.0 is provided in the <ulink url="
#~ "\"http://www.debian.org/releases/squeeze/releasenotes\">release notes</"
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 868959e..4659cf1 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-06-03 19:42+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+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"
@@ -4372,15 +4372,28 @@ msgid "Printer Management"
msgstr "Gestion des imprimantes"
#. 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\"/>. 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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
@@ -5037,11 +5050,18 @@ msgstr ""
"computeroutput>."
#. 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 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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
"Si vous ne voulez pas mettre les paquets à jour vous-même et que vous faites "
"confiance à Debian pour faire du bon travail avec les nouvelles versions, "
@@ -5308,23 +5328,8 @@ msgstr ""
"org/releases/jessie/releasenotes\"/>."
#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Don't use X, use a virtual console, log in as root. Read all debconf "
-#| "information carefully, choose 'keep the local version currently "
-#| "installed'; in most cases hitting return will be fine. Press 'q' to quit "
-#| "the apt-listchanges pager once you've read the information."
-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 "Don't use X, use a virtual console, log in as root."
msgstr ""
-"N'utilisez pas le serveur X, utilisez une console virtuelle, connectez-vous "
-"en tant que superutilisateur. Lisez attentivement toutes les informations "
-"debconf, choisissez « garder la version locale installée actuellement ». "
-"Dans la plupart des cas, appuyer sur entrée sera suffisant. Appuyez sur "
-"« q » pour quitter apt-listchanges une fois que vous avez lu les "
-"informations."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -5409,6 +5414,25 @@ msgid ""
msgstr ""
#. 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 the local version currently "
+#| "installed'; in most cases hitting return will be fine. Press 'q' to quit "
+#| "the apt-listchanges pager once you've read the information."
+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 ""
+"N'utilisez pas le serveur X, utilisez une console virtuelle, connectez-vous "
+"en tant que superutilisateur. Lisez attentivement toutes les informations "
+"debconf, choisissez « garder la version locale installée actuellement ». "
+"Dans la plupart des cas, appuyer sur entrée sera suffisant. Appuyez sur "
+"« q » pour quitter apt-listchanges une fois que vous avez lu les "
+"informations."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -5457,7 +5481,7 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr ""
#. 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!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5514,7 +5538,9 @@ msgstr "cliquez sur configuration avancée"
msgid ""
"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"
@@ -5544,6 +5570,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -5552,8 +5585,8 @@ msgstr ""
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"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
+"rm -rf /etc/php5"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5568,16 +5601,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+#, fuzzy
+#| msgid "Check if the upgraded system works."
+msgid "Check if the upgraded system works:"
msgstr "Vérifiez que le système fonctionne."
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
+msgid "Reboot; log in as first user and test"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
+msgid "if the GOsa² gui is working,"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6459,13 +6493,21 @@ msgid "Automatic installation of security upgrades"
msgstr "Installation automatique des mises à jour de sécurité"
#. 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) 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>."
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
"<computeroutput>unattended-upgrades</computeroutput> est un paquet Debian "
"qui installera (entre autres) les mises à jour de sécurité automatiquement. "
@@ -6475,17 +6517,6 @@ msgstr ""
"électroniques au sujet des mises à jour. Il y a toujours le journal "
"<computeroutput>/var/log/dpkg.log</computeroutput>."
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr ""
-"Pour l'installer, exécutez la commande suivante en tant que "
-"superutilisateur :"
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
-msgstr "apt-get install unattended-upgrades apt-listchanges"
-
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
msgstr "Arrêt automatique des machines la nuit"
@@ -11088,7 +11119,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid "the browsers Iceweasel 31 ESR and Chromium 41"
-msgid "Firefox 45.8 ESR and Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
msgstr "Navigateurs web Iceweasel 31 ESR et Chromium 41"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -11718,7 +11749,9 @@ msgstr "Annexe A — La Licence Publique Générale GNU"
#. type: CDATA
#, 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."
+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 ""
#. type: Content of: <article><section><section><para>
@@ -12973,6 +13006,14 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid "To install these packages run the following command as root:"
+#~ msgstr ""
+#~ "Pour l'installer, exécutez la commande suivante en tant que "
+#~ "superutilisateur :"
+
+#~ msgid "apt-get install unattended-upgrades apt-listchanges"
+#~ msgstr "apt-get install unattended-upgrades apt-listchanges"
+
#, fuzzy
#~| msgid ""
#~| "This is the first release of Debian Edu 8+edu0. Please report feedback "
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 5da7601..5e317b5 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-06-03 19:42+0000\n"
-"PO-Revision-Date: 2017-05-27 18:32+0100\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"PO-Revision-Date: 2017-06-22 19:51+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"
@@ -3800,28 +3800,30 @@ msgstr "Amministrazione delle stampanti"
#. type: Content of: <article><section><para>
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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
"Per l'amministrazione delle stampanti ci si collega con il browser web a "
-"<ulink url=\"https://www:631\"/>. Quella che appare è la consueta "
-"interfaccia di gestione di CUPS in cui si può aggiungere/cancellare/"
-"modificare le proprie stampanti e pulire le code di stampa. Questo è "
-"consentito di default solo a root ma questa condotta può essere modificata: "
-"aprire /etc/cups/cups-files.conf con un editor e aggiungere uno o più nomi "
-"di gruppi secondo la policy del sito nella linea che contiene "
-"<computeroutput>SystemGroup lpadmin</computeroutput>. I gruppi presenti in "
-"GOsa² che possono essere usati sono <computeroutput>gosa-admins</"
-"computeroutput> (con il primo utente come membro), <computeroutput>teachers</"
-"computeroutput> e <computeroutput>jradmins</computeroutput> (nessun membro "
-"dopo l'installazione)."
+"<ulink url=\"https://www:631\"/> accettando il certificato autofirmato. "
+"Quella che appare è la consueta interfaccia di gestione di CUPS in cui si "
+"può aggiungere/cancellare/modificare le proprie stampanti e pulire le code "
+"di stampa. Questo è consentito di default solo a root, ma questa condotta "
+"può essere modificata: aprire /etc/cups/cups-files.conf con un editor e "
+"aggiungere uno o più nomi di gruppi secondo la policy del sito nella linea "
+"che contiene <computeroutput>SystemGroup lpadmin</computeroutput>. I gruppi "
+"presenti in GOsa² che possono essere usati sono <computeroutput>gosa-admins</"
+"computeroutput> e <computeroutput>printer-admins</computeroutput>( entrambi "
+"con il primo utente come membro), <computeroutput>teachers</computeroutput> "
+"e <computeroutput>jradmins</computeroutput> (nessun membro dopo "
+"l'installazione)."
#. type: Content of: <article><section><title>
msgid "Clock synchronisation"
@@ -4355,15 +4357,15 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
"Se non si desidera aggiornare manualmente dei pacchetti dando fiducia a "
"Debian di fare il lavoro per noi con le nuove versioni, è possibile "
-"installare il pacchetto <computeroutput>unattended-upgrades</computeroutput> "
-"e configurarlo per l'aggiornamento automatico di tutti i nuovi pacchetti "
-"ogni notte. Questo non aggiornerà i chroot di LTSP."
+"configurare <computeroutput>unattended-upgrades</computeroutput> per "
+"installare l'aggiornamento automatico di tutti i nuovi pacchetti ogni notte. "
+"Questo non aggiornerà i chroot di LTSP."
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4600,15 +4602,8 @@ msgstr ""
"debian.org/releases/stretch/releasenotes\"/>)"
#. type: Content of: <article><section><section><para>
-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 "Don't use X, use a virtual console, log in as root."
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à."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4694,6 +4689,23 @@ 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à."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
"Verranno visualizzati alcuni suggerimenti sulle configurazioni dei pacchetti:"
@@ -4742,10 +4754,10 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr "/etc/default/ldap2zone: scegliere 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!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
-"/etc/gosa/gosa.conf scegliere N (non accettare mai una nuova versione di "
-"gosa.conf!)."
+"/etc/gosa/gosa.con:f scegliere N (non accettare mai una nuova versione di "
+"gosa.conf!)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cope with the Squid3 to Squid renaming:"
@@ -4795,11 +4807,20 @@ msgid "Apply and adjust configuration:"
msgstr "Applicare e regolare la configurazione:"
#. type: CDATA
-#, no-wrap
+#, 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"
msgid ""
"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"
@@ -4836,21 +4857,33 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. 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
-#, no-wrap
+#, 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"
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"
+"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\n"
-"rm -rm /etc/php5"
+"rm -rf /etc/php5"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Enable otherwise broken PHP 7.0 support:"
@@ -4866,19 +4899,16 @@ msgstr ""
"service apache2 restart"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
-msgstr "Verificare se il sistema aggiornato funziona."
+msgid "Check if the upgraded system works:"
+msgstr "Verificare se il sistema aggiornato funziona:"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
-msgstr ""
-"Riavviare e provare se funziona come prima: accedi come primo utente e prova "
-"se"
+msgid "Reboot; log in as first user and test"
+msgstr "Riavviare: accedi come primo utente e prova"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
-msgstr "la gui di GOsa² sta funzionando,"
+msgid "if the GOsa² gui is working,"
+msgstr "se la gui di GOsa² sta funzionando,"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one is able to connect LTSP clients and workstations,"
@@ -5672,28 +5702,19 @@ msgstr "Installazione automatica degli aggiornamenti di sicurezza"
#. type: Content of: <article><section><section><para>
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>."
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
"<computeroutput>unattended-upgrades</computeroutput> è un pacchetto Debian "
-"che installerà aggiornamenti di sicurezza (e altro) automaticamente. Se si "
-"programma di usarlo, si dovrebbero avere alcuni strumenti per monitorare il "
-"sistema, come installare il pacchetto <computeroutput>apt-listchanges</"
-"computeroutput> e configurarlo per inviare email sugli aggiornamenti. Per la "
-"verifica c'è sempre <computeroutput>/var/log/dpkg.log</computeroutput>."
-
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr ""
-"Per installare questi pacchetti eseguire il seguente comando come root:"
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
-msgstr "apt-get install unattended-upgrades apt-listchanges"
+"che installerà aggiornamenti di sicurezza (e altro) automaticamente. Il "
+"pacchetto è installato di default e preconfigurato per installare "
+"aggiornamenti di sicurezza. I log sono disponibili in <computeroutput>/var/"
+"log/unattended-upgrades/</computeroutput>; inoltre, ci sono sempre "
+"<computeroutput>/var/log/dpkg.log</computeroutput> e <computeroutput>/var/"
+"log/apt/</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
@@ -6609,13 +6630,6 @@ msgstr ""
" apt install education-desktop-gnome education-desktop-lxde education-desktop-xfce education-desktop-mate"
#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Users will then be able to choose any of the five desktop environment via "
-#| "the login manager before logging in. Of course, you can also choose to "
-#| "give less choices. Keep in mind that there will be several programs for "
-#| "the same purpose (like file managers, editors, PDF viewers...) if more "
-#| "than one DE is installed; this might confuse users."
msgid ""
"Users will then be able to choose any of the five desktop environment via "
"the login manager before logging in. Of course, you can also choose to give "
@@ -6626,8 +6640,8 @@ msgstr ""
"Gli utenti, quindi, potranno scegliere uno dei cinque ambienti desktop "
"attraverso il gestore degli accessi prima di effettuare il login. "
"Naturalmente si può scegliere di avere meno alternative. Ricordarsi che ci "
-"saranno più programmi per lo stessoscopo (come file manager, editor, "
-"visualizzatori PDF ...). Se più di un ambiente desktop è installato; questo "
+"saranno più programmi per lo stesso scopo (come file manager, editor, "
+"visualizzatori PDF ...). Avere più di un ambiente desktop installato "
"potrebbe confondere gli utenti."
#. type: Content of: <article><section><section><para>
@@ -9806,7 +9820,9 @@ msgstr ""
"sceglierne un altro."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Firefox 45.8 ESR and Chromium 57"
+#, 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"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -10334,8 +10350,11 @@ msgid "Appendix A - The GNU General Public License"
msgstr "Appendix A - La GNU Public Licence"
#. type: CDATA
-#, 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."
+#, 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."
+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."
#. type: Content of: <article><section><section><para>
@@ -11544,6 +11563,13 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "To install these packages run the following command as root:"
+#~ msgstr ""
+#~ "Per installare questi pacchetti eseguire il seguente comando come 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.</"
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 fe5830d..abd142f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-06-03 19:42+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
"PO-Revision-Date: 2017-02-24 06:55+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -3677,15 +3677,28 @@ 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\"/>. 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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
@@ -4215,11 +4228,18 @@ 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 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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
"パッケージのアップグレードを手作業で行いたくなく、Debian による新しいバージョ"
"ンの作業を信頼する場合、<computeroutput>unattended-upgrades</computeroutput> "
@@ -4452,15 +4472,8 @@ msgstr ""
"releasenotes\"/> を見てください)。"
#. type: Content of: <article><section><section><para>
-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 "Don't use X, use a virtual console, log in as root."
msgstr ""
-"X を使わないでください。仮想コンソールを使って root でログインしてください。"
-"debconf の情報を全て注意深く読み、以下で特に言及していない限り「現在インス"
-"トールされているローカルバージョンを維持」を選択するようにしてください。ほと"
-"んどの場合「Enter」を押せばいいはずです。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4548,6 +4561,23 @@ msgstr ""
"します。"
#. 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 ""
@@ -4587,7 +4617,10 @@ msgid "/etc/default/ldap2zone: Choose Y."
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!)"
+#, 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 で上書きしないよ"
"うに!)"
@@ -4639,11 +4672,20 @@ msgid "Apply and adjust configuration:"
msgstr "設定の適用と調整:"
#. type: CDATA
-#, no-wrap
+#, 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"
msgid ""
"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"
@@ -4681,16 +4723,28 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
#. type: CDATA
-#, no-wrap
+#, 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"
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"
+"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 # この代替テーマが不要な場合のみ\n"
@@ -4711,16 +4765,17 @@ msgstr ""
"service apache2 restart"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+#, fuzzy
+#| msgid "Check if the upgraded system works."
+msgid "Check if the upgraded system works:"
msgstr "アップグレードしたシステムが機能するか確認します"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
+msgid "Reboot; log in as first user and test"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
+msgid "if the GOsa² gui is working,"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -5490,13 +5545,21 @@ 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) 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>."
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
"<computeroutput>unattended-upgrades</computeroutput> はセキュリティその他の更"
"新を自動的にインストールする Debian パッケージです。これを利用する場合は "
@@ -5505,15 +5568,6 @@ msgstr ""
"用意しておくべきです。また、<computeroutput>/var/log/dpkg.log</"
"computeroutput> は常にあります。"
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr "パッケージのインストールには root で以下のコマンドを実行します:"
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
-msgstr "apt-get install unattended-upgrades apt-listchanges"
-
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
msgstr "マシン群を夜間自動でシャットダウンします"
@@ -9435,7 +9489,9 @@ msgstr ""
"境選択についてはこのマニュアルを見てください。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Firefox 45.8 ESR and Chromium 57"
+#, fuzzy
+#| msgid "Firefox 45.8 ESR and Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
msgstr "Firefox 45.8 ESR 及び Chromium 57"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9866,7 +9922,9 @@ msgstr "付録A - GNU General Public License"
#. type: CDATA
#, 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."
+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 ""
#. type: Content of: <article><section><section><para>
@@ -11032,6 +11090,12 @@ 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.</"
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 b7cb1de..b26f657 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-06-03 19:42+0000\n"
-"PO-Revision-Date: 2017-05-28 18:03+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"PO-Revision-Date: 2017-07-11 11:47+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.14.1\n"
+"X-Generator: Weblate 2.16-dev\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -3763,27 +3763,30 @@ msgstr "Skriverhåndtering"
#. type: Content of: <article><section><para>
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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
"For skriverhåndtering legg din nettleser til <ulink url=\"https://www:631\"/"
-">. Dette er det normale CUPS administrasjonsgrensesnittet der du kan legge "
-"til/slette/endre skriverne dine, og kan rydde opp i utskriftskøen. Som "
-"standard er bare rot (root) tillatt, men dette kan endres: Åpne /etc/cups/"
-"cups-files.conf med en redigerer, og legg til ett eller flere gyldige "
-"gruppenavn som passer til nettstedets policy, til linjen med inneholdet "
-"<computeroutput> SystemGroup lpadmin</computeroutput>. Eksisterende GOsa²-"
-"grupper som kan brukes er <computeroutput>gosa-admins</computeroutput> (with "
-"the first user as member/med den første bruker som medlem), "
-"<computeroutput>teachers</computeroutput> og <computeroutput>jradmins</"
-"computeroutput> (ingen medlemmer etter installasjonen)."
+"> og aksepterer det selvsignerte sertifikatet. Dette er det normale CUPS "
+"administrasjonsgrensesnittet der du kan legge til/slette/endre skriverne "
+"dine, og kan rydde opp i utskriftskøen. Som standard er bare rot (root) "
+"tillatt, men dette kan endres: Åpne /etc/cups/cups-files.conf med en "
+"redigerer, og legg til ett eller flere gyldige gruppenavn som passer til "
+"nettstedets policy, til linjen med inneholdet <computeroutput> SystemGroup "
+"lpadmin</computeroutput>. Eksisterende GOsa²-grupper som kan brukes er "
+"<computeroutput>gosa-admins</computeroutput> og <computeroutput>printer-"
+"admins</computeroutput> (begge har den først opprettede brukeren som "
+"medlem), <computeroutput>teachers</computeroutput> og "
+"<computeroutput>jradmins</computeroutput> (ingen medlemmer etter "
+"installasjonen)."
#. type: Content of: <article><section><title>
msgid "Clock synchronisation"
@@ -4312,15 +4315,15 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
"Hvis du ikke ønsker å oppgradere pakker manuelt, og stoler på at Debian gjør "
-"en god jobb med nye versjoner, kan du installere pakken "
-"<computeroutput>unattended-upgrades</computeroutput>, og sette den opp til å "
-"automatisk oppgradere alle nye pakker hver natt. Dette vil ikke oppgradere "
-"LTSP-chrooter."
+"en god jobb med nye versjoner, kan du sette opp pakken "
+"<computeroutput>unattended-upgrades</computeroutput>, til å automatisk "
+"oppgradere alle nye pakker hver natt. Dette vil ikke oppgradere LTSP-"
+"chrooter."
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4552,15 +4555,8 @@ msgstr ""
"releasenotes\"/>)"
#. type: Content of: <article><section><section><para>
-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."
-msgstr ""
-"Ikke bruk X, bruk et virtuelt konsoll, logg inn som rot. Les all debconf-"
-"informasjon nøye, velg «behold den lokale versjonen som er installert» med "
-"mindre noe annet er beskrevet under; I de fleste tilfeller bruk bare "
-"«return»-tasten."
+msgid "Don't use X, use a virtual console, log in as root."
+msgstr "Ikke bruk X, bruk et virtuellt konsoll og logg inn som root."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4646,6 +4642,16 @@ msgstr ""
"return> for å rulle nedover, <q> for å forlate sideskifteren."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
+"Les all debconf-informasjon nøye, velg «behold den lokale versjonen som er "
+"installert» med mindre noe annet er beskrevet under; I de fleste tilfeller "
+"bruk bare «return»-tasten."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr "Du vil se noen spørsmål om pakkeoppsett:"
@@ -4693,8 +4699,8 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr "/etc/default/ldap2zone: Velg 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!)"
-msgstr "/etc/gosa/gosa.conf Velg N. (Godta aldri en ny gosa.conf versjon!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
+msgstr "/etc/gosa/gosa.conf: Velg N. (Godta aldri en ny gosa.conf versjon!)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cope with the Squid3 to Squid renaming:"
@@ -4748,14 +4754,18 @@ msgstr "Aktiver og juster oppsett:"
msgid ""
"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"
msgstr ""
"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"
@@ -4785,6 +4795,16 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+"Hvis det oppgraderte systemer ikke klarer å starte med qemu/kvm, se <ulink "
+"url=\"https://bugs.debian.org/844446#\">844446</ulink>. Det kan hjelpe å "
+"endre arkitekturen fra Broadwell i QEMU."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr "Etter omstart, utfør noen flere oppryddinger:"
@@ -4793,13 +4813,13 @@ msgstr "Etter omstart, utfør noen flere oppryddinger:"
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"
+"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 # Bare hvis den ikke ønskes som alternativt tema.\n"
-"dpkg -P php5-imagick\n"
-"rm -rm /etc/php5"
+"apt purge debian-edu-artwork-lines # Bare hvis den ikke ønskes som alternativt tema..\n"
+"dpkg -P php5-imagick # Pakken er kanskje ikke alltid installert.\n"
+"rm -rf /etc/php5"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Enable otherwise broken PHP 7.0 support:"
@@ -4815,19 +4835,16 @@ msgstr ""
"service apache2 restart"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
-msgstr "Sjekk om det oppgraderte systemet virker."
+msgid "Check if the upgraded system works:"
+msgstr "Sjekk om det oppgraderte systemet virker:"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
-msgstr ""
-"Start på nytt og test hvis det virker som før: Logg inn som første bruker og "
-"test om"
+msgid "Reboot; log in as first user and test"
+msgstr "Start på nytt, logg inn som første bruker for å teste"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
-msgstr "GOsa² gui jobber,"
+msgid "if the GOsa² gui is working,"
+msgstr "om GOsa² -grensesnittet fungerer,"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one is able to connect LTSP clients and workstations,"
@@ -5615,27 +5632,19 @@ msgstr "Automatisk installasjon av sikkerhetsoppdateringer"
#. type: Content of: <article><section><section><para>
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>."
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
"<computeroutput>unattended-upgrades</computeroutput> er en Debian-pakke som "
-"automatisk vil installere sikkerhets- (og andre) oppdateringer. Hvis du "
-"planlegger å bruke den, må du ha noen muligheter til å overvåke dine "
-"systemer, som å ha installert pakken <computeroutput>apt-listchanges</"
-"computeroutput> og konfigurer den til å sende e-poster om oppdateringer. Og "
-"det er alltid <computeroutput>/var/log/dpkg.log</computeroutput>."
-
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr "For å installere, kjør følgende som rot:"
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
-msgstr "apt-get install unattended-upgrades apt-listchanges"
+"automatisk vil installere sikkerhets- (og andre) oppdateringer. Pakker er "
+"installert ut av boksen og forhåndsoppsatt til å installere "
+"sikkerhetsoppdateringer. Loggene er tilgjengelig i <computeroutput>/var/log/"
+"unattended-upgrades/</computeroutput>. I tillegg er en sjekke "
+"<computeroutput>/var/log/dpkg.log</computeroutput> og <computeroutput>/var/"
+"log/apt/</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
@@ -9692,8 +9701,8 @@ msgstr ""
"se denne håndboken."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Firefox 45.8 ESR and Chromium 57"
-msgstr "Firefox 45.8 ESR og Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
+msgstr "Firefox 45.9 ESR og Chromium 59"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Iceweasel has been re-renamed to Firefox!"
@@ -10217,8 +10226,12 @@ msgstr "Vedlegg A - GNU Generell Offentlig Lisens"
#. type: CDATA
#, 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."
-msgstr "Merknad til oversettere: Det er ikke nødvendig å oversette GPLs lisenstekst. Oversettelser er tilgjengelige på https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
+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 ""
+"Merknad til oversettere: Det er ikke nødvendig å oversette GPLs lisenstekst.\n"
+"Oversettelser er tilgjengelige på https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -11411,6 +11424,12 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid "To install these packages run the following command as root:"
+#~ msgstr "For å installere, kjør følgende som rot:"
+
+#~ 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.</"
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 72a0bed..2626ffc 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-06-03 19:42+0000\n"
-"PO-Revision-Date: 2017-05-29 23:43+0200\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"PO-Revision-Date: 2017-07-12 14:57+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"
@@ -15,7 +15,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: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -3923,13 +3923,14 @@ msgstr "Printerbeheer"
#. type: Content of: <article><section><para>
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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
@@ -3941,10 +3942,11 @@ msgstr ""
"cups-files.conf met een editor en voeg op de regel met "
"<computeroutput>SystemGroup lpadmin</computeroutput> een of meer geldige "
"groepen toe, afhankelijk van uw lokale beleidskeuzes. Bestaande GOsa²-"
-"groepen die hier gebruikt zouden kunnen komen, zijn <computeroutput>gosa-"
-"admins</computeroutput> (waarvan de eerste gebruiker lid is), "
-"<computeroutput>leerkrachten</computeroutput> en <computeroutput>jradmins</"
-"computeroutput> (waarvan na een installatie nog niemand lid is)."
+"groepen die hier gebruikt zouden kunnen worden, zijn <computeroutput>gosa-"
+"admins</computeroutput> en <computeroutput>printer-admins</computeroutput> "
+"(van beide is de eerste gebruiker lid), <computeroutput>leerkrachten</"
+"computeroutput> en <computeroutput>jradmins</computeroutput> (waarvan na een "
+"installatie nog niemand lid is)."
#. type: Content of: <article><section><title>
msgid "Clock synchronisation"
@@ -4498,16 +4500,15 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
"Indien u verkiest om pakketten niet manueel op te waarderen en erop "
"vertrouwt dat Debian goed zal omgaan met nieuwere versies van pakketten, "
"kunt u het pakket <computeroutput>unattended-upgrades</computeroutput> "
-"installeren en het instellen op het automatisch opwaarderen van pakketten "
-"met nieuwere versies gedurende de nacht. Maar LTSP-chroots worden hiermee "
-"niet opgewaardeerd."
+"instellen op het iedere nacht automatisch opwaarderen van alle pakketten met "
+"recentere versies. Maar LTSP-chroots worden hiermee niet opgewaardeerd."
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4752,16 +4753,10 @@ msgstr ""
"url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
#. type: Content of: <article><section><section><para>
-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 "Don't use X, use a virtual console, log in as root."
msgstr ""
"Werk niet in een grafische omgeving, gebruik een virtuele console, meld u "
-"aan als systeembeheerder (root). Lees aandachtig alle informatie van "
-"debconf, kies 'behoud de momenteel geïnstalleerde versie' tenzij hieronder "
-"anders aangegeven wordt; in de meeste gevallen zal op de return-toets "
-"drukken volstaan."
+"aan als systeembeheerder (root)."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4849,6 +4844,16 @@ msgstr ""
"(de pager) te verlaten."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
+"Lees aandachtig alle informatie van debconf, kies 'behoud de momenteel "
+"geïnstalleerde versie' tenzij hieronder anders aangegeven wordt; in de "
+"meeste gevallen zal op de return-toets drukken volstaan."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
"U zult een aantal vragen zien in verband met de configuratie van pakketten:"
@@ -4897,9 +4902,10 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr "/etc/default/ldap2zone: Kies 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!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
-"/etc/gosa/gosa.conf Kies N. (Aanvaard nooit een nieuwe versie van gosa.conf!)"
+"/etc/gosa/gosa.conf: Kies N. (Aanvaard nooit een nieuwe versie van gosa."
+"conf!)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cope with the Squid3 to Squid renaming:"
@@ -4954,14 +4960,18 @@ msgstr "Pas de configuratie aan en pas ze toe:"
msgid ""
"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"
msgstr ""
"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"
@@ -4991,6 +5001,17 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+"Indien het opgewaardeerde systeem niet kan opstarten op qemu/kvm, raadpleeg "
+"dan probleemrapport <ulink url=\"https://bugs.debian.org/844446#\">844446</"
+"ulink>. De architectuur aanpassen van Broadwell naar QEMU kan aan het "
+"probleem verhelpen."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr "Na het heropstarten heeft u nog wat extra opruimwerk:"
@@ -4999,13 +5020,13 @@ msgstr "Na het heropstarten heeft u nog wat extra opruimwerk:"
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"
+"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 # Enkel indien u het niet als een alternatieve stijl wilt gebruiken.\n"
-"dpkg -P php5-imagick\n"
-"rm -rm /etc/php5"
+"dpkg -P php5-imagick # Mogelijk is niet in alle gevallen het pakket geïnstalleerd.\n"
+"rm -rf /etc/php5"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Enable otherwise broken PHP 7.0 support:"
@@ -5021,19 +5042,16 @@ msgstr ""
"service apache2 restart"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
-msgstr "Ga na of het opgewaardeerde systeem werkt."
+msgid "Check if the upgraded system works:"
+msgstr "Ga na of het opgewaardeerde systeem werkt:"
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
-msgstr ""
-"Herstart en ga na of het systeem zoals vroeger werkt: log in als eerste "
-"gebruiker en test of"
+msgid "Reboot; log in as first user and test"
+msgstr "Herstart; log in als eerste gebruiker en test"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
-msgstr "de GOsa² gui werkt,"
+msgid "if the GOsa² gui is working,"
+msgstr "of de grafische gebruikersomgeving van GOsa² werkt,"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "if one is able to connect LTSP clients and workstations,"
@@ -5861,30 +5879,19 @@ msgstr "Beveiligingsbijwerkingen automatisch installeren"
#. type: Content of: <article><section><section><para>
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>."
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
"<computeroutput>unattended-upgrades</computeroutput> is een pakket in Debian "
-"dat beveiligings- (en andere) bijwerkingen automatisch installeert. Indien u "
-"zinnens bent om het te gebruiken, beschikt u wel best over een instrument om "
-"uw systemen te blijven opvolgen. U kunt daarvoor het pakket "
-"<computeroutput>apt-listchanges</computeroutput> installeren en het zodanig "
-"configureren dat het u e-mailberichten stuurt over opwaarderingen. En er is "
-"natuurlijk ook nog altijd <computeroutput>/var/log/dpkg.log</computeroutput>."
-
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr ""
-"Om deze pakketten te installeren geeft u als systeembeheerder de volgende "
-"opdracht:"
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
-msgstr "apt-get install unattended-upgrades apt-listchanges"
+"dat beveiligings- (en andere) bijwerkingen automatisch installeert. Het "
+"pakket wordt automatisch geïnstalleerd en vooraf geconfigureerd om "
+"beveiligingsopwaarderingen te installeren. De logbestanden zijn te vinden in "
+"<computeroutput>/var/log/unattended-upgrades/</computeroutput>. En er is "
+"natuurlijk ook nog altijd <computeroutput>/var/log/dpkg.log</computeroutput> "
+"en <computeroutput>/var/log/apt/</computeroutput>."
#. type: Content of: <article><section><section><title>
msgid "Automatic shutdown of machines during the night"
@@ -10132,8 +10139,8 @@ msgstr ""
"handleiding om een van de andere te kiezen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Firefox 45.8 ESR and Chromium 57"
-msgstr "Firefox 45.8 ESR en Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
+msgstr "Firefox 45.9 ESR en Chromium 59"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Iceweasel has been re-renamed to Firefox!"
@@ -10676,8 +10683,12 @@ msgstr "Bijlage A - De GNU Algemene Gebruikerslicentie"
#. type: CDATA
#, 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."
-msgstr "Opmerking ten behoeve van vertalers: het vertalen van de tekst van de GPL-licentie is niet nodig. Er zijn vertalingen te vinden op https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
+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 ""
+"Opmerking ten behoeve van vertalers: het vertalen van de tekst van de GPL-licentie is niet nodig.\n"
+"Er zijn vertalingen te vinden op https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -11893,6 +11904,14 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "To install these packages run the following command as root:"
+#~ msgstr ""
+#~ "Om deze pakketten te installeren geeft u als systeembeheerder de volgende "
+#~ "opdracht:"
+
+#~ 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.</"
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 5891e7d..de9df8f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,9 +1,9 @@
msgid ""
msgstr ""
"Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-06-03 19:42+0000\n"
-"PO-Revision-Date: 2017-05-09 07:23+0000\n"
-"Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
+"POT-Creation-Date: 2017-07-15 13:14+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-"
"documentation/debian-edu-stretch/pl/>\n"
"Language: pl\n"
@@ -12,7 +12,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.14-dev\n"
+"X-Generator: Weblate 2.15-dev\n"
# type: Attribute 'lang' of: <article>
#. type: Attribute 'lang' of: <article>
@@ -1595,6 +1595,9 @@ msgid ""
"chapter of this manual, though, as it explains how to log in for the first "
"time."
msgstr ""
+"Należy koniecznie przeczytać <link linkend=\"GettingStarted\">wprowadzenie</"
+"link> do rozdziału tej instrukcji (ang. manual), ponieważ jest tam "
+"wyjaśnione, jak się zalogować po raz pierwszy."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -1602,6 +1605,9 @@ msgid ""
"<ulink url=\"http://www.debian.org/releases/stretch/installmanual"
"\">installation manual</ulink>."
msgstr ""
+"Więcej informacji na temat wydania Debian Stretch jest dostępne w <ulink url="
+"\"http://www.debian.org/releases/stretch/installmanual\">instrukcji "
+"instalacji</ulink>."
#. type: Content of: <article><section><section><title>
msgid "Download the installation media for Debian Edu 9+edu0 Codename Stretch"
@@ -1609,7 +1615,7 @@ msgstr "Pobierz medium instalacyjne dla Debian Edu 9+edu0 Nazwa kodowa Stretch"
#. type: Content of: <article><section><section><section><title>
msgid "netinstall CD image for i386, amd64"
-msgstr ""
+msgstr "obraz netinstall CD dla architektur sprzętowych i386 i amd64"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3369,13 +3375,14 @@ msgstr ""
#. type: Content of: <article><section><para>
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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
@@ -3748,9 +3755,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
@@ -3914,10 +3921,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-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 "Don't use X, use a virtual console, log in as root."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3985,6 +3989,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -4022,7 +4033,7 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr ""
#. 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!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4064,7 +4075,9 @@ msgstr "Zastosuj i dostosuj konfigurację:"
msgid ""
"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"
@@ -4092,6 +4105,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -4100,8 +4120,8 @@ msgstr ""
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"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
+"rm -rf /etc/php5"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4116,16 +4136,15 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "Check if the upgraded system works:"
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
+msgid "Reboot; log in as first user and test"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
+msgid "if the GOsa² gui is working,"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4726,20 +4745,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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>."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -7718,7 +7728,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Firefox 45.8 ESR and Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8103,7 +8113,9 @@ msgstr ""
#. type: CDATA
#, 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."
+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 ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index ad6308b..328f8f2 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-06-03 19:42+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+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"
@@ -2859,13 +2859,14 @@ msgstr ""
#. type: Content of: <article><section><para>
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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<computeroutput>jradmins</computeroutput> (no members after installation)."
msgstr ""
@@ -3238,9 +3239,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
@@ -3404,10 +3405,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-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 "Don't use X, use a virtual console, log in as root."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3474,6 +3472,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -3511,7 +3516,7 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr ""
#. 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!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3553,7 +3558,9 @@ msgstr ""
msgid ""
"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"
@@ -3581,6 +3588,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -3589,8 +3603,8 @@ msgstr ""
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"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
+"rm -rf /etc/php5"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3605,16 +3619,15 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "Check if the upgraded system works:"
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
+msgid "Reboot; log in as first user and test"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
+msgid "if the GOsa² gui is working,"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4215,20 +4228,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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>."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -7199,7 +7203,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Firefox 45.8 ESR and Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -7584,7 +7588,9 @@ msgstr ""
#. type: CDATA
#, 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."
+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 ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 3de659a..5a744cc 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -1203,7 +1203,7 @@ enter password: ]]></screen>
<section id="GettingStarted--Printer_Management">
<title>Printer Management
</title>
-<para>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 [...]
+<para>For Printer Management point your web browser to <ulink url="https://www:631"/> and accept the self-signed certificate. 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</computerout [...]
</para>
</section>
@@ -1339,7 +1339,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
</title>
<para>New package are available for upgrades. The critical ones are normally security fixes. To upgrade, run 'apt-get upgrade && apt-get dist-upgrade' as root in a terminal or log in via ssh to do the same. On LTSP servers, remember to also update the LTSP chroot using <computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get upgrade</computeroutput>.
</para>
-<para>If you do not want to manually upgrade packages and trust Debian to do a good job with new versions, you can install the <computeroutput>unattended-upgrades</computeroutput> package and configure it to automatically upgrade all new packages every night. This will not upgrade the LTSP chroots.
+<para>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-upgrades</computeroutput> to automatically upgrade all new packages every night. This will not upgrade the LTSP chroots.
</para>
<para>To upgrade the LTSP chroot, one can use <computeroutput>ltsp-chroot apt-get update && ltsp-chroot apt-get upgrade</computeroutput>. On 64-bit servers, one will have to add <computeroutput>-a i386</computeroutput> as an argument to ltsp-chroot. It is a good idea to update the chroot when updating the host system.
</para>
@@ -1412,7 +1412,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
</para>
<para>Please note that the following recipe applies to a default Debian Edu main server installation (desktop=kde, profiles Main Server, Workstation, LTSP Server). (For a general overview concerning jessie to stretch upgrade, see: <ulink url="https://www.debian.org/releases/stretch/releasenotes"/>)
</para>
-<para>Don't use X, use a virtual console, log in as root. Read all debconf information carefully, choose 'keep your currently-installed version' unless stated differently below; in most cases hitting return will be fine.
+<para>Don't use X, use a virtual console, log in as root.
</para>
<para>Please note one difference between <computeroutput>apt</computeroutput> and <computeroutput>apt-get</computeroutput> in Stretch: By default <computeroutput>apt-get</computeroutput> keeps downloaded packages, <computeroutput>apt</computeroutput> removes them from the cache (after successful installation).
</para>
@@ -1447,6 +1447,9 @@ apt full-upgrade]]></screen>
<para>apt-list-changes: be prepared for a lot of NEWS to read; press <return> to scroll down, <q> to leave the pager.
</para></listitem>
<listitem>
+<para>Read all debconf information carefully, choose 'keep your currently-installed version' unless stated differently below; in most cases hitting return will be fine.
+</para></listitem>
+<listitem>
<para>You will see some prompts about package configurations:
</para>
<itemizedlist>
@@ -1469,7 +1472,7 @@ apt full-upgrade]]></screen>
<para>/etc/default/ldap2zone: Choose Y.
</para></listitem>
<listitem>
-<para>/etc/gosa/gosa.conf Choose N. (Never accept a new gosa.conf version!)
+<para>/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)
</para></listitem></itemizedlist></listitem>
<listitem>
<para>Cope with the Squid3 to Squid renaming:
@@ -1493,7 +1496,9 @@ Search for 'sudoHost :tjener', replace 'tjener' with 'tjener.intern'
<para>Apply and adjust configuration:
</para></listitem></itemizedlist><screen><![CDATA[cfengine-debian-edu -D installation
rm /etc/apache2/conf-enabled/nagios3.conf
-rm /etc/apache2/mods-enabled/userdir.conf
+a2dismod userdir
+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
service apache2 restart]]></screen>
@@ -1509,11 +1514,14 @@ apt install education-ltsp-server # Only if profile 'LTSP-Server' is instal
</para></listitem></itemizedlist><screen><![CDATA[apt install debian-edu-artwork-softwaves]]></screen>
<itemizedlist>
<listitem>
+<para>If the upgraded system fails to boot on qemu/kvm, see <ulink url="https://bugs.debian.org/844446#">844446</ulink>. Changing the architecture away from Broadwell in QEMU might help.
+</para></listitem>
+<listitem>
<para>After reboot, do some more cleanup:
</para></listitem></itemizedlist><screen><![CDATA[apt purge linux-image-3.16.0-4-amd64
apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.
-dpkg -P php5-imagick
-rm -rm /etc/php5]]></screen>
+dpkg -P php5-imagick # Package might not be installed in all cases.
+rm -rf /etc/php5]]></screen>
<itemizedlist>
<listitem>
<para>Enable otherwise broken PHP 7.0 support:
@@ -1521,13 +1529,13 @@ rm -rm /etc/php5]]></screen>
service apache2 restart]]></screen>
<itemizedlist>
<listitem>
-<para>Check if the upgraded system works.
+<para>Check if the upgraded system works:
</para></listitem></itemizedlist>
-<para>Reboot and test if it works like before: Log in as first user and test if
+<para>Reboot; log in as first user and test
</para>
<itemizedlist>
<listitem>
-<para>the GOsa² gui is working,
+<para>if the GOsa² gui is working,
</para></listitem>
<listitem>
<para>if one is able to connect LTSP clients and workstations,
@@ -1802,10 +1810,8 @@ apt-get upgrade]]></screen>
<section id="Administration--Automatic_installation_of_security_upgrades">
<title>Automatic installation of security upgrades
</title>
-<para><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>.
+<para><computeroutput>unattended-upgrades</computeroutput> is a Debian package which will install security (and other) upgrades automatically. The package is installed by default and preconfigured to install security upgrades. The logs are available in <computeroutput>/var/log/unattended-upgrades/</computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</computeroutput> and <computeroutput>/var/log/apt/</computeroutput>.
</para>
-<para>To install these packages run the following command as root:
-</para><screen><![CDATA[ apt-get install unattended-upgrades apt-listchanges]]></screen>
</section>
<section id="Administration--Automatic_shutdown_of_machines_during_the_night">
@@ -3315,7 +3321,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
<para>KDE Plasma Workspace is installed by default; to choose one of the others see this manual.
</para></listitem></itemizedlist></listitem>
<listitem>
-<para>Firefox 45.8 ESR and Chromium 57
+<para>Firefox 45.9 ESR and Chromium 59
</para>
<itemizedlist>
<listitem>
@@ -3496,7 +3502,8 @@ FIXME". <!-- <remark>status ignore</remark> -->
<section id="AppendixA">
<title>Appendix A - The GNU General Public License
-</title><screen><![CDATA[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. ]]></screen>
+</title><screen><![CDATA[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. ]]></screen>
<section id="AppendixA--Manual_for_Debian_Edu_9.2B-edu0_Codename_Stretch">
<title>Manual for Debian Edu 9+edu0 Codename Stretch
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 be3f4dc..b370755 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-06-03 19:42+0000\n"
-"PO-Revision-Date: 2017-05-20 09:44+0000\n"
+"POT-Creation-Date: 2017-07-15 13:14+0000\n"
+"PO-Revision-Date: 2017-07-10 09:41+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.14.1-dev\n"
+"X-Generator: Weblate 2.16-dev\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -732,6 +732,10 @@ msgid ""
"has to be re-generated; run <computeroutput>ltsp-update-image</"
"computeroutput> on the LTSP server."
msgstr ""
+"请注意：瘦客户端使用服务器上安装的程序。无盘工作站使用安装在服务器的 LTSP "
+"chroot 中的程序，客户端根文件系统用 NBD （网络块设备）提供。每一修改 LTSP "
+"chroot 之后相关的 NBD 图像需要重新生成；在 LTSP 服务器上运行 "
+"<computeroutput>ltsp-update-image</computeroutput>。"
#. type: Content of: <article><section><section><section><title>
msgid "Thin clients"
@@ -1225,6 +1229,8 @@ msgid ""
"could be turned into a gateway if the Debian Edu 'Minimal' profile is "
"installed."
msgstr ""
+"已经有路由器但无法根据需要进行配置（由于技术原因不允许）的情况下，如果安装的"
+"是 Debian Edu ‘最小’配置，则具有两个网络接口的系统可能会变成网关。"
#. type: Content of: <article><section><section><para>
msgid "After the installation:"
@@ -2958,7 +2964,7 @@ msgstr "./images/filterbox.png"
#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Filterbox"
-msgstr ""
+msgstr "过滤器栏"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3246,20 +3252,15 @@ msgstr ""
"\"Architecture\">结构</link>一章。"
#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "This setup also allows diskless workstations and thin clients to be "
-#| "booted on the main network. Unlike workstations, diskless workstations "
-#| "don't have to be added to LDAP with GOsa², but can be, for example if you "
-#| "want to force the hostname."
msgid ""
"Diskless workstations and thin-clients work out-of-the-box when connected to "
"the main network. Only workstations with disks <emphasis role=\"strong"
"\">have to</emphasis> be added with GOsa², but all <emphasis role=\"strong"
"\">can</emphasis>."
msgstr ""
-"这个设置也允许无盘工作站和瘦客户端在主网上被引导。不像工作站，无盘工作站没有"
-"用 GOsa² 被添加到 LDAP，但可以，为示例如果你想要强行主机名。"
+"当连接到主网络时，无盘工作站和瘦客户端开箱即可工作。仅是有磁盘的工作站"
+"<emphasis role=\"strong\">需要</emphasis>用 GOsa² 添加，但所有的都<emphasis "
+"role=\"strong\">可以</emphasis>。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3270,6 +3271,10 @@ msgid ""
"10.0.16.0/20 or 4000 hosts) are reserved for DHCP and are assigned "
"dynamically."
msgstr ""
+"要添加机器，请使用 GOsa² 主菜单，系统，添加。你可以从预配置地址空间 "
+"10.0.0.0/8 中使用一个 IP 地址/主机名。目前只有两个预定义固定地址：10.0.2.2 "
+"(tjener) 和 10.0.0.1（网关）。从 10.0.16.20 到 10.0.31.254（粗略的 "
+"10.0.16.0/20 即 4000 主机）地址为 DHCP 和动态分配保留。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3284,6 +3289,12 @@ msgid ""
"With the exception of the main server all systems will then have a matching "
"icon."
msgstr ""
+"要在 GOsa² 中分配具有 MAC 地址为 52:54:00:12:34:10 的一个静态 IP 地址你需要输"
+"入这个 MAC 地址，主机名和其 IP；抑或可以点击<computeroutput>建议 ip</"
+"computeroutput> 按钮将在 10.0.0.0/8 中显示第一个自由的固定地址，如果以这种方"
+"式添加第一台机器，最有可能的是 10.0.0.2。应最好考虑有关你的网络：例如你将为服"
+"务器而使用 x>10 和 x<50 的 10.0.0.x，而对于工作站 x>100。不要忽略激"
+"活已正确添加的系统。除主服务器之外所有系统将在那时有一个相关的图标。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3300,6 +3311,14 @@ msgid ""
"needed, reboot the system afterwards. The following screenshots show how "
"this looks in practice:"
msgstr ""
+"如果机器引导作为瘦客户端/无盘工作站或已使用任何网络配置文件来安装，可以使用 "
+"<computeroutput>sitesummary2ldapdhcp</computeroutput> 脚本自动添加机器到 "
+"GOsa²。对于简单机器将开箱即可工作，对于实际有一个以上 mac 地址的机器使用被选"
+"择的一个，<computeroutput>sitesummary2ldapdhcp -h</computeroutput> 显示用法信"
+"息。请注意，<computeroutput>sitesummary2ldapdhcp</computeroutput> 处理后显示"
+"的 IP 地址属于动态 IP 范围。这些系统可以随后被修改适合你的网络：重命名每个新"
+"系统，激活 DHCP 和 DNS，以及如若需要的网络组，然后重新引导该系统。随后的屏幕"
+"快照显示在实际中所看到的是怎样的："
#. type: CDATA
#, no-wrap
@@ -3312,58 +3331,67 @@ msgid ""
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
"enter password:"
msgstr ""
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
+"\n"
+"Enter password if you want to activate these changes, and ^c to abort.\n"
+"\n"
+"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
+"enter password:"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/gosa_systems_list.png"
-msgstr ""
+msgstr "./images/gosa_systems_list.png"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "GOsa² systems listing"
-msgstr ""
+msgstr "GOsa² 系统列表"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/gosa_systems_host_details.png"
-msgstr ""
+msgstr "./images/gosa_systems_host_details.png"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Host details"
-msgstr ""
+msgstr "主机细目"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/gosa_systems_edit_host.png"
-msgstr ""
+msgstr "./images/gosa_systems_edit_host.png"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Modify host"
-msgstr ""
+msgstr "修改主机"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/gosa_systems_add_netgroup.png"
-msgstr ""
+msgstr "./images/gosa_systems_add_netgroup.png"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Add netgroup"
-msgstr ""
+msgstr "添加网络组"
#. type: Content of: <article><section><section><para>
msgid ""
"A cronjob updating DNS runs every hour; <computeroutput>su -c ldap2bind</"
"computeroutput> can be used to trigger the update manually."
msgstr ""
+"cronjob 更新 DNS 每小时运行一次; <computeroutput>su -c ldap2bind</"
+"computeroutput> 可用以手动触发更新。"
#. type: Content of: <article><section><section><section><title>
msgid "Search and delete machines"
-msgstr ""
+msgstr "搜索和删除机器"
#. type: Content of: <article><section><section><section><para>
msgid ""
"Searching for and deleting machines is quite similar to searching for and "
"deleting users, so that information is not repeated here."
-msgstr ""
+msgstr "搜索和删除机器与搜索和删除用户非常相似，因此这里不再重复信息。"
#. type: Content of: <article><section><section><section><title>
msgid "Modify existing machines / Netgroup management"
-msgstr ""
+msgstr "修改现有机器/网络组管理"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3371,6 +3399,8 @@ msgid ""
"properties using the search functionality and clicking on the machine name "
"(as you would with users)."
msgstr ""
+"使用 GOsa² 添加一台机器到 LDAP 树中之后，你可以修改其属性使用搜索功能并在计算"
+"机名称上点击 （与用户那样）。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3378,6 +3408,8 @@ msgid ""
"from modifying user entries, but the fields mean different things in this "
"context."
msgstr ""
+"这些系统的条目格式类似于一个你已经从修改用户条目所知道的，但在上下文间字段意"
+"味不同的事情。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3386,62 +3418,67 @@ msgid ""
"machine or the users logged in to that machine; instead it restricts the "
"services that machine can use on your main-server."
msgstr ""
+"例如，将机器添加到 <computeroutput>NetGroup</computeroutput> 不修改该机器或登"
+"录到该机器的用户的文件访问或命令执行权限；而是限制机器可以在主服务器上使用的"
+"服务。"
#. type: Content of: <article><section><section><section><para>
msgid ""
"The default installation provides the <computeroutput>NetGroups</"
"computeroutput>"
-msgstr ""
+msgstr "默认安装提供<computeroutput>网络组</computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
msgid "cups-queue-autoflush-hosts"
-msgstr ""
+msgstr "cups-queue-autoflush-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "cups-queue-autoreenable-hosts"
-msgstr ""
+msgstr "cups-queue-autoreenable-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "fsautoresize-hosts"
-msgstr ""
+msgstr "fsautoresize-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "ltsp-server-hosts"
-msgstr ""
+msgstr "ltsp-server-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "netblock-hosts"
-msgstr ""
+msgstr "netblock-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "printer-hosts"
-msgstr ""
+msgstr "printer-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "server-hosts"
-msgstr ""
+msgstr "server-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "shutdown-at-night-hosts"
-msgstr ""
+msgstr "shutdown-at-night-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
msgid "winstation-hosts"
-msgstr ""
+msgstr "winstation-hosts"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "workstation-hosts"
-msgstr ""
+msgstr "workstation-hosts"
#. type: Content of: <article><section><section><section><para>
msgid ""
"Currently the <computeroutput>NetGroup</computeroutput> functionality is "
"used for"
-msgstr ""
+msgstr "目前 <computeroutput>NetGroup</computeroutput> 功能是用在"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "NFS."
-msgstr ""
+msgstr "NFS。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -3453,6 +3490,10 @@ msgid ""
"machines properly in the LDAP tree using GOsa² and to configure them to use "
"static IP addresses from LDAP."
msgstr ""
+"主目录由主服务器导出被工作站和 LTSP 服务器挂载。由于安全原因，仅工作站主机，"
+"ltsp 服务器主机和服务器主机在内的主机<computeroutput>网络组</computeroutput>"
+"可以挂载导出的共享 NFS。那么记住在 LDAP 树中所配置这些正确的机器种类以及配置"
+"从 LDAP 里所使用的静态 IP 地址是相当重要的。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -3461,36 +3502,40 @@ msgid ""
"workstations and thin clients don't use NFS, so they don't need to be "
"configured."
msgstr ""
+"记着用 GOsa² 正确地配置工作站和 LTSP 服务器，否则你的用户将无法访问他们的主目"
+"录。无盘工作站和瘦客户端不使用 NFS，那么它们不需要被配置。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "fs-autoresize"
-msgstr ""
+msgstr "fs-autoresize"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Debian Edu machines in this group will automatically resize LVM partitions "
"that run out of space."
-msgstr ""
+msgstr "这一组中的 Debian Edu 机器将自动调整运行空间不足的 LVM分 区大小。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "shutdown at night"
-msgstr ""
+msgstr "夜晚关机"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Debian Edu machines in this group will automatically shut down at night to "
"save energy."
-msgstr ""
+msgstr "这一组的 Debian Edu 机器将在夜晚自动关闭以节省能源。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "CUPS (cups-queue-autoflush-hosts and cups-queue-autoreenable-hosts)"
-msgstr ""
+msgstr "CUPS (cups-queue-autoflush-hosts 和 cups-queue-autoreenable-hosts)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Debian Edu machines in these groups will automatically flush all print "
"queues every night, and re-enable any disabled print queue every hour."
msgstr ""
+"这些组当中的 Debian Edu 机器将每天晚上自动刷新所有打印队列，并且每小时重新启"
+"用任何禁用的打印队列。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -3498,6 +3543,8 @@ msgid ""
"only on the local network. Combined with web proxy restrictions this might "
"be used during exams."
msgstr ""
+"这组中的 Debian Edu 机器将只被允许连接到本地网络上的机器。结合 web 代理限制应"
+"被用在考试期间。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3510,28 +3557,45 @@ msgid ""
"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
"\">HowTo/NetworkClients</link> chapter of this manual."
msgstr ""
+"机器配置的另一个重要部分是“Samba 主机”标志（在“主机信息”区域）。如果你计划添"
+"加现有的 Windows 系统到 Skolelinux Samba 域，你需要添加 Windows 主机到 LDAP "
+"树并设置能够连接该 Windows 主机到这一域的标志。有关添加 Windows 主机到 "
+"Skolelinux 网络的更多信息参看本手册的 <link linkend=\"NetworkClients--"
+"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+"\">HowTo/NetworkClients</link> 一章。"
#. type: Content of: <article><section><title>
msgid "Printer Management"
-msgstr ""
+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 "
+"www:631\"/> and accept the self-signed certificate. 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> and "
+"<computeroutput>printer-admins</computeroutput> (both with the first user as "
"member), <computeroutput>teachers</computeroutput> and "
"<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>printer-admins</computeroutput> (二者皆以第"
+"一个用户作为成员)、<computeroutput>teachers</computeroutput> 、"
+"computeroutput>jradmins</computeroutput> （安装后无成员）。"
#. type: Content of: <article><section><title>
msgid "Clock synchronisation"
-msgstr ""
+msgstr "时钟同步"
#. type: Content of: <article><section><para>
msgid ""
@@ -3541,12 +3605,15 @@ msgid ""
"This can cause machines to keep the external Internet connection open if it "
"is created when used."
msgstr ""
+"Debian Edu 中的默认配置为保持所有机器上的时钟同步，但时钟未必准确。NTP 用于更"
+"新时间。默认情况下，时钟将与外部源进行同步。如果在使用时创建，这会使机器保持"
+"外网连接打开。"
#. type: Content of: <article><section><para>
msgid ""
"If you use dialup or ISDN and pay per minute, you want to change this "
"default setting."
-msgstr ""
+msgstr "如果您使用拨号或 ISDN ，且按分钟付费，您可能想要改变该默认设定。"
#. type: Content of: <article><section><para>
msgid ""
@@ -3558,10 +3625,15 @@ msgid ""
"root. To test if a machine is using the external clock sources, run "
"<computeroutput>ntpq -c lpeer</computeroutput>."
msgstr ""
+"要禁用与外部时钟的同步，需要修改主服务器和所有客户端以及 LTSP chroot 上的 /"
+"etc/ntp.conf 文件。在 <computeroutput>server</computeroutput> 记录前添加注释 "
+"(\"#\") 标记。这之后，NTP 服务器需要以 root 运行 <computeroutput>/etc/init.d/"
+"ntp restart</computeroutput> 来重启。如果机器使用外部时钟源要测试，运行 "
+"<computeroutput>ntpq -c lpeer</computeroutput>。"
#. type: Content of: <article><section><title>
msgid "Extending full partitions"
-msgstr ""
+msgstr "扩展占满的分区"
#. type: Content of: <article><section><para>
msgid ""
@@ -3572,20 +3644,24 @@ msgid ""
"Resizing_Partitions\">administration HowTo chapter</link> for more "
"information."
msgstr ""
+"由于自动分区可能出现的错误，安装后某些分区可能太满了。要扩充这些分区，以 "
+"root 运行 <computeroutput>debian-edu-fsautoresize -n</computeroutput>。参看"
+"<link linkend=\"Administration--Resizing_Partitions\">如何管理章节</link>中如"
+"何“重新分划分区大小”的更多信息。"
#. type: Content of: <article><section><title>
msgid "Maintenance"
-msgstr ""
+msgstr "维护"
#. type: Content of: <article><section><section><title>
msgid "Updating the software"
-msgstr ""
+msgstr "更新软件"
#. type: Content of: <article><section><section><para>
msgid ""
"This section explains how to use <computeroutput>apt-get upgrade</"
"computeroutput>."
-msgstr ""
+msgstr "本节介绍如何使用 <computeroutput>apt-get upgrade</computeroutput>。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3595,6 +3671,10 @@ msgid ""
"available packages) and <computeroutput>apt-get upgrade</computeroutput> "
"(which upgrades the packages for which an upgrade is available)."
msgstr ""
+"使用 <computeroutput>apt-get</computeroutput> 其实很容易。要更新系统需要以 "
+"root 在命令行中执行两个命令：<computeroutput>apt-get update</"
+"computeroutput>（更新可用软件包列表）和 <computeroutput>apt-get upgrade</"
+"computeroutput>（对可以升级的软件包升级）。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3613,6 +3693,10 @@ msgid ""
"LC_ALL=C TMP= TMPDIR= ltsp-chroot -p apt-get upgrade -y\n"
"ltsp-update-kernels # If a new kernel was installed"
msgstr ""
+"LC_ALL=C apt-get update ; LC_ALL=C TMP= TMPDIR= ltsp-chroot apt-get update\n"
+"LC_ALL=C apt-get upgrade -y\n"
+"LC_ALL=C TMP= TMPDIR= ltsp-chroot -p apt-get upgrade -y\n"
+"ltsp-update-kernels # If a new kernel was installed"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3621,12 +3705,16 @@ msgid ""
"kernel modules in sync. The kernel is handed out via TFTP when the machine "
"does PXE boot, and the kernel modules are fetched from the LTSP chroot."
msgstr ""
+"如果在 LTSP chroot 中安装了新内核，运行 <computeroutput>ltsp-update-kernels</"
+"computeroutput> 来保持内核与内核模块同步是重要的。当机器做 PXE 引导时内核通"
+"过 TFTP 分发，而内核模块来自 LTSP chroot。"
#. type: Content of: <article><section><section><para>
msgid ""
"Run <computeroutput>ltsp-update-image</computeroutput> to re-generate the "
"NBD image(s)."
msgstr ""
+"运行 <computeroutput>ltsp-update-image</computeroutput> 重新生成 NBD 映像。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3634,6 +3722,9 @@ msgid ""
"and <computeroutput>apt-listchanges</computeroutput> and configure them to "
"send mail to an address you are reading."
msgstr ""
+"安装 <computeroutput>cron-apt</computeroutput> 和 <computeroutput>apt-"
+"listchanges</computeroutput> 并配置它们来发送邮件到你正在阅读的地址也是一个好"
+"主意。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3643,6 +3734,9 @@ msgid ""
"to wait for the download when you do <computeroutput>apt-get upgrade</"
"computeroutput>."
msgstr ""
+"<computeroutput>cron-apt</computeroutput> 每天通过电子邮件通知你有关可升级的"
+"任何软件包。它不安装这些升级，但下载它们（通常在夜间），那么当你执行 "
+"<computeroutput>apt-get upgrade</computeroutput> 时不必等待下载。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3652,6 +3746,10 @@ msgid ""
"UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink>. On new "
"installations security updates are enabled by default."
msgstr ""
+"如果希望更新可以容易地自动安装，仅需要以 <ulink url=\"https://wiki.debian."
+"org/UnattendedUpgrades\">wiki.debian.org/UnattendedUpgrades</ulink> 中的讲述"
+"来配置 <computeroutput>unattended-upgrades</computeroutput> 软件包。在新的安"
+"全更新安装中默认启用。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3660,10 +3758,13 @@ msgid ""
"running <computeroutput>aptitude</computeroutput> or <computeroutput>apt-"
"get</computeroutput>."
msgstr ""
+"<computeroutput>apt-listchanges</computeroutput> 可以通过电子邮件给你发送新变"
+"更日志记录，或者当在终端中运行 <computeroutput>aptitude</computeroutput> 或 "
+"<computeroutput>apt-get</computeroutput> 时显示它们。"
#. type: Content of: <article><section><section><section><title>
msgid "Keep yourself informed about security updates"
-msgstr ""
+msgstr "保留你自己的安全更新相关信息"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3676,10 +3777,15 @@ msgid ""
"(compared to <computeroutput>cron-apt</computeroutput>) is that it also "
"includes information about updates for packages which aren't installed."
msgstr ""
+"作为上文所述运行 <computeroutput>cron-apt</computeroutput> 是获知已安装软件包"
+"安全更新的一个好方法。另一个保留相关安全更新通知的方法是订阅 <ulink url="
+"\"http://lists.debian.org/debian-security-announce/\">Debian 安全通告邮件列表"
+"</ulink>，那也有益于告诉你有关的安全更新。其缺点（对照 <computeroutput>cron-"
+"apt</computeroutput>）是也包含未安装软件包的相关更新信息。"
#. type: Content of: <article><section><section><title>
msgid "Backup Management"
-msgstr ""
+msgstr "备份管理"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3690,6 +3796,10 @@ msgid ""
"temporarily allow ssh root login on the backup server (main server 'tjener' "
"by default)."
msgstr ""
+"在浏览器指向 <ulink url=\"https://www/slbackup-php\"/> 是备份管理。请注意那需"
+"要通过 SSL 访问该站点，因为你需要在那里输入 root 密码。如果你尝试不使用 SSL "
+"来访问这个站点将会失败。注意：如果你临时允许 root 在备份服务器（默认是主服务"
+"器 'tjener'）上登录该站点将只工作。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3699,24 +3809,30 @@ msgid ""
"If you only want to have spare copies of things (in case you delete them) "
"this setup should be fine for you."
msgstr ""
+"默认情况下 tjener 将备份 <computeroutput>/skole/tjener/home0</"
+"computeroutput>，<computeroutput>/etc/</computeroutput>，<computeroutput>/"
+"root/.svk</computeroutput> 和 LDAP 到 LVM 下的 /skole/backup。如果你仅想要有"
+"事物的备用复本（以防万一你删除它们）这个设置会很适合你。"
#. type: Content of: <article><section><section><para>
msgid ""
"Be aware that this backup scheme doesn't protect you from failing hard "
"drives."
-msgstr ""
+msgstr "要意识到这一备份方案不能从失灵的硬盘保护你。"
#. type: Content of: <article><section><section><para>
msgid ""
"If you want to back up your data to an external server, a tape device or "
"another hard drive you'll have to modify the existing configuration a bit."
msgstr ""
+"如果你想要备份你的数据到外部服务器，磁带设备或者另一个硬盘你将需要修改这个存"
+"在的配置一点点。"
#. type: Content of: <article><section><section><para>
msgid ""
"If you want to restore a complete folder, your best option is to use the "
"command-line:"
-msgstr ""
+msgstr "如果您想恢复整个文件夹，最佳选择是使用如下命令行："
#. type: CDATA
#, no-wrap
@@ -3725,6 +3841,9 @@ msgid ""
" /skole/backup/tjener/skole/tjener/home0/user \\\n"
" /skole/tjener/home0/user_<date>"
msgstr ""
+"$ sudo rdiff-backup -r <date> \\\n"
+" /skole/backup/tjener/skole/tjener/home0/user \\\n"
+" /skole/tjener/home0/user_<date>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3732,34 +3851,41 @@ msgid ""
"computeroutput> for <computeroutput><date></computeroutput> in the "
"folder <computeroutput>/skole/tjener/home0/user_<date></computeroutput>"
msgstr ""
+"这将在 <computeroutput>/skole/tjener/home0/user_<date></"
+"computeroutput> 文件夹中留下来自 <computeroutput>/skole/tjener/home0/user</"
+"computeroutput> 对于 <computeroutput><date></computeroutput> 的内容"
#. type: Content of: <article><section><section><para>
msgid ""
"If you want to restore a single file, then you should be able to select the "
"file (and the version) from the web interface, and download only that file."
msgstr ""
+"如果您想恢复单个文件，您可以从网络界面上选择该文件（以及版本），并下载该文"
+"件。"
#. type: Content of: <article><section><section><para>
msgid ""
"If you want to get rid of older backups, choose \"Maintenance\" in the menu "
"on the backup page and select the oldest snapshot to keep:"
msgstr ""
+"如果要清除较旧的备份，在备份页面的菜单中选择“维护”并选择要保留的最早的快照："
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/slbackup-php_maintenance.png"
-msgstr ""
+msgstr "./images/slbackup-php_maintenance.png"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "slbackup-php Maintenance"
-msgstr ""
+msgstr "slbackup-php 维护"
#. type: Content of: <article><section><section><title>
+#, fuzzy
msgid "Server Monitoring"
-msgstr ""
+msgstr "服务器监控"
#. type: Content of: <article><section><section><section><title>
msgid "Munin"
-msgstr ""
+msgstr "Munin"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3768,6 +3894,9 @@ msgid ""
"weekly, monthly and yearly basis, and provides the system administrator with "
"help when looking for bottlenecks and the source of system problems."
msgstr ""
+"从 <ulink url=\"https://www/munin/\"/> 可得到 Munin 趋势报告系统。它提供基于"
+"一天，星期，月和每年的系统监测曲线图，并且当系统管理员在查找瓶颈及系统问题根"
+"源时给以帮助。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3795,6 +3924,7 @@ msgid ""
"Information about Munin is available from <ulink url=\"http://munin-"
"monitoring.org/\"/>."
msgstr ""
+"Munin 的相关信息，可参见<ulink url=\"http://munin-monitoring.org/\"/>。"
#. type: Content of: <article><section><section><section><title>
msgid "Icinga"
@@ -3897,9 +4027,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
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."
+"good job with new versions, you can configure <computeroutput>unattended-"
+"upgrades</computeroutput> to automatically upgrade all new packages every "
+"night. This will not upgrade the LTSP chroots."
msgstr ""
#. type: Content of: <article><section><section><section><section><section><para>
@@ -4063,10 +4193,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-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 "Don't use X, use a virtual console, log in as root."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -4135,6 +4262,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -4172,7 +4306,7 @@ msgid "/etc/default/ldap2zone: Choose Y."
msgstr ""
#. 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!)"
+msgid "/etc/gosa/gosa.conf: Choose N. (Never accept a new gosa.conf version!)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4216,7 +4350,9 @@ msgstr "文件系统存取配置"
msgid ""
"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"
@@ -4244,6 +4380,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -4252,8 +4395,8 @@ msgstr ""
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"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
+"rm -rf /etc/php5"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4268,16 +4411,15 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "Check if the upgraded system works:"
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Reboot and test if it works like before: Log in as first user and test if"
+msgid "Reboot; log in as first user and test"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "the GOsa² gui is working,"
+msgid "if the GOsa² gui is working,"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4878,20 +5020,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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>."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid "To install these packages run the following command as root:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get install unattended-upgrades apt-listchanges"
+"which will install security (and other) upgrades automatically. The package "
+"is installed by default and preconfigured to install security upgrades. The "
+"logs are available in <computeroutput>/var/log/unattended-upgrades/</"
+"computeroutput>; also, there are always <computeroutput>/var/log/dpkg.log</"
+"computeroutput> and <computeroutput>/var/log/apt/</computeroutput>."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -7872,7 +8005,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Firefox 45.8 ESR and Chromium 57"
+msgid "Firefox 45.9 ESR and Chromium 59"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8257,7 +8390,9 @@ msgstr ""
#. type: CDATA
#, 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."
+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 ""
#. type: Content of: <article><section><section><para>
@@ -9082,7 +9217,7 @@ msgstr ""
#. type: Content of: <article><section><section><title>
msgid "Historic information about older releases"
-msgstr ""
+msgstr "旧版本的历史信息"
#. type: Content of: <article><section><section><para>
msgid "The following Debian Edu releases were made further in the past:"
@@ -9090,41 +9225,46 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "Debian Edu 6.0.7+r1 Codename \"Squeeze\", released 2013-03-03."
-msgstr ""
+msgstr "Debian Edu 6.0.7+r1 代号 \"Squeeze\"，发布于 2013-03-03。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "Debian Edu 6.0.4+r0 Codename \"Squeeze\", released 2012-03-11."
-msgstr ""
+msgstr "Debian Edu 6.0.4+r0 代号 \"Squeeze\"，发布于 2012-03-11。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "Debian Edu 5.0.6+edu1 Codename \"Lenny\", released 2010-10-05."
-msgstr ""
+msgstr "Debian Edu 5.0.6+edu1 代号 \"Lenny\"，发布于 2010-10-05。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "Debian Edu 5.0.4+edu0 Codename \"Lenny\", released 2010-02-08."
-msgstr ""
+msgstr "Debian Edu 5.0.4+edu0 代号 \"Lenny\"，发布于 2010-02-08。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "Debian Edu \"3.0r1 Terra\", released 2007-12-05."
-msgstr ""
+msgstr "Debian Edu \"3.0r1 Terra\"，发布于 2007-12-05。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"Debian Edu \"3.0r0 Terra\" released 2007-07-22. Based on Debian 4.0 Etch "
"released 2007-04-08."
msgstr ""
+"Debian Edu \"3.0r0 Terra\" 发布于 2007-07-22。基于发布于 2007-04-08 的 "
+"Debian 4.0 Etch。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"Debian Edu 2.0, released 2006-03-14. Based on Debian 3.1 Sarge released "
"2005-06-06."
msgstr ""
+"Debian Edu 2.0，发布于2006-03-14。基于 2005-06-06 发布的 Debian 3.1 Sarge。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"Debian Edu \"1.0 Venus\" release 2004-06-20. Based on Debian 3.0 Woody "
"released 2002-07-19."
msgstr ""
+"Debian Edu \"1.0 Venus\" 发布于 2004-06-20。基于 2002-07-19 发布的 Debian "
+"3.0 Woody。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9137,7 +9277,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
msgid "More information on even older releases"
-msgstr ""
+msgstr "关于旧发行版本的更多信息"
#. type: Content of: <article><section><section><section><para>
msgid ""
diff --git a/documentation/debian-edu-stretch/images/de/worldmap.png b/documentation/debian-edu-stretch/images/de/worldmap.png
index 0951d57..f1e6791 100644
Binary files a/documentation/debian-edu-stretch/images/de/worldmap.png and b/documentation/debian-edu-stretch/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-stretch/images/es/worldmap.png b/documentation/debian-edu-stretch/images/es/worldmap.png
index 5576a1e..98b8d8a 100644
Binary files a/documentation/debian-edu-stretch/images/es/worldmap.png and b/documentation/debian-edu-stretch/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-stretch/images/fr/worldmap.png b/documentation/debian-edu-stretch/images/fr/worldmap.png
index ecaae19..a7e4625 100644
Binary files a/documentation/debian-edu-stretch/images/fr/worldmap.png and b/documentation/debian-edu-stretch/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-stretch/images/worldmap.png b/documentation/debian-edu-stretch/images/worldmap.png
index 983609e..0832887 100644
Binary files a/documentation/debian-edu-stretch/images/worldmap.png and b/documentation/debian-edu-stretch/images/worldmap.png 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