[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Jessie manual from the wiki.
Holger Levsen
holger at moszumanska.debian.org
Mon Apr 27 13:36:18 UTC 2015
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 b970f9217481bc7ac61eeed1b06d9f27a2b12ad8
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Apr 27 15:35:55 2015 +0200
Update Debian Edu Jessie manual from the wiki.
---
.../debian-edu-jessie-manual.da.po | 119 +++++++++-----
.../debian-edu-jessie-manual.de.po | 119 +++++++++-----
.../debian-edu-jessie-manual.es.po | 57 +++----
.../debian-edu-jessie-manual.fr.po | 119 +++++++++-----
.../debian-edu-jessie-manual.it.po | 179 +++++++++------------
.../debian-edu-jessie-manual.nb.po | 119 +++++++++-----
.../debian-edu-jessie-manual.nl.po | 120 +++++++++-----
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 45 ++----
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 18 +--
9 files changed, 509 insertions(+), 386 deletions(-)
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index df397ad..cba2e82 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2015-04-26 15:01+0000\n"
+"POT-Creation-Date: 2015-04-27 13:34+0000\n"
"PO-Revision-Date: 2015-04-21 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -4608,12 +4608,16 @@ msgid "Do the actual upgrade."
msgstr "Udfør den faktiske opgradering."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+#| "apt-get update\n"
+#| "apt-get -y dist-upgrade\n"
+#| "apt-get -f install\n"
+#| "apt-get -y dist-upgrade"
msgid ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
"apt-get update\n"
-"apt-get -y dist-upgrade\n"
-"apt-get -f install\n"
"apt-get -y dist-upgrade"
msgstr ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
@@ -4623,10 +4627,15 @@ msgstr ""
"apt-get -y dist-upgrade"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| 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>."
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>."
+"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."
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>-"
@@ -4635,19 +4644,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
-msgstr ""
-"Installer yderligere pakke for at få PXE til at fungere (Debianfejl <ulink "
-"url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get -y install pxelinux"
-msgstr "apt-get -y install pxelinux"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
"bugs.debian.org/779642#\">779642</ulink>)."
msgstr ""
@@ -4701,11 +4697,16 @@ msgstr ""
"gosa-encrypt-passwords"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Install missing packages; the package names were obtained using "
+#| "<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep "
+#| "error:</computeroutput> after the step above (Debian bug <ulink url="
+#| "\"https://bugs.debian.org/779648#\">779648</ulink>)."
msgid ""
-"Install missing packages; the package names were obtained using "
+"Install missing package; the package name was obtained using "
"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
-"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
-"debian.org/779648#\">779648</ulink>)."
+"computeroutput> after the step above."
msgstr ""
"Installer manglende pakker; pakkenavnene blev indhentet via <computeroutput>/"
"usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</computeroutput> "
@@ -4713,13 +4714,10 @@ msgstr ""
"\">779648</ulink>)."
#. type: CDATA
-#, no-wrap
-msgid ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install killer"
+msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4789,22 +4787,28 @@ 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><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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 ""
-"Installer manglende pakker i LTSP-chroot (Debianfejl <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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>
+#, fuzzy
+#| msgid "Installing additional software in the LTSP environment"
+msgid "Install missing package in the LTSP chroot."
+msgstr "Installation af yderligere programmer i LTSP-miljøet"
#. type: CDATA
-#, no-wrap
-msgid ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt-get -y install killer"
+msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleaning up."
@@ -12578,6 +12582,37 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "Install additional package to make PXE work (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
+#~ msgstr ""
+#~ "Installer yderligere pakke for at få PXE til at fungere (Debianfejl "
+#~ "<ulink url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
+
+#~ msgid "apt-get -y install pxelinux"
+#~ msgstr "apt-get -y install pxelinux"
+
+#~ msgid ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
+#~ "Install missing packages in the LTSP chroot (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779647#\">779647</ulink>)."
+#~ msgstr ""
+#~ "Installer manglende pakker i LTSP-chroot (Debianfejl <ulink url=\"https://"
+#~ "bugs.debian.org/779647#\">779647</ulink>)."
+
+#~ msgid ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
# engelsk fejl Jessie
#~ msgid ""
#~ "Install <computeroutput>squid3</computeroutput> as <computeroutput>squid</"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 8a9faaa..ab8315e 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-26 15:01+0000\n"
+"POT-Creation-Date: 2015-04-27 13:34+0000\n"
"PO-Revision-Date: 2015-04-26 09:20+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4725,12 +4725,16 @@ msgid "Do the actual upgrade."
msgstr "Das eigentliche Upgrade vornehmen."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+#| "apt-get update\n"
+#| "apt-get -y dist-upgrade\n"
+#| "apt-get -f install\n"
+#| "apt-get -y dist-upgrade"
msgid ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
"apt-get update\n"
-"apt-get -y dist-upgrade\n"
-"apt-get -f install\n"
"apt-get -y dist-upgrade"
msgstr ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
@@ -4740,10 +4744,15 @@ msgstr ""
"apt-get -y dist-upgrade"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| 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>."
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>."
+"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."
msgstr ""
"Wenn <computeroutput>apt-get</computeroutput> weiterhin mit einer "
"Fehlermeldung abbrechen sollte, dann versuchen Sie, den Fehler zu finden und/"
@@ -4752,19 +4761,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
-msgstr ""
-"Ein zusätzliches Paket installieren, damit PXE funktioniert (Debian-Bug "
-"<ulink url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get -y install pxelinux"
-msgstr "apt-get -y install pxelinux"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
"bugs.debian.org/779642#\">779642</ulink>)."
msgstr ""
@@ -4820,11 +4816,16 @@ msgstr ""
"gosa-encrypt-passwords"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Install missing packages; the package names were obtained using "
+#| "<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep "
+#| "error:</computeroutput> after the step above (Debian bug <ulink url="
+#| "\"https://bugs.debian.org/779648#\">779648</ulink>)."
msgid ""
-"Install missing packages; the package names were obtained using "
+"Install missing package; the package name was obtained using "
"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
-"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
-"debian.org/779648#\">779648</ulink>)."
+"computeroutput> after the step above."
msgstr ""
"Fehlende Pakete installieren; die Namen der Pakete wurden mittels "
"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
@@ -4832,13 +4833,10 @@ msgstr ""
"\"https://bugs.debian.org/779648#\">779648</ulink>)."
#. type: CDATA
-#, no-wrap
-msgid ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install killer"
+msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4911,22 +4909,28 @@ 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><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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 ""
-"Fehlende Pakete im LTSP-Chroot installieren (Debian-Bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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>
+#, fuzzy
+#| msgid "Installing additional software in the LTSP environment"
+msgid "Install missing package in the LTSP chroot."
+msgstr "Installation zusätzlicher Software in der LTSP-Umgebung"
#. type: CDATA
-#, no-wrap
-msgid ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt-get -y install killer"
+msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleaning up."
@@ -12902,6 +12906,37 @@ msgstr ""
"werden."
#~ msgid ""
+#~ "Install additional package to make PXE work (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
+#~ msgstr ""
+#~ "Ein zusätzliches Paket installieren, damit PXE funktioniert (Debian-Bug "
+#~ "<ulink url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
+
+#~ msgid "apt-get -y install pxelinux"
+#~ msgstr "apt-get -y install pxelinux"
+
+#~ msgid ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
+#~ "Install missing packages in the LTSP chroot (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779647#\">779647</ulink>)."
+#~ msgstr ""
+#~ "Fehlende Pakete im LTSP-Chroot installieren (Debian-Bug <ulink url="
+#~ "\"https://bugs.debian.org/779647#\">779647</ulink>)."
+
+#~ msgid ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
#~ "Install <computeroutput>squid3</computeroutput> as <computeroutput>squid</"
#~ "computeroutput> is deprecated and missing in jessie (Debian bug <ulink "
#~ "url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index c23a161..aa054db 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-26 15:01+0000\n"
+"POT-Creation-Date: 2015-04-27 13:34+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"
@@ -4365,27 +4365,14 @@ msgstr ""
msgid ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
"apt-get update\n"
-"apt-get -y dist-upgrade\n"
-"apt-get -f install\n"
"apt-get -y dist-upgrade"
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>."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get -y install pxelinux"
+"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."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4435,18 +4422,16 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install missing packages; the package names were obtained using "
+"Install missing package; the package name was obtained using "
"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
-"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
-"debian.org/779648#\">779648</ulink>)."
+"computeroutput> after the step above."
msgstr ""
#. type: CDATA
-#, no-wrap
-msgid ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install killer"
+msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4494,18 +4479,24 @@ msgid ""
"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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 ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "Installing additional software in the LTSP environment"
+msgid "Install missing package in the LTSP chroot."
+msgstr "Instalación de software adicional en el entorno LTSP"
+
#. type: CDATA
-#, no-wrap
-msgid ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "ltsp-chroot -m -a i386 apt-get -y install killer"
+msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleaning up."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index 97ea7e4..d696c85 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-04-26 15:01+0000\n"
+"POT-Creation-Date: 2015-04-27 13:34+0000\n"
"PO-Revision-Date: 2015-04-21 15:45+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -4751,12 +4751,16 @@ msgid "Do the actual upgrade."
msgstr "Faire la mise à jour à proprement parler."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+#| "apt-get update\n"
+#| "apt-get -y dist-upgrade\n"
+#| "apt-get -f install\n"
+#| "apt-get -y dist-upgrade"
msgid ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
"apt-get update\n"
-"apt-get -y dist-upgrade\n"
-"apt-get -f install\n"
"apt-get -y dist-upgrade"
msgstr ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
@@ -4766,10 +4770,15 @@ msgstr ""
"apt-get -y dist-upgrade"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| 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>."
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>."
+"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."
msgstr ""
"Si <computeroutput>apt-get</computeroutput> termine avec une erreur, essayez "
"de la corriger et/ou de relancer les commandes <computeroutput>apt-get</"
@@ -4778,19 +4787,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
-msgstr ""
-"Installez un paquet supplémentaire pour faire fonctionner PXE (bogue Debian "
-"nº <ulink url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get -y install pxelinux"
-msgstr "apt-get -y install pxelinux"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
"bugs.debian.org/779642#\">779642</ulink>)."
msgstr ""
@@ -4846,11 +4842,16 @@ msgstr ""
"gosa-encrypt-passwords"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Install missing packages; the package names were obtained using "
+#| "<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep "
+#| "error:</computeroutput> after the step above (Debian bug <ulink url="
+#| "\"https://bugs.debian.org/779648#\">779648</ulink>)."
msgid ""
-"Install missing packages; the package names were obtained using "
+"Install missing package; the package name was obtained using "
"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
-"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
-"debian.org/779648#\">779648</ulink>)."
+"computeroutput> after the step above."
msgstr ""
"Installez les paquets manquants. Les noms de paquets ont été obtenus en "
"utilisant <computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | "
@@ -4858,13 +4859,10 @@ msgstr ""
"url=\"https://bugs.debian.org/779648#\">779648</ulink>)."
#. type: CDATA
-#, no-wrap
-msgid ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install killer"
+msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4936,22 +4934,28 @@ 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><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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 ""
-"Installez les paquets manquants dans le chroot LTSP (bogue Debian nº <ulink "
-"url=\"https://bugs.debian.org/779647#\">779647</ulink>)."
+"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>
+#, fuzzy
+#| msgid "Installing additional software in the LTSP environment"
+msgid "Install missing package in the LTSP chroot."
+msgstr "Installer des logiciels supplémentaires dans l'environnement LTSP"
#. type: CDATA
-#, no-wrap
-msgid ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt-get -y install killer"
+msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleaning up."
@@ -12976,6 +12980,37 @@ msgstr ""
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
#~ msgid ""
+#~ "Install additional package to make PXE work (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
+#~ msgstr ""
+#~ "Installez un paquet supplémentaire pour faire fonctionner PXE (bogue "
+#~ "Debian nº <ulink url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
+
+#~ msgid "apt-get -y install pxelinux"
+#~ msgstr "apt-get -y install pxelinux"
+
+#~ msgid ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
+#~ "Install missing packages in the LTSP chroot (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779647#\">779647</ulink>)."
+#~ msgstr ""
+#~ "Installez les paquets manquants dans le chroot LTSP (bogue Debian "
+#~ "nº <ulink url=\"https://bugs.debian.org/779647#\">779647</ulink>)."
+
+#~ msgid ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
#~ "Install <computeroutput>squid3</computeroutput> as <computeroutput>squid</"
#~ "computeroutput> is deprecated and missing in jessie (Debian bug <ulink "
#~ "url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index 97439c0..b2ecb9c 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2015-04-26 15:01+0000\n"
+"POT-Creation-Date: 2015-04-27 13:34+0000\n"
"PO-Revision-Date: 2015-04-26 19:19+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1407,10 +1407,6 @@ msgid "netinstall CD image for i386, amd64"
msgstr "immagine del CD netinstall per i386 e amd64"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The netinstall CD, which also can be used for installation from USB flash "
-#| "drives, is suited to install on i386 and amd64 machines. It's available "
-#| "via"
msgid ""
"The netinstall CD, which also can be used for installation from USB flash "
"drives, is suitable to install i386 and amd64 machines. As the name implies, "
@@ -1422,9 +1418,6 @@ msgstr ""
"Si può scaricare da:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
@@ -1433,9 +1426,6 @@ msgstr ""
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "CD.iso\">debian-edu-8.0+edu0-CD.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
@@ -1444,9 +1434,6 @@ msgstr ""
"CD.iso\">debian-edu-8.0+edu0~b1-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0~b1-CD.iso ./debian-edu-8.0+edu0~b1-CD.iso </computeroutput>"
@@ -1459,11 +1446,6 @@ msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
msgstr "Immagine per flash drive USB / Blue-ray disc per i386 e amd64"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. It behaves like the former DVD "
-#| "image which means it doesn't use internet access during installation. "
-#| "Like the others it can be downloaded over FTP, HTTP or rsync via:"
msgid ""
"The multi-architecture ISO image is 5.2 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
@@ -1476,9 +1458,6 @@ msgstr ""
"tramite FTP, HTTP o rsync tramite:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
@@ -1487,9 +1466,6 @@ msgstr ""
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0-"
-#| "USB.iso\">debian-edu-8.0+edu0-USB.iso</ulink>"
msgid ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8.0+edu0~b1-"
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
@@ -1498,10 +1474,6 @@ msgstr ""
"USB.iso\">debian-edu-8.0+edu0~b1-USB.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/"
-#| "debian-edu-8.0+edu0-USB.iso ./debian-edu-8.0+edu0-USB.iso </"
-#| "computeroutput>"
msgid ""
"<computeroutput>rsync -v --progress ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
@@ -1510,7 +1482,6 @@ msgstr ""
"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-#| msgid "Sources:"
msgid "Sources"
msgstr "Sorgenti:"
@@ -4696,12 +4667,16 @@ msgid "Do the actual upgrade."
msgstr "Effettuare l'aggiornamento vero e proprio."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+#| "apt-get update\n"
+#| "apt-get -y dist-upgrade\n"
+#| "apt-get -f install\n"
+#| "apt-get -y dist-upgrade"
msgid ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
"apt-get update\n"
-"apt-get -y dist-upgrade\n"
-"apt-get -f install\n"
"apt-get -y dist-upgrade"
msgstr ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
@@ -4711,10 +4686,15 @@ msgstr ""
"apt-get -y dist-upgrade"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| 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>."
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>."
+"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."
msgstr ""
"se <computeroutput>apt-get</computeroutput> termina ancora con errori, prova "
"a risolvere il problema eseguendo di nuovo il comando <computeroutput>apt-"
@@ -4722,19 +4702,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
-msgstr ""
-"Installare pacchetti addizionali per far funzionare PXE (Debian bug <ulink "
-"url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get -y install pxelinux"
-msgstr "apt-get -y install pxelinux"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
"bugs.debian.org/779642#\">779642</ulink>)."
msgstr ""
@@ -4789,11 +4756,16 @@ msgstr ""
"gosa-encrypt-passwords"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Install missing packages; the package names were obtained using "
+#| "<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep "
+#| "error:</computeroutput> after the step above (Debian bug <ulink url="
+#| "\"https://bugs.debian.org/779648#\">779648</ulink>)."
msgid ""
-"Install missing packages; the package names were obtained using "
+"Install missing package; the package name was obtained using "
"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
-"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
-"debian.org/779648#\">779648</ulink>)."
+"computeroutput> after the step above."
msgstr ""
"Installare i pacchetti mancanti; il nome dei pacchetti si può ottenere "
"usando <computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep "
@@ -4801,13 +4773,10 @@ msgstr ""
"\"https://bugs.debian.org/779648#\">779648</ulink>)."
#. type: CDATA
-#, no-wrap
-msgid ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install killer"
+msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4877,22 +4846,27 @@ 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><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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 ""
-"Installare i pacchetti mancanti in LTSP chroot (Debian bug <ulink url="
-"\"https://bugs.debian.org/779647#\">779647</ulink>)."
+"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>
+#, fuzzy
+#| msgid "Installing additional software in the LTSP environment"
+msgid "Install missing package in the LTSP chroot."
+msgstr "Installare software addizionale in ambiente LTSP"
#. type: CDATA
-#, no-wrap
-msgid ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt-get -y install killer"
+msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleaning up."
@@ -7336,8 +7310,8 @@ msgid ""
msgstr ""
"I valori predefiniti sono definiti in <computeroutput>[default]</"
"computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
-"</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: "
+"<computeroutput>[192.168.0.10]</computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -9899,8 +9873,6 @@ msgid "New features in Debian Edu Jessie"
msgstr "Nuove caratteristiche in Debian Edu Jessie"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 8.0+edu0 Codename Jessie released 2015-XX-YY"
msgid ""
"New features for Debian Edu 8.0+edu0~b1 Codename Jessie released 2015-04-25"
msgstr ""
@@ -9937,7 +9909,6 @@ msgid "Software updates"
msgstr "Aggiornamenti software"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Everything which is new in Debian Jessie 8.0, eg:"
msgid "Everything which is new in Debian 8 Jessie, eg:"
msgstr "Tutto ciò che è nuovo in Debian Jessie 8.0, ad esempio:"
@@ -9946,9 +9917,6 @@ msgid "Linux kernel 3.16.x"
msgstr "Linux kernel 3.16.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
-#| "0.5.6"
msgid ""
"Desktop environments KDE Plasma Workspace 4.11.13, GNOME 3.14, Xfce 4.10, "
"LXDE 0.5.6"
@@ -9961,9 +9929,6 @@ msgid "new optional desktop environment: MATE 1.8"
msgstr "nuovo ambiente opzionale di desktop: MATE 1.8"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "KDE \"Plasma\" is installed by default; to choose one of the others see "
-#| "this manual."
msgid ""
"KDE Plasma Workspace is installed by default; to choose one of the others "
"see this manual."
@@ -9980,7 +9945,6 @@ msgid "LibreOffice 4.3.3"
msgstr "LibreOffice 4.3.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Educational toolbox GCompris 14.07"
msgid "Educational toolbox GCompris 14.12"
msgstr "Software educativo GCompris 14.12"
@@ -10015,11 +9979,6 @@ msgstr ""
"l'installazione."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "More information about Debian Jessie 8.0 is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/jessie/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/jessie/"
-#| "installmanual\">installation manual</ulink>."
msgid ""
"More information about Debian 8 Jessie is provided in the <ulink url="
"\"http://www.debian.org/releases/jessie/releasenotes\">release notes</ulink> "
@@ -10192,10 +10151,6 @@ msgid "Translation copyright and authors"
msgstr "Copyright e autori delle traduzioni"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Spanish translation is copyrighted by José L. Redrejo Rodríguez "
-#| "(2007), Rafael Rivas (2009, 2010, 2011, 2012) and Norman Garcia (2010, "
-#| "2012, 2013) and is released under the GPL v2 or any later version."
msgid ""
"The Spanish translation is copyrighted by José L. Redrejo Rodríguez (2007), "
"Rafael Rivas (2009, 2010, 2011, 2012, 2015) and Norman Garcia (2010, 2012, "
@@ -10241,10 +10196,6 @@ msgstr ""
"successiva."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014) 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) and Beatrice Torracca (2013, 2014) "
@@ -10269,9 +10220,6 @@ msgstr ""
"licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) "
-#| "and is released under the GPL v2 or any later version."
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015) "
"and is released under the GPL v2 or any later version."
@@ -10434,7 +10382,7 @@ msgstr ""
"lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
#. <remark>
-#. status ignore</remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -12767,6 +12715,37 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "Install additional package to make PXE work (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
+#~ msgstr ""
+#~ "Installare pacchetti addizionali per far funzionare PXE (Debian bug "
+#~ "<ulink url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
+
+#~ msgid "apt-get -y install pxelinux"
+#~ msgstr "apt-get -y install pxelinux"
+
+#~ msgid ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
+#~ "Install missing packages in the LTSP chroot (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779647#\">779647</ulink>)."
+#~ msgstr ""
+#~ "Installare i pacchetti mancanti in LTSP chroot (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779647#\">779647</ulink>)."
+
+#~ msgid ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
#~ "Install <computeroutput>squid3</computeroutput> as <computeroutput>squid</"
#~ "computeroutput> is deprecated and missing in jessie (Debian bug <ulink "
#~ "url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index e401b16..022df9e 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -18,7 +18,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-04-26 15:01+0000\n"
+"POT-Creation-Date: 2015-04-27 13:34+0000\n"
"PO-Revision-Date: 2015-04-19 12:34+0000\n"
"Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -4621,12 +4621,16 @@ msgid "Do the actual upgrade."
msgstr "Gjøre selve oppgraderingen."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+#| "apt-get update\n"
+#| "apt-get -y dist-upgrade\n"
+#| "apt-get -f install\n"
+#| "apt-get -y dist-upgrade"
msgid ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
"apt-get update\n"
-"apt-get -y dist-upgrade\n"
-"apt-get -f install\n"
"apt-get -y dist-upgrade"
msgstr ""
"sed -i «s/wheezy/jessie/g» /etc/apt/sources.list\n"
@@ -4636,10 +4640,15 @@ msgstr ""
"apt-get -y dist-upgrade"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| 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>."
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>."
+"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."
msgstr ""
"Hvis <computeroutput>apt-get</computeroutput> fremdeles avsluttes med en "
"feil, forsøk å rette det til og/eller kjør <computeroutput>apt-get</"
@@ -4648,19 +4657,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
-msgstr ""
-"Installer tilleggspakke for å få PXE i gang (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get -y install pxelinux"
-msgstr "apt-get -y install (installere) pxelinux"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
"bugs.debian.org/779642#\">779642</ulink>)."
msgstr ""
@@ -4714,11 +4710,16 @@ msgstr ""
"gosa-encrypt-passwords"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Install missing packages; the package names were obtained using "
+#| "<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep "
+#| "error:</computeroutput> after the step above (Debian bug <ulink url="
+#| "\"https://bugs.debian.org/779648#\">779648</ulink>)."
msgid ""
-"Install missing packages; the package names were obtained using "
+"Install missing package; the package name was obtained using "
"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
-"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
-"debian.org/779648#\">779648</ulink>)."
+"computeroutput> after the step above."
msgstr ""
" Installer manglende pakker; pakkenavnene innhentes herfra: <computeroutput>/"
"usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</computeroutput> "
@@ -4726,13 +4727,10 @@ msgstr ""
"org/779648#\">779648</ulink>)."
#. type: CDATA
-#, no-wrap
-msgid ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install killer"
+msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -4802,22 +4800,28 @@ 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><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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 ""
-"Installer manglende pakker i LTSP-chroot (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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>
+#, fuzzy
+#| msgid "Installing additional software in the LTSP environment"
+msgid "Install missing package in the LTSP chroot."
+msgstr "Oppgradere LTSP-miljøet"
#. type: CDATA
-#, no-wrap
-msgid ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt-get -y install killer"
+msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove (fjerne automatisk)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleaning up."
@@ -12597,6 +12601,37 @@ msgstr ""
"skolelinux.no/info/cdbygging/news.html</ulink>."
#~ msgid ""
+#~ "Install additional package to make PXE work (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
+#~ msgstr ""
+#~ "Installer tilleggspakke for å få PXE i gang (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
+
+#~ msgid "apt-get -y install pxelinux"
+#~ msgstr "apt-get -y install (installere) pxelinux"
+
+#~ msgid ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
+#~ "Install missing packages in the LTSP chroot (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779647#\">779647</ulink>)."
+#~ msgstr ""
+#~ "Installer manglende pakker i LTSP-chroot (Debian bug <ulink url=\"https://"
+#~ "bugs.debian.org/779647#\">779647</ulink>)."
+
+#~ msgid ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
#~ "Install <computeroutput>squid3</computeroutput> as <computeroutput>squid</"
#~ "computeroutput> is deprecated and missing in jessie (Debian bug <ulink "
#~ "url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index d54f9fd..860a426 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-04-26 15:01+0000\n"
+"POT-Creation-Date: 2015-04-27 13:34+0000\n"
"PO-Revision-Date: 2015-04-26 20:38+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"
@@ -1524,7 +1524,6 @@ msgstr ""
"edu-8.0+edu0~b1-USB.iso ./debian-edu-8.0+edu0~b1-USB.iso </computeroutput>"
#. type: Content of: <article><section><section><section><title>
-#| msgid "Sources:"
msgid "Sources"
msgstr "Broncode"
@@ -4819,12 +4818,16 @@ msgid "Do the actual upgrade."
msgstr "Voer de echte opwaardering uit."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
+#| "apt-get update\n"
+#| "apt-get -y dist-upgrade\n"
+#| "apt-get -f install\n"
+#| "apt-get -y dist-upgrade"
msgid ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
"apt-get update\n"
-"apt-get -y dist-upgrade\n"
-"apt-get -f install\n"
"apt-get -y dist-upgrade"
msgstr ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
@@ -4834,10 +4837,15 @@ msgstr ""
"apt-get -y dist-upgrade"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| 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>."
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>."
+"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."
msgstr ""
"Mocht <computeroutput>apt-get</computeroutput> afgesloten worden met een "
"foutmelding, probeer die dan te verhelpen en/of voer de commando's van "
@@ -4846,19 +4854,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
-msgstr ""
-"Installeer een extra pakket om er voor te zorgen dat PXE werkt (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get -y install pxelinux"
-msgstr "apt-get -y install pxelinux"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"Keep backup of Kerberos configuration file (Debian bug <ulink url=\"https://"
"bugs.debian.org/779642#\">779642</ulink>)."
msgstr ""
@@ -4915,11 +4910,16 @@ msgstr ""
"gosa-encrypt-passwords"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Install missing packages; the package names were obtained using "
+#| "<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep "
+#| "error:</computeroutput> after the step above (Debian bug <ulink url="
+#| "\"https://bugs.debian.org/779648#\">779648</ulink>)."
msgid ""
-"Install missing packages; the package names were obtained using "
+"Install missing package; the package name was obtained using "
"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
-"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
-"debian.org/779648#\">779648</ulink>)."
+"computeroutput> after the step above."
msgstr ""
"Installeer ontbrekende pakketten. De namen van de pakketten werden verkregen "
"via het uitvoeren van de opdracht <computeroutput>/usr/lib/debian-edu-config/"
@@ -4927,13 +4927,10 @@ msgstr ""
"(Debian bug <ulink url=\"https://bugs.debian.org/779648#\">779648</ulink>)."
#. type: CDATA
-#, no-wrap
-msgid ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "apt-get install killer"
+msgid "apt-get -y install killer"
+msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Check if the upgraded system works."
@@ -5004,22 +5001,28 @@ 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><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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 ""
-"Installeer ontbrekende pakketten in de LTSP-chroot (Debian bug <ulink url="
-"\"https://bugs.debian.org/779647#\">779647</ulink>)."
+"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>
+#, fuzzy
+#| msgid "Installing additional software in the LTSP environment"
+msgid "Install missing package in the LTSP chroot."
+msgstr "Bijkomende programmatuur installeren in de LTSP-omgeving"
#. type: CDATA
-#, no-wrap
-msgid ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
-msgstr ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#, fuzzy, no-wrap
+#| msgid "ltsp-chroot -m -a i386 apt-get --purge autoremove"
+msgid "ltsp-chroot -m -a i386 apt-get -y install killer"
+msgstr "ltsp-chroot -m -a i386 apt-get --purge autoremove"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Cleaning up."
@@ -13148,6 +13151,37 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "Install additional package to make PXE work (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779644#\">779644</ulink>)."
+#~ msgstr ""
+#~ "Installeer een extra pakket om er voor te zorgen dat PXE werkt (Debian "
+#~ "bug <ulink url=\"https://bugs.debian.org/779644#\">779644</ulink>)."
+
+#~ msgid "apt-get -y install pxelinux"
+#~ msgstr "apt-get -y install pxelinux"
+
+#~ msgid ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
+#~ "killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
+#~ "Install missing packages in the LTSP chroot (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779647#\">779647</ulink>)."
+#~ msgstr ""
+#~ "Installeer ontbrekende pakketten in de LTSP-chroot (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779647#\">779647</ulink>)."
+
+#~ msgid ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+#~ msgstr ""
+#~ "ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
+#~ "libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+
+#~ msgid ""
#~ "Install <computeroutput>squid3</computeroutput> as <computeroutput>squid</"
#~ "computeroutput> is deprecated and missing in jessie (Debian bug <ulink "
#~ "url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 86e3aca..71df240 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-26 15:01+0000\n"
+"POT-Creation-Date: 2015-04-27 13:34+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"
@@ -3452,27 +3452,14 @@ msgstr ""
msgid ""
"sed -i 's/wheezy/jessie/g' /etc/apt/sources.list\n"
"apt-get update\n"
-"apt-get -y dist-upgrade\n"
-"apt-get -f install\n"
"apt-get -y dist-upgrade"
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>."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Install additional package to make PXE work (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779644#\">779644</ulink>)."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "apt-get -y install pxelinux"
+"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."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3522,17 +3509,14 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install missing packages; the package names were obtained using "
+"Install missing package; the package name was obtained using "
"<computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</"
-"computeroutput> after the step above (Debian bug <ulink url=\"https://bugs."
-"debian.org/779648#\">779648</ulink>)."
+"computeroutput> after the step above."
msgstr ""
#. type: CDATA
#, no-wrap
-msgid ""
-"apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \\\n"
-"killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgid "apt-get -y install killer"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3581,17 +3565,20 @@ msgid ""
"ltsp-chroot -m -a i386 apt-get -y dist-upgrade"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><para>
msgid ""
-"Install missing packages in the LTSP chroot (Debian bug <ulink url=\"https://"
-"bugs.debian.org/779647#\">779647</ulink>)."
+"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 ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Install missing package in the LTSP chroot."
msgstr ""
#. type: CDATA
#, no-wrap
-msgid ""
-"ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \\\n"
-"libnss-myhostname goplay icedtea-7-plugin tmispell-voikko"
+msgid "ltsp-chroot -m -a i386 apt-get -y install killer"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index b3a7b82..f13ef88 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -1419,17 +1419,11 @@ rm /usr/share/pam-configs/edu-krb5]]></screen>
<para>Do the actual upgrade.
</para></listitem></itemizedlist><screen><![CDATA[sed -i 's/wheezy/jessie/g' /etc/apt/sources.list
apt-get update
-apt-get -y dist-upgrade
-apt-get -f install
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>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>
<itemizedlist>
<listitem>
-<para>Install additional package to make PXE work (Debian bug <ulink url="https://bugs.debian.org/779644#">779644</ulink>).
-</para></listitem></itemizedlist><screen><![CDATA[apt-get -y install pxelinux]]></screen>
-<itemizedlist>
-<listitem>
<para>Keep backup of Kerberos configuration file (Debian bug <ulink url="https://bugs.debian.org/779642#">779642</ulink>).
</para></listitem></itemizedlist><screen><![CDATA[cp /etc/krb5.conf /etc/krb5.conf.backup]]></screen>
<itemizedlist>
@@ -1449,9 +1443,8 @@ cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf
gosa-encrypt-passwords]]></screen>
<itemizedlist>
<listitem>
-<para>Install missing packages; the package names were obtained using <computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</computeroutput> after the step above (Debian bug <ulink url="https://bugs.debian.org/779648#">779648</ulink>).
-</para></listitem></itemizedlist><screen><![CDATA[apt-get -y install browser-plugin-libreoffice gosa-plugin-netgroups \
-killer libnss-myhostname goplay icedtea-7-plugin tmispell-voikko]]></screen>
+<para>Install missing package; the package name was obtained using <computeroutput>/usr/lib/debian-edu-config/testsuite/taskpkgs | grep error:</computeroutput> after the step above.
+</para></listitem></itemizedlist><screen><![CDATA[apt-get -y install killer]]></screen>
<itemizedlist>
<listitem>
<para>Check if the upgraded system works.
@@ -1480,9 +1473,8 @@ ltsp-chroot -m -a i386 apt-get -y dist-upgrade]]></screen>
</para>
<itemizedlist>
<listitem>
-<para>Install missing packages in the LTSP chroot (Debian bug <ulink url="https://bugs.debian.org/779647#">779647</ulink>).
-</para></listitem></itemizedlist><screen><![CDATA[ltsp-chroot -m -a i386 apt-get -y install browser-plugin-libreoffice killer \
-libnss-myhostname goplay icedtea-7-plugin tmispell-voikko]]></screen>
+<para>Install missing package in the LTSP chroot.
+</para></listitem></itemizedlist><screen><![CDATA[ltsp-chroot -m -a i386 apt-get -y install killer]]></screen>
<itemizedlist>
<listitem>
<para>Cleaning up.
--
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