[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Wheezy manual from the wiki.
Holger Levsen
holger at layer-acht.org
Mon May 23 07:51:42 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 fef81f80358f273e0ff3434be20fe5922f90d1d3
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon May 23 09:47:37 2016 +0200
Update Debian Edu Wheezy manual from the wiki.
(cherry picked from commit d34375836b88602e4e1dcd4eaed929775125c4f6)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
debian/changelog | 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 | 60 +++-------------------
.../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 ++---------
10 files changed, 69 insertions(+), 444 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e7198bd..871f5b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
debian-edu-doc (1.6~20160519~8+edu0) UNRELEASED; urgency=medium
[ Holger Levsen ]
- * Update Debian Edu Jessie manual from the wiki.
+ * Update Debian Edu Jessie and Wheezy manuals from the wiki.
* Update debian/copyright from the wiki using the update-copyright
target.
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 903add0..0896c6c 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: 2016-05-22 01:42+0200\n"
+"POT-Creation-Date: 2016-05-23 09:34+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,63 +2876,15 @@ 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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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."
@@ -2940,7 +2892,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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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 "
@@ -2950,7 +2902,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><section><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"For general information on GOsa² have a look at: <ulink url=\"https://oss."
"gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2958,6 +2910,10 @@ 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 127bda5..eada18b 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: 2016-05-22 01:42+0200\n"
+"POT-Creation-Date: 2016-05-23 09:34+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,56 +2904,8 @@ 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 ""
@@ -2961,7 +2913,7 @@ msgstr ""
"um auf GOsa² zuzugreifen; melden Sie sich mit der Kennung des Erstbenutzers "
"an."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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."
@@ -2969,7 +2921,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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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 "
@@ -2979,7 +2931,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><section><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"For general information on GOsa² have a look at: <ulink url=\"https://oss."
"gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2987,6 +2939,10 @@ 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 50574ad..7b842b9 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: 2016-05-22 01:42+0200\n"
+"POT-Creation-Date: 2016-05-23 09:34+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,63 +2945,15 @@ 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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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."
@@ -3009,7 +2961,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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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 "
@@ -3019,7 +2971,7 @@ msgstr ""
"equivocado. Si sabe que solamente usted se encuentra conectado a la red, "
"acepte e ignórelo."
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"For general information on GOsa² have a look at: <ulink url=\"https://oss."
"gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -3027,6 +2979,10 @@ 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 eea8223..379cf16 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: 2016-05-22 01:42+0200\n"
+"POT-Creation-Date: 2016-05-23 09:34+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,63 +2954,15 @@ 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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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."
@@ -3018,7 +2970,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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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 "
@@ -3028,7 +2980,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><section><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"For general information on GOsa² have a look at: <ulink url=\"https://oss."
"gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -3036,6 +2988,10 @@ 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 e29ed94..0d0ef84 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: 2016-05-22 01:42+0200\n"
+"POT-Creation-Date: 2016-05-23 09:34+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,63 +2908,15 @@ 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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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."
@@ -2972,7 +2924,7 @@ msgstr ""
"In caso si usi una macchina Debian Edu Wheezy nuova, il certificato sarà "
"riconosciuto dal browser."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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 "
@@ -2982,7 +2934,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><section><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"For general information on GOsa² have a look at: <ulink url=\"https://oss."
"gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2990,6 +2942,10 @@ 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 af3daef..ac913b5 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: 2016-05-22 01:42+0200\n"
+"POT-Creation-Date: 2016-05-23 09:34+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/"
@@ -2855,63 +2855,15 @@ 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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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."
@@ -2920,7 +2872,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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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 "
@@ -2930,7 +2882,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><section><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"For general information on GOsa² have a look at: <ulink url=\"https://oss."
"gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -2938,6 +2890,10 @@ 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"
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 91524eb..9083c2d 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: 2016-05-22 01:42+0200\n"
+"POT-Creation-Date: 2016-05-23 09:34+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,56 +2962,8 @@ 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 ""
@@ -3019,7 +2971,7 @@ msgstr ""
"\"/>. Dit opent het toegangsscherm voor GOsa². Meld u daar aan als de eerste "
"gebruiker."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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."
@@ -3027,7 +2979,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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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 "
@@ -3038,7 +2990,7 @@ msgstr ""
"netwerk, kunt u de browser gerust opdragen de foutmelding te negeren en het "
"certificaat te accepteren."
-#. type: Content of: <article><section><section><section><para>
+#. type: Content of: <article><section><section><para>
msgid ""
"For general information on GOsa² have a look at: <ulink url=\"https://oss."
"gonicus.de/labs/gosa/wiki/documentation\"/>."
@@ -3046,6 +2998,10 @@ 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 84edb5d..cc63ec4 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: 2016-05-22 01:42+0200\n"
+"POT-Creation-Date: 2016-05-23 09:34+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,79 +2171,35 @@ 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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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><section><itemizedlist><listitem><para>
+#. type: Content of: <article><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><section><para>
+#. type: Content of: <article><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 4da9b78..def6cda 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -888,33 +888,6 @@ 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>
@@ -926,6 +899,10 @@ 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