[debian-edu-commits] debian-edu/ 01/01: updated from the wiki
Holger Levsen
holger at moszumanska.debian.org
Thu Feb 12 13:13:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-doc.
commit 944f40c5ecb1820f515c65dca1db5b4f6003631d
Author: Holger Levsen <holger at layer-acht.org>
Date: Thu Feb 12 14:13:08 2015 +0100
updated from the wiki
---
.../debian-edu-jessie-manual.da.po | 58 +++++++++------
.../debian-edu-jessie-manual.de.po | 86 ++++++++++++++++------
.../debian-edu-jessie-manual.es.po | 56 ++++++++------
.../debian-edu-jessie-manual.fr.po | 58 +++++++++------
.../debian-edu-jessie-manual.it.po | 56 +++++++++-----
.../debian-edu-jessie-manual.nb.po | 54 +++++++++-----
.../debian-edu-jessie-manual.nl.po | 58 +++++++++------
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 36 +++++----
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 32 ++++----
9 files changed, 318 insertions(+), 176 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 44bfdff..1675491 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2015-02-09 09:18+0000\n"
+"POT-Creation-Date: 2015-02-12 13:11+0000\n"
"PO-Revision-Date: 2014-10-21 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -9043,7 +9043,9 @@ msgid "Java"
msgstr "Java"
#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
+#, fuzzy
+#| msgid "running standalone Java applications"
+msgid "Running standalone Java applications"
msgstr "kørsel af uafhængige Javaprogrammer"
#. type: Content of: <article><section><section><section><para>
@@ -9083,14 +9085,20 @@ msgstr ""
"situation, startende med <computeroutput>dpkg-reconfigure exim4-config</"
"computeroutput>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Every user who wants to use KMail (or Icedove, not installed by default) "
+"needs to configure it as follows. For a user with username jdoe the internal "
+"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+"\">jdoe at postoffice.intern</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
-msgid "Every user who wants to use KMail needs to configure it as follows."
+msgid "KMail"
msgstr ""
-"Hver bruger som ønsker at bruge KMail skal konfigurere den som i det "
-"følgende."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Kmail"
+msgid "Start KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9098,11 +9106,11 @@ msgid "Close the tip of the day"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the account assistant"
+msgid "Cancel the Account Assistant"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail"
+msgid "Open Settings/Configure KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9110,7 +9118,7 @@ msgid "Modify the default identity"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email-address (<username>@postoffice.intern)"
+msgid "enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9122,7 +9130,7 @@ msgid "click OK"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Now choose Accounts out of the menu"
+msgid "Choose Accounts out of the menu"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9130,7 +9138,7 @@ msgid "click add"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "choose imap-server (get rid of kwallet each time it pops up)"
+msgid "choose imap-server (get rid of KWallet each time it pops up)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9164,7 +9172,7 @@ msgid "accept the certificate (forever)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail once again to configure Sending"
+msgid "Open Settings/Configure KMail to configure Sending"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9214,17 +9222,11 @@ msgid "You should now be able to read your welcome email (next message)."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Every user who wants to use KMail needs to configure it as follows."
-msgid ""
-"Every user who wants to use Icedove (not installed by default) needs to "
-"configure it as follows."
+msgid "Icedove"
msgstr ""
-"Hver bruger som ønsker at bruge KMail skal konfigurere den som i det "
-"følgende."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start icedove"
+msgid "Start Icedove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9232,7 +9234,7 @@ msgid "Click 'Skip this and use my existing email'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Enter your email address <username>@postoffice.intern"
+msgid "Enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -12485,6 +12487,20 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgstr ""
+#~ "Hver bruger som ønsker at bruge KMail skal konfigurere den som i det "
+#~ "følgende."
+
+#, fuzzy
+#~| msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgid ""
+#~ "Every user who wants to use Icedove (not installed by default) needs to "
+#~ "configure it as follows."
+#~ msgstr ""
+#~ "Hver bruger som ønsker at bruge KMail skal konfigurere den som i det "
+#~ "følgende."
+
#~ msgid ""
#~ "Start KMail, click \"Next\" in the Account Wizard, select "
#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
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 c3f4e7a..ec3d309 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-09 09:18+0000\n"
+"POT-Creation-Date: 2015-02-12 13:11+0000\n"
"PO-Revision-Date: 2015-02-09 11:29+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -9186,7 +9186,9 @@ msgid "Java"
msgstr "Java"
#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
+#, fuzzy
+#| msgid "running standalone Java applications"
+msgid "Running standalone Java applications"
msgstr "Java-Anwendungen ausführen"
#. type: Content of: <article><section><section><section><para>
@@ -9227,14 +9229,22 @@ msgstr ""
"lokalen Gegebenheiten entsprechend anpassen. Der Befehl <computeroutput>dpkg-"
"reconfigure exim4-config</computeroutput> ist dazu ein erster Schritt."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Every user who wants to use KMail (or Icedove, not installed by default) "
+"needs to configure it as follows. For a user with username jdoe the internal "
+"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+"\">jdoe at postoffice.intern</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
-msgid "Every user who wants to use KMail needs to configure it as follows."
+msgid "KMail"
msgstr ""
-"Jeder Benutzer, der KMail verwenden will, muss die Konfiguration wie folgt "
-"vornehmen."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Kmail"
+#, fuzzy
+#| msgid "Start Kmail"
+msgid "Start KMail"
msgstr "KMail starten"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9242,11 +9252,15 @@ msgid "Close the tip of the day"
msgstr "den Tipp des Tages schließen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the account assistant"
+#, fuzzy
+#| msgid "Cancel the account assistant"
+msgid "Cancel the Account Assistant"
msgstr "den Postfach-Assistenten abbrechen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail"
+#, fuzzy
+#| msgid "Open Settings/Configure Kmail"
+msgid "Open Settings/Configure KMail"
msgstr "das Fenster 'Einstellungen/KMail einrichten ...' öffnen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9254,8 +9268,8 @@ msgid "Modify the default identity"
msgstr "die Standard-Identität ändern"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email-address (<username>@postoffice.intern)"
-msgstr "die E-Mail-Adresse (<username>@postoffice.intern) eingeben"
+msgid "enter your email address"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
@@ -9268,7 +9282,9 @@ msgid "click OK"
msgstr "auf OK klicken"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Now choose Accounts out of the menu"
+#, fuzzy
+#| msgid "Now choose Accounts out of the menu"
+msgid "Choose Accounts out of the menu"
msgstr "Jetzt 'Zugänge' aus dem Menü wählen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9276,7 +9292,9 @@ msgid "click add"
msgstr "auf 'Hinzufügen' klicken"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "choose imap-server (get rid of kwallet each time it pops up)"
+#, fuzzy
+#| msgid "choose imap-server (get rid of kwallet each time it pops up)"
+msgid "choose imap-server (get rid of KWallet each time it pops up)"
msgstr ""
"die Option 'IMAP-Email-Server' wählen (KWallet immer abbrechen, falls es "
"erscheint)"
@@ -9318,7 +9336,9 @@ msgid "accept the certificate (forever)"
msgstr "das Zertifikat akzeptieren (dauerhaft)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail once again to configure Sending"
+#, fuzzy
+#| msgid "Open Settings/Configure Kmail once again to configure Sending"
+msgid "Open Settings/Configure KMail to configure Sending"
msgstr ""
"noch einmal das Fenster 'Einstellungen/KMail einrichten ...' öffnen, um den "
"Versand zu konfigurieren"
@@ -9371,15 +9391,15 @@ msgstr ""
"Sie sollten nun die Willkommens-E-Mail lesen können ('Nächste Nachricht')"
#. type: Content of: <article><section><section><section><title>
-msgid ""
-"Every user who wants to use Icedove (not installed by default) needs to "
-"configure it as follows."
-msgstr ""
-"Jeder Benutzer, der Icedove (standardmäßig nicht installiert) verwenden "
-"will, muss die Konfiguration wie folgt vornehmen."
+#, fuzzy
+#| msgid "Start icedove"
+msgid "Icedove"
+msgstr "Icedove starten"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start icedove"
+#, fuzzy
+#| msgid "Start icedove"
+msgid "Start Icedove"
msgstr "Icedove starten"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9389,8 +9409,8 @@ msgstr ""
"verwenden' klicken"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Enter your email address <username>@postoffice.intern"
-msgstr "die E-Mail-Adresse (<username>@postoffice.intern) eingeben"
+msgid "Enter your email address"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Uncheck 'Remember password'"
@@ -10264,8 +10284,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -12617,6 +12637,24 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgstr ""
+#~ "Jeder Benutzer, der KMail verwenden will, muss die Konfiguration wie "
+#~ "folgt vornehmen."
+
+#~ msgid "enter your email-address (<username>@postoffice.intern)"
+#~ msgstr "die E-Mail-Adresse (<username>@postoffice.intern) eingeben"
+
+#~ msgid ""
+#~ "Every user who wants to use Icedove (not installed by default) needs to "
+#~ "configure it as follows."
+#~ msgstr ""
+#~ "Jeder Benutzer, der Icedove (standardmäßig nicht installiert) verwenden "
+#~ "will, muss die Konfiguration wie folgt vornehmen."
+
+#~ msgid "Enter your email address <username>@postoffice.intern"
+#~ msgstr "die E-Mail-Adresse (<username>@postoffice.intern) eingeben"
+
#~ msgid ""
#~ "Start KMail, click \"Next\" in the Account Wizard, select "
#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
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 8540cc3..4586d7b 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-09 09:18+0000\n"
+"POT-Creation-Date: 2015-02-12 13:11+0000\n"
"PO-Revision-Date: 2013-12-02 00:31-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -8303,7 +8303,7 @@ msgid "Java"
msgstr "Java"
#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
+msgid "Running standalone Java applications"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -8340,14 +8340,20 @@ msgstr ""
"<computeroutput>exim4</computeroutput> para adaptarse a la situación local, "
"iniciando con <computeroutput>dpkg-reconfigure exim4-config</computeroutput>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Every user who wants to use KMail (or Icedove, not installed by default) "
+"needs to configure it as follows. For a user with username jdoe the internal "
+"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+"\">jdoe at postoffice.intern</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
-msgid "Every user who wants to use KMail needs to configure it as follows."
+msgid "KMail"
msgstr ""
-"Cada usuario que quiera usar KMail necesita configurarlo de la siguiente "
-"manera."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Kmail"
+msgid "Start KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8355,11 +8361,11 @@ msgid "Close the tip of the day"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the account assistant"
+msgid "Cancel the Account Assistant"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail"
+msgid "Open Settings/Configure KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8367,7 +8373,7 @@ msgid "Modify the default identity"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email-address (<username>@postoffice.intern)"
+msgid "enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8379,7 +8385,7 @@ msgid "click OK"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Now choose Accounts out of the menu"
+msgid "Choose Accounts out of the menu"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8387,7 +8393,7 @@ msgid "click add"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "choose imap-server (get rid of kwallet each time it pops up)"
+msgid "choose imap-server (get rid of KWallet each time it pops up)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8421,7 +8427,7 @@ msgid "accept the certificate (forever)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail once again to configure Sending"
+msgid "Open Settings/Configure KMail to configure Sending"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8471,17 +8477,11 @@ msgid "You should now be able to read your welcome email (next message)."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Every user who wants to use KMail needs to configure it as follows."
-msgid ""
-"Every user who wants to use Icedove (not installed by default) needs to "
-"configure it as follows."
+msgid "Icedove"
msgstr ""
-"Cada usuario que quiera usar KMail necesita configurarlo de la siguiente "
-"manera."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start icedove"
+msgid "Start Icedove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8489,7 +8489,7 @@ msgid "Click 'Skip this and use my existing email'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Enter your email address <username>@postoffice.intern"
+msgid "Enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -11315,6 +11315,20 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgstr ""
+#~ "Cada usuario que quiera usar KMail necesita configurarlo de la siguiente "
+#~ "manera."
+
+#, fuzzy
+#~| msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgid ""
+#~ "Every user who wants to use Icedove (not installed by default) needs to "
+#~ "configure it as follows."
+#~ msgstr ""
+#~ "Cada usuario que quiera usar KMail necesita configurarlo de la siguiente "
+#~ "manera."
+
#~ msgid ""
#~ "Start KMail, click \"Next\" in the Account Wizard, select "
#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
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 e97d521..e2408dd 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-02-09 09:18+0000\n"
+"POT-Creation-Date: 2015-02-12 13:11+0000\n"
"PO-Revision-Date: 2014-12-23 23:13+0100\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -9259,7 +9259,9 @@ msgid "Java"
msgstr "Java"
#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
+#, fuzzy
+#| msgid "running standalone Java applications"
+msgid "Running standalone Java applications"
msgstr "Exécuter des applications Java indépendantes"
#. type: Content of: <article><section><section><section><para>
@@ -9301,14 +9303,20 @@ msgstr ""
"selon les besoins. <computeroutput>dpkg-reconfigure exim4-config</"
"computeroutput> est la première étape dans cette direction."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Every user who wants to use KMail (or Icedove, not installed by default) "
+"needs to configure it as follows. For a user with username jdoe the internal "
+"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+"\">jdoe at postoffice.intern</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
-msgid "Every user who wants to use KMail needs to configure it as follows."
+msgid "KMail"
msgstr ""
-"Tous les utilisateurs voulant utiliser KMail doivent le configurer de la "
-"manière suivante :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Kmail"
+msgid "Start KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9316,11 +9324,11 @@ msgid "Close the tip of the day"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the account assistant"
+msgid "Cancel the Account Assistant"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail"
+msgid "Open Settings/Configure KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9328,7 +9336,7 @@ msgid "Modify the default identity"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email-address (<username>@postoffice.intern)"
+msgid "enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9340,7 +9348,7 @@ msgid "click OK"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Now choose Accounts out of the menu"
+msgid "Choose Accounts out of the menu"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9348,7 +9356,7 @@ msgid "click add"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "choose imap-server (get rid of kwallet each time it pops up)"
+msgid "choose imap-server (get rid of KWallet each time it pops up)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9382,7 +9390,7 @@ msgid "accept the certificate (forever)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail once again to configure Sending"
+msgid "Open Settings/Configure KMail to configure Sending"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9432,17 +9440,11 @@ msgid "You should now be able to read your welcome email (next message)."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Every user who wants to use KMail needs to configure it as follows."
-msgid ""
-"Every user who wants to use Icedove (not installed by default) needs to "
-"configure it as follows."
+msgid "Icedove"
msgstr ""
-"Tous les utilisateurs voulant utiliser KMail doivent le configurer de la "
-"manière suivante :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start icedove"
+msgid "Start Icedove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9450,7 +9452,7 @@ msgid "Click 'Skip this and use my existing email'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Enter your email address <username>@postoffice.intern"
+msgid "Enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -12752,6 +12754,20 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgstr ""
+#~ "Tous les utilisateurs voulant utiliser KMail doivent le configurer de la "
+#~ "manière suivante :"
+
+#, fuzzy
+#~| msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgid ""
+#~ "Every user who wants to use Icedove (not installed by default) needs to "
+#~ "configure it as follows."
+#~ msgstr ""
+#~ "Tous les utilisateurs voulant utiliser KMail doivent le configurer de la "
+#~ "manière suivante :"
+
#~ msgid ""
#~ "Start KMail, click \"Next\" in the Account Wizard, select "
#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
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 c7f12f3..3a8fcc6 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2015-02-09 09:18+0000\n"
+"POT-Creation-Date: 2015-02-12 13:11+0000\n"
"PO-Revision-Date: 2014-12-19 20:45+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -9077,7 +9077,9 @@ msgid "Java"
msgstr "Java"
#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
+#, fuzzy
+#| msgid "running standalone Java applications"
+msgid "Running standalone Java applications"
msgstr "eseguire applicazioni Java autonome"
#. type: Content of: <article><section><section><section><para>
@@ -9118,13 +9120,20 @@ msgstr ""
"<computeroutput>exim4</computeroutput> in base alla situazione locale, "
"eseguendo <computeroutput>dpkg-reconfigure exim4-config</computeroutput>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Every user who wants to use KMail (or Icedove, not installed by default) "
+"needs to configure it as follows. For a user with username jdoe the internal "
+"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+"\">jdoe at postoffice.intern</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
-msgid "Every user who wants to use KMail needs to configure it as follows."
+msgid "KMail"
msgstr ""
-"Ogni utente che vuole usare KMail bisogna che lo configuri nel modo seguente."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Kmail"
+msgid "Start KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9132,11 +9141,11 @@ msgid "Close the tip of the day"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the account assistant"
+msgid "Cancel the Account Assistant"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail"
+msgid "Open Settings/Configure KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9144,7 +9153,7 @@ msgid "Modify the default identity"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email-address (<username>@postoffice.intern)"
+msgid "enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9156,7 +9165,7 @@ msgid "click OK"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Now choose Accounts out of the menu"
+msgid "Choose Accounts out of the menu"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9164,7 +9173,7 @@ msgid "click add"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "choose imap-server (get rid of kwallet each time it pops up)"
+msgid "choose imap-server (get rid of KWallet each time it pops up)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9198,7 +9207,7 @@ msgid "accept the certificate (forever)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail once again to configure Sending"
+msgid "Open Settings/Configure KMail to configure Sending"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9248,16 +9257,11 @@ msgid "You should now be able to read your welcome email (next message)."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Every user who wants to use KMail needs to configure it as follows."
-msgid ""
-"Every user who wants to use Icedove (not installed by default) needs to "
-"configure it as follows."
+msgid "Icedove"
msgstr ""
-"Ogni utente che vuole usare KMail bisogna che lo configuri nel modo seguente."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start icedove"
+msgid "Start Icedove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9265,7 +9269,7 @@ msgid "Click 'Skip this and use my existing email'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Enter your email address <username>@postoffice.intern"
+msgid "Enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -12529,6 +12533,20 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgstr ""
+#~ "Ogni utente che vuole usare KMail bisogna che lo configuri nel modo "
+#~ "seguente."
+
+#, fuzzy
+#~| msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgid ""
+#~ "Every user who wants to use Icedove (not installed by default) needs to "
+#~ "configure it as follows."
+#~ msgstr ""
+#~ "Ogni utente che vuole usare KMail bisogna che lo configuri nel modo "
+#~ "seguente."
+
#~ msgid ""
#~ "Start KMail, click \"Next\" in the Account Wizard, select "
#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
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 65c7737..ca2e74d 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -18,7 +18,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-02-09 09:18+0000\n"
+"POT-Creation-Date: 2015-02-12 13:11+0000\n"
"PO-Revision-Date: 2015-01-31 17:45+0000\n"
"Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -8945,7 +8945,9 @@ msgid "Java"
msgstr "Java"
#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
+#, fuzzy
+#| msgid "running standalone Java applications"
+msgid "Running standalone Java applications"
msgstr "kjører frittstående Java applikasjoner"
#. type: Content of: <article><section><section><section><para>
@@ -8986,12 +8988,20 @@ msgstr ""
"innstillinger. En kan starte med <computeroutput>dpkg-reconfigure exim4-"
"config</computeroutput>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Every user who wants to use KMail (or Icedove, not installed by default) "
+"needs to configure it as follows. For a user with username jdoe the internal "
+"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+"\">jdoe at postoffice.intern</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
-msgid "Every user who wants to use KMail needs to configure it as follows."
-msgstr "Hver bruker som ønsker å bruke KMail må sette den opp som følger."
+msgid "KMail"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Kmail"
+msgid "Start KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8999,11 +9009,11 @@ msgid "Close the tip of the day"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the account assistant"
+msgid "Cancel the Account Assistant"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail"
+msgid "Open Settings/Configure KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9011,7 +9021,7 @@ msgid "Modify the default identity"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email-address (<username>@postoffice.intern)"
+msgid "enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9023,7 +9033,7 @@ msgid "click OK"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Now choose Accounts out of the menu"
+msgid "Choose Accounts out of the menu"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9031,7 +9041,7 @@ msgid "click add"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "choose imap-server (get rid of kwallet each time it pops up)"
+msgid "choose imap-server (get rid of KWallet each time it pops up)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9065,7 +9075,7 @@ msgid "accept the certificate (forever)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail once again to configure Sending"
+msgid "Open Settings/Configure KMail to configure Sending"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9115,15 +9125,11 @@ msgid "You should now be able to read your welcome email (next message)."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Every user who wants to use KMail needs to configure it as follows."
-msgid ""
-"Every user who wants to use Icedove (not installed by default) needs to "
-"configure it as follows."
-msgstr "Hver bruker som ønsker å bruke KMail må sette den opp som følger."
+msgid "Icedove"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start icedove"
+msgid "Start Icedove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9131,7 +9137,7 @@ msgid "Click 'Skip this and use my existing email'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Enter your email address <username>@postoffice.intern"
+msgid "Enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -12328,6 +12334,16 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgstr "Hver bruker som ønsker å bruke KMail må sette den opp som følger."
+
+#, fuzzy
+#~| msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgid ""
+#~ "Every user who wants to use Icedove (not installed by default) needs to "
+#~ "configure it as follows."
+#~ msgstr "Hver bruker som ønsker å bruke KMail må sette den opp som følger."
+
#~ msgid ""
#~ "Start KMail, click \"Next\" in the Account Wizard, select "
#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
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 9000b3a..1af27d2 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-02-09 09:18+0000\n"
+"POT-Creation-Date: 2015-02-12 13:11+0000\n"
"PO-Revision-Date: 2015-01-26 18:20+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -9394,7 +9394,9 @@ msgid "Java"
msgstr "Java"
#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
+#, fuzzy
+#| msgid "running standalone Java applications"
+msgid "Running standalone Java applications"
msgstr "autonome javatoepassingen uitvoeren"
#. type: Content of: <article><section><section><section><para>
@@ -9437,14 +9439,20 @@ msgstr ""
"configuratie bijwerken begint bij de opdracht <computeroutput>dpkg-"
"reconfigure exim4-config</computeroutput>."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Every user who wants to use KMail (or Icedove, not installed by default) "
+"needs to configure it as follows. For a user with username jdoe the internal "
+"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+"\">jdoe at postoffice.intern</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
-msgid "Every user who wants to use KMail needs to configure it as follows."
+msgid "KMail"
msgstr ""
-"Elke gebruiker die KMail wenst te gebruiken, moet het op de volgende manier "
-"configureren."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Kmail"
+msgid "Start KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9452,11 +9460,11 @@ msgid "Close the tip of the day"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the account assistant"
+msgid "Cancel the Account Assistant"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail"
+msgid "Open Settings/Configure KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9464,7 +9472,7 @@ msgid "Modify the default identity"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email-address (<username>@postoffice.intern)"
+msgid "enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9476,7 +9484,7 @@ msgid "click OK"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Now choose Accounts out of the menu"
+msgid "Choose Accounts out of the menu"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9484,7 +9492,7 @@ msgid "click add"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "choose imap-server (get rid of kwallet each time it pops up)"
+msgid "choose imap-server (get rid of KWallet each time it pops up)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9518,7 +9526,7 @@ msgid "accept the certificate (forever)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail once again to configure Sending"
+msgid "Open Settings/Configure KMail to configure Sending"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9568,17 +9576,11 @@ msgid "You should now be able to read your welcome email (next message)."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Every user who wants to use KMail needs to configure it as follows."
-msgid ""
-"Every user who wants to use Icedove (not installed by default) needs to "
-"configure it as follows."
+msgid "Icedove"
msgstr ""
-"Elke gebruiker die KMail wenst te gebruiken, moet het op de volgende manier "
-"configureren."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start icedove"
+msgid "Start Icedove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9586,7 +9588,7 @@ msgid "Click 'Skip this and use my existing email'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Enter your email address <username>@postoffice.intern"
+msgid "Enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -12920,6 +12922,20 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgstr ""
+#~ "Elke gebruiker die KMail wenst te gebruiken, moet het op de volgende "
+#~ "manier configureren."
+
+#, fuzzy
+#~| msgid "Every user who wants to use KMail needs to configure it as follows."
+#~ msgid ""
+#~ "Every user who wants to use Icedove (not installed by default) needs to "
+#~ "configure it as follows."
+#~ msgstr ""
+#~ "Elke gebruiker die KMail wenst te gebruiken, moet het op de volgende "
+#~ "manier configureren."
+
#~ msgid ""
#~ "Start KMail, click \"Next\" in the Account Wizard, select "
#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 52fe378..aed9171 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-09 09:18+0000\n"
+"POT-Creation-Date: 2015-02-12 13:11+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -6634,7 +6634,7 @@ msgid "Java"
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
+msgid "Running standalone Java applications"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -6666,12 +6666,20 @@ msgid ""
"computeroutput>."
msgstr ""
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Every user who wants to use KMail (or Icedove, not installed by default) "
+"needs to configure it as follows. For a user with username jdoe the internal "
+"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+"\">jdoe at postoffice.intern</ulink>."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
-msgid "Every user who wants to use KMail needs to configure it as follows."
+msgid "KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Kmail"
+msgid "Start KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6679,11 +6687,11 @@ msgid "Close the tip of the day"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the account assistant"
+msgid "Cancel the Account Assistant"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail"
+msgid "Open Settings/Configure KMail"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6691,7 +6699,7 @@ msgid "Modify the default identity"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email-address (<username>@postoffice.intern)"
+msgid "enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6703,7 +6711,7 @@ msgid "click OK"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Now choose Accounts out of the menu"
+msgid "Choose Accounts out of the menu"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6711,7 +6719,7 @@ msgid "click add"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "choose imap-server (get rid of kwallet each time it pops up)"
+msgid "choose imap-server (get rid of KWallet each time it pops up)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6745,7 +6753,7 @@ msgid "accept the certificate (forever)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure Kmail once again to configure Sending"
+msgid "Open Settings/Configure KMail to configure Sending"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6793,13 +6801,11 @@ msgid "You should now be able to read your welcome email (next message)."
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid ""
-"Every user who wants to use Icedove (not installed by default) needs to "
-"configure it as follows."
+msgid "Icedove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start icedove"
+msgid "Start Icedove"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6807,7 +6813,7 @@ msgid "Click 'Skip this and use my existing email'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Enter your email address <username>@postoffice.intern"
+msgid "Enter your email address"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 873f221..8ee8144 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -2946,8 +2946,8 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
<title>Java
</title>
-<section id="Users--running_standalone_Java_applications">
-<title>running standalone Java applications
+<section id="Users--Running_standalone_Java_applications">
+<title>Running standalone Java applications
</title>
<para>Standalone Java applications are supported out of the box by the OpenJDK Java runtime.
</para>
@@ -2966,29 +2966,31 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
</title>
<para>All users can send and receive mails within the internal network. To allow mail outside the internal network, the adminstrator needs to configure the mailserver <computeroutput>exim4</computeroutput> to suit the local situation, starting with <computeroutput>dpkg-reconfigure exim4-config</computeroutput>.
</para>
+<para>Every user who wants to use KMail (or Icedove, not installed by default) needs to configure it as follows. For a user with username jdoe the internal email address is <ulink url="mailto:jdoe at postoffice.intern">jdoe at postoffice.intern</ulink>.
+</para>
-<section id="Users--Every_user_who_wants_to_use_KMail_needs_to_configure_it_as_follows.">
-<title>Every user who wants to use KMail needs to configure it as follows.
+<section id="Users--KMail">
+<title>KMail
</title>
<itemizedlist>
<listitem>
-<para>Start Kmail
+<para>Start KMail
</para></listitem>
<listitem>
<para>Close the tip of the day
</para></listitem>
<listitem>
-<para>Cancel the account assistant
+<para>Cancel the Account Assistant
</para></listitem>
<listitem>
-<para>Open Settings/Configure Kmail
+<para>Open Settings/Configure KMail
</para></listitem>
<listitem>
<para>Modify the default identity
</para>
<itemizedlist>
<listitem>
-<para>enter your email-address (<username>@postoffice.intern)
+<para>enter your email address
</para></listitem>
<listitem>
<para>make sure that 'postoffice.intern' is the default domain (tab Advanced)
@@ -2997,14 +2999,14 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
<para>click OK
</para></listitem></itemizedlist></listitem>
<listitem>
-<para>Now choose Accounts out of the menu
+<para>Choose Accounts out of the menu
</para>
<itemizedlist>
<listitem>
<para>click add
</para></listitem>
<listitem>
-<para>choose imap-server (get rid of kwallet each time it pops up)
+<para>choose imap-server (get rid of KWallet each time it pops up)
</para></listitem>
<listitem>
<para>enter 'intern' as account name and 'postoffice.intern' as imap server
@@ -3031,7 +3033,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
<para>click ok
</para></listitem></itemizedlist></listitem>
<listitem>
-<para>Open Settings/Configure Kmail once again to configure Sending
+<para>Open Settings/Configure KMail to configure Sending
</para>
<itemizedlist>
<listitem>
@@ -3072,18 +3074,18 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
</para></listitem></itemizedlist>
</section>
-<section id="Users--Every_user_who_wants_to_use_Icedove_.28not_installed_by_default.29_needs_to_configure_it_as_follows.">
-<title>Every user who wants to use Icedove (not installed by default) needs to configure it as follows.
+<section id="Users--Icedove">
+<title>Icedove
</title>
<itemizedlist>
<listitem>
-<para>Start icedove
+<para>Start Icedove
</para></listitem>
<listitem>
<para>Click 'Skip this and use my existing email'
</para></listitem>
<listitem>
-<para>Enter your email address <username>@postoffice.intern
+<para>Enter your email address
</para></listitem>
<listitem>
<para>Uncheck 'Remember password'
--
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