[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Jessie manual from the wiki.
Holger Levsen
holger at layer-acht.org
Sun Sep 18 09:04:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch jessie
in repository debian-edu-doc.
commit aadc6f4590cd06c320b2c5b17b79f1a3b2764ee8
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Sep 18 11:04:44 2016 +0200
Update Debian Edu Jessie manual from the wiki.
---
debian/changelog | 7 ++
.../debian-edu-jessie-manual.da.po | 75 +++++++++-----------
.../debian-edu-jessie-manual.de.po | 79 ++++++++++-----------
.../debian-edu-jessie-manual.es.po | 36 +---------
.../debian-edu-jessie-manual.fr.po | 81 ++++++++++------------
.../debian-edu-jessie-manual.it.po | 77 +++++++++-----------
.../debian-edu-jessie-manual.nb.po | 77 +++++++++-----------
.../debian-edu-jessie-manual.nl.po | 79 ++++++++++-----------
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 36 +---------
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 13 ----
10 files changed, 216 insertions(+), 344 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index abf8b90..47a8cdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-doc (1.6~20160918+deb8u3) UNRELEASED; urgency=medium
+
+ [ Holger Levsen ]
+ * Update Debian Edu Jessie manual from the wiki.
+
+ -- Holger Levsen <holger at debian.org> Sun, 18 Sep 2016 11:03:55 +0200
+
debian-edu-doc (1.6~20160910+deb8u2) jessie; urgency=medium
[ Holger Levsen ]
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 544486e..825c376 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: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 10:58+0200\n"
"PO-Revision-Date: 2016-05-25 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -4598,25 +4598,6 @@ msgstr ""
"apt-get -y upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"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 ""
-"Fjern diversion; <computeroutput>debian-edu-config</computeroutput>s "
-"postinst ser ud til at gøre det for sent (Debianfejl <ulink url=\"https://"
-"bugs.debian.org/779641#\">779641</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-msgstr ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr "Udfør den faktiske opgradering."
@@ -4643,19 +4624,6 @@ msgstr ""
"computeroutput> igen."
#. 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 ""
-"Bevar en sikkerhedskopi af Kerberos' konfigurationsfil (Debianfejl <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 "Anvend debian-edu-konfiguration (tager lidt tid)."
@@ -4665,15 +4633,6 @@ 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 "Erstat Kerberosfil (ødelagt af cfengine) med den korrekte."
-
-#. 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 <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
@@ -12620,3 +12579,35 @@ msgid ""
msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+
+#~ msgid ""
+#~ "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 ""
+#~ "Fjern diversion; <computeroutput>debian-edu-config</computeroutput>s "
+#~ "postinst ser ud til at gøre det for sent (Debianfejl <ulink url=\"https://"
+#~ "bugs.debian.org/779641#\">779641</ulink>)."
+
+#~ msgid ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+#~ msgstr ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+
+#~ msgid ""
+#~ "Keep backup of Kerberos configuration file (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779642#\">779642</ulink>)."
+#~ msgstr ""
+#~ "Bevar en sikkerhedskopi af Kerberos' konfigurationsfil (Debianfejl <ulink "
+#~ "url=\"https://bugs.debian.org/779642#\">779642</ulink>)."
+
+#~ msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+#~ msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
+
+#~ msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+#~ msgstr "Erstat Kerberosfil (ødelagt af cfengine) med den korrekte."
+
+#~ msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+#~ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
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 f6dd937..2aeefa1 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: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 10:58+0200\n"
"PO-Revision-Date: 2016-08-14 10:00+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -4711,25 +4711,6 @@ msgstr ""
"apt-get -y upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"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 von <computeroutput>debian-edu-"
-"config</computeroutput> scheint dies zu spät zu tun (Debian-Bug <ulink url="
-"\"https://bugs.debian.org/779641#\">779641</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-msgstr ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr "Das eigentliche Upgrade vornehmen."
@@ -4756,19 +4737,6 @@ msgstr ""
"insbesondere <computeroutput>apt-get -f install</computeroutput>."
#. 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)."
@@ -4778,17 +4746,6 @@ 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 überschriebene 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 <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
@@ -12881,6 +12838,40 @@ msgstr ""
"werden."
#~ msgid ""
+#~ "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 von <computeroutput>debian-"
+#~ "edu-config</computeroutput> scheint dies zu spät zu tun (Debian-Bug "
+#~ "<ulink url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+
+#~ msgid ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+#~ msgstr ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+
+#~ 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>)."
+
+#~ msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+#~ msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
+
+#~ msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+#~ msgstr ""
+#~ "Die von cfengine fehlerhafterweise überschriebene Kerberos-Datei durch "
+#~ "die richtige ersetzen."
+
+#~ msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+#~ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
+
+#~ msgid ""
#~ "New features for Debian Edu 8.0+edu0~b1 Codename Jessie released "
#~ "2015-04-25"
#~ msgstr ""
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 6ef9d73..250b8ed 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: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 10:58+0200\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"
@@ -4399,20 +4399,6 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"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
-#, no-wrap
-msgid ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr ""
@@ -4432,17 +4418,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 "Apply debian-edu configuration (takes some time)."
msgstr ""
@@ -4452,15 +4427,6 @@ 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 ""
"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
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 efbfa9c..8cdd47a 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: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 10:58+0200\n"
"PO-Revision-Date: 2016-05-28 17:02+0100\n"
"Last-Translator: Cedric Boutillier <boutil at boutil.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -4749,26 +4749,6 @@ msgstr ""
"apt-get -y upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"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 ""
-"Supprimez les diversions ; le script postinst du paquet "
-"<computeroutput>debian-edu-config</computeroutput> semble le faire trop tard "
-"(bogue Debian nº <ulink url=\"https://bugs.debian.org/779641#\">779641</"
-"ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-msgstr ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr "Faire la mise à jour à proprement parler."
@@ -4795,19 +4775,6 @@ msgstr ""
"computeroutput>."
#. 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 ""
-"Faire une sauvegarde du fichier de configuration Kerberos (bogue Debian "
-"nº <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 "Appliquez la configuration de debian-edu (cela prend un peu de temps)."
@@ -4817,17 +4784,6 @@ 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 ""
-"Remplacez le fichier Kerberos (modifié de manière incorrecte par cfengine) "
-"par la sauvegarde."
-
-#. 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 <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
@@ -13033,6 +12989,41 @@ msgstr ""
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
#~ msgid ""
+#~ "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 ""
+#~ "Supprimez les diversions ; le script postinst du paquet "
+#~ "<computeroutput>debian-edu-config</computeroutput> semble le faire trop "
+#~ "tard (bogue Debian nº <ulink url=\"https://bugs.debian.org/779641#"
+#~ "\">779641</ulink>)."
+
+#~ msgid ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+#~ msgstr ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+
+#~ msgid ""
+#~ "Keep backup of Kerberos configuration file (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779642#\">779642</ulink>)."
+#~ msgstr ""
+#~ "Faire une sauvegarde du fichier de configuration Kerberos (bogue Debian "
+#~ "nº <ulink url=\"https://bugs.debian.org/779642#\">779642</ulink>)."
+
+#~ msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+#~ msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
+
+#~ msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+#~ msgstr ""
+#~ "Remplacez le fichier Kerberos (modifié de manière incorrecte par "
+#~ "cfengine) par la sauvegarde."
+
+#~ msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+#~ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
+
+#~ msgid ""
#~ "New features for Debian Edu 8.0+edu0~b1 Codename Jessie released "
#~ "2015-04-25"
#~ 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 37b216c..d5ad344 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: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 10:58+0200\n"
"PO-Revision-Date: 2016-05-25 19:22+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -4664,25 +4664,6 @@ msgstr ""
"apt-get -y upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"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 ""
-"Rimuovere diversione; postinst da <computeroutput>debian-edu-config</"
-"computeroutput> sembra funzionare troppo lentamente (Debian bug <ulink url="
-"\"https://bugs.debian.org/779641#\">779641</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-msgstr ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr "Effettuare l'aggiornamento vero e proprio."
@@ -4709,19 +4690,6 @@ msgstr ""
"computeroutput> ancora una volta."
#. 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 ""
-"Fare la copia del file di configurazione di Kerberos (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 "Applicare la configurazione debian-edu (richiede un po 'di tempo)."
@@ -4731,16 +4699,6 @@ 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 ""
-"Sostituire il file Kerberos (incasinato da cfengine) con quello giusto."
-
-#. 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 <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
@@ -12770,6 +12728,39 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "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 ""
+#~ "Rimuovere diversione; postinst da <computeroutput>debian-edu-config</"
+#~ "computeroutput> sembra funzionare troppo lentamente (Debian bug <ulink "
+#~ "url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+
+#~ msgid ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+#~ msgstr ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+
+#~ msgid ""
+#~ "Keep backup of Kerberos configuration file (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779642#\">779642</ulink>)."
+#~ msgstr ""
+#~ "Fare la copia del file di configurazione di Kerberos (Debian bug <ulink "
+#~ "url=\"https://bugs.debian.org/779642#\">779642</ulink>)."
+
+#~ msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+#~ msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
+
+#~ msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+#~ msgstr ""
+#~ "Sostituire il file Kerberos (incasinato da cfengine) con quello giusto."
+
+#~ msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+#~ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
+
+#~ msgid ""
#~ "New features for Debian Edu 8.0+edu0~b1 Codename Jessie released "
#~ "2015-04-25"
#~ 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 df0429c..82f3fcd 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -21,7 +21,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 10:58+0200\n"
"PO-Revision-Date: 2016-08-05 07:55+0000\n"
"Last-Translator: Ingrid Yrvin <ingrid.yrvin at gmail.com>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/debian-"
@@ -4586,26 +4586,6 @@ msgstr ""
"apt-get -y upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"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 ""
-"Fjerne diversion; postinst fra (Remove diversion; the postinst from) "
-"<computeroutput>debian-edu-config</computeroutput> ser ut til å gjøre det "
-"for sent (Debian bug <ulink url=\"https://bugs.debian.org/779641#\">779641</"
-"ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-msgstr ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr "Gjøre selve oppgraderingen."
@@ -4632,19 +4612,6 @@ msgstr ""
"computeroutput>."
#. 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 ""
-"Behold sikkerhetskopi av Kerberos filoppsett (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 "Bruk Debian Edu-oppsettet (tar litt tid)."
@@ -4654,15 +4621,6 @@ 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 "Erstatt Kerberos-filen (rotet til av CFEngine) med den riktige."
-
-#. 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 <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
@@ -12538,3 +12496,36 @@ msgstr ""
"Mer informasjon om de gamle utgavene kan du finne på <ulink url='http://"
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+
+#~ msgid ""
+#~ "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 ""
+#~ "Fjerne diversion; postinst fra (Remove diversion; the postinst from) "
+#~ "<computeroutput>debian-edu-config</computeroutput> ser ut til å gjøre det "
+#~ "for sent (Debian bug <ulink url=\"https://bugs.debian.org/779641#"
+#~ "\">779641</ulink>)."
+
+#~ msgid ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+#~ msgstr ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+
+#~ msgid ""
+#~ "Keep backup of Kerberos configuration file (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779642#\">779642</ulink>)."
+#~ msgstr ""
+#~ "Behold sikkerhetskopi av Kerberos filoppsett (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779642#\">779642</ulink>)."
+
+#~ msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+#~ msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
+
+#~ msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+#~ msgstr "Erstatt Kerberos-filen (rotet til av CFEngine) med den riktige."
+
+#~ msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+#~ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
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 ea7ea90..ea1b15d 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: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 10:58+0200\n"
"PO-Revision-Date: 2016-08-19 20:51+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"
@@ -4806,25 +4806,6 @@ msgstr ""
"apt-get -y upgrade"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"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 ""
-"Verwijder diversion. Het postinstallatiescript van <computeroutput>debian-"
-"edu-config</computeroutput> lijkt dit te laat te doen (Debian bug <ulink url="
-"\"https://bugs.debian.org/779641#\">779641</ulink>)."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-msgstr ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr "Voer de echte opwaardering uit."
@@ -4851,19 +4832,6 @@ msgstr ""
"nogmaals <computeroutput>apt-get -y dist-upgrade</computeroutput>."
#. 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 ""
-"Maak een reservekopie van het configuratiebestand van Kerberos (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 "Voer het configureren van debian-edu uit (dit duurt even)."
@@ -4873,17 +4841,6 @@ 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 ""
-"Vervang het bestand van Kerberos (dat door cfengine verknoeid wordt) door "
-"het juiste."
-
-#. 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 <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
@@ -13126,6 +13083,40 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "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 ""
+#~ "Verwijder diversion. Het postinstallatiescript van <computeroutput>debian-"
+#~ "edu-config</computeroutput> lijkt dit te laat te doen (Debian bug <ulink "
+#~ "url=\"https://bugs.debian.org/779641#\">779641</ulink>)."
+
+#~ msgid ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+#~ msgstr ""
+#~ "dpkg-divert --remove /usr/share/pam-configs/krb5\n"
+#~ "rm /usr/share/pam-configs/edu-krb5"
+
+#~ msgid ""
+#~ "Keep backup of Kerberos configuration file (Debian bug <ulink url="
+#~ "\"https://bugs.debian.org/779642#\">779642</ulink>)."
+#~ msgstr ""
+#~ "Maak een reservekopie van het configuratiebestand van Kerberos (Debian "
+#~ "bug <ulink url=\"https://bugs.debian.org/779642#\">779642</ulink>)."
+
+#~ msgid "cp /etc/krb5.conf /etc/krb5.conf.backup"
+#~ msgstr "cp /etc/krb5.conf /etc/krb5.conf.backup"
+
+#~ msgid "Replace Kerberos file (messed up by cfengine) with the right one."
+#~ msgstr ""
+#~ "Vervang het bestand van Kerberos (dat door cfengine verknoeid wordt) door "
+#~ "het juiste."
+
+#~ msgid "cp /etc/krb5.conf.backup /etc/krb5.conf"
+#~ msgstr "cp /etc/krb5.conf.backup /etc/krb5.conf"
+
+#~ msgid ""
#~ "New features for Debian Edu 8.0+edu0~b1 Codename Jessie released "
#~ "2015-04-25"
#~ msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index d5603fd..a2a6cbb 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: 2016-09-02 15:15+0200\n"
+"POT-Creation-Date: 2016-09-18 10:58+0200\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"
@@ -3437,20 +3437,6 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"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
-#, no-wrap
-msgid ""
-"dpkg-divert --remove /usr/share/pam-configs/krb5\n"
-"rm /usr/share/pam-configs/edu-krb5"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Do the actual upgrade."
msgstr ""
@@ -3470,17 +3456,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 "Apply debian-edu configuration (takes some time)."
msgstr ""
@@ -3490,15 +3465,6 @@ 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 ""
"Regenerate <computeroutput>gosa.secrets</computeroutput> to make GOsa² work "
"with new php version; backup <computeroutput>gosa.conf</computeroutput> just "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 152aacf..892d6ee 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -1413,11 +1413,6 @@ ltsp-update-kernels # If a new kernel was installed]]></screen>
apt-get -y upgrade]]></screen>
<itemizedlist>
<listitem>
-<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>Do the actual upgrade.
</para></listitem></itemizedlist><screen><![CDATA[sed -i 's/wheezy/jessie/g' /etc/apt/sources.list
apt-get update
@@ -1426,18 +1421,10 @@ apt-get -y dist-upgrade]]></screen>
</para>
<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 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 <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
--
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