[debian-edu-commits] debian-edu/ 01/01: Updated from the wiki
Holger Levsen
holger at layer-acht.org
Wed Jun 28 14:01: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 78adec74b350e9ad0974e7073c62e1e2c074ce67
Author: Holger Levsen <holger at layer-acht.org>
Date: Wed Jun 28 16:00:20 2017 +0200
Updated from the wiki
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
.../debian-edu-stretch-manual.da.po | 47 ++++++++++------
.../debian-edu-stretch-manual.de.po | 63 ++++++++++++++++------
.../debian-edu-stretch-manual.es.po | 27 +++++++---
.../debian-edu-stretch-manual.fi.po | 27 +++++++---
.../debian-edu-stretch-manual.fr.po | 51 +++++++++++-------
.../debian-edu-stretch-manual.it.po | 57 +++++++++++++++-----
.../debian-edu-stretch-manual.ja.po | 50 ++++++++++++-----
.../debian-edu-stretch-manual.nb.po | 57 +++++++++++++++-----
.../debian-edu-stretch-manual.nl.po | 59 +++++++++++++++-----
.../debian-edu-stretch-manual.pl.po | 27 +++++++---
.../debian-edu-stretch-manual.pot | 27 +++++++---
.../debian-edu-stretch-manual.xml | 14 +++--
.../debian-edu-stretch-manual.zh.po | 27 +++++++---
13 files changed, 391 insertions(+), 142 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 c4c2af5..ef8faa0 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2017-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+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"
@@ -5141,21 +5141,8 @@ msgstr ""
"releasenotes\"/>)"
#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Don't use X, use a virtual console, log in as root. Read all debconf "
-#| "information carefully, choose 'keep the local version currently "
-#| "installed'; in most cases hitting return will be fine. Press 'q' to quit "
-#| "the apt-listchanges pager once you've read the information."
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
-"Brug ikke X, brug en virtuel konsol, log ind som root. Læs al debconf-"
-"information omhyggeligt, vælg »bevar den lokalt installeret version«; i de "
-"fleste tilfælde vil et tryk på retur være okay. Tryk »q« for at afslutte apt-"
-"listchanges-tekstsøgeren når du har læst informationen."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -5240,6 +5227,23 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Don't use X, use a virtual console, log in as root. Read all debconf "
+#| "information carefully, choose 'keep the local version currently "
+#| "installed'; in most cases hitting return will be fine. Press 'q' to quit "
+#| "the apt-listchanges pager once you've read the information."
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+"Brug ikke X, brug en virtuel konsol, log ind som root. Læs al debconf-"
+"information omhyggeligt, vælg »bevar den lokalt installeret version«; i de "
+"fleste tilfælde vil et tryk på retur være okay. Tryk »q« for at afslutte apt-"
+"listchanges-tekstsøgeren når du har læst informationen."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -5325,7 +5329,9 @@ msgstr "klik avanceret konfiguration"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -5355,6 +5361,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -5363,7 +5376,7 @@ msgstr ""
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
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 5cfbabc..e363700 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-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+0000\n"
"PO-Revision-Date: 2017-06-27 14:05+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4665,16 +4665,8 @@ msgstr ""
"\"https://www.debian.org/releases/stretch/releasenotes\"/>"
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
-"Benutzen Sie nicht X, sondern eine virtuelle Konsole, melden Sie sich als "
-"root an. Lesen Sie alle Debconf-Informationen sorgfätig durch, wählen Sie "
-"»Die momentan installierte Version beibehalten« - bis auf die unten "
-"aufgeführten Fälle; in den meisten Fällen wird das Drücken von »Enter« "
-"richtig sein."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4762,6 +4754,24 @@ msgstr ""
"Anzeigeprogramm zu beenden."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Don't use X, use a virtual console, log in as root. Read all debconf "
+#| "information carefully, choose 'keep your currently-installed version' "
+#| "unless stated differently below; in most cases hitting return will be "
+#| "fine."
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+"Benutzen Sie nicht X, sondern eine virtuelle Konsole, melden Sie sich als "
+"root an. Lesen Sie alle Debconf-Informationen sorgfätig durch, wählen Sie "
+"»Die momentan installierte Version beibehalten« - bis auf die unten "
+"aufgeführten Fälle; in den meisten Fällen wird das Drücken von »Enter« "
+"richtig sein."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr "Sie werden einige Aufforderungen für Paketkonfigurationen erhalten:"
@@ -4863,11 +4873,20 @@ msgid "Apply and adjust configuration:"
msgstr "Die Konfiguration anwenden und anpassen:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "cfengine-debian-edu -D installation\n"
+#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
+#| "rm /etc/apache2/mods-enabled/userdir.conf\n"
+#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
+#| "service squid start\n"
+#| "service apache2 restart"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -4904,15 +4923,27 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr "Nach einem Neustart weiter aufräumen:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt purge linux-image-3.16.0-4-amd64 \n"
+#| "apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
+#| "dpkg -P php5-imagick\n"
+#| "rm -rf /etc/php5"
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
"apt purge linux-image-3.16.0-4-amd64 \n"
@@ -10413,8 +10444,8 @@ msgstr ""
"translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre "
"Sprache anlegen und wie Übersetzungen aktualisiert werden."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
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 c980811..cec44cf 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+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"
@@ -4913,10 +4913,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -4998,6 +4995,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -5079,7 +5083,9 @@ msgstr "Configuración del acceso al sistema de archivos"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -5109,6 +5115,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -5117,7 +5130,7 @@ msgstr ""
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
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 6eab405..7ce7821 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-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+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-"
@@ -3407,10 +3407,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3477,6 +3474,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -3556,7 +3560,9 @@ msgstr ""
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -3584,6 +3590,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -3592,7 +3605,7 @@ msgstr ""
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
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 f881a7d..861b56a 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+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"
@@ -5328,23 +5328,8 @@ msgstr ""
"org/releases/jessie/releasenotes\"/>."
#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Don't use X, use a virtual console, log in as root. Read all debconf "
-#| "information carefully, choose 'keep the local version currently "
-#| "installed'; in most cases hitting return will be fine. Press 'q' to quit "
-#| "the apt-listchanges pager once you've read the information."
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
-"N'utilisez pas le serveur X, utilisez une console virtuelle, connectez-vous "
-"en tant que superutilisateur. Lisez attentivement toutes les informations "
-"debconf, choisissez « garder la version locale installée actuellement ». "
-"Dans la plupart des cas, appuyer sur entrée sera suffisant. Appuyez sur "
-"« q » pour quitter apt-listchanges une fois que vous avez lu les "
-"informations."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -5429,6 +5414,25 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Don't use X, use a virtual console, log in as root. Read all debconf "
+#| "information carefully, choose 'keep the local version currently "
+#| "installed'; in most cases hitting return will be fine. Press 'q' to quit "
+#| "the apt-listchanges pager once you've read the information."
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+"N'utilisez pas le serveur X, utilisez une console virtuelle, connectez-vous "
+"en tant que superutilisateur. Lisez attentivement toutes les informations "
+"debconf, choisissez « garder la version locale installée actuellement ». "
+"Dans la plupart des cas, appuyer sur entrée sera suffisant. Appuyez sur "
+"« q » pour quitter apt-listchanges une fois que vous avez lu les "
+"informations."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -5534,7 +5538,9 @@ msgstr "cliquez sur configuration avancée"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -5564,6 +5570,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -5572,7 +5585,7 @@ msgstr ""
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
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 d0cd8be..c0247c6 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-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+0000\n"
"PO-Revision-Date: 2017-06-22 19:51+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -4602,15 +4602,8 @@ msgstr ""
"debian.org/releases/stretch/releasenotes\"/>)"
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
-"Non usare X, ma utilizzare una console virtuale e accedere come root. "
-"Occorre leggere con attenzione tutte le informazioni di debconf, scegliere "
-"'keep your currently-installed version' a meno che non sia indicato "
-"diversamente in seguito: nella maggior parte dei casi funzionerà."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4696,6 +4689,23 @@ msgstr ""
"<return> per scorrere verso il basso, <q> per lasciare."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Don't use X, use a virtual console, log in as root. Read all debconf "
+#| "information carefully, choose 'keep your currently-installed version' "
+#| "unless stated differently below; in most cases hitting return will be "
+#| "fine."
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+"Non usare X, ma utilizzare una console virtuale e accedere come root. "
+"Occorre leggere con attenzione tutte le informazioni di debconf, scegliere "
+"'keep your currently-installed version' a meno che non sia indicato "
+"diversamente in seguito: nella maggior parte dei casi funzionerà."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
"Verranno visualizzati alcuni suggerimenti sulle configurazioni dei pacchetti:"
@@ -4797,11 +4807,20 @@ msgid "Apply and adjust configuration:"
msgstr "Applicare e regolare la configurazione:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "cfengine-debian-edu -D installation\n"
+#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
+#| "rm /etc/apache2/mods-enabled/userdir.conf\n"
+#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
+#| "service squid start\n"
+#| "service apache2 restart"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -4838,15 +4857,27 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr "Dopo il riavvio, fare un po' di pulizia:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt purge linux-image-3.16.0-4-amd64 \n"
+#| "apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
+#| "dpkg -P php5-imagick\n"
+#| "rm -rf /etc/php5"
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
"apt purge linux-image-3.16.0-4-amd64 \n"
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 4a9728c..6f2ac78 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+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"
@@ -4472,15 +4472,8 @@ msgstr ""
"releasenotes\"/> を見てください)。"
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
-"X を使わないでください。仮想コンソールを使って root でログインしてください。"
-"debconf の情報を全て注意深く読み、以下で特に言及していない限り「現在インス"
-"トールされているローカルバージョンを維持」を選択するようにしてください。ほと"
-"んどの場合「Enter」を押せばいいはずです。"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4568,6 +4561,23 @@ msgstr ""
"します。"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Don't use X, use a virtual console, log in as root. Read all debconf "
+#| "information carefully, choose 'keep your currently-installed version' "
+#| "unless stated differently below; in most cases hitting return will be "
+#| "fine."
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+"X を使わないでください。仮想コンソールを使って root でログインしてください。"
+"debconf の情報を全て注意深く読み、以下で特に言及していない限り「現在インス"
+"トールされているローカルバージョンを維持」を選択するようにしてください。ほと"
+"んどの場合「Enter」を押せばいいはずです。"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -4662,11 +4672,20 @@ msgid "Apply and adjust configuration:"
msgstr "設定の適用と調整:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "cfengine-debian-edu -D installation\n"
+#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
+#| "rm /etc/apache2/mods-enabled/userdir.conf\n"
+#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
+#| "service squid start\n"
+#| "service apache2 restart"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -4704,6 +4723,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -4717,7 +4743,7 @@ msgstr ""
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
"apt purge linux-image-3.16.0-4-amd64 \n"
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 f183b0f..fb1f583 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-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+0000\n"
"PO-Revision-Date: 2017-06-21 21:57+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -4562,15 +4562,8 @@ msgstr ""
"releasenotes\"/>)"
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
-"Ikke bruk X, bruk et virtuelt konsoll, logg inn som rot. Les all debconf-"
-"informasjon nøye, velg «behold den lokale versjonen som er installert» med "
-"mindre noe annet er beskrevet under; I de fleste tilfeller bruk bare "
-"«return»-tasten."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4656,6 +4649,23 @@ msgstr ""
"return> for å rulle nedover, <q> for å forlate sideskifteren."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Don't use X, use a virtual console, log in as root. Read all debconf "
+#| "information carefully, choose 'keep your currently-installed version' "
+#| "unless stated differently below; in most cases hitting return will be "
+#| "fine."
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+"Ikke bruk X, bruk et virtuelt konsoll, logg inn som rot. Les all debconf-"
+"informasjon nøye, velg «behold den lokale versjonen som er installert» med "
+"mindre noe annet er beskrevet under; I de fleste tilfeller bruk bare "
+"«return»-tasten."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr "Du vil se noen spørsmål om pakkeoppsett:"
@@ -4754,11 +4764,20 @@ msgid "Apply and adjust configuration:"
msgstr "Aktiver og juster oppsett:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "cfengine-debian-edu -D installation\n"
+#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
+#| "rm /etc/apache2/mods-enabled/userdir.conf\n"
+#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
+#| "service squid start\n"
+#| "service apache2 restart"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -4795,15 +4814,27 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr "Etter omstart, utfør noen flere oppryddinger:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt purge linux-image-3.16.0-4-amd64 \n"
+#| "apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
+#| "dpkg -P php5-imagick\n"
+#| "rm -rf /etc/php5"
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
"apt purge linux-image-3.16.0-4-amd64 \n"
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 812b9a6..02178a9 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-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+0000\n"
"PO-Revision-Date: 2017-06-26 21:21+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"
@@ -4753,16 +4753,8 @@ msgstr ""
"url=\"https://www.debian.org/releases/stretch/releasenotes\"/>)"
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
-"Werk niet in een grafische omgeving, gebruik een virtuele console, meld u "
-"aan als systeembeheerder (root). Lees aandachtig alle informatie van "
-"debconf, kies 'behoud de momenteel geïnstalleerde versie' tenzij hieronder "
-"anders aangegeven wordt; in de meeste gevallen zal op de return-toets "
-"drukken volstaan."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4850,6 +4842,24 @@ msgstr ""
"(de pager) te verlaten."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Don't use X, use a virtual console, log in as root. Read all debconf "
+#| "information carefully, choose 'keep your currently-installed version' "
+#| "unless stated differently below; in most cases hitting return will be "
+#| "fine."
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+"Werk niet in een grafische omgeving, gebruik een virtuele console, meld u "
+"aan als systeembeheerder (root). Lees aandachtig alle informatie van "
+"debconf, kies 'behoud de momenteel geïnstalleerde versie' tenzij hieronder "
+"anders aangegeven wordt; in de meeste gevallen zal op de return-toets "
+"drukken volstaan."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
"U zult een aantal vragen zien in verband met de configuratie van pakketten:"
@@ -4952,11 +4962,20 @@ msgid "Apply and adjust configuration:"
msgstr "Pas de configuratie aan en pas ze toe:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "cfengine-debian-edu -D installation\n"
+#| "rm /etc/apache2/conf-enabled/nagios3.conf\n"
+#| "rm /etc/apache2/mods-enabled/userdir.conf\n"
+#| "sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
+#| "service squid start\n"
+#| "service apache2 restart"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -4993,15 +5012,27 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr "apt install debian-edu-artwork-softwaves"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr "Na het heropstarten heeft u nog wat extra opruimwerk:"
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "apt purge linux-image-3.16.0-4-amd64 \n"
+#| "apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
+#| "dpkg -P php5-imagick\n"
+#| "rm -rf /etc/php5"
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
"apt purge linux-image-3.16.0-4-amd64 \n"
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 65b4e09..fa6e533 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-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+0000\n"
"PO-Revision-Date: 2017-06-05 08:57+0000\n"
"Last-Translator: Stanisław Krukowski <stdf021 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -3921,10 +3921,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3992,6 +3989,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -4071,7 +4075,9 @@ msgstr "Zastosuj i dostosuj konfigurację:"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -4099,6 +4105,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -4107,7 +4120,7 @@ msgstr ""
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 05c480c..52acc55 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+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"
@@ -3405,10 +3405,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3475,6 +3472,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -3554,7 +3558,9 @@ msgstr ""
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -3582,6 +3588,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -3590,7 +3603,7 @@ msgstr ""
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 1aa8868..5a744cc 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -1412,7 +1412,7 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
</para>
<para>Please note that the following recipe applies to a default Debian Edu main server installation (desktop=kde, profiles Main Server, Workstation, LTSP Server). (For a general overview concerning jessie to stretch upgrade, see: <ulink url="https://www.debian.org/releases/stretch/releasenotes"/>)
</para>
-<para>Don't use X, use a virtual console, log in as root. Read all debconf information carefully, choose 'keep your currently-installed version' unless stated differently below; in most cases hitting return will be fine.
+<para>Don't use X, use a virtual console, log in as root.
</para>
<para>Please note one difference between <computeroutput>apt</computeroutput> and <computeroutput>apt-get</computeroutput> in Stretch: By default <computeroutput>apt-get</computeroutput> keeps downloaded packages, <computeroutput>apt</computeroutput> removes them from the cache (after successful installation).
</para>
@@ -1447,6 +1447,9 @@ apt full-upgrade]]></screen>
<para>apt-list-changes: be prepared for a lot of NEWS to read; press <return> to scroll down, <q> to leave the pager.
</para></listitem>
<listitem>
+<para>Read all debconf information carefully, choose 'keep your currently-installed version' unless stated differently below; in most cases hitting return will be fine.
+</para></listitem>
+<listitem>
<para>You will see some prompts about package configurations:
</para>
<itemizedlist>
@@ -1493,7 +1496,9 @@ Search for 'sudoHost :tjener', replace 'tjener' with 'tjener.intern'
<para>Apply and adjust configuration:
</para></listitem></itemizedlist><screen><![CDATA[cfengine-debian-edu -D installation
rm /etc/apache2/conf-enabled/nagios3.conf
-rm /etc/apache2/mods-enabled/userdir.conf
+a2dismod userdir
+ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load
+a2enmod debian-edu-userdir
sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)
service squid start
service apache2 restart]]></screen>
@@ -1509,10 +1514,13 @@ apt install education-ltsp-server # Only if profile 'LTSP-Server' is instal
</para></listitem></itemizedlist><screen><![CDATA[apt install debian-edu-artwork-softwaves]]></screen>
<itemizedlist>
<listitem>
+<para>If the upgraded system fails to boot on qemu/kvm, see <ulink url="https://bugs.debian.org/844446#">844446</ulink>. Changing the architecture away from Broadwell in QEMU might help.
+</para></listitem>
+<listitem>
<para>After reboot, do some more cleanup:
</para></listitem></itemizedlist><screen><![CDATA[apt purge linux-image-3.16.0-4-amd64
apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.
-dpkg -P php5-imagick
+dpkg -P php5-imagick # Package might not be installed in all cases.
rm -rf /etc/php5]]></screen>
<itemizedlist>
<listitem>
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 c052343..f4b2563 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-06-27 11:46+0000\n"
+"POT-Creation-Date: 2017-06-28 13:25+0000\n"
"PO-Revision-Date: 2017-06-21 10:37+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -4140,10 +4140,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid ""
-"Don't use X, use a virtual console, log in as root. Read all debconf "
-"information carefully, choose 'keep your currently-installed version' unless "
-"stated differently below; in most cases hitting return will be fine."
+msgid "Don't use X, use a virtual console, log in as root."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -4212,6 +4209,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Read all debconf information carefully, choose 'keep your currently-"
+"installed version' unless stated differently below; in most cases hitting "
+"return will be fine."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "You will see some prompts about package configurations:"
msgstr ""
@@ -4293,7 +4297,9 @@ msgstr "文件系统存取配置"
msgid ""
"cfengine-debian-edu -D installation\n"
"rm /etc/apache2/conf-enabled/nagios3.conf\n"
-"rm /etc/apache2/mods-enabled/userdir.conf\n"
+"a2dismod userdir\n"
+"ln -s /etc/apache2/mods-available/userdir.load etc/apache2/mods-available/debian-edu-userdir.load\n"
+"a2enmod debian-edu-userdir\n"
"sed -i 's/udp4/udp/' /etc/inetd.conf # Debian Bug #789667 (atftpd)\n"
"service squid start\n"
"service apache2 restart"
@@ -4321,6 +4327,13 @@ msgid "apt install debian-edu-artwork-softwaves"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"If the upgraded system fails to boot on qemu/kvm, see <ulink url=\"https://"
+"bugs.debian.org/844446#\">844446</ulink>. Changing the architecture away "
+"from Broadwell in QEMU might help."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "After reboot, do some more cleanup:"
msgstr ""
@@ -4329,7 +4342,7 @@ msgstr ""
msgid ""
"apt purge linux-image-3.16.0-4-amd64 \n"
"apt purge debian-edu-artwork-lines # Only if not wanted as an alternative theme.\n"
-"dpkg -P php5-imagick\n"
+"dpkg -P php5-imagick # Package might not be installed in all cases.\n"
"rm -rf /etc/php5"
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