[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Stretch manual from the wiki.
Holger Levsen
holger at layer-acht.org
Tue Apr 25 11:37:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-doc.
commit 33c08dc4c805b8fbff3b70b8434f0cc668fbfc88
Author: Holger Levsen <holger at layer-acht.org>
Date: Tue Apr 25 13:37:12 2017 +0200
Update Debian Edu Stretch manual from the wiki.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
.../debian-edu-stretch-manual.da.po | 382 +++++++++++++---
.../debian-edu-stretch-manual.de.po | 414 +++++++++++++++---
.../debian-edu-stretch-manual.es.po | 297 +++++++++++--
.../debian-edu-stretch-manual.fi.po | 270 ++++++++++--
.../debian-edu-stretch-manual.fr.po | 436 +++++++++++++++----
.../debian-edu-stretch-manual.it.po | 453 +++++++++++++++----
.../debian-edu-stretch-manual.ja.po | 405 ++++++++++++++---
.../debian-edu-stretch-manual.nb.po | 430 ++++++++++++++----
.../debian-edu-stretch-manual.nl.po | 481 ++++++++++++++++-----
.../debian-edu-stretch-manual.pl.po | 286 ++++++++++--
.../debian-edu-stretch-manual.pot | 270 ++++++++++--
.../debian-edu-stretch-manual.xml | 163 +++++--
.../debian-edu-stretch-manual.zh.po | 313 +++++++++++---
13 files changed, 3754 insertions(+), 846 deletions(-)
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index 0b07a14..6b28448 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-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+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"
@@ -5123,57 +5123,240 @@ msgstr ""
#| "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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"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><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If <computeroutput>apt-get</computeroutput> finishes with an error, try "
+#| "to fix it and/or run <computeroutput>apt-get -f install</computeroutput> "
+#| "and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once "
+#| "again."
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
+msgstr ""
+"Hvis <computeroutput>apt-get</computeroutput> stadig afslutter med en fejl, "
+"så prøv at rette den og/eller køre <computeroutput>apt-get -f install</"
+"computeroutput> og så <computeroutput>apt-get -y dist-upgrade</"
+"computeroutput> igen."
+
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Upgrade the server side"
+msgid "Upgrading the main server"
msgstr "Opgrader serversiden"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+#, fuzzy
+#| msgid "Make sure the current system is up-to-date."
+msgid "Start by making sure the current system is up-to-date:"
msgstr "Sikr dig at det nuværende system er opdateret."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
"apt-get update\n"
-"apt-get -y upgrade"
+"apt-get upgrade"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
-msgstr "Udfør den faktiske opgradering."
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
+msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
-"sed -i 's/wheezy/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "You will see some prompts about package configurations:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "click advanced configuration"
+msgid "Apply and adjust configuration:"
+msgstr "klik avanceret konfiguration"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "New features in Debian Edu Stretch"
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr "Nye funktioner i Debian Edu Stretch"
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
msgstr ""
-"Hvis <computeroutput>apt-get</computeroutput> stadig afslutter med en fejl, "
-"så prøv at rette den og/eller køre <computeroutput>apt-get -f install</"
-"computeroutput> og så <computeroutput>apt-get -y dist-upgrade</"
-"computeroutput> igen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -5181,31 +5364,48 @@ 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 "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
-"Genstart og test om alt fungerer som før: Log ind som den første bruger og "
-"test om den grafiske brugerflade for GOsa² fungerer, om du kan forbinde LTSP-"
-"klienter og arbejdsstationer, om du kan tilføje/fjerne et netgruppe-"
-"medlemskab for et system, om du kan sende og modtage intern post, om du kan "
-"håndtere printere og måske andre sidespecifikke aktiviteter. Brug "
-"testprogrampakkens skripter hvis du finder en fejl."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr "Introduktion til tynde klienter og diskløse arbejdsstationer"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#, fuzzy
+#| msgid "Upgrade LTSP chroot (default arch i386)"
+msgid "Upgrading LTSP chroots (default arch i386)"
msgstr "Opgrader LTSP-chroot (standardarkitektur i386)"
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
+msgstr ""
+
#. type: CDATA
#, fuzzy, no-wrap
#| msgid ""
@@ -5218,13 +5418,13 @@ msgstr "Opgrader LTSP-chroot (standardarkitektur i386)"
#| "ltsp-chroot -m -a i386 apt-get -f install\n"
#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
"sed -i '/stretch/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
"ltsp-chroot -m -a i386 apt-get update\n"
@@ -5235,28 +5435,22 @@ msgstr ""
"ltsp-chroot -m -a i386 apt-get -f install\n"
"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
-msgstr ""
-"Hvis <computeroutput>apt-get</computeroutput> stadig afslutter med en fejl, "
-"så prøv at rette den og/eller køre <computeroutput>apt-get</computeroutput>-"
-"kommandoerne igen, specielt <computeroutput>apt-get -f install</"
-"computeroutput>.."
-
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+#, fuzzy
+#| msgid "Cleaning up."
+msgid "Cleaning up:"
msgstr "Rydder op."
#. type: CDATA
-#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+#, fuzzy
+#| msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr "Opdater LTSP-understøttelse på serversiden."
#. type: CDATA
@@ -5272,6 +5466,21 @@ msgstr ""
"ltsp-update-kernels\n"
"ltsp-update-sshkeys"
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+#| "debian-edu/default-diskless.cfg</computeroutput>."
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+"sæt den symbolske henvisning i <computeroutput>/var/lib/tftpboot/pxelinux."
+"cfg</computeroutput> på tjener til at pege på <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr "Genskabelse af en LTSP-chroot"
@@ -12299,6 +12508,50 @@ msgstr ""
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+#~ msgstr ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+
+#~ msgid "Do the actual upgrade."
+#~ msgstr "Udfør den faktiske opgradering."
+
+#~ msgid ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+#~ msgstr ""
+#~ "sed -i 's/wheezy/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+
+#~ msgid ""
+#~ "Reboot and test if it works like before: Log in as first user and test if "
+#~ "the GOsa² gui is working, if you're able to connect LTSP clients and "
+#~ "workstations, if you can add/remove a netgroup membership of a system, if "
+#~ "you can send and receive internal email, if you can manage printers, and "
+#~ "maybe other site specific things. Use the testsuite scripts if you spot "
+#~ "an error."
+#~ msgstr ""
+#~ "Genstart og test om alt fungerer som før: Log ind som den første bruger "
+#~ "og test om den grafiske brugerflade for GOsa² fungerer, om du kan "
+#~ "forbinde LTSP-klienter og arbejdsstationer, om du kan tilføje/fjerne et "
+#~ "netgruppe-medlemskab for et system, om du kan sende og modtage intern "
+#~ "post, om du kan håndtere printere og måske andre sidespecifikke "
+#~ "aktiviteter. Brug testprogrampakkens skripter hvis du finder en fejl."
+
+#~ msgid ""
+#~ "If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+#~ "try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+#~ "commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+#~ msgstr ""
+#~ "Hvis <computeroutput>apt-get</computeroutput> stadig afslutter med en "
+#~ "fejl, så prøv at rette den og/eller køre <computeroutput>apt-get</"
+#~ "computeroutput>-kommandoerne igen, specielt <computeroutput>apt-get -f "
+#~ "install</computeroutput>.."
+
+#~ msgid ""
#~ "Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to "
#~ "Debian Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and "
#~ "6.0.7 as well as the following changes:"
@@ -13513,9 +13766,6 @@ msgstr ""
#~ msgid "click on the just configured server entry, click 'Modify'"
#~ msgstr "klik på den konfigurerede serverpost, klik »Ændr«"
-#~ msgid "click advanced configuration"
-#~ msgstr "klik avanceret konfiguration"
-
#~ msgid "click detect automatically"
#~ msgstr "klik detekter automatisk"
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 190e863..8af3e2c 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+0000\n"
"PO-Revision-Date: 2017-04-10 21:49+0000\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4664,11 +4664,16 @@ msgstr ""
"\"https://www.debian.org/releases/stretch/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 your currently-installed version'; 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"information carefully, choose 'keep your currently-installed version' unless "
+"stated differently below; in most cases hitting return will be fine."
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 "
@@ -4676,48 +4681,232 @@ msgstr ""
"das Drücken von »Enter« richtig sein. Drücken Sie »q«, um den Pager von apt-"
"listchanges zu verlassen, nachdem Sie die Informationen gelesen haben."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If <computeroutput>apt-get</computeroutput> finishes with an error, try "
+#| "to fix it and/or run <computeroutput>apt-get -f install</computeroutput> "
+#| "and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once "
+#| "again."
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
+msgstr ""
+"Wenn <computeroutput>apt-get</computeroutput> mit einer Fehlermeldung "
+"abbrechen sollte, dann versuchen Sie, den Fehler zu finden und/oder führen "
+"Sie die <computeroutput>apt-get</computeroutput>-Befehle erneut aus, "
+"insbesondere <computeroutput>apt-get -f install</computeroutput>."
+
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Upgrade the server side"
+msgid "Upgrading the main server"
msgstr "Upgrade auf der Server-Seite"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+#, fuzzy
+#| msgid "Make sure the current system is up-to-date."
+msgid "Start by making sure the current system is up-to-date:"
msgstr "Sicherstellen, dass das gegenwärtige System aktualisiert ist."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
"apt-get update\n"
-"apt-get -y upgrade"
+"apt-get upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
-msgstr "Das eigentliche Upgrade vornehmen."
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
+msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
+msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "You will see some prompts about package configurations:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "Apply and adjust configuration:"
+msgstr "Konfiguration der Zugriffsrechte auf das Dateisystem"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "New features in Debian Edu Stretch"
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr "Neuerungen in Debian Edu Stretch"
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
msgstr ""
-"Wenn <computeroutput>apt-get</computeroutput> mit einer Fehlermeldung "
-"abbrechen sollte, dann versuchen Sie, den Fehler zu finden und/oder führen "
-"Sie die <computeroutput>apt-get</computeroutput>-Befehle erneut aus, "
-"insbesondere <computeroutput>apt-get -f install</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4725,46 +4914,69 @@ 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 "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
-"Führen Sie einen Reboot aus und testen Sie, ob alles wie vorher "
-"funktioniert: Melden Sie sich als Erstbenutzer an und prüfen Sie, ob die "
-"GOsa²-Webseite funktioniert, ob Sie LTSP-Clients und Arbeitsplatzrechner "
-"benutzen, ein System zu einer Netgroup hinzufügen oder daraus entfernen, "
-"interne E-Mails senden und empfangen sowie Drucker verwalten können, und ob "
-"lokal vorhandene Anwendungen funktionieren. Verwenden Sie die Testsuite-"
-"Skripte, falls Sie einen Fehler bemerken."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr ""
+"Einführung in Thin Clients (auch als Terminals bezeichnet) und Diskless "
+"Workstations (Arbeitsplatzrechner ohne Festplatte)"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
msgstr ""
-"Die LDAP-Datenbank (auf dem Hauptserver) muss angepasst werden. Mittels "
-"GOsa² oder einem LDAP-Editor muss der Wert »tjener« von »sudoHost« durch "
-"»tjener.intern« ersetzt werden."
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#, fuzzy
+#| msgid "Upgrade LTSP chroot (default arch i386)"
+msgid "Upgrading LTSP chroots (default arch i386)"
msgstr ""
"Upgrade für den LTSP-Chroot (Architektur i386 als Standard) durchführen"
-#. type: CDATA
-#, no-wrap
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+#| "sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+#| "ltsp-chroot -m -a i386 apt-get -f install\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
"ltsp-chroot -m -a i386 apt-get update\n"
"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
@@ -4774,28 +4986,22 @@ msgstr ""
"ltsp-chroot -m -a i386 apt-get -f install\n"
"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
-msgstr ""
-"Wenn <computeroutput>apt-get</computeroutput> weiterhin mit einer "
-"Fehlermeldung abbrechen sollte, dann versuchen Sie, den Fehler zu finden und/"
-"oder führen Sie die <computeroutput>apt-get</computeroutput>-Befehle erneut "
-"aus, insbesondere <computeroutput>apt-get -f install</computeroutput>."
-
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+#, fuzzy
+#| msgid "Cleaning up."
+msgid "Cleaning up:"
msgstr "Aufräumen"
#. type: CDATA
-#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+#, fuzzy
+#| msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr "Den LTSP-Support auf der Server-Seite aktualisieren."
#. type: CDATA
@@ -4809,6 +5015,21 @@ msgstr ""
"ltsp-update-sshkeys\n"
"ltsp-update-image"
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on the main server to point to <computeroutput>/var/lib/"
+#| "tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+"lassen sie auf dem Hauptserver den symbolischen Link in <computeroutput>/var/"
+"lib/tftpboot/pxelinux.cfg</computeroutput> auf <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput> zeigen."
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr "Eine LTSP-Chroot-Umgebung neu erzeugen"
@@ -11431,3 +11652,58 @@ msgstr ""
"Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+
+#~ msgid ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+#~ msgstr ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+
+#~ msgid "Do the actual upgrade."
+#~ msgstr "Das eigentliche Upgrade vornehmen."
+
+#~ msgid ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+#~ msgstr ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+
+#~ msgid ""
+#~ "Reboot and test if it works like before: Log in as first user and test if "
+#~ "the GOsa² gui is working, if you're able to connect LTSP clients and "
+#~ "workstations, if you can add/remove a netgroup membership of a system, if "
+#~ "you can send and receive internal email, if you can manage printers, and "
+#~ "maybe other site specific things. Use the testsuite scripts if you spot "
+#~ "an error."
+#~ msgstr ""
+#~ "Führen Sie einen Reboot aus und testen Sie, ob alles wie vorher "
+#~ "funktioniert: Melden Sie sich als Erstbenutzer an und prüfen Sie, ob die "
+#~ "GOsa²-Webseite funktioniert, ob Sie LTSP-Clients und Arbeitsplatzrechner "
+#~ "benutzen, ein System zu einer Netgroup hinzufügen oder daraus entfernen, "
+#~ "interne E-Mails senden und empfangen sowie Drucker verwalten können, und "
+#~ "ob lokal vorhandene Anwendungen funktionieren. Verwenden Sie die "
+#~ "Testsuite-Skripte, falls Sie einen Fehler bemerken."
+
+#~ msgid ""
+#~ "The LDAP data base (on the main server) has to be adjusted. The sudoHost "
+#~ "value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
+#~ "LDAP editor."
+#~ msgstr ""
+#~ "Die LDAP-Datenbank (auf dem Hauptserver) muss angepasst werden. Mittels "
+#~ "GOsa² oder einem LDAP-Editor muss der Wert »tjener« von »sudoHost« durch "
+#~ "»tjener.intern« ersetzt werden."
+
+#~ msgid ""
+#~ "If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+#~ "try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+#~ "commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+#~ msgstr ""
+#~ "Wenn <computeroutput>apt-get</computeroutput> weiterhin mit einer "
+#~ "Fehlermeldung abbrechen sollte, dann versuchen Sie, den Fehler zu finden "
+#~ "und/oder führen Sie die <computeroutput>apt-get</computeroutput>-Befehle "
+#~ "erneut aus, insbesondere <computeroutput>apt-get -f install</"
+#~ "computeroutput>."
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 fe09b3a..b6532ad 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-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+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"
@@ -4918,100 +4918,303 @@ 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"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><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "On thin clients, <computeroutput>pavucontrol</computeroutput> or "
+#| "<computeroutput>alsamixer</computeroutput> (but not <computeroutput>kmix</"
+#| "computeroutput>) can be used to change audio volume."
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
+msgstr ""
+"En clientes ligeros, <computeroutput>pavucontrol</computeroutput> o "
+"<computeroutput>alsamixer</computeroutput> (pero no <computeroutput>kmix</"
+"computeroutput>) puede ser usado para ajustar el volumen."
+
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Services running on the main server"
+msgid "Upgrading the main server"
+msgstr "Servicios que corren en el servidor principal"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start by making sure the current system is up-to-date:"
msgstr ""
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
+msgid ""
+"apt update\n"
+"apt full-upgrade"
+msgstr ""
+"apt-get update \n"
+"apt-get upgrade"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
+msgid "Prepare and start the upgrade to Stretch:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "You will see some prompts about package configurations:"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"Reboot and test if it works like before: Log in as first user and test if "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
msgstr ""
-#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
-"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "Apply and adjust configuration:"
+msgstr "Configuración del acceso al sistema de archivos"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "New features in Debian Edu Jessie"
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr "Nuevas características en Debin Edu Jessie"
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+"Reboot and test if it works like before: Log in as first user and test if"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr "Introducción a clientes ligeros y estaciones de trabajo sin disco"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+msgid "and maybe other site specific things."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrading LTSP chroots (default arch i386)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
msgstr ""
#. type: CDATA
#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up:"
msgstr ""
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
+msgstr "apt-get install killer"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr ""
#. type: CDATA
@@ -5022,6 +5225,13 @@ msgid ""
"ltsp-update-image"
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr "Recrear un chroot LTSP"
@@ -10896,11 +11106,6 @@ msgstr ""
#~ msgid "Install missing package in the LTSP chroot."
#~ msgstr "Instalación de software adicional en el entorno LTSP"
-#, fuzzy
-#~| msgid "apt-get install killer"
-#~ msgid "ltsp-chroot -m -a i386 apt-get -y install killer"
-#~ msgstr "apt-get install killer"
-
#~ msgid "Source image"
#~ msgstr "Imagen del código fuente"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
index 0f6ea0c..581967d 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+0000\n"
"PO-Revision-Date: 2017-04-17 06:21+0000\n"
"Last-Translator: ekeimaja <ekeimaja at gmail.com>\n"
"Language-Team: Finnish <https://hosted.weblate.org/projects/debian-edu-"
@@ -3408,100 +3408,281 @@ 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"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><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+msgid "Upgrading the main server"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+msgid "Start by making sure the current system is up-to-date:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"apt update\n"
+"apt full-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "You will see some prompts about package configurations:"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
msgid ""
-"Reboot and test if it works like before: Log in as first user and test if "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
msgstr ""
-#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply and adjust configuration:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
-"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrading LTSP chroots (default arch i386)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
msgstr ""
#. type: CDATA
#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+msgid "Cleaning up:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side:"
msgstr ""
#. type: CDATA
@@ -3512,6 +3693,13 @@ msgid ""
"ltsp-update-image"
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr ""
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 86d3316..2abc7d4 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-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+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"
@@ -5326,9 +5326,8 @@ msgstr ""
#| "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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"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 "
@@ -5337,52 +5336,251 @@ msgstr ""
"« q » pour quitter apt-listchanges une fois que vous avez lu les "
"informations."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If <computeroutput>apt-get</computeroutput> finishes with an error, try "
+#| "to fix it and/or run <computeroutput>apt-get -f install</computeroutput> "
+#| "and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once "
+#| "again."
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
+msgstr ""
+"Si <computeroutput>apt-get</computeroutput> termine avec une erreur, essayez "
+"de la corriger et/ou de lancer <computeroutput>apt-get -f install</"
+"computeroutput>, puis à nouveau <computeroutput>apt-get -y dist-upgrade</"
+"computeroutput>."
+
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Upgrade the server side"
+msgid "Upgrading the main server"
msgstr "Mettez à jour la partie serveur"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+#, fuzzy
+#| msgid "Make sure the current system is up-to-date."
+msgid "Start by making sure the current system is up-to-date:"
msgstr "Assurez-vous que le système actuel est à jour."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
"apt-get update\n"
-"apt-get -y upgrade"
+"apt-get upgrade"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
+"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+"apt update\n"
+"apt full-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "You will see some prompts about package configurations:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+#| "org/779646#\">779646</ulink>)."
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+"Considérez une étape optionnelle (bogue Debian nº <ulink url=\"https://bugs."
+"debian.org/779646#\">779646</ulink>)."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
-msgstr "Faire la mise à jour à proprement parler."
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
#. type: CDATA
#, fuzzy, no-wrap
#| msgid ""
-#| "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
-#| "apt-get update\n"
-#| "apt-get -y dist-upgrade"
+#| "service squid stop\n"
+#| "umount /var/spool/squid\n"
+#| "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#| "mount /var/spool/squid3\n"
+#| "service squid3 start\n"
+#| "apt-get -y purge squid squid-common"
msgid ""
-"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
msgstr ""
-"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "click advanced configuration"
+msgid "Apply and adjust configuration:"
+msgstr "cliquez sur configuration avancée"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "New features in Debian Edu Jessie"
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr "Nouvelles fonctionnalités dans Debian Edu Jessie"
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
msgstr ""
-"Si <computeroutput>apt-get</computeroutput> termine avec une erreur, essayez "
-"de la corriger et/ou de lancer <computeroutput>apt-get -f install</"
-"computeroutput>, puis à nouveau <computeroutput>apt-get -y dist-upgrade</"
-"computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -5390,33 +5588,48 @@ 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 "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
-"Redémarrez et testez s'il fonctionne comme avant : connectez-vous en tant "
-"que premier utilisateur et testez si l'interface graphique de GOsa² "
-"fonctionne, si vous pouvez vous connectez aux clients légers et aux stations "
-"de travail, si vous pouvez ajouter ou supprimer une appartenance à un groupe "
-"réseau d'un système, si vous pouvez envoyer et recevoir des emails internes, "
-"si vous pouvez gérer les imprimantes, et peut-être d'autres choses "
-"spécifiques. Utilisez les scripts de la suite de tests si vous détectez une "
-"erreur."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr "Introduction aux clients légers et stations de travail sans disque dur"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#, fuzzy
+#| msgid "Upgrade LTSP chroot (default arch i386)"
+msgid "Upgrading LTSP chroots (default arch i386)"
msgstr "Mise à niveau du chroot LTSP (architecture par défaut i386)"
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
+msgstr ""
+
#. type: CDATA
#, fuzzy, no-wrap
#| msgid ""
@@ -5429,13 +5642,13 @@ msgstr "Mise à niveau du chroot LTSP (architecture par défaut i386)"
#| "ltsp-chroot -m -a i386 apt-get -f install\n"
#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
"sed -i '/jessie/ s/deb/#deb/g' /opt/ltsp/i386/etc/apt/sources.list\n"
"ltsp-chroot -m -a i386 apt-get update\n"
@@ -5446,28 +5659,22 @@ msgstr ""
"ltsp-chroot -m -a i386 apt-get -f install\n"
"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
-msgstr ""
-"Si <computeroutput>apt-get</computeroutput> termine avec une erreur, essayez "
-"de la corriger et/ou de relancer les commandes <computeroutput>apt-get</"
-"computeroutput>, en particulier <computeroutput>apt-get -f install</"
-"computeroutput>."
-
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+#, fuzzy
+#| msgid "Cleaning up."
+msgid "Cleaning up:"
msgstr "Nettoyage."
#. type: CDATA
-#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+#, fuzzy
+#| msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr "Mettez à jour la prise en charge LTSP du côté serveur."
#. type: CDATA
@@ -5483,6 +5690,21 @@ msgstr ""
"ltsp-update-kernels\n"
"ltsp-update-sshkeys"
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on tjener to point to <computeroutput>/var/lib/tftpboot/"
+#| "debian-edu/default-diskless.cfg</computeroutput>."
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+"Modifiez le lien symbolique <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+"computeroutput> sur tjener pour pointer vers <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr "Recréer un chroot LTSP"
@@ -12749,6 +12971,57 @@ msgstr ""
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
#~ msgid ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+#~ msgstr ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+
+#~ msgid "Do the actual upgrade."
+#~ msgstr "Faire la mise à jour à proprement parler."
+
+#, fuzzy
+#~| msgid ""
+#~| "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+#~| "apt-get update\n"
+#~| "apt-get -y dist-upgrade"
+#~ msgid ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+#~ msgstr ""
+#~ "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+
+#~ msgid ""
+#~ "Reboot and test if it works like before: Log in as first user and test if "
+#~ "the GOsa² gui is working, if you're able to connect LTSP clients and "
+#~ "workstations, if you can add/remove a netgroup membership of a system, if "
+#~ "you can send and receive internal email, if you can manage printers, and "
+#~ "maybe other site specific things. Use the testsuite scripts if you spot "
+#~ "an error."
+#~ msgstr ""
+#~ "Redémarrez et testez s'il fonctionne comme avant : connectez-vous en tant "
+#~ "que premier utilisateur et testez si l'interface graphique de GOsa² "
+#~ "fonctionne, si vous pouvez vous connectez aux clients légers et aux "
+#~ "stations de travail, si vous pouvez ajouter ou supprimer une appartenance "
+#~ "à un groupe réseau d'un système, si vous pouvez envoyer et recevoir des "
+#~ "emails internes, si vous pouvez gérer les imprimantes, et peut-être "
+#~ "d'autres choses spécifiques. Utilisez les scripts de la suite de tests si "
+#~ "vous détectez une erreur."
+
+#~ msgid ""
+#~ "If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+#~ "try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+#~ "commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+#~ msgstr ""
+#~ "Si <computeroutput>apt-get</computeroutput> termine avec une erreur, "
+#~ "essayez de la corriger et/ou de relancer les commandes "
+#~ "<computeroutput>apt-get</computeroutput>, en particulier "
+#~ "<computeroutput>apt-get -f install</computeroutput>."
+
+#~ msgid ""
#~ "Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to "
#~ "Debian Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and "
#~ "6.0.7 as well as the following changes:"
@@ -14027,9 +14300,6 @@ msgstr ""
#~ "cliquez sur l'entrée correspondant sur le serveur fraîchement configuré. "
#~ "Cliquez sur « modifier »."
-#~ msgid "click advanced configuration"
-#~ msgstr "cliquez sur configuration avancée"
-
#~ msgid "click detect automatically"
#~ msgstr "cliquez sur détection automatique"
@@ -14731,13 +15001,6 @@ msgstr ""
#~ msgstr "apt-get -y install killer"
#~ msgid ""
-#~ "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
-#~ "org/779646#\">779646</ulink>)."
-#~ msgstr ""
-#~ "Considérez une étape optionnelle (bogue Debian nº <ulink url=\"https://"
-#~ "bugs.debian.org/779646#\">779646</ulink>)."
-
-#~ msgid ""
#~ "Clean up after cfengine has autoremoved packages without purging. This "
#~ "will remove configuration files of removed packages and should only be "
#~ "used with care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> "
@@ -14901,21 +15164,6 @@ msgstr ""
#~ "premier démarrage de <computeroutput>squid3</computeroutput>."
#~ msgid ""
-#~ "service squid stop\n"
-#~ "umount /var/spool/squid\n"
-#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-#~ "mount /var/spool/squid3\n"
-#~ "service squid3 start\n"
-#~ "apt-get -y purge squid squid-common"
-#~ msgstr ""
-#~ "service squid stop\n"
-#~ "umount /var/spool/squid\n"
-#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-#~ "mount /var/spool/squid3\n"
-#~ "service squid3 start\n"
-#~ "apt-get -y purge squid squid-common"
-
-#~ msgid ""
#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
#~ "It's great if that's true! It could be..."
#~ msgstr ""
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 7bc6def..ab7a1da 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2017-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+0000\n"
"PO-Revision-Date: 2017-03-23 19:01+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -4607,11 +4607,16 @@ msgstr ""
"debian.org/releases/stretch/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 your currently-installed version'; 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"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 e scegliere "
@@ -4619,48 +4624,251 @@ msgstr ""
"funzionerà. Premere 'q' per uscire da apt-listchanges dopo aver letto le "
"informazioni."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If <computeroutput>apt-get</computeroutput> finishes with an error, try "
+#| "to fix it and/or run <computeroutput>apt-get -f install</computeroutput> "
+#| "and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once "
+#| "again."
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
+msgstr ""
+"se <computeroutput>apt-get</computeroutput> termina ancora con errori, prova "
+"a risolvere il problema eseguendo <computeroutput>apt-get -f install</"
+"computeroutput> e poi <computeroutput>apt-get -y dist-upgrade</"
+"computeroutput> ancora una volta."
+
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Upgrade the server side"
+msgid "Upgrading the main server"
msgstr "Aggiornare il lato server"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+#, fuzzy
+#| msgid "Make sure the current system is up-to-date."
+msgid "Start by making sure the current system is up-to-date:"
msgstr "Verificare che in sistema attuale sia aggiornato."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
"apt-get update\n"
-"apt-get -y upgrade"
+"apt-get upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
-msgstr "Effettuare l'aggiornamento vero e proprio."
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
+msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
+msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "You will see some prompts about package configurations:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+#| "org/779646#\">779646</ulink>)."
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+"Considerare un passo opzionale (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "service squid stop\n"
+#| "umount /var/spool/squid\n"
+#| "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#| "mount /var/spool/squid3\n"
+#| "service squid3 start\n"
+#| "apt-get -y purge squid squid-common"
+msgid ""
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
+msgstr ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "click advanced configuration"
+msgid "Apply and adjust configuration:"
+msgstr "click su configurazione avanzata"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "New features in Debian Edu Stretch"
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr "Nuove caratteristiche in Debian Edu Stretch"
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
msgstr ""
-"se <computeroutput>apt-get</computeroutput> termina ancora con errori, prova "
-"a risolvere il problema eseguendo <computeroutput>apt-get -f install</"
-"computeroutput> e poi <computeroutput>apt-get -y dist-upgrade</"
-"computeroutput> ancora una volta."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4668,44 +4876,66 @@ 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 "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
-"Riavviare e verificare se funziona come prima: entrare come primo utente e "
-"controllare se la gui di GOsa² sta lavorando, se i client LTSP e le "
-"worhstation si collegano, se è possibile aggiungere/rimuovere membri ai "
-"gruppi di sistema, se è possibile inviare e ricevere e-mail interne, se è "
-"possibile gestire le stampanti efare altre cose specifiche. Utilizzare gli "
-"script testsuite se si verifica un errore."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr "Introduzione ai thin-client e alle workstation senza dischi"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
msgstr ""
-"La base di dati di LDAP (sul server principale) deve essere regolata. Il "
-"valore sudoHost 'tjener' deve essere sostituito con 'tjener.intern' "
-"utilizzando GOsa² o con un altro editor LDAP."
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#, fuzzy
+#| msgid "Upgrade LTSP chroot (default arch i386)"
+msgid "Upgrading LTSP chroots (default arch i386)"
msgstr "Aggiornare LTSP chroot (default arch i386)"
-#. type: CDATA
-#, no-wrap
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+#| "sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+#| "ltsp-chroot -m -a i386 apt-get -f install\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
"ltsp-chroot -m -a i386 apt-get update\n"
"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
@@ -4715,27 +4945,22 @@ msgstr ""
"ltsp-chroot -m -a i386 apt-get -f install\n"
"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
-msgstr ""
-"se <computeroutput>apt-get</computeroutput> termina ancora con errori, prova "
-"a risolvere il problema eseguendo di nuovo il comando <computeroutput>apt-"
-"get</computeroutput> e/o <computeroutput>apt-get -f install</computeroutput>."
-
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+#, fuzzy
+#| msgid "Cleaning up."
+msgid "Cleaning up:"
msgstr "Pulizia."
#. type: CDATA
-#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+#, fuzzy
+#| msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr "Aggiornare il supporto LTSP la server."
#. type: CDATA
@@ -4749,6 +4974,22 @@ msgstr ""
"ltsp-update-sshkeys\n"
"ltsp-update-image"
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on the main server to point to <computeroutput>/var/lib/"
+#| "tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+"impostare il collegamento simbolico in <computeroutput>/var/lib/tftpboot/"
+"pxelinux.cfg</computeroutput> sul server principale in modo che punti a "
+"<computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
+"computeroutput>."
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr "Ricreare un chroot LTSP"
@@ -11310,6 +11551,59 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+#~ msgstr ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+
+#~ msgid "Do the actual upgrade."
+#~ msgstr "Effettuare l'aggiornamento vero e proprio."
+
+#~ msgid ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+#~ msgstr ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+
+#~ msgid ""
+#~ "Reboot and test if it works like before: Log in as first user and test if "
+#~ "the GOsa² gui is working, if you're able to connect LTSP clients and "
+#~ "workstations, if you can add/remove a netgroup membership of a system, if "
+#~ "you can send and receive internal email, if you can manage printers, and "
+#~ "maybe other site specific things. Use the testsuite scripts if you spot "
+#~ "an error."
+#~ msgstr ""
+#~ "Riavviare e verificare se funziona come prima: entrare come primo utente "
+#~ "e controllare se la gui di GOsa² sta lavorando, se i client LTSP e le "
+#~ "worhstation si collegano, se è possibile aggiungere/rimuovere membri ai "
+#~ "gruppi di sistema, se è possibile inviare e ricevere e-mail interne, se è "
+#~ "possibile gestire le stampanti efare altre cose specifiche. Utilizzare "
+#~ "gli script testsuite se si verifica un errore."
+
+#~ msgid ""
+#~ "The LDAP data base (on the main server) has to be adjusted. The sudoHost "
+#~ "value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
+#~ "LDAP editor."
+#~ msgstr ""
+#~ "La base di dati di LDAP (sul server principale) deve essere regolata. Il "
+#~ "valore sudoHost 'tjener' deve essere sostituito con 'tjener.intern' "
+#~ "utilizzando GOsa² o con un altro editor LDAP."
+
+#~ msgid ""
+#~ "If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+#~ "try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+#~ "commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+#~ msgstr ""
+#~ "se <computeroutput>apt-get</computeroutput> termina ancora con errori, "
+#~ "prova a risolvere il problema eseguendo di nuovo il comando "
+#~ "<computeroutput>apt-get</computeroutput> e/o <computeroutput>apt-get -f "
+#~ "install</computeroutput>."
+
+#~ msgid ""
#~ "Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to "
#~ "Debian Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and "
#~ "6.0.7 as well as the following changes:"
@@ -12544,9 +12838,6 @@ msgstr ""
#~ msgid "click on the just configured server entry, click 'Modify'"
#~ msgstr "click su sulla voce server configurato, poi click su 'Modify'"
-#~ msgid "click advanced configuration"
-#~ msgstr "click su configurazione avanzata"
-
#~ msgid "click detect automatically"
#~ msgstr "click su detect automatically"
@@ -13241,13 +13532,6 @@ msgstr ""
#~ msgstr "apt-get -y install killer"
#~ msgid ""
-#~ "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
-#~ "org/779646#\">779646</ulink>)."
-#~ msgstr ""
-#~ "Considerare un passo opzionale (Debian bug <ulink url=\"https://bugs."
-#~ "debian.org/779646#\">779646</ulink>)."
-
-#~ msgid ""
#~ "Clean up after cfengine has autoremoved packages without purging. This "
#~ "will remove configuration files of removed packages and should only be "
#~ "used with care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> "
@@ -13420,21 +13704,6 @@ msgstr ""
#~ "<computeroutput>squid3</computeroutput>."
#~ msgid ""
-#~ "service squid stop\n"
-#~ "umount /var/spool/squid\n"
-#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-#~ "mount /var/spool/squid3\n"
-#~ "service squid3 start\n"
-#~ "apt-get -y purge squid squid-common"
-#~ msgstr ""
-#~ "service squid stop\n"
-#~ "umount /var/spool/squid\n"
-#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-#~ "mount /var/spool/squid3\n"
-#~ "service squid3 start\n"
-#~ "apt-get -y purge squid squid-common"
-
-#~ msgid ""
#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
#~ "It's great if that's true! It could be..."
#~ msgstr ""
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 f9f0a29..4354015 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-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+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"
@@ -4452,11 +4452,16 @@ 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 your currently-installed version'; 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"information carefully, choose 'keep your currently-installed version' unless "
+"stated differently below; in most cases hitting return will be fine."
msgstr ""
"X を使わないでください。仮想コンソールを使って root でログインしてください。"
"debconf の情報を全て注意深く読み、「現在インストールされているローカルバー"
@@ -4464,48 +4469,232 @@ msgstr ""
"いはずです。変更情報を読み終えたら「q」を押して apt-listchanges のページャー"
"を終了してください。"
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If <computeroutput>apt-get</computeroutput> finishes with an error, try "
+#| "to fix it and/or run <computeroutput>apt-get -f install</computeroutput> "
+#| "and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once "
+#| "again."
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
+msgstr ""
+"<computeroutput>apt-get</computeroutput> がエラーを出して終了した場合は原因を"
+"修正して <computeroutput>apt-get -f install</computeroutput> を実行し、"
+"<computeroutput>apt-get -y dist-upgrade</computeroutput> をもう一度実行してく"
+"ださい"
+
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Upgrade the server side"
+msgid "Upgrading the main server"
msgstr "サーバ側をアップグレードします"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+#, fuzzy
+#| msgid "Make sure the current system is up-to-date."
+msgid "Start by making sure the current system is up-to-date:"
msgstr "現在のシステムが最新であることを確認します"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
"apt-get update\n"
-"apt-get -y upgrade"
+"apt-get upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
-msgstr "実際のアップグレードを行います"
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
+msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleanup the package cache:"
msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
+msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "You will see some prompts about package configurations:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "Apply and adjust configuration:"
+msgstr "ファイルシステムのアクセス設定"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "New features in Debian Edu Stretch"
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr "Debian Edu Stretch の新機能"
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
msgstr ""
-"<computeroutput>apt-get</computeroutput> がエラーを出して終了した場合は原因を"
-"修正して <computeroutput>apt-get -f install</computeroutput> を実行し、"
-"<computeroutput>apt-get -y dist-upgrade</computeroutput> をもう一度実行してく"
-"ださい"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4513,43 +4702,67 @@ 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 "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
-"再起動して以前と同じように動作するか確認します: 最初のユーザとしてログイン"
-"し、GOsa² GUI が動作するか、LTSP クライアントやワークステーションに接続できる"
-"か、システムのネットグループのメンバーを追加/削除できるか、内部のメールを送受"
-"信できるか、プリンタを管理できるか、その他サイト特有の事項を確認します。エ"
-"ラーを見つけたらテストスイートのスクリプトを使います。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr "シンクライアント及びディスクレスワークステーションについて"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
msgstr ""
-"(中心サーバの) LDAP データベースを調整しないといけません。GOsa² や LDAP エ"
-"ディタを使い、sudoHost の「tjener」を「tjener.intern」に置き換えます。 "
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#, fuzzy
+#| msgid "Upgrade LTSP chroot (default arch i386)"
+msgid "Upgrading LTSP chroots (default arch i386)"
msgstr ""
"LTSP chroot (例はデフォルトアーキテクチャの i386) をアップグレードします"
-#. type: CDATA
-#, no-wrap
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+#| "sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+#| "ltsp-chroot -m -a i386 apt-get -f install\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
"ltsp-chroot -m -a i386 apt-get update\n"
"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
@@ -4559,28 +4772,22 @@ msgstr ""
"ltsp-chroot -m -a i386 apt-get -f install\n"
"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
-msgstr ""
-"<computeroutput>apt-get</computeroutput> がまだエラーを出して終了する場合は原"
-"因を修正して <computeroutput>apt-get</computeroutput>、特に "
-"<computeroutput>apt-get -f install</computeroutput> をもう一度実行してくださ"
-"い。"
-
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+#, fuzzy
+#| msgid "Cleaning up."
+msgid "Cleaning up:"
msgstr "後始末"
#. type: CDATA
-#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+#, fuzzy
+#| msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr "サーバ側の LTSP サポートを更新します"
#. type: CDATA
@@ -4594,6 +4801,21 @@ msgstr ""
"ltsp-update-sshkeys\n"
"ltsp-update-image"
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on the main server to point to <computeroutput>/var/lib/"
+#| "tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+"中心サーバの <computeroutput>/var/lib/tftpboot/pxelinux.cfg</computeroutput> "
+"のシンボリックリンクが <computeroutput>/var/lib/tftpboot/debian-edu/default-"
+"diskless.cfg</computeroutput> を指すようにします。"
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr "LTSP chroot の再生成"
@@ -10811,3 +11033,54 @@ msgid ""
msgstr ""
"もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
"skolelinux.no/info/cdbygging/news.html\"/> にあります。"
+
+#~ msgid ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+#~ msgstr ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+
+#~ msgid "Do the actual upgrade."
+#~ msgstr "実際のアップグレードを行います"
+
+#~ msgid ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+#~ msgstr ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+
+#~ msgid ""
+#~ "Reboot and test if it works like before: Log in as first user and test if "
+#~ "the GOsa² gui is working, if you're able to connect LTSP clients and "
+#~ "workstations, if you can add/remove a netgroup membership of a system, if "
+#~ "you can send and receive internal email, if you can manage printers, and "
+#~ "maybe other site specific things. Use the testsuite scripts if you spot "
+#~ "an error."
+#~ msgstr ""
+#~ "再起動して以前と同じように動作するか確認します: 最初のユーザとしてログイン"
+#~ "し、GOsa² GUI が動作するか、LTSP クライアントやワークステーションに接続で"
+#~ "きるか、システムのネットグループのメンバーを追加/削除できるか、内部のメー"
+#~ "ルを送受信できるか、プリンタを管理できるか、その他サイト特有の事項を確認し"
+#~ "ます。エラーを見つけたらテストスイートのスクリプトを使います。"
+
+#~ msgid ""
+#~ "The LDAP data base (on the main server) has to be adjusted. The sudoHost "
+#~ "value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
+#~ "LDAP editor."
+#~ msgstr ""
+#~ "(中心サーバの) LDAP データベースを調整しないといけません。GOsa² や LDAP エ"
+#~ "ディタを使い、sudoHost の「tjener」を「tjener.intern」に置き換えます。 "
+
+#~ msgid ""
+#~ "If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+#~ "try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+#~ "commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+#~ msgstr ""
+#~ "<computeroutput>apt-get</computeroutput> がまだエラーを出して終了する場合"
+#~ "は原因を修正して <computeroutput>apt-get</computeroutput>、特に "
+#~ "<computeroutput>apt-get -f install</computeroutput> をもう一度実行してくだ"
+#~ "さい。"
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 d0c1c41..037ee5a 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+0000\n"
"PO-Revision-Date: 2017-04-12 06:14+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -4549,59 +4549,254 @@ 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 your currently-installed version'; 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"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»; I de "
"fleste tilfeller bruk bare «return»-tasten. Trykk «q» for å avslutte apt-"
"listchange-siden så snart informasjonen er lest."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If <computeroutput>apt-get</computeroutput> finishes with an error, try "
+#| "to fix it and/or run <computeroutput>apt-get -f install</computeroutput> "
+#| "and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once "
+#| "again."
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
+msgstr ""
+"Hvis <computeroutput>apt-get</computeroutput> avsluttes med en feil, forsøk "
+"å rette den og/eller kjør <computeroutput>apt-get -f install</"
+"computeroutput>, og så igjen<computeroutput>apt-get -y dist-upgrade</"
+"computeroutput>."
+
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Upgrade the server side"
+msgid "Upgrading the main server"
msgstr "Oppgrader tjenersiden"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+#, fuzzy
+#| msgid "Make sure the current system is up-to-date."
+msgid "Start by making sure the current system is up-to-date:"
msgstr "Sørg for at gjeldende system er up-to-date."
#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
+msgid ""
+"apt update\n"
+"apt full-upgrade"
+msgstr ""
+"aptitude update \n"
+"aptitude dist-upgrade"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
+msgstr ""
+
+#. type: CDATA
#, no-wrap
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
msgstr ""
-"apt-get update\n"
-"apt-get -y upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
-msgstr "Gjøre selve oppgraderingen."
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
+msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
-"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "You will see some prompts about package configurations:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+#| "org/779646#\">779646</ulink>)."
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+"Vurder en tilleggsmulighet (Debian bug <ulink url=\"https://bugs.debian."
+"org/779646#\">779646</ulink>)."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "click advanced configuration"
+msgid "Apply and adjust configuration:"
+msgstr "klikk på avansert oppsett"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "New features in Debian Edu Stretch"
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr "Nye egenskaper i Debian Edu Stretch"
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
msgstr ""
-"Hvis <computeroutput>apt-get</computeroutput> avsluttes med en feil, forsøk "
-"å rette den og/eller kjør <computeroutput>apt-get -f install</"
-"computeroutput>, og så igjen<computeroutput>apt-get -y dist-upgrade</"
-"computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4609,43 +4804,66 @@ 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 "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
-"Start på nytt, og test om det virker som før: Logg inn som første bruker, og "
-"test om GOsa² GUI virker, om du er i stand til å koble til LTSP-klienter og "
-"arbeidsstasjoner, om du kan legge til/fjerne et nettgruppemedlemskap for et "
-"system, om du kan sende og motta intern e-post, om du kan administrere "
-"skrivere og kanskje annet tilbehør. Bruk Testsuite-skriptet hvis du finner "
-"en feil."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr "Introduksjon til tynne klienter og diskløse arbeidsstasjoner"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
msgstr ""
-"LDAP-databasen (på hovedtjeneren) må justeres. SudoHost-verdien 'tjener' "
-"erstattes med 'tjener.intern' med GOsa² eller en LDAP-editor."
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#, fuzzy
+#| msgid "Upgrade LTSP chroot (default arch i386)"
+msgid "Upgrading LTSP chroots (default arch i386)"
msgstr "Oppgrader LTSP-chroot (default arch i386)"
-#. type: CDATA
-#, no-wrap
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+#| "sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+#| "ltsp-chroot -m -a i386 apt-get -f install\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
"ltsp-chroot -m -a i386 apt-get update\n"
"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
@@ -4655,28 +4873,22 @@ msgstr ""
"ltsp-chroot -m -a i386 apt-get -f install\n"
"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
-msgstr ""
-"Hvis <computeroutput>apt-get</computeroutput> fremdeles avsluttes med en "
-"feil, forsøk å rette det til og/eller kjør <computeroutput>apt-get</"
-"computeroutput> kommandoene igjen, spesielt <computeroutput>apt-get -f "
-"install</computeroutput>."
-
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+#, fuzzy
+#| msgid "Cleaning up."
+msgid "Cleaning up:"
msgstr "Rydder opp."
#. type: CDATA
-#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove (fjerne automatisk)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+#, fuzzy
+#| msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr "Oppdater LTSP-støtten på tjenersiden."
#. type: CDATA
@@ -4690,6 +4902,21 @@ msgstr ""
"ltsp-update-sshkeys\n"
"ltsp-update-image"
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on the main server to point to <computeroutput>/var/lib/"
+#| "tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+"Sett symlink i <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+"computeroutput> på hovedtjener til å peke på <computeroutput>/var/lib/"
+"tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr "Gjenoppretter LTSP-chroot"
@@ -7400,8 +7627,7 @@ msgid ""
"exit\n"
"ltsp-update-image"
msgstr ""
-"ltsp-chroot -a i386 # dette kjører \"chroot /opt/ltsp/i386\" med mer, "
-"f.eks. hindrer det at nisser startes opp\n"
+"ltsp-chroot -a i386 # dette kjører \"chroot /opt/ltsp/i386\" med mer, f.eks. hindrer det at nisser startes opp\n"
"apt update\n"
"apt upgrade\n"
"apt full-upgrade\n"
@@ -8873,9 +9099,7 @@ msgstr ""
"ltsp-chroot -a i386 rm swbuild.asc\n"
"# oppdater dpkg-databasen og installer de ønskede pakkene\n"
"ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-"
-"gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier"
-",smart-product-drivers"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -11153,6 +11377,58 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+#~ msgstr ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+
+#~ msgid "Do the actual upgrade."
+#~ msgstr "Gjøre selve oppgraderingen."
+
+#~ msgid ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+#~ msgstr ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+
+#~ msgid ""
+#~ "Reboot and test if it works like before: Log in as first user and test if "
+#~ "the GOsa² gui is working, if you're able to connect LTSP clients and "
+#~ "workstations, if you can add/remove a netgroup membership of a system, if "
+#~ "you can send and receive internal email, if you can manage printers, and "
+#~ "maybe other site specific things. Use the testsuite scripts if you spot "
+#~ "an error."
+#~ msgstr ""
+#~ "Start på nytt, og test om det virker som før: Logg inn som første bruker, "
+#~ "og test om GOsa² GUI virker, om du er i stand til å koble til LTSP-"
+#~ "klienter og arbeidsstasjoner, om du kan legge til/fjerne et "
+#~ "nettgruppemedlemskap for et system, om du kan sende og motta intern e-"
+#~ "post, om du kan administrere skrivere og kanskje annet tilbehør. Bruk "
+#~ "Testsuite-skriptet hvis du finner en feil."
+
+#~ msgid ""
+#~ "The LDAP data base (on the main server) has to be adjusted. The sudoHost "
+#~ "value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
+#~ "LDAP editor."
+#~ msgstr ""
+#~ "LDAP-databasen (på hovedtjeneren) må justeres. SudoHost-verdien 'tjener' "
+#~ "erstattes med 'tjener.intern' med GOsa² eller en LDAP-editor."
+
+#~ msgid ""
+#~ "If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+#~ "try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+#~ "commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+#~ msgstr ""
+#~ "Hvis <computeroutput>apt-get</computeroutput> fremdeles avsluttes med en "
+#~ "feil, forsøk å rette det til og/eller kjør <computeroutput>apt-get</"
+#~ "computeroutput> kommandoene igjen, spesielt <computeroutput>apt-get -f "
+#~ "install</computeroutput>."
+
#~ msgid "Based on Debian 3.1 Sarge released 2005-06-06."
#~ msgstr "Basert på Debian 3.1 Sarge, gitt ut 2005-06-06."
@@ -12366,9 +12642,6 @@ msgstr ""
#~ "klikk på den nettopp oppsatte adgangen til serveren, klikk "
#~ "«Modify» (endre)"
-#~ msgid "click advanced configuration"
-#~ msgstr "klikk på avansert oppsett"
-
#~ msgid "click detect automatically"
#~ msgstr "klikk oppdag automatisk"
@@ -13061,13 +13334,6 @@ msgstr ""
#~ msgstr "apt-get -y install killer"
#~ msgid ""
-#~ "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
-#~ "org/779646#\">779646</ulink>)."
-#~ msgstr ""
-#~ "Vurder en tilleggsmulighet (Debian bug <ulink url=\"https://bugs.debian."
-#~ "org/779646#\">779646</ulink>)."
-
-#~ msgid ""
#~ "Clean up after cfengine has autoremoved packages without purging. This "
#~ "will remove configuration files of removed packages and should only be "
#~ "used with care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> "
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 e3a528d..b74bb2e 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
"Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2017-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+0000\n"
"PO-Revision-Date: 2017-04-13 20:59+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"
@@ -2804,11 +2804,6 @@ msgstr ""
"systeembeheerder te worden."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "See the information about Debian Edu specific <ulink url=\"https://wiki."
-#| "debian.org/DebianEdu/Documentation/Stretch//"
-#| "Architecture#File_system_access_configuration\">file system access "
-#| "configuration</ulink> before adding users."
msgid ""
"See the information about Debian Edu specific <link linkend=\"Architecture--"
"File_system_access_configuration\">file system access configuration</link> "
@@ -4757,11 +4752,16 @@ msgstr ""
"url=\"https://www.debian.org/releases/stretch/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 your currently-installed version'; 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"information carefully, choose 'keep your currently-installed version' unless "
+"stated differently below; in most cases hitting return will be fine."
msgstr ""
"Werk niet in een grafische omgeving, gebruik een virtuele console, meld u "
"aan als systeembeheerder (root). Lees aandachtig alle informatie van "
@@ -4769,48 +4769,251 @@ msgstr ""
"gevallen zal op de return-toets drukken volstaan. Druk op 'q' om de schermen "
"van apt-listchanges te verlaten eens u de informatie doorgenomen heeft."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If <computeroutput>apt-get</computeroutput> finishes with an error, try "
+#| "to fix it and/or run <computeroutput>apt-get -f install</computeroutput> "
+#| "and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once "
+#| "again."
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
+msgstr ""
+"Mocht <computeroutput>apt-get</computeroutput> afgesloten worden met een "
+"foutmelding, probeer die dan te verhelpen en/of voer het commando "
+"<computeroutput>apt-get -f install</computeroutput> uit en vervolgens "
+"nogmaals <computeroutput>apt-get -y dist-upgrade</computeroutput>."
+
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Upgrade the server side"
+msgid "Upgrading the main server"
msgstr "Werk het servergedeelte bij"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+#, fuzzy
+#| msgid "Make sure the current system is up-to-date."
+msgid "Start by making sure the current system is up-to-date:"
msgstr "Zorg er voor dat het huidige systeem up-to-date is."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt-get update\n"
+#| "apt-get upgrade"
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
"apt-get update\n"
-"apt-get -y upgrade"
+"apt-get upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
-msgstr "Voer de echte opwaardering uit."
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
+msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
+msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "You will see some prompts about package configurations:"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
+#| "org/779646#\">779646</ulink>)."
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+"Overweeg eventueel het zetten van een bijkomende stap (Debian bug <ulink url="
+"\"https://bugs.debian.org/779646#\">779646</ulink>)."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "service squid stop\n"
+#| "umount /var/spool/squid\n"
+#| "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+#| "mount /var/spool/squid3\n"
+#| "service squid3 start\n"
+#| "apt-get -y purge squid squid-common"
+msgid ""
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
+msgstr ""
+"service squid stop\n"
+"umount /var/spool/squid\n"
+"sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
+"mount /var/spool/squid3\n"
+"service squid3 start\n"
+"apt-get -y purge squid squid-common"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "click advanced configuration"
+msgid "Apply and adjust configuration:"
+msgstr "klik op geavanceerde isntellingen"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "New features in Debian Edu Stretch"
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr "Nieuwe functionaliteit in Debian Edu Stretch"
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
msgstr ""
-"Mocht <computeroutput>apt-get</computeroutput> afgesloten worden met een "
-"foutmelding, probeer die dan te verhelpen en/of voer het commando "
-"<computeroutput>apt-get -f install</computeroutput> uit en vervolgens "
-"nogmaals <computeroutput>apt-get -y dist-upgrade</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4818,45 +5021,66 @@ 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 "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
-"Herstart het systeem en ga na of het werkt zoals voordien: meld u aan als "
-"eerste gebruiker en test of de grafische omgeving van GOsa² werkt, ga na of "
-"LTSP-clients en werkstations verbinding kunnen maken, of u een systeem kunt "
-"toevoegen aan/verwijderen uit een netgroep, of u intern e-mails kunt "
-"verzenden en ontvangen, of u printers kunt beheren, en eventueel andere "
-"zaken die specifiek zijn voor uw situatie. Gebruik de scripts van de "
-"testsuite als u een probleem opmerkt."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Introduction to thin clients and diskless workstations"
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr "Een inleiding in thin clients en schijfloze werkstations"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
msgstr ""
-"De databank van LDAP (op de hoofdserver) moet aangepast worden. De waarde "
-"'tjener' voor sudoHost moet met GOsa² of een LDAP-editor vervangen worden "
-"door 'tjener.intern'."
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#, fuzzy
+#| msgid "Upgrade LTSP chroot (default arch i386)"
+msgid "Upgrading LTSP chroots (default arch i386)"
msgstr "Waardeer de LTSP-chroot op (standaardarchitectuur i386)"
-#. type: CDATA
-#, no-wrap
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
+msgstr ""
+
+#. type: CDATA
+#, fuzzy, no-wrap
+#| msgid ""
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y upgrade\n"
+#| "sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+#| "ltsp-chroot -m -a i386 apt-get update\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
+#| "ltsp-chroot -m -a i386 apt-get -f install\n"
+#| "ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
"ltsp-chroot -m -a i386 apt-get update\n"
"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
@@ -4866,28 +5090,22 @@ msgstr ""
"ltsp-chroot -m -a i386 apt-get -f install\n"
"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
-msgstr ""
-"Mocht <computeroutput>apt-get</computeroutput> afgesloten worden met een "
-"foutmelding, probeer die dan te verhelpen en/of voer de commando's van "
-"<computeroutput>apt-get</computeroutput> opnieuw uit, in het bijzonder "
-"<computeroutput>apt-get -f install</computeroutput>."
-
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+#, fuzzy
+#| msgid "Cleaning up."
+msgid "Cleaning up:"
msgstr "Ruim op."
#. type: CDATA
-#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+#, fuzzy
+#| msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr "Werk op de server de ondersteuning voor LTSP bij."
#. type: CDATA
@@ -4901,6 +5119,21 @@ msgstr ""
"ltsp-update-sshkeys\n"
"ltsp-update-image"
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "set the symlink in <computeroutput>/var/lib/tftpboot/pxelinux.cfg</"
+#| "computeroutput> on the main server to point to <computeroutput>/var/lib/"
+#| "tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+"doe de symbolische koppeling in <computeroutput>/var/lib/tftpboot/pxelinux."
+"cfg</computeroutput> op de hoofdserver verwijzen naar <computeroutput>/var/"
+"lib/tftpboot/debian-edu/default-diskless.cfg</computeroutput>."
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr "Een LTSP-chroot opnieuw aanmaken"
@@ -9896,7 +10129,6 @@ msgid "Icedove has been re-renamed to Thunderbird."
msgstr "De naam van Icedove werd opnieuw veranderd naar Thunderbird."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LibreOffice 5.2.5"
msgid "LibreOffice 5.2.6"
msgstr "LibreOffice 5.2.6"
@@ -9958,9 +10190,6 @@ msgstr ""
"Japanse vertaling is nieuw in Stretch."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Partly translated versions exists for Spanish, Polish and Simplified "
-#| "Chinese."
msgid ""
"Partly translated versions exist for Spanish, Polish and Simplified Chinese."
msgstr ""
@@ -10107,14 +10336,6 @@ msgstr ""
"v2 of een latere versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-#| "2014, 2015, 2016, 2017), Håvard Korsvoll (2007-2009), Tore Skogly (2008), "
-#| "Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014, "
-#| "2016, 2017), Ingrid Yrvin (2014, 2015, 2016), Hans Arthur Kielland "
-#| "Aanesen (2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan "
-#| "Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) and is released under "
-#| "the GPL v2 or any later version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015, 2016, 2017), Håvard Korsvoll (2007-2009), Tore Skogly (2008), "
@@ -10151,10 +10372,6 @@ msgstr ""
"vrijgegeven onder de licentie GPL v2 of een latere versie."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
-#| "2014) and is released under the GPL v2 or any later version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017) and Beatrice Torracca "
@@ -10230,11 +10447,6 @@ msgid "Translations of this document"
msgstr "Vertalingen van dit document"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "Versions of this document fully translated into German, Italian, French, "
-#| "Danish, Dutch and Norwegian Bokmål are available. An incomplete "
-#| "translation exists for Spanish. This is an <ulink url=\"http://maintainer."
-#| "skolelinux.org/debian-edu-doc/\">online overview of all languages</ulink>."
msgid ""
"Versions of this document translated into German, Italian, French, Danish, "
"Dutch, Norwegian Bokmål and Japanese are available. Incomplete translations "
@@ -11664,6 +11876,60 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+#~ msgstr ""
+#~ "apt-get update\n"
+#~ "apt-get -y upgrade"
+
+#~ msgid "Do the actual upgrade."
+#~ msgstr "Voer de echte opwaardering uit."
+
+#~ msgid ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+#~ msgstr ""
+#~ "sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
+#~ "apt-get update\n"
+#~ "apt-get -y dist-upgrade"
+
+#~ msgid ""
+#~ "Reboot and test if it works like before: Log in as first user and test if "
+#~ "the GOsa² gui is working, if you're able to connect LTSP clients and "
+#~ "workstations, if you can add/remove a netgroup membership of a system, if "
+#~ "you can send and receive internal email, if you can manage printers, and "
+#~ "maybe other site specific things. Use the testsuite scripts if you spot "
+#~ "an error."
+#~ msgstr ""
+#~ "Herstart het systeem en ga na of het werkt zoals voordien: meld u aan als "
+#~ "eerste gebruiker en test of de grafische omgeving van GOsa² werkt, ga na "
+#~ "of LTSP-clients en werkstations verbinding kunnen maken, of u een systeem "
+#~ "kunt toevoegen aan/verwijderen uit een netgroep, of u intern e-mails kunt "
+#~ "verzenden en ontvangen, of u printers kunt beheren, en eventueel andere "
+#~ "zaken die specifiek zijn voor uw situatie. Gebruik de scripts van de "
+#~ "testsuite als u een probleem opmerkt."
+
+#~ msgid ""
+#~ "The LDAP data base (on the main server) has to be adjusted. The sudoHost "
+#~ "value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
+#~ "LDAP editor."
+#~ msgstr ""
+#~ "De databank van LDAP (op de hoofdserver) moet aangepast worden. De waarde "
+#~ "'tjener' voor sudoHost moet met GOsa² of een LDAP-editor vervangen worden "
+#~ "door 'tjener.intern'."
+
+#~ msgid ""
+#~ "If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+#~ "try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+#~ "commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+#~ msgstr ""
+#~ "Mocht <computeroutput>apt-get</computeroutput> afgesloten worden met een "
+#~ "foutmelding, probeer die dan te verhelpen en/of voer de commando's van "
+#~ "<computeroutput>apt-get</computeroutput> opnieuw uit, in het bijzonder "
+#~ "<computeroutput>apt-get -f install</computeroutput>."
+
+#~ msgid ""
#~ "Debian Edu 6.0.7+r1 Codename \"Squeeze\" is an incremental update to "
#~ "Debian Edu 6.0.4+r0, containing all the changes between Debian 6.0.4 and "
#~ "6.0.7 as well as the following changes:"
@@ -12961,9 +13227,6 @@ msgstr ""
#~ msgid "click on the just configured server entry, click 'Modify'"
#~ msgstr "klik op het pas ingestelde servertype en klip op \"Bewerken\" "
-#~ msgid "click advanced configuration"
-#~ msgstr "klik op geavanceerde isntellingen"
-
#~ msgid "click detect automatically"
#~ msgstr "klik op automatisch detecteren"
@@ -13665,13 +13928,6 @@ msgstr ""
#~ msgstr "apt-get -y install killer"
#~ msgid ""
-#~ "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
-#~ "org/779646#\">779646</ulink>)."
-#~ msgstr ""
-#~ "Overweeg eventueel het zetten van een bijkomende stap (Debian bug <ulink "
-#~ "url=\"https://bugs.debian.org/779646#\">779646</ulink>)."
-
-#~ msgid ""
#~ "Clean up after cfengine has autoremoved packages without purging. This "
#~ "will remove configuration files of removed packages and should only be "
#~ "used with care; use <computeroutput>dpkg -l|grep ^rc</computeroutput> "
@@ -13836,21 +14092,6 @@ msgstr ""
#~ "eerst opstart."
#~ msgid ""
-#~ "service squid stop\n"
-#~ "umount /var/spool/squid\n"
-#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-#~ "mount /var/spool/squid3\n"
-#~ "service squid3 start\n"
-#~ "apt-get -y purge squid squid-common"
-#~ msgstr ""
-#~ "service squid stop\n"
-#~ "umount /var/spool/squid\n"
-#~ "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-#~ "mount /var/spool/squid3\n"
-#~ "service squid3 start\n"
-#~ "apt-get -y purge squid squid-common"
-
-#~ msgid ""
#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
#~ "It's great if that's true! It could be..."
#~ msgstr ""
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 86b44cc..5aeb52a 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+0000\n"
"PO-Revision-Date: 2017-04-15 22:02+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -960,9 +960,9 @@ msgid ""
"installed software on the clients. Home directories and system settings are "
"stored on the server too."
msgstr ""
-"Bezdyskowe stacje robocze są wspaniałym sposobem ponownego użycia starszego ("
-"lecz mocnego) sprzętu komputerowego z tymi samymi kosztami utrzymania, jak w "
-"przypadku cienkich klientów. Oprogramowanie jest administrowane i "
+"Bezdyskowe stacje robocze są wspaniałym sposobem ponownego użycia starszego "
+"(lecz mocnego) sprzętu komputerowego z tymi samymi kosztami utrzymania, jak "
+"w przypadku cienkich klientów. Oprogramowanie jest administrowane i "
"utrzymywane na serwerze bez potrzeby instalowania lokalnego oprogramowania "
"na klientach. Katalogi domowe i ustawienia systemowe są także przechowywane "
"na serwerze."
@@ -1234,9 +1234,8 @@ msgid ""
msgstr ""
"Przestrzeń wymiany poprzez sieć jest automatycznie włączona dla klientów "
"LTSP; jej rozmiar wynosi 512 MB, a jeśli chcesz, możesz to dostosować "
-"poprzez zmodyfikowanie pliku "
-"<computeroutput>/etc/ltsp/nbdswapd.conf</computeroutput> na tjener, "
-"ustawiając zmienną SIZE."
+"poprzez zmodyfikowanie pliku <computeroutput>/etc/ltsp/nbdswapd.conf</"
+"computeroutput> na tjener, ustawiając zmienną SIZE."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -3829,100 +3828,286 @@ 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"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><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
+msgstr ""
+
+# type: Content of: <article><section><section><section><title>
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Services running on the main server"
+msgid "Upgrading the main server"
+msgstr "Usługi uruchamiane na serwerze głównym"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start by making sure the current system is up-to-date:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt full-upgrade"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
+msgid "Prepare and start the upgrade to Stretch:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "You will see some prompts about package configurations:"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"Reboot and test if it works like before: Log in as first user and test if "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
msgstr ""
-#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
-"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "Apply and adjust configuration:"
+msgstr "Konfiguracja dostępu do systemu plików"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrading LTSP chroots (default arch i386)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up:"
msgstr ""
#. type: CDATA
#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr ""
#. type: CDATA
@@ -3933,6 +4118,13 @@ msgid ""
"ltsp-update-image"
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index dd6137f..c3db783 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-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+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"
@@ -3406,100 +3406,281 @@ 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"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><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+msgid "Upgrading the main server"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+msgid "Start by making sure the current system is up-to-date:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"apt update\n"
+"apt full-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "You will see some prompts about package configurations:"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
msgid ""
-"Reboot and test if it works like before: Log in as first user and test if "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
msgstr ""
-#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Apply and adjust configuration:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
-"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+"Reboot and test if it works like before: Log in as first user and test if"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrading LTSP chroots (default arch i386)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
msgstr ""
#. type: CDATA
#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+msgid "Cleaning up:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Update LTSP support on the server side:"
msgstr ""
#. type: CDATA
@@ -3510,6 +3691,13 @@ msgid ""
"ltsp-update-image"
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 918abc3..76a66d9 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -1412,58 +1412,169 @@ 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'; in most cases hitting return will be fine. Press 'q' to quit the apt-listchanges pager once you've read the information.
+<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>
+<para>Please note one difference between apt and apt-get in Stretch: By default apt-get keeps downloaded packages, apt removes them from the cache (after successful installation).
+</para>
+<para>If <computeroutput>apt</computeroutput> finishes with an error, try to fix it and/or run <computeroutput>apt -f install</computeroutput> and then <computeroutput>apt -y full-upgrade</computeroutput> once again.
</para>
-<section id="Upgrades--Upgrade_the_server_side">
-<title>Upgrade the server side
+<section id="Upgrades--Upgrading_the_main_server">
+<title>Upgrading the main server
</title>
<itemizedlist>
<listitem>
-<para>Make sure the current system is up-to-date.
-</para></listitem></itemizedlist><screen><![CDATA[apt-get update
-apt-get -y upgrade]]></screen>
+<para>Start by making sure the current system is up-to-date:
+</para></listitem></itemizedlist><screen><![CDATA[apt update
+apt full-upgrade]]></screen>
+<itemizedlist>
+<listitem>
+<para>If the upgrade breaks due to sitesummary (this is a bug not yet fixed in jessie):
+</para></listitem></itemizedlist><screen><![CDATA[dpkg -r sitesummary
+apt -f install
+apt install sitesummary]]></screen>
<itemizedlist>
<listitem>
-<para>Do the actual upgrade.
-</para></listitem></itemizedlist><screen><![CDATA[sed -i 's/jessie/stretch/g' /etc/apt/sources.list
-apt-get update
-apt-get -y dist-upgrade]]></screen>
-<para>If <computeroutput>apt-get</computeroutput> finishes with an error, try to fix it and/or run <computeroutput>apt-get -f install</computeroutput> and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again.
+<para>Cleanup the package cache:
+</para></listitem></itemizedlist><screen><![CDATA[apt-get clean]]></screen>
+<itemizedlist>
+<listitem>
+<para>Prepare and start the upgrade to Stretch:
+</para></listitem></itemizedlist><screen><![CDATA[# First, adjust for a changed profile name:
+sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config
+# Then it's best to use the new default mirror:
+sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list
+# Finally, replace jessie with stretch.
+sed -i 's/jessie/stretch/g' /etc/apt/sources.list
+apt update
+apt full-upgrade]]></screen>
+<itemizedlist>
+<listitem>
+<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>You will see some prompts about package configurations:
</para>
<itemizedlist>
<listitem>
+<para>icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin).
+</para></listitem>
+<listitem>
+<para>Just in case several display managers are installed: display-manager: Choose lightdm.
+</para></listitem>
+<listitem>
+<para>Configuring Kerberos Authentication: Enter 'kerberos' as hostname.
+</para></listitem>
+<listitem>
+<para>Configuring icinga-common: Use external commands with Icinga: Choose <Yes>.
+</para></listitem>
+<listitem>
+<para>tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="https://bugs.debian.org/789667#">789667</ulink>)
+</para></listitem>
+<listitem>
+<para>/etc/default/ldap2zone: Choose Y.
+</para></listitem>
+<listitem>
+<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:
+</para></listitem></itemizedlist><screen><![CDATA[service squid stop # This usually takes some time!
+rm -rf /var/spool/squid
+umount /var/spool/squid3
+sed -i 's#spool/squid3#spool/squid#' /etc/fstab
+mv /var/spool/squid3 /var/spool/squid
+mount -a
+rm /etc/squid3 -rf
+rm /etc/default/squid3 -rf]]></screen>
+<itemizedlist>
+<listitem>
+<para>Modify LDAP to use the fully qualified domain name (FQDN) for sudo:
+</para></listitem></itemizedlist><screen><![CDATA[ldapvi -ZD '(cn=admin)'
+(Enter root password.)
+Search for 'sudoHost :tjener', replace tjener with tjener.intern
+(Enter 'y' to modify the LDAP data base.)]]></screen>
+<itemizedlist>
+<listitem>
+<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
+sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)
+service squid start
+service apache2 restart]]></screen>
+<itemizedlist>
+<listitem>
+<para>Install renamed metapackages:
+</para></listitem></itemizedlist><screen><![CDATA[apt update
+apt install education-networked-common
+apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed.]]></screen>
+<itemizedlist>
+<listitem>
+<para>Get the new Debian Edu Stretch artwork:
+</para></listitem></itemizedlist><screen><![CDATA[apt install debian-edu-artwork-softwaves]]></screen>
+<itemizedlist>
+<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>
+<itemizedlist>
+<listitem>
+<para>Enable otherwise broken PHP 7.0 support.
+</para></listitem></itemizedlist><screen><![CDATA[a2enmod php7.0
+service apache2 restart]]></screen>
+<itemizedlist>
+<listitem>
<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 the GOsa² gui is working, if you're able to connect LTSP clients and workstations, if you can add/remove a netgroup membership of a system, if you can send and receive internal email, if you can manage printers, and maybe other site specific things. Use the testsuite scripts if you spot an error.
+<para>Reboot and test if it works like before: Log in as first user and test if
</para>
<itemizedlist>
<listitem>
-<para>The LDAP data base (on the main server) has to be adjusted. The sudoHost value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an LDAP editor.
+<para>the GOsa² gui is working,
+</para></listitem>
+<listitem>
+<para>if one is able to connect LTSP clients and workstations,
+</para></listitem>
+<listitem>
+<para>if one can add/remove a netgroup membership of a system,
+</para></listitem>
+<listitem>
+<para>if one can send and receive internal email,
+</para></listitem>
+<listitem>
+<para>if one can manage printers,
+</para></listitem>
+<listitem>
+<para>and maybe other site specific things.
</para></listitem></itemizedlist>
</section>
-<section id="Upgrades--Upgrade_LTSP_chroot_.28default_arch_i386.29">
-<title>Upgrade LTSP chroot (default arch i386)
-</title><screen><![CDATA[ltsp-chroot -m -a i386 apt-get update
-ltsp-chroot -m -a i386 apt-get -y upgrade
+<section id="Upgrades--Upgrading_LTSP_chroots_.28default_arch_i386.29">
+<title>Upgrading LTSP chroots (default arch i386)
+</title>
+<para>Make sure you have enough disk space. LTSP now uses Network Block Device (NBD). The NBD image file size is about 4 GiB (default installation). If the image is updated, another 4 GiB for a temporary file are needed.
+</para><screen><![CDATA[ltsp-chroot -m -a i386 apt update
+ltsp-chroot -m -a i386 apt -y full-upgrade
sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list
-ltsp-chroot -m -a i386 apt-get update
-ltsp-chroot -m -a i386 apt-get -y dist-upgrade
-ltsp-chroot -m -a i386 apt-get -f install
-ltsp-chroot -m -a i386 apt-get -y dist-upgrade]]></screen>
-<para>If <computeroutput>apt-get</computeroutput> still finishes with an error, try to fix it and/or run the <computeroutput>apt-get</computeroutput> commands again, esp. <computeroutput>apt-get -f install</computeroutput>.
-</para>
+ltsp-chroot -m -a i386 apt update
+ltsp-chroot -m -a i386 apt -y full-upgrade
+ltsp-chroot -m -a i386 apt -f install
+ltsp-chroot -m -a i386 apt -y full-upgrade]]></screen>
<itemizedlist>
<listitem>
-<para>Cleaning up.
-</para></listitem></itemizedlist><screen><![CDATA[ltsp-chroot -m -a i386 apt-get --purge autoremove]]></screen>
+<para>Cleaning up:
+</para></listitem></itemizedlist><screen><![CDATA[ltsp-chroot -m -a i386 apt --purge autoremove]]></screen>
<itemizedlist>
<listitem>
-<para>Update LTSP support on the server side.
+<para>Update LTSP support on the server side:
</para></listitem></itemizedlist><screen><![CDATA[ltsp-update-kernels
ltsp-update-sshkeys
ltsp-update-image]]></screen>
+<para>To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> could be used instead; see <computeroutput>man ltsp-update-image</computeroutput>.
+</para>
</section>
<section id="Upgrades--Recreating_an_LTSP_chroot">
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 0599bb1..c68ecb7 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-04-10 19:28+0000\n"
+"POT-Creation-Date: 2017-04-25 11:35+0000\n"
"PO-Revision-Date: 2017-04-13 07:02+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -2653,14 +2653,16 @@ msgid ""
"server to use this server as its \"forwarder\". Update /etc/bind/named.conf."
"options and specify the IP address of the DNS server to use."
msgstr ""
-"如果普通的 DNS 流量阻塞你的外部网络而你需要使用某个特定的 DNS 服务器来查找互联网主机，你需要告知这个 DNS "
-"服务器作为它的“转发器”来使用这一服务器。"
+"如果普通的 DNS 流量阻塞你的外部网络而你需要使用某个特定的 DNS 服务器来查找互"
+"联网主机，你需要告知这个 DNS 服务器作为它的“转发器”来使用这一服务器。"
#. type: Content of: <article><section><section><para>
msgid ""
"The <link linkend=\"HowTo\">HowTo</link> chapter covers more tips and tricks "
"and some frequently asked questions."
-msgstr "这里的 <link linkend=\"HowTo\">HowTo</link> 一章涵盖了更多的提示和技巧以及一些经常被问及的问题。"
+msgstr ""
+"这里的 <link linkend=\"HowTo\">HowTo</link> 一章涵盖了更多的提示和技巧以及一"
+"些经常被问及的问题。"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Debian Edu KDE desktop"
@@ -2670,7 +2672,9 @@ msgstr "Debian Edu KDE 桌面"
msgid ""
"There are several services running on the main server which can be managed "
"via a web management interface. We'll describe each service below."
-msgstr "可以通过一个 web 管理界面管理运行在主要服务器上的几个服务。我们会在下面叙述每一个。"
+msgstr ""
+"可以通过一个 web 管理界面管理运行在主要服务器上的几个服务。我们会在下面叙述每"
+"一个。"
#. type: Content of: <article><section><section><title>
msgid "Introduction to GOsa²"
@@ -2682,8 +2686,8 @@ msgid ""
"parts of your Debian Edu setup. With GOsa² you can manage (add, modify, or "
"delete) these main groups:"
msgstr ""
-"GOsa² 是一个可以帮助管理你的 Debian Edu 设置的一些重要部分的基于 web 的管理工具。使用 GOsa² "
-"你可以管理（添加，修改，或者删除）这些主要的组："
+"GOsa² 是一个可以帮助管理你的 Debian Edu 设置的一些重要部分的基于 web 的管理工"
+"具。使用 GOsa² 你可以管理（添加，修改，或者删除）这些主要的组："
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "Group Administration"
@@ -2715,38 +2719,43 @@ msgid ""
"Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-"
"\">Installing a graphical environment on the main-server to use GOsa²</link>."
msgstr ""
-"为了访问 GOsa² 你需要 Skolelinux 主服务器和一个有 web 浏览器的（客户端）系统，而如果是作为称作组合服务器（主服务器 + LTSP "
-"服务器 + 工作站配置）来安装就可以是主服务器自身。如果上面提到的全都没有，请参阅：<link linkend=\"Administration"
-"--Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-\">"
-"在主服务器上安装图形环境来使用 GOsa²</link>。"
+"为了访问 GOsa² 你需要 Skolelinux 主服务器和一个有 web 浏览器的（客户端）系"
+"统，而如果是作为称作组合服务器（主服务器 + LTSP 服务器 + 工作站配置）来安装就"
+"可以是主服务器自身。如果上面提到的全都没有，请参阅：<link linkend="
+"\"Administration--Installing_a_graphical_environment_on_the_main-"
+"server_to_use_GOsa.2BALI-\">在主服务器上安装图形环境来使用 GOsa²</link>。"
#. type: Content of: <article><section><section><para>
msgid ""
"From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
"access, and log in as the first user."
msgstr ""
-"从一个 web 浏览器中使用这个 URL <ulink url=\"https://www/gosa\"/> 来访问 GOsa²，并作为首用户登录。"
+"从一个 web 浏览器中使用这个 URL <ulink url=\"https://www/gosa\"/> 来访问 "
+"GOsa²，并作为首用户登录。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"If you are using a new Debian Edu Stretch machine, the site certificate will "
"be known by the browser."
-msgstr "如果你使用的是新的 Debian Edu Stretch 计算机，该网站证书会被浏览器识别。"
+msgstr ""
+"如果你使用的是新的 Debian Edu Stretch 计算机，该网站证书会被浏览器识别。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
"Otherwise, you will get an error message about the SSL certificate being "
"wrong. If you know you are alone on your network, just tell the browser to "
"accept it and ignore that."
-msgstr "否则，你将收到有关 SSL 证书有误的错误消息。如果你知道是独自在你的网络上，就告诉浏览器接受它并忽略那个。"
+msgstr ""
+"否则，你将收到有关 SSL 证书有误的错误消息。如果你知道是独自在你的网络上，就告"
+"诉浏览器接受它并忽略那个。"
#. type: Content of: <article><section><section><para>
msgid ""
"For general information on GOsa² have a look at: <ulink url=\"https://oss."
"gonicus.de/labs/gosa/wiki/documentation\"/>."
msgstr ""
-"对于总体上的 GOsa² 信息请参看：<ulink url=\"https://oss.gonicus.de/labs/gosa/wiki/"
-"documentation\"/>。"
+"对于总体上的 GOsa² 信息请参看：<ulink url=\"https://oss.gonicus.de/labs/gosa/"
+"wiki/documentation\"/>。"
#. type: Content of: <article><section><section><section><title>
msgid "GOsa² Login plus Overview"
@@ -3971,100 +3980,285 @@ 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'; in "
-"most cases hitting return will be fine. Press 'q' to quit the apt-"
-"listchanges pager once you've read the information."
+"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><para>
+msgid ""
+"Please note one difference between apt and apt-get in Stretch: By default "
+"apt-get keeps downloaded packages, apt removes them from the cache (after "
+"successful installation)."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
+"it and/or run <computeroutput>apt -f install</computeroutput> and then "
+"<computeroutput>apt -y full-upgrade</computeroutput> once again."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade the server side"
+#, fuzzy
+#| msgid "Services running on the main server"
+msgid "Upgrading the main server"
+msgstr "运行在主服务器上的服务"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start by making sure the current system is up-to-date:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt full-upgrade"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Make sure the current system is up-to-date."
+msgid ""
+"If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
+"jessie):"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"apt-get update\n"
-"apt-get -y upgrade"
+"dpkg -r sitesummary\n"
+"apt -f install\n"
+"apt install sitesummary"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Do the actual upgrade."
+msgid "Cleanup the package cache:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get clean"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Prepare and start the upgrade to Stretch:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
+"# First, adjust for a changed profile name:\n"
+"sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
+"# Then it's best to use the new default mirror:\n"
+"sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
+"# Finally, replace jessie with stretch.\n"
"sed -i 's/jessie/stretch/g' /etc/apt/sources.list\n"
-"apt-get update\n"
-"apt-get -y dist-upgrade"
+"apt update\n"
+"apt full-upgrade"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> finishes with an error, try to "
-"fix it and/or run <computeroutput>apt-get -f install</computeroutput> and "
-"then <computeroutput>apt-get -y dist-upgrade</computeroutput> once again."
+"apt-list-changes: be prepared for a lot of NEWS to read; press <"
+"return> to scroll down, <q> to leave the pager."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Check if the upgraded system works."
+msgid "You will see some prompts about package configurations:"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"icinga-cgi: Provide icingaadmin's password (same as used for nagiosadmin)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"Reboot and test if it works like before: Log in as first user and test if "
-"the GOsa² gui is working, if you're able to connect LTSP clients and "
-"workstations, if you can add/remove a netgroup membership of a system, if "
-"you can send and receive internal email, if you can manage printers, and "
-"maybe other site specific things. Use the testsuite scripts if you spot an "
-"error."
+"Just in case several display managers are installed: display-manager: Choose "
+"lightdm."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Configuring Kerberos Authentication: Enter 'kerberos' as hostname."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Configuring icinga-common: Use external commands with Icinga: Choose <"
+"Yes>."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
+"\"https://bugs.debian.org/789667#\">789667</ulink>)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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!)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cope with the Squid3 to Squid renaming:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
msgid ""
-"The LDAP data base (on the main server) has to be adjusted. The sudoHost "
-"value 'tjener' has to be replaced with 'tjener.intern' using GOsa² or an "
-"LDAP editor."
+"service squid stop # This usually takes some time!\n"
+"rm -rf /var/spool/squid\n"
+"umount /var/spool/squid3\n"
+"sed -i 's#spool/squid3#spool/squid#' /etc/fstab\n"
+"mv /var/spool/squid3 /var/spool/squid\n"
+"mount -a\n"
+"rm /etc/squid3 -rf\n"
+"rm /etc/default/squid3 -rf"
msgstr ""
-#. type: Content of: <article><section><section><section><title>
-msgid "Upgrade LTSP chroot (default arch i386)"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Modify LDAP to use the fully qualified domain name (FQDN) for sudo:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y upgrade\n"
-"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
-"ltsp-chroot -m -a i386 apt-get update\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade\n"
-"ltsp-chroot -m -a i386 apt-get -f install\n"
-"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
+"ldapvi -ZD '(cn=admin)'\n"
+"(Enter root password.)\n"
+"Search for 'sudoHost :tjener', replace tjener with tjener.intern\n"
+"(Enter 'y' to modify the LDAP data base.)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "Apply and adjust configuration:"
+msgstr "文件系统存取配置"
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install renamed metapackages:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"apt update\n"
+"apt install education-networked-common\n"
+"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Get the new Debian Edu Stretch artwork:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt install debian-edu-artwork-softwaves"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "After reboot, do some more cleanup:"
+msgstr ""
+
+#. type: CDATA
+#, 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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Enable otherwise broken PHP 7.0 support."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"a2enmod php7.0 \n"
+"service apache2 restart"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Check if the upgraded system works."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
-"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
-"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
+"Reboot and test if it works like before: Log in as first user and test if"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "the GOsa² gui is working,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one is able to connect LTSP clients and workstations,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can add/remove a netgroup membership of a system,"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cleaning up."
+msgid "if one can send and receive internal email,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "if one can manage printers,"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "and maybe other site specific things."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Upgrading LTSP chroots (default arch i386)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Make sure you have enough disk space. LTSP now uses Network Block Device "
+"(NBD). The NBD image file size is about 4 GiB (default installation). If the "
+"image is updated, another 4 GiB for a temporary file are needed."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"sed -i 's/jessie/stretch/g' /opt/ltsp/i386/etc/apt/sources.list\n"
+"ltsp-chroot -m -a i386 apt update\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade\n"
+"ltsp-chroot -m -a i386 apt -f install\n"
+"ltsp-chroot -m -a i386 apt -y full-upgrade"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cleaning up:"
msgstr ""
#. type: CDATA
#, no-wrap
-msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt --purge autoremove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Update LTSP support on the server side."
+msgid "Update LTSP support on the server side:"
msgstr ""
#. type: CDATA
@@ -4075,6 +4269,13 @@ msgid ""
"ltsp-update-image"
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"To save disk space, <computeroutput>ltsp-update-image -n</computeroutput> "
+"could be used instead; see <computeroutput>man ltsp-update-image</"
+"computeroutput>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Recreating an LTSP chroot"
msgstr ""
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list