[debian-edu-commits] debian-edu/ 01/01: updated from the wiki
Holger Levsen
holger at moszumanska.debian.org
Thu Mar 12 17:21:05 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 29e7bfeac9ec4699b182aa44eabcf1cc33fe5d2f
Author: Holger Levsen <holger at layer-acht.org>
Date: Thu Mar 12 18:18:59 2015 +0100
updated from the wiki
---
.../debian-edu-jessie-manual.da.po | 79 +++++++++------
.../debian-edu-jessie-manual.de.po | 111 +++++++++++++--------
.../debian-edu-jessie-manual.es.po | 72 +++++++------
.../debian-edu-jessie-manual.fr.po | 80 +++++++++------
.../debian-edu-jessie-manual.it.po | 79 +++++++++------
.../debian-edu-jessie-manual.nb.po | 78 +++++++++------
.../debian-edu-jessie-manual.nl.po | 80 +++++++++------
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 69 +++++++------
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 29 +++---
.../debian-edu-jessie/images/de/worldmap.png | Bin 387005 -> 387009 bytes
.../debian-edu-jessie/images/es/worldmap.png | Bin 387110 -> 387114 bytes
.../debian-edu-jessie/images/fr/worldmap.png | Bin 387044 -> 387048 bytes
.../debian-edu-jessie/images/worldmap.png | Bin 387037 -> 387041 bytes
13 files changed, 414 insertions(+), 263 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 75a031a..856a52d 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-03-10 13:02+0000\n"
+"POT-Creation-Date: 2015-03-12 17:17+0000\n"
"PO-Revision-Date: 2014-10-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"
@@ -4643,8 +4643,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Remove diversion; debian-edu-config's postinst seems to do it too late "
-"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Remove diversion; the postinst from <computeroutput>debian-edu-config</"
+"computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
msgstr ""
#. type: CDATA
@@ -4655,17 +4656,6 @@ msgid ""
msgstr ""
#. 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 ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr ""
@@ -4680,10 +4670,21 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
+#| "entries to you via email, or alternativly display them in the terminal "
+#| "when running <computeroutput>aptitude</computeroutput> or "
+#| "<computeroutput>apt-get</computeroutput>."
msgid ""
-"If apt-get still finishes with an error, try to fix it and/or run the apt-"
-"get commands again, esp. apt-get -f install."
+"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
msgstr ""
+"<computeroutput>apt-listchanges</computeroutput> kan sende nye "
+"ændringslogpunkter til dig via e-post, eller alternativt vise dem i "
+"terminalen når der køres <computeroutput>aptitude</computeroutput> eller "
+"<computeroutput>apt-get</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4699,8 +4700,9 @@ msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"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>)."
msgstr ""
#. type: CDATA
@@ -4711,6 +4713,17 @@ msgid ""
msgstr ""
#. 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 ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Apply debian-edu configuration (takes some time)."
msgstr ""
@@ -4721,9 +4734,20 @@ msgid "cfengine-debian-edu -D installation"
msgstr "/usr/sbin/debian-edu-pxeinstall"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Replace squid with squid3, keep the cache; a new swap file will be generated "
-"and the cache index be rebuilt upon first squid3 start."
+"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
+"computeroutput>, keep the cache; a new swap file will be generated and the "
+"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
+"start."
msgstr ""
#. type: CDATA
@@ -4738,22 +4762,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Replace Kerberos file (messed up by cfengine) with the right one."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgid ""
+"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
+"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
+"in case it has been modified."
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version\n"
"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
"gosa-encrypt-passwords"
msgstr ""
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 ed43003..00ba871 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-03-10 13:02+0000\n"
+"POT-Creation-Date: 2015-03-12 17:17+0000\n"
"PO-Revision-Date: 2015-03-10 22:08+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4721,9 +4721,15 @@ msgstr ""
"apt-get -y upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Remove diversion; debian-edu-config's postinst seems to do it too late "
+#| "(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</"
+#| "ulink>)."
msgid ""
-"Remove diversion; debian-edu-config's postinst seems to do it too late "
-"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Remove diversion; the postinst from <computeroutput>debian-edu-config</"
+"computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
msgstr ""
"Eine Umleitung entfernen; das Postinst-Skript aus debian-edu-config scheint "
"dies zu spät zu tun (Debian-Bug <ulink url=\"https://bugs.debian.org/779641#"
@@ -4739,19 +4745,6 @@ msgstr ""
"rm /usr/share/pam-configs/edu-krb5"
#. 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 ""
-"Ein Backup der Kerberos-Konfigurationsdatei bereithalten (Debian-Bug <ulink "
-"url=\"https://bugs.debian.org/779642#\">779642</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
-msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr "Das eigentliche Upgrade vornehmen."
@@ -4771,9 +4764,14 @@ msgstr ""
"apt-get -y dist-upgrade"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If apt-get still finishes with an error, try to fix it and/or run the apt-"
+#| "get commands again, esp. apt-get -f install."
msgid ""
-"If apt-get still finishes with an error, try to fix it and/or run the apt-"
-"get commands again, esp. apt-get -f install."
+"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
msgstr ""
"Wenn apt-get weiterhin mit einer Fehlermeldung abbrechen sollte, dann "
"versuchen Sie, den Fehler zu finden und/oder führen Sie die apt-get Befehle "
@@ -4793,9 +4791,14 @@ msgid "apt-get -y install pxelinux"
msgstr "apt-get -y install pxelinux"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Install squid3 as squid is deprecated and missing in jessie (Debian bug "
+#| "<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
msgid ""
-"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"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>)."
msgstr ""
"Das Paket squid3 installieren, da squid veraltet ist und in Jessie fehlt "
"(Debian-Bug <ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
@@ -4810,6 +4813,19 @@ msgstr ""
"service squid3 stop"
#. 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 ""
+"Ein Backup der Kerberos-Konfigurationsdatei bereithalten (Debian-Bug <ulink "
+"url=\"https://bugs.debian.org/779642#\">779642</ulink>)."
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Apply debian-edu configuration (takes some time)."
msgstr "Die Debian-Edu-Konfiguration anwenden (dauert einige Zeit)."
@@ -4819,9 +4835,26 @@ msgid "cfengine-debian-edu -D installation"
msgstr "cfengine-debian-edu -D installation"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+"Die von cfengine fehlerhafterweise überschiebene Kerberos-Datei durch die "
+"richtige ersetzen."
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Replace squid with squid3, keep the cache; a new swap file will be "
+#| "generated and the cache index be rebuilt upon first squid3 start."
msgid ""
-"Replace squid with squid3, keep the cache; a new swap file will be generated "
-"and the cache index be rebuilt upon first squid3 start."
+"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
+"computeroutput>, keep the cache; a new swap file will be generated and the "
+"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
+"start."
msgstr ""
"Squid durch Squid3 ersetzen, den Cache weiterverwenden; beim ersten Start "
"von Squid3 wird eine neue Swap-Datei erstellt und es wird der Cache-Index "
@@ -4845,26 +4878,21 @@ msgstr ""
"apt-get -y purge squid squid-common"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Replace Kerberos file (messed up by cfengine) with the right one."
-msgstr ""
-"Die von cfengine fehlerhafterweise überschiebene Kerberos-Datei durch die "
-"richtige ersetzen."
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
-msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgid ""
+"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
+"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
+"in case it has been modified."
msgstr ""
-"Die Datei gosa.secrets erneuern, damit GOsa² mit der neuen PHP-Version "
-"funktioniert."
#. type: CDATA
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "rm /etc/gosa/gosa.secrets\n"
+#| "cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
+#| "gosa-encrypt-passwords"
msgid ""
"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version\n"
"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
"gosa-encrypt-passwords"
msgstr ""
@@ -10567,8 +10595,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <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 "
@@ -12920,6 +12948,11 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+#~ msgstr ""
+#~ "Die Datei gosa.secrets erneuern, damit GOsa² mit der neuen PHP-Version "
+#~ "funktioniert."
+
#~ msgid ""
#~ "FIXME: confirm this is really all what needs to be done for upgrades. "
#~ "It's great if that's true! It could be..."
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 b59032f..1bad13e 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: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-10 13:02+0000\n"
+"POT-Creation-Date: 2015-03-12 17:17+0000\n"
"PO-Revision-Date: 2013-12-02 00:31-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -4615,8 +4615,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Remove diversion; debian-edu-config's postinst seems to do it too late "
-"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Remove diversion; the postinst from <computeroutput>debian-edu-config</"
+"computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
msgstr ""
#. type: CDATA
@@ -4627,17 +4628,6 @@ msgid ""
msgstr ""
#. 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 ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr ""
@@ -4652,10 +4642,14 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
msgid ""
-"If apt-get still finishes with an error, try to fix it and/or run the apt-"
-"get commands again, esp. apt-get -f install."
+"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 ""
+"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
+"esta imagen como un archivo <computeroutput>dia</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4671,8 +4665,9 @@ msgstr "apt-get -f install"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"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>)."
msgstr ""
#. type: CDATA
@@ -4683,6 +4678,17 @@ msgid ""
msgstr ""
#. 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 ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Apply debian-edu configuration (takes some time)."
msgstr ""
@@ -4692,9 +4698,20 @@ msgid "cfengine-debian-edu -D installation"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Replace squid with squid3, keep the cache; a new swap file will be generated "
-"and the cache index be rebuilt upon first squid3 start."
+"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
+"computeroutput>, keep the cache; a new swap file will be generated and the "
+"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
+"start."
msgstr ""
#. type: CDATA
@@ -4709,22 +4726,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Replace Kerberos file (messed up by cfengine) with the right one."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgid ""
+"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
+"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
+"in case it has been modified."
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version\n"
"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
"gosa-encrypt-passwords"
msgstr ""
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 564c28c..24023da 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-03-10 13:02+0000\n"
+"POT-Creation-Date: 2015-03-12 17:17+0000\n"
"PO-Revision-Date: 2014-12-23 23:13+0100\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -4754,8 +4754,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Remove diversion; debian-edu-config's postinst seems to do it too late "
-"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Remove diversion; the postinst from <computeroutput>debian-edu-config</"
+"computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
msgstr ""
#. type: CDATA
@@ -4766,17 +4767,6 @@ msgid ""
msgstr ""
#. 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 ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr ""
@@ -4791,10 +4781,22 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
+#| "entries to you via email, or alternativly display them in the terminal "
+#| "when running <computeroutput>aptitude</computeroutput> or "
+#| "<computeroutput>apt-get</computeroutput>."
msgid ""
-"If apt-get still finishes with an error, try to fix it and/or run the apt-"
-"get commands again, esp. apt-get -f install."
+"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
msgstr ""
+"<computeroutput>apt-listchanges</computeroutput> peut vous envoyer par "
+"courrier électronique les nouvelles entrées des journaux de modifications, "
+"ou bien les afficher dans un terminal lorsque la commande "
+"<computeroutput>aptitude</computeroutput> ou <computeroutput>apt-get</"
+"computeroutput> est utilisée."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4810,8 +4812,9 @@ msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"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>)."
msgstr ""
#. type: CDATA
@@ -4822,6 +4825,17 @@ msgid ""
msgstr ""
#. 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 ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Apply debian-edu configuration (takes some time)."
msgstr ""
@@ -4832,9 +4846,20 @@ msgid "cfengine-debian-edu -D installation"
msgstr "/usr/sbin/debian-edu-pxeinstall"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Replace squid with squid3, keep the cache; a new swap file will be generated "
-"and the cache index be rebuilt upon first squid3 start."
+"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
+"computeroutput>, keep the cache; a new swap file will be generated and the "
+"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
+"start."
msgstr ""
#. type: CDATA
@@ -4849,22 +4874,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Replace Kerberos file (messed up by cfengine) with the right one."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgid ""
+"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
+"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
+"in case it has been modified."
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version\n"
"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
"gosa-encrypt-passwords"
msgstr ""
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 811d90d..0ccf780 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-03-10 13:02+0000\n"
+"POT-Creation-Date: 2015-03-12 17:17+0000\n"
"PO-Revision-Date: 2014-12-19 20:45+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -4672,8 +4672,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Remove diversion; debian-edu-config's postinst seems to do it too late "
-"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Remove diversion; the postinst from <computeroutput>debian-edu-config</"
+"computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
msgstr ""
#. type: CDATA
@@ -4684,17 +4685,6 @@ msgid ""
msgstr ""
#. 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 ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr ""
@@ -4709,10 +4699,21 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
+#| "entries to you via email, or alternativly display them in the terminal "
+#| "when running <computeroutput>aptitude</computeroutput> or "
+#| "<computeroutput>apt-get</computeroutput>."
msgid ""
-"If apt-get still finishes with an error, try to fix it and/or run the apt-"
-"get commands again, esp. apt-get -f install."
+"If <computeroutput>apt-get</computeroutput> still finishes with an error, "
+"try to fix it and/or run the <computeroutput>apt-get</computeroutput> "
+"commands again, esp. <computeroutput>apt-get -f install</computeroutput>."
msgstr ""
+"<computeroutput>apt-listchanges</computeroutput> può inviare via posta "
+"elettronica le nuove voci nel file changelog, o in alternativa le mostra nel "
+"terminale quando si esegue <computeroutput>aptitude</computeroutput> o "
+"<computeroutput>apt-get</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4728,8 +4729,9 @@ msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"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>)."
msgstr ""
#. type: CDATA
@@ -4740,6 +4742,17 @@ msgid ""
msgstr ""
#. 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 ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Apply debian-edu configuration (takes some time)."
msgstr ""
@@ -4750,9 +4763,20 @@ msgid "cfengine-debian-edu -D installation"
msgstr "/usr/sbin/debian-edu-pxeinstall"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Replace squid with squid3, keep the cache; a new swap file will be generated "
-"and the cache index be rebuilt upon first squid3 start."
+"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
+"computeroutput>, keep the cache; a new swap file will be generated and the "
+"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
+"start."
msgstr ""
#. type: CDATA
@@ -4767,22 +4791,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Replace Kerberos file (messed up by cfengine) with the right one."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgid ""
+"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
+"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
+"in case it has been modified."
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version\n"
"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
"gosa-encrypt-passwords"
msgstr ""
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 f3350c0..d78413b 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-03-10 13:02+0000\n"
+"POT-Creation-Date: 2015-03-12 17:17+0000\n"
"PO-Revision-Date: 2015-01-31 17:45+0000\n"
"Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -4614,8 +4614,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Remove diversion; debian-edu-config's postinst seems to do it too late "
-"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Remove diversion; the postinst from <computeroutput>debian-edu-config</"
+"computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
msgstr ""
#. type: CDATA
@@ -4626,17 +4627,6 @@ msgid ""
msgstr ""
#. 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 ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr ""
@@ -4651,10 +4641,20 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
+#| "entries to you via email, or alternativly display them in the terminal "
+#| "when running <computeroutput>aptitude</computeroutput> or "
+#| "<computeroutput>apt-get</computeroutput>."
msgid ""
-"If apt-get still finishes with an error, try to fix it and/or run the apt-"
-"get commands again, esp. apt-get -f install."
+"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 ""
+"Ellers erstatt <computeroutput>i386</computeroutput> med "
+"<computeroutput>amd64</computeroutput> eller <computeroutput>powerpc</"
+"computeroutput> som det passer."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4670,8 +4670,9 @@ msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"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>)."
msgstr ""
#. type: CDATA
@@ -4682,6 +4683,17 @@ msgid ""
msgstr ""
#. 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 ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Apply debian-edu configuration (takes some time)."
msgstr ""
@@ -4692,9 +4704,20 @@ msgid "cfengine-debian-edu -D installation"
msgstr "/usr/sbin/debian-edu-pxeinstall"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Replace squid with squid3, keep the cache; a new swap file will be generated "
-"and the cache index be rebuilt upon first squid3 start."
+"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
+"computeroutput>, keep the cache; a new swap file will be generated and the "
+"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
+"start."
msgstr ""
#. type: CDATA
@@ -4709,22 +4732,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Replace Kerberos file (messed up by cfengine) with the right one."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgid ""
+"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
+"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
+"in case it has been modified."
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version\n"
"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
"gosa-encrypt-passwords"
msgstr ""
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 668e720..499ab22 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-03-10 13:02+0000\n"
+"POT-Creation-Date: 2015-03-12 17:17+0000\n"
"PO-Revision-Date: 2015-02-15 22:33+0100\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"
@@ -4810,8 +4810,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Remove diversion; debian-edu-config's postinst seems to do it too late "
-"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Remove diversion; the postinst from <computeroutput>debian-edu-config</"
+"computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
msgstr ""
#. type: CDATA
@@ -4822,17 +4823,6 @@ msgid ""
msgstr ""
#. 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 ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr ""
@@ -4847,10 +4837,22 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>apt-listchanges</computeroutput> can send new changelog "
+#| "entries to you via email, or alternativly display them in the terminal "
+#| "when running <computeroutput>aptitude</computeroutput> or "
+#| "<computeroutput>apt-get</computeroutput>."
msgid ""
-"If apt-get still finishes with an error, try to fix it and/or run the apt-"
-"get commands again, esp. apt-get -f install."
+"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 ""
+"Het pakket <computeroutput>apt-listchanges</computeroutput> kan u via e-mail "
+"de toevoegingen aan het logboek changelog opsturen, of ze u anders in het "
+"terminalvenster tonen bij het uitvoeren van de opdracht "
+"<computeroutput>aptitude</computeroutput> of <computeroutput>apt-get</"
+"computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -4866,8 +4868,9 @@ msgstr "apt-get install killer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"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>)."
msgstr ""
#. type: CDATA
@@ -4878,6 +4881,17 @@ msgid ""
msgstr ""
#. 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 ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Apply debian-edu configuration (takes some time)."
msgstr ""
@@ -4888,9 +4902,20 @@ msgid "cfengine-debian-edu -D installation"
msgstr "/usr/sbin/debian-edu-pxeinstall"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Replace squid with squid3, keep the cache; a new swap file will be generated "
-"and the cache index be rebuilt upon first squid3 start."
+"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
+"computeroutput>, keep the cache; a new swap file will be generated and the "
+"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
+"start."
msgstr ""
#. type: CDATA
@@ -4905,22 +4930,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Replace Kerberos file (messed up by cfengine) with the right one."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgid ""
+"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
+"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
+"in case it has been modified."
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version\n"
"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
"gosa-encrypt-passwords"
msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 861a0a4..cd6ed34 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-03-10 13:02+0000\n"
+"POT-Creation-Date: 2015-03-12 17:17+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"
@@ -3447,8 +3447,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Remove diversion; debian-edu-config's postinst seems to do it too late "
-"(Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+"Remove diversion; the postinst from <computeroutput>debian-edu-config</"
+"computeroutput> seems to do it too late (Debian bug <ulink url=\"https://"
+"bugs.debian.org/779641#\">779641</ulink>)."
msgstr ""
#. type: CDATA
@@ -3459,17 +3460,6 @@ msgid ""
msgstr ""
#. 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 ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr ""
@@ -3485,8 +3475,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"If apt-get still finishes with an error, try to fix it and/or run the apt-"
-"get commands again, esp. apt-get -f install."
+"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>
@@ -3502,8 +3493,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Install squid3 as squid is deprecated and missing in jessie (Debian bug "
-"<ulink url=\"https://bugs.debian.org/779649#\">779649</ulink>)."
+"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>)."
msgstr ""
#. type: CDATA
@@ -3514,6 +3506,17 @@ msgid ""
msgstr ""
#. 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 ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Apply debian-edu configuration (takes some time)."
msgstr ""
@@ -3523,9 +3526,20 @@ msgid "cfengine-debian-edu -D installation"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Replace squid with squid3, keep the cache; a new swap file will be generated "
-"and the cache index be rebuilt upon first squid3 start."
+"Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</"
+"computeroutput>, keep the cache; a new swap file will be generated and the "
+"cache index be rebuilt upon first <computeroutput>squid3</computeroutput> "
+"start."
msgstr ""
#. type: CDATA
@@ -3540,22 +3554,17 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Replace Kerberos file (messed up by cfengine) with the right one."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Regenerate gosa.secrets to make GOsa² work with new php version."
+msgid ""
+"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
+"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
+"in case it has been modified."
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
"rm /etc/gosa/gosa.secrets\n"
+"cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version\n"
"cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf\n"
"gosa-encrypt-passwords"
msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 6b5564d..c596026 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -1418,22 +1418,18 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
apt-get -y upgrade]]></screen>
<itemizedlist>
<listitem>
-<para>Remove diversion; debian-edu-config's postinst seems to do it too late (Debian bug <ulink url="https://bugs.debian.org/779641#">779641</ulink>).
+<para>Remove diversion; the postinst from <computeroutput>debian-edu-config</computeroutput> seems to do it too late (Debian bug <ulink url="https://bugs.debian.org/779641#">779641</ulink>).
</para></listitem></itemizedlist><screen><![CDATA[dpkg-divert --remove /usr/share/pam-configs/krb5
rm /usr/share/pam-configs/edu-krb5]]></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>
-<listitem>
<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 apt-get still finishes with an error, try to fix it and/or run the apt-get commands again, esp. apt-get -f install.
+<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>
<itemizedlist>
<listitem>
@@ -1441,16 +1437,24 @@ apt-get -y dist-upgrade]]></screen>
</para></listitem></itemizedlist><screen><![CDATA[apt-get -y install pxelinux]]></screen>
<itemizedlist>
<listitem>
-<para>Install squid3 as squid is deprecated and missing in jessie (Debian bug <ulink url="https://bugs.debian.org/779649#">779649</ulink>).
+<para>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>).
</para></listitem></itemizedlist><screen><![CDATA[apt-get -y install squid3
service squid3 stop]]></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>
+<listitem>
<para>Apply debian-edu configuration (takes some time).
</para></listitem></itemizedlist><screen><![CDATA[cfengine-debian-edu -D installation]]></screen>
<itemizedlist>
<listitem>
-<para>Replace squid with squid3, keep the cache; a new swap file will be generated and the cache index be rebuilt upon first squid3 start.
+<para>Replace Kerberos file (messed up by cfengine) with the right one.
+</para></listitem></itemizedlist><screen><![CDATA[cp /etc/krb5.conf.backup /etc/krb5.conf]]></screen>
+<itemizedlist>
+<listitem>
+<para>Replace <computeroutput>squid</computeroutput> with <computeroutput>squid3</computeroutput>, keep the cache; a new swap file will be generated and the cache index be rebuilt upon first <computeroutput>squid3</computeroutput> start.
</para></listitem></itemizedlist><screen><![CDATA[service squid stop
umount /var/spool/squid
sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab
@@ -1459,12 +1463,9 @@ service squid3 start
apt-get -y purge squid squid-common]]></screen>
<itemizedlist>
<listitem>
-<para>Replace Kerberos file (messed up by cfengine) with the right one.
-</para></listitem></itemizedlist><screen><![CDATA[cp /etc/krb5.conf.backup /etc/krb5.conf]]></screen>
-<itemizedlist>
-<listitem>
-<para>Regenerate gosa.secrets to make GOsa² work with new php version.
+<para>Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work with new php version; backup <computeroutput>gosa.conf</computeroutput> just in case it has been modified.
</para></listitem></itemizedlist><screen><![CDATA[rm /etc/gosa/gosa.secrets
+cp /etc/gosa/gosa.conf /etc/gosa/gosa.conf.wheezy_version
cp /etc/gosa/gosa.conf.orig /etc/gosa/gosa.conf
gosa-encrypt-passwords]]></screen>
<itemizedlist>
@@ -1500,7 +1501,7 @@ ltsp-chroot -m -a i386 apt-get update
ltsp-chroot -m -a i386 apt-get -y dist-upgrade
ltsp-chroot -m -a i386 apt-get -f install
ltsp-chroot -m -a i386 apt-get -y dist-upgrade]]></screen>
-<para>If apt-get still finishes with an error, try to fix it and/or run the apt-get commands again, esp. apt-get -f install.
+<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>
<itemizedlist>
<listitem>
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index 4d94007..0ddab32 100644
Binary files a/documentation/debian-edu-jessie/images/de/worldmap.png and b/documentation/debian-edu-jessie/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/es/worldmap.png b/documentation/debian-edu-jessie/images/es/worldmap.png
index eeff367..ed3debe 100644
Binary files a/documentation/debian-edu-jessie/images/es/worldmap.png and b/documentation/debian-edu-jessie/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/fr/worldmap.png b/documentation/debian-edu-jessie/images/fr/worldmap.png
index 41a4295..d85f9bd 100644
Binary files a/documentation/debian-edu-jessie/images/fr/worldmap.png and b/documentation/debian-edu-jessie/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/worldmap.png b/documentation/debian-edu-jessie/images/worldmap.png
index b1dab44..5f33eed 100644
Binary files a/documentation/debian-edu-jessie/images/worldmap.png and b/documentation/debian-edu-jessie/images/worldmap.png differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list