[debian-edu-commits] debian-edu/ 01/01: updated from the wiki (mail instructions, thanks Wolfgang)

[Holger Levsen]

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 e1f243735bc3f090f2786303160b37244ff1f544
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Feb 9 10:19:34 2015 +0100

    updated from the wiki (mail instructions, thanks Wolfgang)
---
 debian/copyright                                   |   4 +-
 .../debian-edu-jessie-manual.da.po                 | 262 +++++++++++++++---
 .../debian-edu-jessie-manual.de.po                 | 292 +++++++++++++++++----
 .../debian-edu-jessie-manual.es.po                 | 262 +++++++++++++++---
 .../debian-edu-jessie-manual.fr.po                 | 280 +++++++++++++++++---
 .../debian-edu-jessie-manual.it.po                 | 266 ++++++++++++++++---
 .../debian-edu-jessie-manual.nb.po                 | 263 ++++++++++++++++---
 .../debian-edu-jessie-manual.nl.po                 | 279 +++++++++++++++++---
 .../debian-edu-jessie/debian-edu-jessie-manual.pot | 192 ++++++++++++--
 .../debian-edu-jessie/debian-edu-jessie-manual.xml | 148 ++++++++++-
 .../debian-edu-jessie/images/de/worldmap.png       | Bin 387010 -> 386995 bytes
 .../debian-edu-jessie/images/es/worldmap.png       | Bin 387116 -> 387100 bytes
 .../debian-edu-jessie/images/fr/worldmap.png       | Bin 387050 -> 387034 bytes
 .../debian-edu-jessie/images/worldmap.png          | Bin 387043 -> 387028 bytes
 14 files changed, 1946 insertions(+), 302 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 46f1820..1624ae0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -95,7 +95,7 @@ Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Holger Levsen
   2011 Mike Gabriel
   2012 Justin B Rye
   2012 David Prévot
-  2012, 2013, 2014 Wolfgang Schweer
+  2012, 2013, 2014, 2015 Wolfgang Schweer
   2012 Bernhard Hammes
 License: GPL-2+
 
@@ -142,7 +142,7 @@ License: GPL-2+
 Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
 Copyright: 2008 Christophe Masson
   2010 Olivier Vitrat
-  2012, 2013,2014,2015 Cédric Boutillier
+  2012, 2013, 2014, 2015 Cédric Boutillier
   2012 Jean-Paul Guilloneau
   2012 David Prévot
   2012 Thomas Vincent
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 76cbb5e..44bfdff 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-08 10:45+0000\n"
+"POT-Creation-Date: 2015-02-09 09:18+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"
@@ -9083,47 +9083,191 @@ msgstr ""
 "situation, startende med <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><title>
 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."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Close the tip of the day"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cancel the account assistant"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Open Settings/Configure Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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)"
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Now choose Accounts out of the menu"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as account name and 'postoffice.intern' as imap server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check if the username is present"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "don't enter the password, as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click the tab Advanced"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Start KMail, click \"Next\" in the Account Wizard, select "
-"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
-"real name and e-mail address <computeroutput>username at postoffice.intern</"
-"computeroutput>, click \"Next\". Check if the username is correct, don't "
-"enter the password, click \"Next\". (Kerberos provides single sign on "
-"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
-"<computeroutput>postoffice.intern</computeroutput> twice as server name, "
-"click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
-"menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
-"\"Modify...\", then \"Continue\" to accept the certificate problem and "
-"\"Forever\", \"OK\", \"Apply\" and once more \"OK\". That's it!"
+"click 'Auto detect', then change Authentication manually from 'Login' to "
+"'GSSAPI'"
 msgstr ""
-"Start KMail, klik »Næste« i kontoguiden, vælg <computeroutput>IMAP</"
-"computeroutput> som kontotype, klik »Næste«. Indtast navn og e-post-adresse "
-"<computeroutput>brugernavn at postkontor.intern</computeroutput>, klik »Næste«. "
-"Kontroller om brugernavnet er korrekt, indtast ikke adgangskoden, klik "
-"»Næste«. Kerberos tilbyder single sign on vedrørende SMTP og IMAP, så du "
-"ikke skal indtaste din adgangskode). Indtast <computeroutput>postkontor."
-"intern</computeroutput> to gange som servernavn, klik »Afslut«. Luk dagens "
-"fif. Klik »Opsætning« i KMail-menuen, vælg »Konfigurer KMail ...«, klik så "
-"på »Konti«. Klik »Ændr ...«, så »Fortsæt« for at acceptere "
-"certifikatproblemet og »Altid«, »O.k.«, »Anvend« og en gang mere »O.k.«. Det "
-"var det!"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click ok"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click Add"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as name and set it as default, choose SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click 'Create and Configure'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'postoffice.intern' as outgoing server name"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check 'server requires authentication'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter username; again, omit the password"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click on the just configured server entry, click 'Modify'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "click advanced configuration"
+msgstr "Adgangskonfiguration for filsystem"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click detect automatically"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click two times OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
-"Now send a test email to yourself. (This will create the IMAP folders on the "
-"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
-"There should be your recently sent email in the inbox below of \"intern\"."
+"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."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start icedove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Uncheck 'Remember password'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Don't enter your password as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Continue'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Manual config'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"First time accessing the inbox click 'Confirm Security Exception' to accept "
+"the certificate"
 msgstr ""
-"Send nu en test-e-post til dig selv. (Dette vil oprette IMAP-mapperne på "
-"serveren). Vent et øjeblik, klik så på »Kontroller post« i KMail-menuen. Du "
-"skulle så se din seneste sendte e-post i indboksen under »intern«."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -9659,6 +9803,20 @@ msgid "Copyright and authors"
 msgstr "Ophavsret og forfattere"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, "
+#| "2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), "
+#| "Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), "
+#| "Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
+#| "2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, "
+#| "2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt "
+#| "(2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike "
+#| "Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang "
+#| "Schweer (2012, 2013, 2014) and Bernhard Hammes (2012) and is released "
+#| "under the GPL2 or any later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, 2002, 2003, "
@@ -9669,7 +9827,7 @@ msgid ""
 "Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
 "(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
 "(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014) and "
+"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015) and "
 "Bernhard Hammes (2012) and is released under the GPL2 or any later version. "
 "Enjoy!"
 msgstr ""
@@ -9779,7 +9937,7 @@ msgstr ""
 #| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
 "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
 "l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
 "version."
@@ -12327,6 +12485,42 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "Start KMail, click \"Next\" in the Account Wizard, select "
+#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
+#~ "Enter real name and e-mail address <computeroutput>username at postoffice."
+#~ "intern</computeroutput>, click \"Next\". Check if the username is "
+#~ "correct, don't enter the password, click \"Next\". (Kerberos provides "
+#~ "single sign on concerning SMTP and IMAP, so you don't have to enter your "
+#~ "password.) Enter <computeroutput>postoffice.intern</computeroutput> twice "
+#~ "as server name, click \"Finish\". Close the tip of the day. Click "
+#~ "\"Settings\" in the KMail menu, select \"Configure KMail...\", then click "
+#~ "on \"Accounts\". Click \"Modify...\", then \"Continue\" to accept the "
+#~ "certificate problem and \"Forever\", \"OK\", \"Apply\" and once more \"OK"
+#~ "\". That's it!"
+#~ msgstr ""
+#~ "Start KMail, klik »Næste« i kontoguiden, vælg <computeroutput>IMAP</"
+#~ "computeroutput> som kontotype, klik »Næste«. Indtast navn og e-post-"
+#~ "adresse <computeroutput>brugernavn at postkontor.intern</computeroutput>, "
+#~ "klik »Næste«. Kontroller om brugernavnet er korrekt, indtast ikke "
+#~ "adgangskoden, klik »Næste«. Kerberos tilbyder single sign on vedrørende "
+#~ "SMTP og IMAP, så du ikke skal indtaste din adgangskode). Indtast "
+#~ "<computeroutput>postkontor.intern</computeroutput> to gange som "
+#~ "servernavn, klik »Afslut«. Luk dagens fif. Klik »Opsætning« i KMail-"
+#~ "menuen, vælg »Konfigurer KMail ...«, klik så på »Konti«. Klik »Ændr ...«, "
+#~ "så »Fortsæt« for at acceptere certifikatproblemet og »Altid«, »O.k.«, "
+#~ "»Anvend« og en gang mere »O.k.«. Det var det!"
+
+#~ msgid ""
+#~ "Now send a test email to yourself. (This will create the IMAP folders on "
+#~ "the server.) Wait a little bit, then click \"Check Mail\" in the KMail "
+#~ "menu. There should be your recently sent email in the inbox below of "
+#~ "\"intern\"."
+#~ msgstr ""
+#~ "Send nu en test-e-post til dig selv. (Dette vil oprette IMAP-mapperne på "
+#~ "serveren). Vent et øjeblik, klik så på »Kontroller post« i KMail-menuen. "
+#~ "Du skulle så se din seneste sendte e-post i indboksen under »intern«."
+
 #, fuzzy
 #~| msgid ""
 #~| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
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 158d1d6..11d68c1 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-08 10:45+0000\n"
+"POT-Creation-Date: 2015-02-09 09:18+0000\n"
 "PO-Revision-Date: 2015-02-08 13:56+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -9227,52 +9227,191 @@ 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>
+#. type: Content of: <article><section><section><section><title>
 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."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Close the tip of the day"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cancel the account assistant"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Open Settings/Configure Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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)"
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Now choose Accounts out of the menu"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as account name and 'postoffice.intern' as imap server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check if the username is present"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "don't enter the password, as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click the tab Advanced"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Start KMail, click \"Next\" in the Account Wizard, select "
-"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
-"real name and e-mail address <computeroutput>username at postoffice.intern</"
-"computeroutput>, click \"Next\". Check if the username is correct, don't "
-"enter the password, click \"Next\". (Kerberos provides single sign on "
-"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
-"<computeroutput>postoffice.intern</computeroutput> twice as server name, "
-"click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
-"menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
-"\"Modify...\", then \"Continue\" to accept the certificate problem and "
-"\"Forever\", \"OK\", \"Apply\" and once more \"OK\". That's it!"
-msgstr ""
-"Starten Sie KMail; klicken Sie im ersten Fenster des Postfach-Assistenten "
-"auf »Weiter«; wählen Sie <computeroutput>IMAP</computeroutput> als Postfach-"
-"Typ, klicken Sie auf »Weiter«; tragen Sie ihren vollständigen Namen und Ihre "
-"E-Mailadresse <computeroutput>benutzername at postoffice.intern</"
-"computeroutput> ein, klicken Sie auf »Weiter«; überprüfen Sie den Eintrag im "
-"Feld »Benutzer«, lassen Sie das Feld »Passwort« leer, klicken Sie auf "
-"»Weiter«. (Durch die Verwendung von Kerberos gilt die bei der Anmeldung "
-"erfolgte Authentifizierung auch für SMTP und IMAP, wodurch hier die "
-"Passworteingabe entfällt.) Tragen Sie zweimal <computeroutput>postoffice."
-"intern</computeroutput> als Servernamen ein, klicken Sie auf "
-"»Fertigstellen«. Schließen Sie den »Tipp des Tages«. Klicken Sie im KMail-"
-"Menü auf »Einstellungen«, wählen Sie »KMail einrichten ...«, klicken Sie "
-"dann auf »Zugänge«. Klicken Sie auf »Ändern ...«; das Problem mit dem "
-"Zertifikat kann mit »Fortsetzen«, »Dauerhaft« gelöst werden, dann »OK«, "
-"»Anwenden« und noch einmal »OK« klicken. Sie haben es geschafft!"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Now send a test email to yourself. (This will create the IMAP folders on the "
-"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
-"There should be your recently sent email in the inbox below of \"intern\"."
-msgstr ""
-"Senden Sie nun eine Test-Email an sich selbst. (Dadurch werden die IMAP-"
-"Verzeichnisse auf dem Server angelegt.) Warten Sie etwas und klicken Sie "
-"dann im KMail-Menü auf »Nach E-Mail sehen«. Im Posteingang unterhalb von "
-"»Intern« sollte die gerade abgeschickte E-Mail vorhanden sein."
+"click 'Auto detect', then change Authentication manually from 'Login' to "
+"'GSSAPI'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click ok"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click Add"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as name and set it as default, choose SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click 'Create and Configure'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'postoffice.intern' as outgoing server name"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check 'server requires authentication'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter username; again, omit the password"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click on the just configured server entry, click 'Modify'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "click advanced configuration"
+msgstr "Konfiguration der Zugriffsrechte auf das Dateisystem"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click detect automatically"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click two times OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
+"Jeder Benutzer, der KMail verwenden will, muss die Konfiguration wie folgt "
+"vornehmen."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start icedove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Uncheck 'Remember password'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Don't enter your password as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Continue'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Manual config'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"First time accessing the inbox click 'Confirm Security Exception' to accept "
+"the certificate"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -9826,6 +9965,20 @@ msgid "Copyright and authors"
 msgstr "Copyright und Autoren"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, "
+#| "2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), "
+#| "Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), "
+#| "Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
+#| "2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, "
+#| "2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt "
+#| "(2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike "
+#| "Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang "
+#| "Schweer (2012, 2013, 2014) and Bernhard Hammes (2012) and is released "
+#| "under the GPL2 or any later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, 2002, 2003, "
@@ -9836,7 +9989,7 @@ msgid ""
 "Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
 "(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
 "(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014) and "
+"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015) and "
 "Bernhard Hammes (2012) and is released under the GPL2 or any later version. "
 "Enjoy!"
 msgstr ""
@@ -9926,9 +10079,16 @@ msgstr ""
 "lizenziert."
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "The French translation is copyrighted by Christophe Masson (2008), "
+#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-"
+#| "Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and "
+#| "the French l10n team (2009, 2010, 2012) and is released under the GPL v2 "
+#| "or any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
 "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
 "l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
 "version."
@@ -10105,8 +10265,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 "
@@ -12459,6 +12619,48 @@ msgstr ""
 "werden."
 
 #~ msgid ""
+#~ "Start KMail, click \"Next\" in the Account Wizard, select "
+#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
+#~ "Enter real name and e-mail address <computeroutput>username at postoffice."
+#~ "intern</computeroutput>, click \"Next\". Check if the username is "
+#~ "correct, don't enter the password, click \"Next\". (Kerberos provides "
+#~ "single sign on concerning SMTP and IMAP, so you don't have to enter your "
+#~ "password.) Enter <computeroutput>postoffice.intern</computeroutput> twice "
+#~ "as server name, click \"Finish\". Close the tip of the day. Click "
+#~ "\"Settings\" in the KMail menu, select \"Configure KMail...\", then click "
+#~ "on \"Accounts\". Click \"Modify...\", then \"Continue\" to accept the "
+#~ "certificate problem and \"Forever\", \"OK\", \"Apply\" and once more \"OK"
+#~ "\". That's it!"
+#~ msgstr ""
+#~ "Starten Sie KMail; klicken Sie im ersten Fenster des Postfach-Assistenten "
+#~ "auf »Weiter«; wählen Sie <computeroutput>IMAP</computeroutput> als "
+#~ "Postfach-Typ, klicken Sie auf »Weiter«; tragen Sie ihren vollständigen "
+#~ "Namen und Ihre E-Mailadresse <computeroutput>benutzername at postoffice."
+#~ "intern</computeroutput> ein, klicken Sie auf »Weiter«; überprüfen Sie den "
+#~ "Eintrag im Feld »Benutzer«, lassen Sie das Feld »Passwort« leer, klicken "
+#~ "Sie auf »Weiter«. (Durch die Verwendung von Kerberos gilt die bei der "
+#~ "Anmeldung erfolgte Authentifizierung auch für SMTP und IMAP, wodurch hier "
+#~ "die Passworteingabe entfällt.) Tragen Sie zweimal "
+#~ "<computeroutput>postoffice.intern</computeroutput> als Servernamen ein, "
+#~ "klicken Sie auf »Fertigstellen«. Schließen Sie den »Tipp des Tages«. "
+#~ "Klicken Sie im KMail-Menü auf »Einstellungen«, wählen Sie »KMail "
+#~ "einrichten ...«, klicken Sie dann auf »Zugänge«. Klicken Sie auf "
+#~ "»Ändern ...«; das Problem mit dem Zertifikat kann mit »Fortsetzen«, "
+#~ "»Dauerhaft« gelöst werden, dann »OK«, »Anwenden« und noch einmal »OK« "
+#~ "klicken. Sie haben es geschafft!"
+
+#~ msgid ""
+#~ "Now send a test email to yourself. (This will create the IMAP folders on "
+#~ "the server.) Wait a little bit, then click \"Check Mail\" in the KMail "
+#~ "menu. There should be your recently sent email in the inbox below of "
+#~ "\"intern\"."
+#~ msgstr ""
+#~ "Senden Sie nun eine Test-Email an sich selbst. (Dadurch werden die IMAP-"
+#~ "Verzeichnisse auf dem Server angelegt.) Warten Sie etwas und klicken Sie "
+#~ "dann im KMail-Menü auf »Nach E-Mail sehen«. Im Posteingang unterhalb von "
+#~ "»Intern« sollte die gerade abgeschickte E-Mail vorhanden sein."
+
+#~ msgid ""
 #~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
 #~ "192.168.1.0/24)."
 #~ msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index 86942ff..8540cc3 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-08 10:45+0000\n"
+"POT-Creation-Date: 2015-02-09 09:18+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"
@@ -8340,50 +8340,191 @@ 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>
+#. type: Content of: <article><section><section><section><title>
 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."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Close the tip of the day"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cancel the account assistant"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Open Settings/Configure Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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)"
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Now choose Accounts out of the menu"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as account name and 'postoffice.intern' as imap server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check if the username is present"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "don't enter the password, as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click the tab Advanced"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"click 'Auto detect', then change Authentication manually from 'Login' to "
+"'GSSAPI'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click ok"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click Add"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as name and set it as default, choose SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click 'Create and Configure'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'postoffice.intern' as outgoing server name"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check 'server requires authentication'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter username; again, omit the password"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click on the just configured server entry, click 'Modify'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "click advanced configuration"
+msgstr "Configuración del acceso al sistema de archivos"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click detect automatically"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click two times OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
+"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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Uncheck 'Remember password'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Don't enter your password as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Continue'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Manual config'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Start KMail, click \"Next\" in the Account Wizard, select "
-"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
-"real name and e-mail address <computeroutput>username at postoffice.intern</"
-"computeroutput>, click \"Next\". Check if the username is correct, don't "
-"enter the password, click \"Next\". (Kerberos provides single sign on "
-"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
-"<computeroutput>postoffice.intern</computeroutput> twice as server name, "
-"click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
-"menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
-"\"Modify...\", then \"Continue\" to accept the certificate problem and "
-"\"Forever\", \"OK\", \"Apply\" and once more \"OK\". That's it!"
-msgstr ""
-"Inicie KMail, haga clic en \"Siguiente\" en el asistente, seleccione "
-"<computeroutput>IMAP</computeroutput> como tipo de cuenta, haga clic en "
-"\"Siguiente\". Escriba su nombre y su dirección de correo electrónico "
-"<computeroutput>username at postoffice.intern</computeroutput>, haga clic en "
-"\"Siguiente\". Revise si el nombre de usuario es el correo, no escriba la "
-"contraseña, haga clic en \"Siguiente\". (Kerberos le brinda un ingreso "
-"sencillo SMTP e IMAP, así no tendrá que ingresar su contraseña.) Escriba "
-"<computeroutput>postoffice.intern</computeroutput> dos veces como nombre de "
-"servidor, haga clic en \"Finalizar\". Cierre el tip del día. Haga clic en "
-"\"Configuraciónes\" en el menú KMail, selecciones \"Configurar KMail...\", "
-"después haga clic en \"Cuentas\". Haga clic en \"Modificar...\", luego en "
-"\"Continuar\" para aceptar el problema de certificado y \"Siempre\", \"OK\", "
-"\"Aplicar\" y una vez más \"OK\". ¡Eso es todo!"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Now send a test email to yourself. (This will create the IMAP folders on the "
-"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
-"There should be your recently sent email in the inbox below of \"intern\"."
-msgstr ""
-"Ahora, envíe un correo de prueba a usted mismo. (Esto creará los directorio "
-"IMAP en el servidor.) Espere un poco, después haga clic en \"Revisar correo"
-"\" en el menú KMail. Deberá estar el correo que envió recientemente en el "
-"buzón de entrada debajo de \"intern\"."
+"First time accessing the inbox click 'Confirm Security Exception' to accept "
+"the certificate"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -8936,7 +9077,7 @@ msgid ""
 "Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
 "(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
 "(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014) and "
+"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015) and "
 "Bernhard Hammes (2012) and is released under the GPL2 or any later version. "
 "Enjoy!"
 msgstr ""
@@ -9019,7 +9160,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
 "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
 "l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
 "version."
@@ -11174,6 +11315,45 @@ msgstr ""
 "Más información sobre versiones más anteriores puede encontrarse en <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "Start KMail, click \"Next\" in the Account Wizard, select "
+#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
+#~ "Enter real name and e-mail address <computeroutput>username at postoffice."
+#~ "intern</computeroutput>, click \"Next\". Check if the username is "
+#~ "correct, don't enter the password, click \"Next\". (Kerberos provides "
+#~ "single sign on concerning SMTP and IMAP, so you don't have to enter your "
+#~ "password.) Enter <computeroutput>postoffice.intern</computeroutput> twice "
+#~ "as server name, click \"Finish\". Close the tip of the day. Click "
+#~ "\"Settings\" in the KMail menu, select \"Configure KMail...\", then click "
+#~ "on \"Accounts\". Click \"Modify...\", then \"Continue\" to accept the "
+#~ "certificate problem and \"Forever\", \"OK\", \"Apply\" and once more \"OK"
+#~ "\". That's it!"
+#~ msgstr ""
+#~ "Inicie KMail, haga clic en \"Siguiente\" en el asistente, seleccione "
+#~ "<computeroutput>IMAP</computeroutput> como tipo de cuenta, haga clic en "
+#~ "\"Siguiente\". Escriba su nombre y su dirección de correo electrónico "
+#~ "<computeroutput>username at postoffice.intern</computeroutput>, haga clic en "
+#~ "\"Siguiente\". Revise si el nombre de usuario es el correo, no escriba la "
+#~ "contraseña, haga clic en \"Siguiente\". (Kerberos le brinda un ingreso "
+#~ "sencillo SMTP e IMAP, así no tendrá que ingresar su contraseña.) Escriba "
+#~ "<computeroutput>postoffice.intern</computeroutput> dos veces como nombre "
+#~ "de servidor, haga clic en \"Finalizar\". Cierre el tip del día. Haga clic "
+#~ "en \"Configuraciónes\" en el menú KMail, selecciones \"Configurar KMail..."
+#~ "\", después haga clic en \"Cuentas\". Haga clic en \"Modificar...\", "
+#~ "luego en \"Continuar\" para aceptar el problema de certificado y \"Siempre"
+#~ "\", \"OK\", \"Aplicar\" y una vez más \"OK\". ¡Eso es todo!"
+
+#~ msgid ""
+#~ "Now send a test email to yourself. (This will create the IMAP folders on "
+#~ "the server.) Wait a little bit, then click \"Check Mail\" in the KMail "
+#~ "menu. There should be your recently sent email in the inbox below of "
+#~ "\"intern\"."
+#~ msgstr ""
+#~ "Ahora, envíe un correo de prueba a usted mismo. (Esto creará los "
+#~ "directorio IMAP en el servidor.) Espere un poco, después haga clic en "
+#~ "\"Revisar correo\" en el menú KMail. Deberá estar el correo que envió "
+#~ "recientemente en el buzón de entrada debajo de \"intern\"."
+
 #, fuzzy
 #~| msgid ""
 #~| "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
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 ca9d87e..e97d521 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-08 10:45+0000\n"
+"POT-Creation-Date: 2015-02-09 09:18+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"
@@ -9301,51 +9301,191 @@ 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>
+#. type: Content of: <article><section><section><section><title>
 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 :"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Close the tip of the day"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cancel the account assistant"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Open Settings/Configure Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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)"
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Now choose Accounts out of the menu"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as account name and 'postoffice.intern' as imap server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check if the username is present"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "don't enter the password, as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click the tab Advanced"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"click 'Auto detect', then change Authentication manually from 'Login' to "
+"'GSSAPI'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click ok"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click Add"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as name and set it as default, choose SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click 'Create and Configure'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'postoffice.intern' as outgoing server name"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check 'server requires authentication'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter username; again, omit the password"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click on the just configured server entry, click 'Modify'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "click advanced configuration"
+msgstr "Configuration de l'accès au système de fichiers"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click detect automatically"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click two times OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
-"Start KMail, click \"Next\" in the Account Wizard, select "
-"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
-"real name and e-mail address <computeroutput>username at postoffice.intern</"
-"computeroutput>, click \"Next\". Check if the username is correct, don't "
-"enter the password, click \"Next\". (Kerberos provides single sign on "
-"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
-"<computeroutput>postoffice.intern</computeroutput> twice as server name, "
-"click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
-"menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
-"\"Modify...\", then \"Continue\" to accept the certificate problem and "
-"\"Forever\", \"OK\", \"Apply\" and once more \"OK\". That's it!"
-msgstr ""
-"Démarrez KMail. Cliquez sur « Suivant » dans l'assistant de comptes. "
-"Sélectionnez <computeroutput>IMAP</computeroutput> comme type de compte et "
-"cliquez sur « Suivant ». Entrez votre nom et votre adresse de courrier "
-"électronique <computeroutput>nom_utilisateur at postoffice,intern</"
-"computeroutput>, et cliquez sur « Suivant ». Vérifiez que votre nom "
-"d'utilisateur est correct, n'entrez pas de mot de passe et cliquez sur "
-"« Suivant ». (Kerberos fournit une seule authentification pour SMTP et IMAP, "
-"donc vous n'avez pas besoin d'entrer votre mot de passe.) Entrez "
-"<computeroutput>postoffice.intern</computeroutput> pour le nom de serveur "
-"(deux fois) et cliquez sur « Terminer ». Fermez la fenêtre de l'astuce du "
-"jour. Dans le menu de KMail, cliquez sur « Configuration », sélectionnez "
-"« Configurer KMail... » puis « Comptes ». Cliquez sur « Modifier », puis "
-"« Continuer » pour accepter le certificat. Cliquez ensuite « Pour "
-"toujours », « Ok », « Appliquer » et encore une fois sur « Ok », et voilà !"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Now send a test email to yourself. (This will create the IMAP folders on the "
-"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
-"There should be your recently sent email in the inbox below of \"intern\"."
-msgstr ""
-"Maintenant, envoyez-vous un courrier électronique. (Cela créera les dossiers "
-"IMAP sur le serveur.) Attendez un instant, puis appuyez sur « Relevez le "
-"courrier » dans le menu de KMail. Vous devriez trouver le message que vous "
-"venez d'envoyer dans la boîte de réception sous « intern »."
+"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 :"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start icedove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Uncheck 'Remember password'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Don't enter your password as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Continue'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Manual config'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"First time accessing the inbox click 'Confirm Security Exception' to accept "
+"the certificate"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -9902,6 +10042,20 @@ msgid "Copyright and authors"
 msgstr "Droits d'auteur et auteurs"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, "
+#| "2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), "
+#| "Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), "
+#| "Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
+#| "2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, "
+#| "2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt "
+#| "(2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike "
+#| "Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang "
+#| "Schweer (2012, 2013, 2014) and Bernhard Hammes (2012) and is released "
+#| "under the GPL2 or any later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, 2002, 2003, "
@@ -9912,7 +10066,7 @@ msgid ""
 "Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
 "(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
 "(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014) and "
+"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015) and "
 "Bernhard Hammes (2012) and is released under the GPL2 or any later version. "
 "Enjoy!"
 msgstr ""
@@ -10029,7 +10183,7 @@ msgstr ""
 #| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
 "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
 "l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
 "version."
@@ -12599,6 +12753,48 @@ msgstr ""
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
 #~ msgid ""
+#~ "Start KMail, click \"Next\" in the Account Wizard, select "
+#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
+#~ "Enter real name and e-mail address <computeroutput>username at postoffice."
+#~ "intern</computeroutput>, click \"Next\". Check if the username is "
+#~ "correct, don't enter the password, click \"Next\". (Kerberos provides "
+#~ "single sign on concerning SMTP and IMAP, so you don't have to enter your "
+#~ "password.) Enter <computeroutput>postoffice.intern</computeroutput> twice "
+#~ "as server name, click \"Finish\". Close the tip of the day. Click "
+#~ "\"Settings\" in the KMail menu, select \"Configure KMail...\", then click "
+#~ "on \"Accounts\". Click \"Modify...\", then \"Continue\" to accept the "
+#~ "certificate problem and \"Forever\", \"OK\", \"Apply\" and once more \"OK"
+#~ "\". That's it!"
+#~ msgstr ""
+#~ "Démarrez KMail. Cliquez sur « Suivant » dans l'assistant de comptes. "
+#~ "Sélectionnez <computeroutput>IMAP</computeroutput> comme type de compte "
+#~ "et cliquez sur « Suivant ». Entrez votre nom et votre adresse de courrier "
+#~ "électronique <computeroutput>nom_utilisateur at postoffice,intern</"
+#~ "computeroutput>, et cliquez sur « Suivant ». Vérifiez que votre nom "
+#~ "d'utilisateur est correct, n'entrez pas de mot de passe et cliquez sur "
+#~ "« Suivant ». (Kerberos fournit une seule authentification pour SMTP et "
+#~ "IMAP, donc vous n'avez pas besoin d'entrer votre mot de passe.) Entrez "
+#~ "<computeroutput>postoffice.intern</computeroutput> pour le nom de serveur "
+#~ "(deux fois) et cliquez sur « Terminer ». Fermez la fenêtre de l'astuce du "
+#~ "jour. Dans le menu de KMail, cliquez sur « Configuration », sélectionnez "
+#~ "« Configurer KMail... » puis « Comptes ». Cliquez sur « Modifier », puis "
+#~ "« Continuer » pour accepter le certificat. Cliquez ensuite « Pour "
+#~ "toujours », « Ok », « Appliquer » et encore une fois sur « Ok », et "
+#~ "voilà !"
+
+#~ msgid ""
+#~ "Now send a test email to yourself. (This will create the IMAP folders on "
+#~ "the server.) Wait a little bit, then click \"Check Mail\" in the KMail "
+#~ "menu. There should be your recently sent email in the inbox below of "
+#~ "\"intern\"."
+#~ msgstr ""
+#~ "Maintenant, envoyez-vous un courrier électronique. (Cela créera les "
+#~ "dossiers IMAP sur le serveur.) Attendez un instant, puis appuyez sur "
+#~ "« Relevez le courrier » dans le menu de KMail. Vous devriez trouver le "
+#~ "message que vous venez d'envoyer dans la boîte de réception sous "
+#~ "« intern »."
+
+#~ msgid ""
 #~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
 #~ "192.168.1.0/24)."
 #~ msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index 8170b83..c7f12f3 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-08 10:45+0000\n"
+"POT-Creation-Date: 2015-02-09 09:18+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"
@@ -9118,48 +9118,189 @@ msgstr ""
 "<computeroutput>exim4</computeroutput> in base alla situazione locale, "
 "eseguendo <computeroutput>dpkg-reconfigure exim4-config</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><title>
 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."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Close the tip of the day"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cancel the account assistant"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Open Settings/Configure Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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)"
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Now choose Accounts out of the menu"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as account name and 'postoffice.intern' as imap server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check if the username is present"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "don't enter the password, as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click the tab Advanced"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Start KMail, click \"Next\" in the Account Wizard, select "
-"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
-"real name and e-mail address <computeroutput>username at postoffice.intern</"
-"computeroutput>, click \"Next\". Check if the username is correct, don't "
-"enter the password, click \"Next\". (Kerberos provides single sign on "
-"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
-"<computeroutput>postoffice.intern</computeroutput> twice as server name, "
-"click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
-"menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
-"\"Modify...\", then \"Continue\" to accept the certificate problem and "
-"\"Forever\", \"OK\", \"Apply\" and once more \"OK\". That's it!"
+"click 'Auto detect', then change Authentication manually from 'Login' to "
+"'GSSAPI'"
 msgstr ""
-"Avviare KMail, fare clic su \"Next\" nella procedura guidata, selezionare "
-"<computeroutput>IMAP</computeroutput> come tipo di account, clic su \"Next"
-"\". Introdurre nome e cognome e l'indirizzo e-mail <computeroutput>nome-"
-"utente at postoffice.intern</computeroutput>, clic su \"Next\". Controllare se "
-"il nome utente è corretto, non inserire la password, click su \"Next\". "
-"(Kerberos consente una singola registrazione per SMTP e IMAP, così da non "
-"dover reinserire la password.) Scrivere <computeroutput>postoffice.intern</"
-"computeroutput> due volte come nome del server, click su \"Finish\". "
-"Chiudere il suggerimento del giorno. Click su \"Settings\" nel menu di "
-"KMail, selezionare \"Configure KMail...\", poi click su \"Accounts\". Click "
-"su \"Modify...\", poi \"Continue\" per accettare il problema del certificato "
-"e \"Forever\", \"OK\", \"Apply\" e ancora una volta \"OK\". Questo è tutto!"
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click ok"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click Add"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as name and set it as default, choose SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click 'Create and Configure'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'postoffice.intern' as outgoing server name"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check 'server requires authentication'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter username; again, omit the password"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click on the just configured server entry, click 'Modify'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "click advanced configuration"
+msgstr "Configurazione dell'accesso al file system"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click detect automatically"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click two times OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
-"Now send a test email to yourself. (This will create the IMAP folders on the "
-"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
-"There should be your recently sent email in the inbox below of \"intern\"."
+"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."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start icedove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Uncheck 'Remember password'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Don't enter your password as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Continue'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Manual config'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"First time accessing the inbox click 'Confirm Security Exception' to accept "
+"the certificate"
 msgstr ""
-"Ora mandare una email di prova a se stessi. (Questo creerà le cartelle IMAP "
-"sul server.) Aspettare un po', poi fare clic su \"Check Mail\" nel menu di "
-"KMail. Ci dovrebbe essere la propria e-mail inviata di recente nella casella "
-"di posta al di sotto di \"intern\"."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -9707,6 +9848,20 @@ msgid "Copyright and authors"
 msgstr "Copyright e autori"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, "
+#| "2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), "
+#| "Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), "
+#| "Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
+#| "2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, "
+#| "2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt "
+#| "(2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike "
+#| "Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang "
+#| "Schweer (2012, 2013, 2014) and Bernhard Hammes (2012) and is released "
+#| "under the GPL2 or any later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, 2002, 2003, "
@@ -9717,7 +9872,7 @@ msgid ""
 "Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
 "(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
 "(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014) and "
+"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015) and "
 "Bernhard Hammes (2012) and is released under the GPL2 or any later version. "
 "Enjoy!"
 msgstr ""
@@ -9831,7 +9986,7 @@ msgstr ""
 #| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
 "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
 "l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
 "version."
@@ -12375,6 +12530,45 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "Start KMail, click \"Next\" in the Account Wizard, select "
+#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
+#~ "Enter real name and e-mail address <computeroutput>username at postoffice."
+#~ "intern</computeroutput>, click \"Next\". Check if the username is "
+#~ "correct, don't enter the password, click \"Next\". (Kerberos provides "
+#~ "single sign on concerning SMTP and IMAP, so you don't have to enter your "
+#~ "password.) Enter <computeroutput>postoffice.intern</computeroutput> twice "
+#~ "as server name, click \"Finish\". Close the tip of the day. Click "
+#~ "\"Settings\" in the KMail menu, select \"Configure KMail...\", then click "
+#~ "on \"Accounts\". Click \"Modify...\", then \"Continue\" to accept the "
+#~ "certificate problem and \"Forever\", \"OK\", \"Apply\" and once more \"OK"
+#~ "\". That's it!"
+#~ msgstr ""
+#~ "Avviare KMail, fare clic su \"Next\" nella procedura guidata, selezionare "
+#~ "<computeroutput>IMAP</computeroutput> come tipo di account, clic su \"Next"
+#~ "\". Introdurre nome e cognome e l'indirizzo e-mail <computeroutput>nome-"
+#~ "utente at postoffice.intern</computeroutput>, clic su \"Next\". Controllare "
+#~ "se il nome utente è corretto, non inserire la password, click su \"Next"
+#~ "\". (Kerberos consente una singola registrazione per SMTP e IMAP, così da "
+#~ "non dover reinserire la password.) Scrivere <computeroutput>postoffice."
+#~ "intern</computeroutput> due volte come nome del server, click su \"Finish"
+#~ "\". Chiudere il suggerimento del giorno. Click su \"Settings\" nel menu "
+#~ "di KMail, selezionare \"Configure KMail...\", poi click su \"Accounts\". "
+#~ "Click su \"Modify...\", poi \"Continue\" per accettare il problema del "
+#~ "certificato e \"Forever\", \"OK\", \"Apply\" e ancora una volta \"OK\". "
+#~ "Questo è tutto!"
+
+#~ msgid ""
+#~ "Now send a test email to yourself. (This will create the IMAP folders on "
+#~ "the server.) Wait a little bit, then click \"Check Mail\" in the KMail "
+#~ "menu. There should be your recently sent email in the inbox below of "
+#~ "\"intern\"."
+#~ msgstr ""
+#~ "Ora mandare una email di prova a se stessi. (Questo creerà le cartelle "
+#~ "IMAP sul server.) Aspettare un po', poi fare clic su \"Check Mail\" nel "
+#~ "menu di KMail. Ci dovrebbe essere la propria e-mail inviata di recente "
+#~ "nella casella di posta al di sotto di \"intern\"."
+
+#~ msgid ""
 #~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
 #~ "192.168.1.0/24)."
 #~ msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index 9c21257..65c7737 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-08 10:45+0000\n"
+"POT-Creation-Date: 2015-02-09 09:18+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"
@@ -8986,46 +8986,187 @@ msgstr ""
 "innstillinger.  En kan starte med <computeroutput>dpkg-reconfigure exim4-"
 "config</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. 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."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Close the tip of the day"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cancel the account assistant"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Open Settings/Configure Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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)"
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Now choose Accounts out of the menu"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as account name and 'postoffice.intern' as imap server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check if the username is present"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "don't enter the password, as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click the tab Advanced"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Start KMail, click \"Next\" in the Account Wizard, select "
-"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
-"real name and e-mail address <computeroutput>username at postoffice.intern</"
-"computeroutput>, click \"Next\". Check if the username is correct, don't "
-"enter the password, click \"Next\". (Kerberos provides single sign on "
-"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
-"<computeroutput>postoffice.intern</computeroutput> twice as server name, "
-"click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
-"menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
-"\"Modify...\", then \"Continue\" to accept the certificate problem and "
-"\"Forever\", \"OK\", \"Apply\" and once more \"OK\". That's it!"
+"click 'Auto detect', then change Authentication manually from 'Login' to "
+"'GSSAPI'"
 msgstr ""
-"Start KMail, klikk på «Next» (Neste) i Account Wizard, "
-"velg<computeroutput>IMAP</computeroutput> som kontotype, klikk «Next». Skriv "
-"inn riktig navn og e-postadresse <computeroutput>brukernavn at postoffice."
-"intern </computeroutput>, klikk «Next». Sjekk om brukernavnet er riktig,  "
-"ikke oppgi passordet, klikk «Next» (Kerberos gir enkel pålogging når det "
-"gjelder SMTP og IMAP, så du trenger ikke å skrive inn passordet ditt.) Skriv "
-"inn<computeroutput> postoffice.intern </computeroutput> to ganger som "
-"servernavn, klikk «Finish» (Ferdig). Lukk dagens tips/råd. Klikk på "
-"«Settings» (Innstillinger) i KMail menyen, velg «Konfigurer KMail ...», "
-"klikk deretter på «Accounts» (Kontoer). Klikk «Modify ...» («Endre...»), "
-"deretter «Continue» (Fortsett) for å godta sertifikat problem og «Forever», "
-"«OK», «Apply» (Bruk), og en gang til «OK». Det er det!      "
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click ok"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click Add"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as name and set it as default, choose SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click 'Create and Configure'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'postoffice.intern' as outgoing server name"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check 'server requires authentication'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter username; again, omit the password"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click on the just configured server entry, click 'Modify'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "click advanced configuration"
+msgstr "Oppsett av tilgang til filsystem"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click detect automatically"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click two times OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start icedove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Uncheck 'Remember password'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Don't enter your password as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Continue'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Manual config'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Now send a test email to yourself. (This will create the IMAP folders on the "
-"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
-"There should be your recently sent email in the inbox below of \"intern\"."
+"First time accessing the inbox click 'Confirm Security Exception' to accept "
+"the certificate"
 msgstr ""
-"Send nå en test til deg selv. (Dette vil opprette IMAP-mappene på server.) "
-"Vent litt, klikk deretter «Check Mail» i KMail menyen. Der bør din nylig "
-"sendte e-post være i innboksen under «intern»."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -9563,6 +9704,20 @@ msgid "Copyright and authors"
 msgstr "Opphavsrett og forfattere"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, "
+#| "2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), "
+#| "Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), "
+#| "Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
+#| "2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, "
+#| "2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt "
+#| "(2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike "
+#| "Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang "
+#| "Schweer (2012, 2013, 2014) and Bernhard Hammes (2012) and is released "
+#| "under the GPL2 or any later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, 2002, 2003, "
@@ -9573,7 +9728,7 @@ msgid ""
 "Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
 "(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
 "(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014) and "
+"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015) and "
 "Bernhard Hammes (2012) and is released under the GPL2 or any later version. "
 "Enjoy!"
 msgstr ""
@@ -9685,7 +9840,7 @@ msgstr ""
 #| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
 "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
 "l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
 "version."
@@ -12174,6 +12329,44 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
 #~ msgid ""
+#~ "Start KMail, click \"Next\" in the Account Wizard, select "
+#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
+#~ "Enter real name and e-mail address <computeroutput>username at postoffice."
+#~ "intern</computeroutput>, click \"Next\". Check if the username is "
+#~ "correct, don't enter the password, click \"Next\". (Kerberos provides "
+#~ "single sign on concerning SMTP and IMAP, so you don't have to enter your "
+#~ "password.) Enter <computeroutput>postoffice.intern</computeroutput> twice "
+#~ "as server name, click \"Finish\". Close the tip of the day. Click "
+#~ "\"Settings\" in the KMail menu, select \"Configure KMail...\", then click "
+#~ "on \"Accounts\". Click \"Modify...\", then \"Continue\" to accept the "
+#~ "certificate problem and \"Forever\", \"OK\", \"Apply\" and once more \"OK"
+#~ "\". That's it!"
+#~ msgstr ""
+#~ "Start KMail, klikk på «Next» (Neste) i Account Wizard, "
+#~ "velg<computeroutput>IMAP</computeroutput> som kontotype, klikk «Next». "
+#~ "Skriv inn riktig navn og e-postadresse "
+#~ "<computeroutput>brukernavn at postoffice.intern </computeroutput>, klikk "
+#~ "«Next». Sjekk om brukernavnet er riktig,  ikke oppgi passordet, klikk "
+#~ "«Next» (Kerberos gir enkel pålogging når det gjelder SMTP og IMAP, så du "
+#~ "trenger ikke å skrive inn passordet ditt.) Skriv inn<computeroutput> "
+#~ "postoffice.intern </computeroutput> to ganger som servernavn, klikk "
+#~ "«Finish» (Ferdig). Lukk dagens tips/råd. Klikk på "
+#~ "«Settings» (Innstillinger) i KMail menyen, velg «Konfigurer KMail ...», "
+#~ "klikk deretter på «Accounts» (Kontoer). Klikk «Modify ...» («Endre...»), "
+#~ "deretter «Continue» (Fortsett) for å godta sertifikat problem og "
+#~ "«Forever», «OK», «Apply» (Bruk), og en gang til «OK». Det er det!      "
+
+#~ msgid ""
+#~ "Now send a test email to yourself. (This will create the IMAP folders on "
+#~ "the server.) Wait a little bit, then click \"Check Mail\" in the KMail "
+#~ "menu. There should be your recently sent email in the inbox below of "
+#~ "\"intern\"."
+#~ msgstr ""
+#~ "Send nå en test til deg selv. (Dette vil opprette IMAP-mappene på "
+#~ "server.) Vent litt, klikk deretter «Check Mail» i KMail menyen. Der bør "
+#~ "din nylig sendte e-post være i innboksen under «intern»."
+
+#~ msgid ""
 #~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
 #~ "192.168.1.0/24)."
 #~ msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index b29a0a5..9000b3a 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-08 10:45+0000\n"
+"POT-Creation-Date: 2015-02-09 09:18+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"
@@ -9437,51 +9437,191 @@ msgstr ""
 "configuratie bijwerken begint bij de opdracht <computeroutput>dpkg-"
 "reconfigure exim4-config</computeroutput>."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><title>
 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."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Close the tip of the day"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cancel the account assistant"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Open Settings/Configure Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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)"
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Now choose Accounts out of the menu"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as account name and 'postoffice.intern' as imap server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check if the username is present"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "don't enter the password, as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click the tab Advanced"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"click 'Auto detect', then change Authentication manually from 'Login' to "
+"'GSSAPI'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click ok"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click Add"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as name and set it as default, choose SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click 'Create and Configure'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'postoffice.intern' as outgoing server name"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check 'server requires authentication'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter username; again, omit the password"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click on the just configured server entry, click 'Modify'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid "File system access configuration"
+msgid "click advanced configuration"
+msgstr "Configuratie van de toegang tot het bestandssysteem"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click detect automatically"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click two times OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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 ""
-"Start KMail, click \"Next\" in the Account Wizard, select "
-"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
-"real name and e-mail address <computeroutput>username at postoffice.intern</"
-"computeroutput>, click \"Next\". Check if the username is correct, don't "
-"enter the password, click \"Next\". (Kerberos provides single sign on "
-"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
-"<computeroutput>postoffice.intern</computeroutput> twice as server name, "
-"click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
-"menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
-"\"Modify...\", then \"Continue\" to accept the certificate problem and "
-"\"Forever\", \"OK\", \"Apply\" and once more \"OK\". That's it!"
-msgstr ""
-"Start KMail op. Klik in de accountassistent op \"Volgende\" en kies voor "
-"<computeroutput>IMAP</computeroutput> als type account. Klik op \"Volgende"
-"\". Voer uw echte naam in en het e-mailadres "
-"<computeroutput>gebruikersnaam at postoffice.intern</computeroutput>. Klik op "
-"\"Volgende\". Controleer of de gebruikersnaam correct is. voer geen "
-"wachtwoord in. Klik op \"Volgende\". (Door het gebruik van Kerberos, geldt "
-"het wachtwoord bij het aanmelden op het systeem meteen ook voor SMTP en "
-"IMAP, en moet u dus geen wachtwoord ingeven.) Geef "
-"<computeroutput>postoffice.intern</computeroutput> tweemaal in als "
-"servernaam. Klik op \"Afsluiten\". Sluit de tip van de dag. Klik op "
-"\"Instellingen\" in het menu van KMail. Kies \"KMail configureren...\" Klik "
-"vervolgens op \"Accounts\". Klik op \"Wijzigen...\", en nadien op \"Doorgaan"
-"\" om de melding van een probleem met het certificaat te accepteren en "
-"vervolgens op \"Voorgoed\", \"OK\", \"Toepassen\" en nogmaals \"OK\". Klaar!"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"Now send a test email to yourself. (This will create the IMAP folders on the "
-"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
-"There should be your recently sent email in the inbox below of \"intern\"."
-msgstr ""
-"Verstuur nu een testbericht naar uzelf. (Hierdoor zullen op de server de "
-"mappen voor IMAP aangemaakt worden.) Wacht enige ogenblikken, en klik dan in "
-"het menu van KMail op \"Post bekijken\". In het postvak in onder \"intern\" "
-"zou het pas verzonden bericht zichtbaar moeten zijn."
+"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."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start icedove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Uncheck 'Remember password'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Don't enter your password as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Continue'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Manual config'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"First time accessing the inbox click 'Confirm Security Exception' to accept "
+"the certificate"
+msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
@@ -10042,6 +10182,20 @@ msgid "Copyright and authors"
 msgstr "Auteursrechten en auteurs"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
+#| "2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, "
+#| "2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), "
+#| "Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), "
+#| "Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, "
+#| "2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
+#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, "
+#| "2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt "
+#| "(2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike "
+#| "Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang "
+#| "Schweer (2012, 2013, 2014) and Bernhard Hammes (2012) and is released "
+#| "under the GPL2 or any later version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, 2002, 2003, "
@@ -10052,7 +10206,7 @@ msgid ""
 "Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
 "(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
 "(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014) and "
+"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015) and "
 "Bernhard Hammes (2012) and is released under the GPL2 or any later version. "
 "Enjoy!"
 msgstr ""
@@ -10171,7 +10325,7 @@ msgstr ""
 #| "any later version."
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
 "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
 "l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
 "version."
@@ -12767,6 +12921,47 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #~ msgid ""
+#~ "Start KMail, click \"Next\" in the Account Wizard, select "
+#~ "<computeroutput>IMAP</computeroutput> as account type, click \"Next\". "
+#~ "Enter real name and e-mail address <computeroutput>username at postoffice."
+#~ "intern</computeroutput>, click \"Next\". Check if the username is "
+#~ "correct, don't enter the password, click \"Next\". (Kerberos provides "
+#~ "single sign on concerning SMTP and IMAP, so you don't have to enter your "
+#~ "password.) Enter <computeroutput>postoffice.intern</computeroutput> twice "
+#~ "as server name, click \"Finish\". Close the tip of the day. Click "
+#~ "\"Settings\" in the KMail menu, select \"Configure KMail...\", then click "
+#~ "on \"Accounts\". Click \"Modify...\", then \"Continue\" to accept the "
+#~ "certificate problem and \"Forever\", \"OK\", \"Apply\" and once more \"OK"
+#~ "\". That's it!"
+#~ msgstr ""
+#~ "Start KMail op. Klik in de accountassistent op \"Volgende\" en kies voor "
+#~ "<computeroutput>IMAP</computeroutput> als type account. Klik op \"Volgende"
+#~ "\". Voer uw echte naam in en het e-mailadres "
+#~ "<computeroutput>gebruikersnaam at postoffice.intern</computeroutput>. Klik "
+#~ "op \"Volgende\". Controleer of de gebruikersnaam correct is. voer geen "
+#~ "wachtwoord in. Klik op \"Volgende\". (Door het gebruik van Kerberos, "
+#~ "geldt het wachtwoord bij het aanmelden op het systeem meteen ook voor "
+#~ "SMTP en IMAP, en moet u dus geen wachtwoord ingeven.) Geef "
+#~ "<computeroutput>postoffice.intern</computeroutput> tweemaal in als "
+#~ "servernaam. Klik op \"Afsluiten\". Sluit de tip van de dag. Klik op "
+#~ "\"Instellingen\" in het menu van KMail. Kies \"KMail configureren...\" "
+#~ "Klik vervolgens op \"Accounts\". Klik op \"Wijzigen...\", en nadien op "
+#~ "\"Doorgaan\" om de melding van een probleem met het certificaat te "
+#~ "accepteren en vervolgens op \"Voorgoed\", \"OK\", \"Toepassen\" en "
+#~ "nogmaals \"OK\". Klaar!"
+
+#~ msgid ""
+#~ "Now send a test email to yourself. (This will create the IMAP folders on "
+#~ "the server.) Wait a little bit, then click \"Check Mail\" in the KMail "
+#~ "menu. There should be your recently sent email in the inbox below of "
+#~ "\"intern\"."
+#~ msgstr ""
+#~ "Verstuur nu een testbericht naar uzelf. (Hierdoor zullen op de server de "
+#~ "mappen voor IMAP aangemaakt worden.) Wacht enige ogenblikken, en klik dan "
+#~ "in het menu van KMail op \"Post bekijken\". In het postvak in onder "
+#~ "\"intern\" zou het pas verzonden bericht zichtbaar moeten zijn."
+
+#~ msgid ""
 #~ "eth1 is used for serving LTSP clients (192.168.0.0/24 as default or "
 #~ "192.168.1.0/24)."
 #~ msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index d2e4094..52fe378 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-08 10:45+0000\n"
+"POT-Creation-Date: 2015-02-09 09:18+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"
@@ -6666,30 +6666,182 @@ msgid ""
 "computeroutput>."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><title>
 msgid "Every user who wants to use KMail needs to configure it as follows."
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Close the tip of the day"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Cancel the account assistant"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Open Settings/Configure Kmail"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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)"
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Now choose Accounts out of the menu"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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)"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as account name and 'postoffice.intern' as imap server"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check if the username is present"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "don't enter the password, as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click the tab Advanced"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid ""
-"Start KMail, click \"Next\" in the Account Wizard, select "
-"<computeroutput>IMAP</computeroutput> as account type, click \"Next\". Enter "
-"real name and e-mail address <computeroutput>username at postoffice.intern</"
-"computeroutput>, click \"Next\". Check if the username is correct, don't "
-"enter the password, click \"Next\". (Kerberos provides single sign on "
-"concerning SMTP and IMAP, so you don't have to enter your password.) Enter "
-"<computeroutput>postoffice.intern</computeroutput> twice as server name, "
-"click \"Finish\". Close the tip of the day. Click \"Settings\" in the KMail "
-"menu, select \"Configure KMail...\", then click on \"Accounts\". Click "
-"\"Modify...\", then \"Continue\" to accept the certificate problem and "
-"\"Forever\", \"OK\", \"Apply\" and once more \"OK\". That's it!"
+"click 'Auto detect', then change Authentication manually from 'Login' to "
+"'GSSAPI'"
 msgstr ""
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click ok"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click Add"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'intern' as name and set it as default, choose SMTP"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click 'Create and Configure'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter 'postoffice.intern' as outgoing server name"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "check 'server requires authentication'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "enter username; again, omit the password"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click on the just configured server entry, click 'Modify'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click advanced configuration"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click detect automatically"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "click two times OK"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Start icedove"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+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"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Uncheck 'Remember password'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Don't enter your password as Kerberos single sign on will be used"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Continue'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Manual config'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"Now send a test email to yourself. (This will create the IMAP folders on the "
-"server.) Wait a little bit, then click \"Check Mail\" in the KMail menu. "
-"There should be your recently sent email in the inbox below of \"intern\"."
+"First time accessing the inbox click 'Confirm Security Exception' to accept "
+"the certificate"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -7127,7 +7279,7 @@ msgid ""
 "Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh "
 "(2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat "
 "(2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye "
-"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014) and "
+"(2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015) and "
 "Bernhard Hammes (2012) and is released under the GPL2 or any later version. "
 "Enjoy!"
 msgstr ""
@@ -7182,7 +7334,7 @@ msgstr ""
 #. type: Content of: <article><section><para>
 msgid ""
 "The French translation is copyrighted by Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
 "Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French "
 "l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later "
 "version."
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 42f22da..873f221 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -2966,12 +2966,150 @@ 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 needs to configure it as follows. 
+
+<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.
+</title>
+<itemizedlist>
+<listitem>
+<para>Start Kmail 
+</para></listitem>
+<listitem>
+<para>Close the tip of the day 
+</para></listitem>
+<listitem>
+<para>Cancel the account assistant 
+</para></listitem>
+<listitem>
+<para>Open Settings/Configure Kmail 
+</para></listitem>
+<listitem>
+<para>Modify the default identity 
 </para>
-<para>Start KMail, click "Next" in the Account Wizard, select <computeroutput>IMAP</computeroutput> as account type, click "Next". Enter real name and e-mail address <computeroutput>username at postoffice.intern</computeroutput>, click "Next". Check if the username is correct, don't enter the password, click "Next". (Kerberos provides single sign on concerning SMTP and IMAP, so you don't have to enter your password.) Enter <computeroutput>postoffice.intern</computeroutput> twice as server n [...]
+<itemizedlist>
+<listitem>
+<para>enter your email-address (<username>@postoffice.intern) 
+</para></listitem>
+<listitem>
+<para>make sure that 'postoffice.intern' is the default domain (tab Advanced) 
+</para></listitem>
+<listitem>
+<para>click OK 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Now choose Accounts out of the menu 
 </para>
-<para>Now send a test email to yourself. (This will create the IMAP folders on the server.) Wait a little bit, then click "Check Mail" in the KMail menu. There should be your recently sent email in the inbox below of "intern".  
+<itemizedlist>
+<listitem>
+<para>click add 
+</para></listitem>
+<listitem>
+<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 
+</para></listitem>
+<listitem>
+<para>check if the username is present 
+</para></listitem>
+<listitem>
+<para>don't enter the password, as Kerberos single sign on will be used 
+</para></listitem>
+<listitem>
+<para>click the tab Advanced 
+</para></listitem>
+<listitem>
+<para>click 'Auto detect', then change Authentication manually from 'Login' to 'GSSAPI' 
+</para></listitem>
+<listitem>
+<para>click ok 
+</para></listitem>
+<listitem>
+<para>accept the certificate (forever) 
+</para></listitem>
+<listitem>
+<para>click ok 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>Open Settings/Configure Kmail once again to configure Sending 
 </para>
+<itemizedlist>
+<listitem>
+<para>click Add 
+</para></listitem>
+<listitem>
+<para>enter 'intern' as name and set it as default, choose SMTP 
+</para></listitem>
+<listitem>
+<para>click 'Create and Configure' 
+</para></listitem>
+<listitem>
+<para>enter 'postoffice.intern' as outgoing server name 
+</para></listitem>
+<listitem>
+<para>check 'server requires authentication' 
+</para></listitem>
+<listitem>
+<para>enter username; again, omit the password 
+</para></listitem>
+<listitem>
+<para>click OK 
+</para></listitem>
+<listitem>
+<para>click on the just configured server entry, click 'Modify' 
+</para></listitem>
+<listitem>
+<para>click advanced configuration 
+</para></listitem>
+<listitem>
+<para>click detect automatically 
+</para></listitem>
+<listitem>
+<para>click two times OK 
+</para></listitem></itemizedlist></listitem>
+<listitem>
+<para>You should now be able to read your welcome email (next message).  
+</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.
+</title>
+<itemizedlist>
+<listitem>
+<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></listitem>
+<listitem>
+<para>Uncheck 'Remember password' 
+</para></listitem>
+<listitem>
+<para>Don't enter your password as Kerberos single sign on will be used 
+</para></listitem>
+<listitem>
+<para>Click 'Continue' 
+</para></listitem>
+<listitem>
+<para>Click 'Manual config' 
+</para></listitem>
+<listitem>
+<para>Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well 
+</para></listitem>
+<listitem>
+<para>Click 'Done' 
+</para></listitem>
+<listitem>
+<para>A warning pops up, check 'I understand the risks' and click 'Done' 
+</para></listitem>
+<listitem>
+<para>First time accessing the inbox click 'Confirm Security Exception' to accept the certificate 
+</para></listitem></itemizedlist>
+</section>
 
 <section id="Users--Obtaining_a_Kerberos_ticket_to_read_email_on_diskless_workstations">
 <title>Obtaining a Kerberos ticket to read email on diskless workstations
@@ -3270,7 +3408,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <section id="CopyRight">
 <title>Copyright and authors
 </title>
-<para>This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009 [...]
+<para>This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009 [...]
 </para>
 <para>If you add content to it, <emphasis role="strong">please only do so if you are the author. You need to release it under the same conditions</emphasis>! Then add your name here and release it under the "GPL v2 or any later version" licence. 
 </para>
@@ -3287,7 +3425,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </para>
 <para>The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014) and Beatrice Torracca (2013, 2014) and is released under the GPL v2 or any later version. 
 </para>
-<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013,2014,2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version. 
+<para>The French translation is copyrighted by Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012) and is released under the GPL v2 or any later version. 
 </para>
 <para>The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014) and is released under the GPL v2 or any later version. 
 </para>
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index f3a9281..4caf021 100644
Binary files a/documentation/debian-edu-jessie/images/de/worldmap.png and b/documentation/debian-edu-jessie/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/es/worldmap.png b/documentation/debian-edu-jessie/images/es/worldmap.png
index bb399c4..999dfe9 100644
Binary files a/documentation/debian-edu-jessie/images/es/worldmap.png and b/documentation/debian-edu-jessie/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/fr/worldmap.png b/documentation/debian-edu-jessie/images/fr/worldmap.png
index eeb9b80..5200ce3 100644
Binary files a/documentation/debian-edu-jessie/images/fr/worldmap.png and b/documentation/debian-edu-jessie/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/worldmap.png b/documentation/debian-edu-jessie/images/worldmap.png
index ab0292d..f601b8c 100644
Binary files a/documentation/debian-edu-jessie/images/worldmap.png and b/documentation/debian-edu-jessie/images/worldmap.png differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git