[debian-edu-commits] debian-edu/ 03/04: updated from the wiki

Holger Levsen holger at layer-acht.org
Sat May 21 23:51:57 UTC 2016 

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 418d1d119a11ed78d3b07eace0cf0392a53fca24
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun May 22 01:47:02 2016 +0200

    updated from the wiki
---
 .../debian-edu-jessie-manual.da.po                 | 18 ++---
 .../debian-edu-jessie-manual.de.po                 | 22 +++---
 .../debian-edu-jessie-manual.es.po                 |  2 +-
 .../debian-edu-jessie-manual.fr.po                 | 22 +++---
 .../debian-edu-jessie-manual.it.po                 | 52 +++++++-------
 .../debian-edu-jessie-manual.nb.po                 |  2 +-
 .../debian-edu-jessie-manual.nl.po                 | 28 ++++----
 .../debian-edu-jessie/debian-edu-jessie-manual.pot |  2 +-
 .../debian-edu-wheezy-manual.da.po                 | 60 +++++++++++++---
 .../debian-edu-wheezy-manual.de.po                 | 60 +++++++++++++---
 .../debian-edu-wheezy-manual.es.po                 | 60 +++++++++++++---
 .../debian-edu-wheezy-manual.fr.po                 | 60 +++++++++++++---
 .../debian-edu-wheezy-manual.it.po                 | 60 +++++++++++++---
 .../debian-edu-wheezy-manual.nb.po                 | 82 +++++++++++++++++-----
 .../debian-edu-wheezy-manual.nl.po                 | 60 +++++++++++++---
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 60 +++++++++++++---
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 31 ++++++--
 17 files changed, 528 insertions(+), 153 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 fb354fe..df1c117 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-05-19 02:13+0200\n"
+"POT-Creation-Date: 2016-05-22 01:43+0200\n"
 "PO-Revision-Date: 2015-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"
@@ -1397,16 +1397,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
-"iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-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+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
-"iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1437,16 +1437,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
 "\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
-"iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
+"\">debian-edu-8+edu0-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+edu0-USB."
 "iso\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
+"iso\">debian-edu-8+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
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 4053d25..58b8abe 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-05-19 02:13+0200\n"
+"POT-Creation-Date: 2016-05-22 01:43+0200\n"
 "PO-Revision-Date: 2015-05-04 15:33+0000\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1451,16 +1451,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
-"iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-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+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
-"iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1491,16 +1491,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
 "\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
-"iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
+"\">debian-edu-8+edu0-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+edu0-USB."
 "iso\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
+"iso\">debian-edu-8+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1521,8 +1521,8 @@ msgid ""
 "options."
 msgstr ""
 "Quellen können aus dem Debian-Archiv bezogen werden; für einige Download-"
-"Optionen siehe <ulink url=\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/"
-">."
+"Optionen siehe <ulink url=\"http://cdimage.debian.org/debian-cd/8.4.0/source/"
+"iso-dvd/\"/>."
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD / DVD by mail"
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 1902277..0c5d374 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-05-19 02:13+0200\n"
+"POT-Creation-Date: 2016-05-22 01:43+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"
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 f42f196..ceca891 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-05-19 02:13+0200\n"
+"POT-Creation-Date: 2016-05-22 01:43+0200\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1450,16 +1450,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
-"iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-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+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD."
-"iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1491,16 +1491,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
 "\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
-"iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
+"\">debian-edu-8+edu0-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+edu0-USB."
 "iso\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
+"iso\">debian-edu-8+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1521,8 +1521,8 @@ msgid ""
 "options."
 msgstr ""
 "Le code source est disponible depuis l'archive Debian. Consultez <ulink url="
-"\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> pour plusieurs options "
-"de téléchargement."
+"\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> pour "
+"plusieurs options de téléchargement."
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD / DVD by mail"
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 2dae110..c7281ac 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-05-19 02:13+0200\n"
+"POT-Creation-Date: 2016-05-22 01:43+0200\n"
 "PO-Revision-Date: 2015-05-04 19:34+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1399,8 +1399,8 @@ msgstr ""
 msgid ""
 "Download the installation media for Debian Edu 8+edu0 Codename \"Jessie\""
 msgstr ""
-"Scaricare il supporto di installazione per Debian Edu 8+edu0 nome in "
-"codice Jessie"
+"Scaricare il supporto di installazione per Debian Edu 8+edu0 nome in codice "
+"Jessie"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "netinstall CD image for i386, amd64"
@@ -1422,16 +1422,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"CD.iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-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+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"CD.iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1462,16 +1462,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
 "\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
+"\">debian-edu-8+edu0-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+edu0-USB."
 "iso\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
+"iso\">debian-edu-8+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1492,8 +1492,8 @@ msgid ""
 "options."
 msgstr ""
 "I sorgenti sono disponibili negli archivi Debian, consultare <ulink url="
-"\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> per altre opzioni di "
-"download."
+"\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> per altre "
+"opzioni di download."
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD / DVD by mail"
@@ -10084,17 +10084,17 @@ msgid ""
 "or any later version. Enjoy!"
 msgstr ""
 "Questo documento è scritto e sotto copyright Holger Levsen (2007, 2008, "
-"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016), Petter Reinholdtsen (2001, 2002, "
-"2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), Patrick "
-"Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
-"(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel "
-"Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim "
-"Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
-"(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
-"(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015),  "
-"Bernhard Hammes (2012) e Joe Hansen (2015) ed è rilasciato sotto licenza "
-"GPL2 o versioni successive. Buon divertimento!"
+"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016), Petter Reinholdtsen (2001, "
+"2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), "
+"Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), "
+"Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
+"2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+"(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, "
+"2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
+"Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), "
+"Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, "
+"2014, 2015),  Bernhard Hammes (2012) e Joe Hansen (2015) ed è rilasciato "
+"sotto licenza GPL2 o versioni successive. Buon divertimento!"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -11170,8 +11170,8 @@ msgid ""
 "<computeroutput>ftp.skolelinux.org</computeroutput> under <computeroutput>cd-"
 "jessie-live/</computeroutput>."
 msgstr ""
-"L'immagine e sarà (ma al momento NON è) disponibile usando <ulink "
-"url=\"ftp://ftp.skolelinux.org/cd-jessie-live/\">FTP</ulink>, <ulink url="
+"L'immagine e sarà (ma al momento NON è) disponibile usando <ulink url="
+"\"ftp://ftp.skolelinux.org/cd-jessie-live/\">FTP</ulink>, <ulink url="
 "\"http://ftp.skolelinux.org/cd-jessie-live/\">HTTP</ulink> o rsync da "
 "<computeroutput>ftp.skolelinux.org</computeroutput> sotto <computeroutput>cd-"
 "jessie-live/</computeroutput>."
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 9e5d628..f1d3bdf 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-05-19 02:13+0200\n"
+"POT-Creation-Date: 2016-05-22 01:43+0200\n"
 "PO-Revision-Date: 2015-06-02 12:58+0000\n"
 "Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
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 6e0636d..afaefcc 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-05-19 02:13+0200\n"
+"POT-Creation-Date: 2016-05-22 01:43+0200\n"
 "PO-Revision-Date: 2015-05-06 13:15+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"
@@ -1465,16 +1465,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"CD.iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-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+edu0-CD.iso"
 "\">debian-edu-8+edu0-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"CD.iso\">debian-edu-8+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-CD.iso"
+"\">debian-edu-8+edu0-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1505,16 +1505,16 @@ msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
 "\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB.iso"
+"\">debian-edu-8+edu0-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+edu0-USB."
 "iso\">debian-edu-8+edu0-USB.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-"
-"USB.iso\">debian-edu-8+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-8+edu0-USB."
+"iso\">debian-edu-8+edu0-USB.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -1535,8 +1535,8 @@ msgid ""
 "options."
 msgstr ""
 "De broncode kunt u vinden in het Debian archief. Raadpleeg <ulink url="
-"\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> voor een aantal "
-"downloadopties."
+"\"http://cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> voor een "
+"aantal downloadopties."
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD / DVD by mail"
@@ -10434,9 +10434,9 @@ msgid ""
 msgstr ""
 "De volgende auteurs, bij wie ook de auteursrechten berusten, schreven mee "
 "aan dit document: Holger Levsen (2007, 2008, 2009, 2010, 2011, 2012, 2013, "
-"2014, 2015, 2016), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, "
-"2010, 2012, 2014), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin "
-"(2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
+"2014, 2015, 2016), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, "
+"2009, 2010, 2012, 2014), Daniel Heß (2007), Patrick Winnertz (2007), Knut "
+"Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner "
 "Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. "
 "Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen "
 "Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh (2009), Philipp Hübner "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index eefeed3..c603721 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-05-19 02:13+0200\n"
+"POT-Creation-Date: 2016-05-22 01:43+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"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 87fbd66..903add0 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2015-05-04 15:25+0000\n"
+"POT-Creation-Date: 2016-05-22 01:42+0200\n"
 "PO-Revision-Date: 2014-09-23 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -2876,15 +2876,63 @@ msgstr ""
 "\">Installation af et grafisk miljø på hovedserveren for brug med GOsa²</"
 "link>."
 
+#. type: Content of: <article><section><section><title>
+msgid "NB: Fixing possible GOsa² login error"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"After investigating further it seems to be that the mechanism using "
+"encrypted passwords in gosa.conf is failing now."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"(As far as I know the random cleartext password generated during setup is "
+"encrypted using gosa-encrypt-passwords and a file gosa.secrets is generated "
+"to let apache2 cope with the encrypted passwords.)"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
+"This seems to work getting an upgraded Wheezy main-server working again (no "
+"need to generate a new gosa.conf). This has to be done as root user."
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "cat /dev/null > /etc/gosa/gosa.secrets"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"take the random cleartext password from gosa.conf.orig and put it instead of "
+"the encrypted long one into gosa.conf (actually twice: adminPassword and "
+"snapshotAdminPassword). You can use sudo pico gosa.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"be sure to add write access with 'chmod a+r /etc/gosa/gosa.secrets /etc/gosa/"
+"gosa.conf'"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "restart apache2: 'sudo service apache2 restart'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "GOsa² Login plus Overview"
+msgstr "GOsa²-logind samt overblik"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
 "Fra en internetbrowser så brug adressen <ulink url=\"https://www/gosa\"/> "
 "for adgang til GOsa², og log ind som den første bruger."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
@@ -2892,7 +2940,7 @@ msgstr ""
 "Hvis du bruger en ny Debian Edu Wheezy-maskine, så vil sidecertifikatet være "
 "kendt af browseren."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Otherwise, you will get an error message about the SSL certificate being "
 "wrong. If you know you are alone on your network, just tell the browser to "
@@ -2902,7 +2950,7 @@ msgstr ""
 "ved, at du er alene på netværket, så bare giv browseren besked om, at du "
 "accepterer den og ignorer beskeden."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "For general information on GOsa² have a look at: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2910,10 +2958,6 @@ msgstr ""
 "For generel information om GOsa² så kig eventuelt på: <ulink url=\"https://"
 "oss.gonicus.de/labs/gosa/wiki/documentation\"/>."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "GOsa² Login plus Overview"
-msgstr "GOsa²-logind samt overblik"
-
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index b4f5533..127bda5 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-04 15:25+0000\n"
+"POT-Creation-Date: 2016-05-22 01:42+0200\n"
 "PO-Revision-Date: 2015-05-04 15:40+0000\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -2904,8 +2904,56 @@ msgstr ""
 "\">Installation einer graphischen Benutzerumgebung auf dem Hauptserver, um "
 "GOsa² nutzen zu können</link>."
 
+#. type: Content of: <article><section><section><title>
+msgid "NB: Fixing possible GOsa² login error"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"After investigating further it seems to be that the mechanism using "
+"encrypted passwords in gosa.conf is failing now."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"(As far as I know the random cleartext password generated during setup is "
+"encrypted using gosa-encrypt-passwords and a file gosa.secrets is generated "
+"to let apache2 cope with the encrypted passwords.)"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
+"This seems to work getting an upgraded Wheezy main-server working again (no "
+"need to generate a new gosa.conf). This has to be done as root user."
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "cat /dev/null > /etc/gosa/gosa.secrets"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"take the random cleartext password from gosa.conf.orig and put it instead of "
+"the encrypted long one into gosa.conf (actually twice: adminPassword and "
+"snapshotAdminPassword). You can use sudo pico gosa.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"be sure to add write access with 'chmod a+r /etc/gosa/gosa.secrets /etc/gosa/"
+"gosa.conf'"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "restart apache2: 'sudo service apache2 restart'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "GOsa² Login plus Overview"
+msgstr "GOsa²-Anmeldung und Übersicht"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
@@ -2913,7 +2961,7 @@ msgstr ""
 "um auf GOsa² zuzugreifen; melden Sie sich mit der Kennung des Erstbenutzers "
 "an."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
@@ -2921,7 +2969,7 @@ msgstr ""
 "Falls Sie in Debian Edu Wheezy einen neu hinzugefügten Rechner verwenden, "
 "wird das Zertifikat der Site dem Browser bekannt sein."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Otherwise, you will get an error message about the SSL certificate being "
 "wrong. If you know you are alone on your network, just tell the browser to "
@@ -2931,7 +2979,7 @@ msgstr ""
 "erhalten. Falls Sie der Einzige im Netzwerk sind, dann ignorieren Sie den "
 "Fehler und weisen Sie Ihren Browser an, das Zertifikat zu akzeptieren."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "For general information on GOsa² have a look at: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2939,10 +2987,6 @@ msgstr ""
 "Allgemeine Informationen über GOsa² finden Sie unter <ulink url=\"https://"
 "oss.gonicus.de/labs/gosa/wiki/documentation\"/>."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "GOsa² Login plus Overview"
-msgstr "GOsa²-Anmeldung und Übersicht"
-
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index b193ba4..50574ad 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-04 15:25+0000\n"
+"POT-Creation-Date: 2016-05-22 01:42+0200\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"
@@ -2945,15 +2945,63 @@ msgstr ""
 "\">Instalar un entorno gráfico en el servidor principal para usar GOsa²</"
 "link>."
 
+#. type: Content of: <article><section><section><title>
+msgid "NB: Fixing possible GOsa² login error"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"After investigating further it seems to be that the mechanism using "
+"encrypted passwords in gosa.conf is failing now."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"(As far as I know the random cleartext password generated during setup is "
+"encrypted using gosa-encrypt-passwords and a file gosa.secrets is generated "
+"to let apache2 cope with the encrypted passwords.)"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
+"This seems to work getting an upgraded Wheezy main-server working again (no "
+"need to generate a new gosa.conf). This has to be done as root user."
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "cat /dev/null > /etc/gosa/gosa.secrets"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"take the random cleartext password from gosa.conf.orig and put it instead of "
+"the encrypted long one into gosa.conf (actually twice: adminPassword and "
+"snapshotAdminPassword). You can use sudo pico gosa.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"be sure to add write access with 'chmod a+r /etc/gosa/gosa.secrets /etc/gosa/"
+"gosa.conf'"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "restart apache2: 'sudo service apache2 restart'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "GOsa² Login plus Overview"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
 "Desde un navegador web, utilice <ulink url=\"https://www/gosa\"/> para "
 "acceder a GOsa² e ingrese por primera vez."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
@@ -2961,7 +3009,7 @@ msgstr ""
 "Si está utilizando una computadora nueva con Debian Edu, el certificado de "
 "seguridad del sitio web será reconocido por el navegador."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Otherwise, you will get an error message about the SSL certificate being "
 "wrong. If you know you are alone on your network, just tell the browser to "
@@ -2971,7 +3019,7 @@ msgstr ""
 "equivocado. Si sabe que solamente usted se encuentra conectado a la red, "
 "acepte e ignórelo."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "For general information on GOsa² have a look at: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2979,10 +3027,6 @@ msgstr ""
 "Para información general sobre GOsa², revise:  <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "GOsa² Login plus Overview"
-msgstr ""
-
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index ac80d22..eea8223 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-05-04 15:25+0000\n"
+"POT-Creation-Date: 2016-05-22 01:42+0200\n"
 "PO-Revision-Date: 2014-09-23 07:24+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -2954,15 +2954,63 @@ msgstr ""
 "server_to_use_GOsa.2BALI-\">Installation d'un environnement graphique sur le "
 "serveur principal pour utiliser GOsa²</link>."
 
+#. type: Content of: <article><section><section><title>
+msgid "NB: Fixing possible GOsa² login error"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"After investigating further it seems to be that the mechanism using "
+"encrypted passwords in gosa.conf is failing now."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"(As far as I know the random cleartext password generated during setup is "
+"encrypted using gosa-encrypt-passwords and a file gosa.secrets is generated "
+"to let apache2 cope with the encrypted passwords.)"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
+"This seems to work getting an upgraded Wheezy main-server working again (no "
+"need to generate a new gosa.conf). This has to be done as root user."
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "cat /dev/null > /etc/gosa/gosa.secrets"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"take the random cleartext password from gosa.conf.orig and put it instead of "
+"the encrypted long one into gosa.conf (actually twice: adminPassword and "
+"snapshotAdminPassword). You can use sudo pico gosa.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"be sure to add write access with 'chmod a+r /etc/gosa/gosa.secrets /etc/gosa/"
+"gosa.conf'"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "restart apache2: 'sudo service apache2 restart'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "GOsa² Login plus Overview"
+msgstr "Connexion à GOsa² et aperçu"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
 "Depuis un navigateur web, utilisez l'URL <ulink url=\"https://www/gosa\"/> "
 "pour accéder à GOsa² et identifiez-vous en tant que premier utilisateur."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
@@ -2970,7 +3018,7 @@ msgstr ""
 "Si vous utilisez une nouvelle machine Debian Edu Wheezy, le certificat du "
 "site sera connu du navigateur."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Otherwise, you will get an error message about the SSL certificate being "
 "wrong. If you know you are alone on your network, just tell the browser to "
@@ -2980,7 +3028,7 @@ msgstr ""
 "incorrect. Si vous savez que vous êtes seul sur votre réseau, indiquez "
 "seulement à votre navigateur d'accepter et d'ignorer cette erreur."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "For general information on GOsa² have a look at: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2988,10 +3036,6 @@ msgstr ""
 "Pour des informations générales sur GOsa², veuillez lire :<ulink url="
 "\"https://oss.gonicus.de/labs/gosa/wiki/documentation\"/>."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "GOsa² Login plus Overview"
-msgstr "Connexion à GOsa² et aperçu"
-
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index eeae6eb..e29ed94 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2015-05-04 15:25+0000\n"
+"POT-Creation-Date: 2016-05-22 01:42+0200\n"
 "PO-Revision-Date: 2014-06-26 19:17+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -2908,15 +2908,63 @@ msgstr ""
 "\">Installare un ambiente grafico sul server principale per usare GOsa²</"
 "link>."
 
+#. type: Content of: <article><section><section><title>
+msgid "NB: Fixing possible GOsa² login error"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"After investigating further it seems to be that the mechanism using "
+"encrypted passwords in gosa.conf is failing now."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"(As far as I know the random cleartext password generated during setup is "
+"encrypted using gosa-encrypt-passwords and a file gosa.secrets is generated "
+"to let apache2 cope with the encrypted passwords.)"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
+"This seems to work getting an upgraded Wheezy main-server working again (no "
+"need to generate a new gosa.conf). This has to be done as root user."
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "cat /dev/null > /etc/gosa/gosa.secrets"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"take the random cleartext password from gosa.conf.orig and put it instead of "
+"the encrypted long one into gosa.conf (actually twice: adminPassword and "
+"snapshotAdminPassword). You can use sudo pico gosa.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"be sure to add write access with 'chmod a+r /etc/gosa/gosa.secrets /etc/gosa/"
+"gosa.conf'"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "restart apache2: 'sudo service apache2 restart'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "GOsa² Login plus Overview"
+msgstr "Accesso a GOsa² e pagina iniziale"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
 "Da un browser web usare questo URL <ulink url=\"https://www/gosa\"/> per "
 "l'accesso a GOsa², collegandosi come primo utente."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
@@ -2924,7 +2972,7 @@ msgstr ""
 "In caso si usi una macchina Debian Edu Wheezy nuova, il certificato sarà "
 "riconosciuto dal browser."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Otherwise, you will get an error message about the SSL certificate being "
 "wrong. If you know you are alone on your network, just tell the browser to "
@@ -2934,7 +2982,7 @@ msgstr ""
 "Se si sa di essere soli nella rete basta dire al browser di accettarlo e "
 "ignorare il messaggio. "
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "For general information on GOsa² have a look at: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2942,10 +2990,6 @@ msgstr ""
 "Per maggiori informazioni su GOsa² dare un'occhiata a: <ulink url=\"https://"
 "oss.gonicus.de/labs/gosa/wiki/documentation\"/>"
 
-#. type: Content of: <article><section><section><section><title>
-msgid "GOsa² Login plus Overview"
-msgstr "Accesso a GOsa² e pagina iniziale"
-
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index e1ce2b5..af3daef 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -22,7 +22,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-07-04 17:02+0300\n"
+"POT-Creation-Date: 2016-05-22 01:42+0200\n"
 "PO-Revision-Date: 2015-06-08 08:35+0000\n"
 "Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -765,11 +765,11 @@ msgid ""
 "using network-PROM (or PXE) without using the local client hard drive. The "
 "thin client setup used is that of the Linux Terminal Server Project (LTSP)."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som (X-)"
-"terminaler. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. Tynnklientoppsettet som er brukt er Linux Terminal "
-"Server Project (LTSP)."
+"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som "
+"(X-)terminaler. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er Linux "
+"Terminal Server Project (LTSP)."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2855,15 +2855,63 @@ msgstr ""
 "server_to_use_GOsa.2BALI-\">disse instruksjonene</link> for å få fram et "
 "grafisk brukergrensesnitt på hovedtjeneren."
 
+#. type: Content of: <article><section><section><title>
+msgid "NB: Fixing possible GOsa² login error"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"After investigating further it seems to be that the mechanism using "
+"encrypted passwords in gosa.conf is failing now."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"(As far as I know the random cleartext password generated during setup is "
+"encrypted using gosa-encrypt-passwords and a file gosa.secrets is generated "
+"to let apache2 cope with the encrypted passwords.)"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
+"This seems to work getting an upgraded Wheezy main-server working again (no "
+"need to generate a new gosa.conf). This has to be done as root user."
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "cat /dev/null > /etc/gosa/gosa.secrets"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"take the random cleartext password from gosa.conf.orig and put it instead of "
+"the encrypted long one into gosa.conf (actually twice: adminPassword and "
+"snapshotAdminPassword). You can use sudo pico gosa.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"be sure to add write access with 'chmod a+r /etc/gosa/gosa.secrets /etc/gosa/"
+"gosa.conf'"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "restart apache2: 'sudo service apache2 restart'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "GOsa² Login plus Overview"
+msgstr "GOsa² Login pluss oversikt"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
 "Legg inn denne nettadressen i en nettleser for å få tilgang til GOsa², og "
 "logg inn."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
@@ -2872,7 +2920,7 @@ msgstr ""
 "for SSL-sertifikatet allerede være på plass, og du vil ikke få noe spørsmål "
 "om dette.  "
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Otherwise, you will get an error message about the SSL certificate being "
 "wrong. If you know you are alone on your network, just tell the browser to "
@@ -2882,7 +2930,7 @@ msgstr ""
 "Skolelinux/Debian Edu Wheezy, så vil du få en feilmelding om ssl-sertifikat. "
 "Be nettleseren din om å akseptere dette. "
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "For general information on GOsa² have a look at: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2890,10 +2938,6 @@ msgstr ""
 "For generell informasjon om GOsa² ta en titt på: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "GOsa² Login plus Overview"
-msgstr "GOsa² Login pluss oversikt"
-
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
@@ -6187,10 +6231,10 @@ msgid ""
 "boots from a diskette or directly from the server using network-PROM (or "
 "PXE) without using a local client hard drive."
 msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PC-er å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. "
 
 #. type: Content of: <article><section><section><para>
 msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -6763,8 +6807,8 @@ msgid ""
 msgstr ""
 "Standardverdiene er definert under <computeroutput>[default]</"
 "computeroutput>. For å sette opp en spesiell klient så kan du oppgi hvilken "
-"klient det er med MAC-adressen eller IP-adressen som dette <computeroutput>"
-"[192.168.0.10]</computeroutput>."
+"klient det er med MAC-adressen eller IP-adressen som dette "
+"<computeroutput>[192.168.0.10]</computeroutput>."
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
index 57b4171..91524eb 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2015-05-04 15:25+0000\n"
+"POT-Creation-Date: 2016-05-22 01:42+0200\n"
 "PO-Revision-Date: 2015-05-05 23:36+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"
@@ -2962,8 +2962,56 @@ msgstr ""
 "\">Een grafische omgeving installeren op de hoofdserver om GOsa² te kunnen "
 "gebruiken</link>."
 
+#. type: Content of: <article><section><section><title>
+msgid "NB: Fixing possible GOsa² login error"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"After investigating further it seems to be that the mechanism using "
+"encrypted passwords in gosa.conf is failing now."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"(As far as I know the random cleartext password generated during setup is "
+"encrypted using gosa-encrypt-passwords and a file gosa.secrets is generated "
+"to let apache2 cope with the encrypted passwords.)"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
+"This seems to work getting an upgraded Wheezy main-server working again (no "
+"need to generate a new gosa.conf). This has to be done as root user."
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "cat /dev/null > /etc/gosa/gosa.secrets"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"take the random cleartext password from gosa.conf.orig and put it instead of "
+"the encrypted long one into gosa.conf (actually twice: adminPassword and "
+"snapshotAdminPassword). You can use sudo pico gosa.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"be sure to add write access with 'chmod a+r /etc/gosa/gosa.secrets /etc/gosa/"
+"gosa.conf'"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "restart apache2: 'sudo service apache2 restart'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "GOsa² Login plus Overview"
+msgstr "Zich aanmelden bij GOsa² en de overzichtspagina"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
@@ -2971,7 +3019,7 @@ msgstr ""
 "\"/>. Dit opent het toegangsscherm voor GOsa². Meld u daar aan als de eerste "
 "gebruiker."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
@@ -2979,7 +3027,7 @@ msgstr ""
 "Indien u een vers geïnstalleerde machine met Debian Edu Wheezy gebruikt, zal "
 "de browser het certificaat van de site kennen."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Otherwise, you will get an error message about the SSL certificate being "
 "wrong. If you know you are alone on your network, just tell the browser to "
@@ -2990,7 +3038,7 @@ msgstr ""
 "netwerk, kunt u de browser gerust opdragen de foutmelding te negeren en het "
 "certificaat te accepteren."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "For general information on GOsa² have a look at: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2998,10 +3046,6 @@ msgstr ""
 "Raadpleeg voor algemene informatie over GOsa² het internetadres <ulink url="
 "\"https://oss.gonicus.de/labs/gosa/wiki/documentation\"/>."
 
-#. type: Content of: <article><section><section><section><title>
-msgid "GOsa² Login plus Overview"
-msgstr "Zich aanmelden bij GOsa² en de overzichtspagina"
-
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr "./images/gosa2_overview.png"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index f4e58c4..84edb5d 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-07-04 17:02+0300\n"
+"POT-Creation-Date: 2016-05-22 01:42+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"
@@ -2171,35 +2171,79 @@ msgid ""
 "server to use GOsa²</link>."
 msgstr ""
 
+#. type: Content of: <article><section><section><title>
+msgid "NB: Fixing possible GOsa² login error"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"After investigating further it seems to be that the mechanism using "
+"encrypted passwords in gosa.conf is failing now."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"(As far as I know the random cleartext password generated during setup is "
+"encrypted using gosa-encrypt-passwords and a file gosa.secrets is generated "
+"to let apache2 cope with the encrypted passwords.)"
+msgstr ""
+
 #. type: Content of: <article><section><section><para>
 msgid ""
+"This seems to work getting an upgraded Wheezy main-server working again (no "
+"need to generate a new gosa.conf). This has to be done as root user."
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "cat /dev/null > /etc/gosa/gosa.secrets"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"take the random cleartext password from gosa.conf.orig and put it instead of "
+"the encrypted long one into gosa.conf (actually twice: adminPassword and "
+"snapshotAdminPassword). You can use sudo pico gosa.conf"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid ""
+"be sure to add write access with 'chmod a+r /etc/gosa/gosa.secrets /etc/gosa/"
+"gosa.conf'"
+msgstr ""
+
+#. type: Content of: <article><section><section><orderedlist><listitem><para>
+msgid "restart apache2: 'sudo service apache2 restart'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "GOsa² Login plus Overview"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
 "From a web browser use the URL <ulink url=\"https://www/gosa\"/> for GOsa² "
 "access, and log in as the first user."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If you are using a new Debian Edu Wheezy machine, the site certificate will "
 "be known by the browser."
 msgstr ""
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Otherwise, you will get an error message about the SSL certificate being "
 "wrong. If you know you are alone on your network, just tell the browser to "
 "accept it and ignore that."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
 "For general information on GOsa² have a look at: <ulink url=\"https://oss."
 "gonicus.de/labs/gosa/wiki/documentation\"/>."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><title>
-msgid "GOsa² Login plus Overview"
-msgstr ""
-
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/gosa2_overview.png"
 msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index def6cda..4da9b78 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -888,6 +888,33 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 </para></listitem></itemizedlist>
 <para>For GOsa² access you need the Skolelinux main server and a (client) system with a web browser installed which can be the main server itself if it was installed as a so called combined server (main server + thin client server + workstation). If all of the mentioned before is not available, see: <link linkend="Administration--Installing_a_graphical_environment_on_the_main-server_to_use_GOsa.2BALI-">Installing a graphical environment on the main-server to use GOsa²</link>. 
 </para>
+</section>
+
+<section id="GettingStarted--NB:_Fixing_possible_GOsa.2BALI-_login_error">
+<title>NB: Fixing possible GOsa² login error
+</title>
+<para>After investigating further it seems to be that the mechanism using encrypted passwords in gosa.conf is failing now. 
+</para>
+<para>(As far as I know the random cleartext password generated during setup  is encrypted using gosa-encrypt-passwords and a file gosa.secrets is generated to let apache2 cope with the encrypted passwords.) 
+</para>
+<para>This seems to work getting an upgraded Wheezy main-server working again (no need to generate a new gosa.conf). This has to be done as root user.  
+</para><orderedlist numeration="arabic">
+<listitem>
+<para>cat /dev/null > /etc/gosa/gosa.secrets 
+</para></listitem>
+<listitem>
+<para>take the random cleartext password from gosa.conf.orig and put it instead of the encrypted long one into gosa.conf (actually twice: adminPassword and snapshotAdminPassword). You can use sudo pico gosa.conf  
+</para></listitem>
+<listitem>
+<para>be sure to add write access with 'chmod a+r /etc/gosa/gosa.secrets /etc/gosa/gosa.conf' 
+</para></listitem>
+<listitem>
+<para>restart apache2: 'sudo service apache2 restart' 
+</para></listitem></orderedlist>
+
+<section id="GettingStarted--GOsa.2BALI-_Login_plus_Overview">
+<title>GOsa² Login plus Overview
+</title>
 <para>From a web browser use the URL <ulink url="https://www/gosa"/> for GOsa² access, and log in as the first user. 
 </para>
 <itemizedlist>
@@ -899,10 +926,6 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 </para></listitem></itemizedlist>
 <para>For general information on GOsa² have a look at: <ulink url="https://oss.gonicus.de/labs/gosa/wiki/documentation"/>. 
 </para>
-
-<section id="GettingStarted--GOsa.2BALI-_Login_plus_Overview">
-<title>GOsa² Login plus Overview
-</title>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa2_overview.png"/></imageobject><textobject><phrase>GOsa² overview page after login as the first  user</phrase></textobject></inlinemediaobject> 
 </para>
 <para>After logging in to GOsa² you will see the overview page of GOsa². 

-- 
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