[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Stretch manual from the wiki.

Holger Levsen holger at layer-acht.org
Tue Feb 21 19:15:46 UTC 2017


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 dfae049da4c0392ef1963a2cf02330226ae372cf
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Feb 21 20:15:31 2017 +0100

    Update Debian Edu Stretch manual from the wiki.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../debian-edu-stretch-manual.da.po                | 392 +++++++++++--------
 .../debian-edu-stretch-manual.de.po                | 407 ++++++++++---------
 .../debian-edu-stretch-manual.es.po                | 229 +++--------
 .../debian-edu-stretch-manual.fr.po                | 423 +++++++++++---------
 .../debian-edu-stretch-manual.it.po                | 403 ++++++++++---------
 .../debian-edu-stretch-manual.ja.po                | 389 ++++++++++--------
 .../debian-edu-stretch-manual.nb.po                | 393 +++++++++++--------
 .../debian-edu-stretch-manual.nl.po                | 435 ++++++++++++---------
 .../debian-edu-stretch-manual.pl.po                | 209 +++-------
 .../debian-edu-stretch-manual.pot                  | 204 +++-------
 .../debian-edu-stretch-manual.xml                  | 142 ++-----
 .../debian-edu-stretch-manual.zh.po                | 208 +++-------
 12 files changed, 1847 insertions(+), 1987 deletions(-)

diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index f5f1052..b0be5a8 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2016-10-06 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -5821,25 +5821,10 @@ msgstr "apt-get install -t stretch-backports tuxtype"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid ""
-#| "Backports are automatically updated (if available) just like other "
-#| "packages. (Previously, extra configuration was needed to achieve this, "
-#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
-#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
-#| "anymore]."
+#| "Like the normal archive, backports has three sections: main, contrib and "
+#| "non-free."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-"Backports bliver automatisk opdateret (hvis tilgængelige) ligesom andre "
-"pakker. (Tidligere var ekstra konfiguration krævet, men siden 2011 [[<ulink "
-"url=\"http://backports.debian.org/news/squeeze-backports_and_lenny-backports-"
-"sloppy_started/|er\"/> dette ikke krævet længere]."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -9129,10 +9114,38 @@ msgstr "Samba i Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Samba (v3), since Debian Edu Wheezy (the previous release), has been "
+#| "fully prepared for use as an NT4-style domain controller with Windows XP, "
+#| "Windows Vista and Windows 7 as clients. After a machine has joined the "
+#| "domain, this machine can be fully managed with GOsa²."
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 "Samba (v3) siden Debian Edu Wheezy (den forrige udgivelse) er blevet fuldt "
 "forberedt for brug som en NT4-lignende domænecontroller med Windows XP, "
@@ -9502,10 +9515,15 @@ msgid "HowTos for teaching and learning"
 msgstr "Hjælp for undervisning og læring"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Debian packages on this page can be installed by running either "
+#| "<computeroutput>aptitude install <package></computeroutput> or "
+#| "<computeroutput>apt-get install <package></computeroutput> (as "
+#| "root)."
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 "Alle Debianpakkerne på denne side kan installeres ved at køre enten "
 "<computeroutput>aptitude install <package></computeroutput> eller "
@@ -9572,13 +9590,21 @@ msgid "Monitoring pupils"
 msgstr "Overvågning af elever"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"https://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"https://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 "Nogle skoler bruger kontrolværktøjer som <ulink url=\"http://packages.debian."
 "org/stable/controlaula#\">Controlaula</ulink> eller <ulink url=\"http://"
@@ -9635,7 +9661,9 @@ msgstr ""
 "lærere og elever forberede sig på undervisningen på alle computere:"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
+#, fuzzy
+#| msgid "Providing the repository on tjener"
+msgid "Providing the repository on the main server"
 msgstr "Tilbydelse af arkivet på tjener"
 
 #. type: Content of: <article><section><section><section><para>
@@ -9722,8 +9750,12 @@ msgid "The following instructions are for updating LTSP chroots."
 msgstr "De følgende instruktioner er for opdatering af LTSP-chroot'er."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using an editor add the following lines to <computeroutput>/etc/apt/"
+#| "sources.list</computeroutput> in the chroot:"
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 "Med et redigeringsprogram tilføjes de følgende linjer til <computeroutput>/"
@@ -9807,10 +9839,15 @@ msgstr ""
 "og gå til <computeroutput>https://www/gosa/</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using GOsa² to change the password ensures that Kerberos "
+#| "(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+#| "sambaLMPassword) passwords are the same."
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 "Brugen af GOsa² til at ændre adgangskoden sikrer at adgangskoderne for "
 "Kerberos (krbPrincipalKey), LDAP (userPassword) og Samba (sambaNTPassword og "
@@ -9866,9 +9903,16 @@ msgid "Using email"
 msgstr "Brug af e-post"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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>."
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -9880,11 +9924,16 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Every user who wants to use KMail (or Icedove, not installed by default) "
+#| "needs to configure it as follows. For a user with username jdoe the "
+#| "internal email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+#| "\">jdoe at postoffice.intern</ulink>."
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 "Hver bruger som ønsker at bruge KMail (eller Icedove, som ikke er "
 "installeret som standard) skal konfigurere programmet således. For en bruger "
@@ -9892,142 +9941,12 @@ msgstr ""
 "jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr "KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start KMail"
-msgstr "Start KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Close the tip of the day"
-msgstr "Luk dagens fif"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the Account Assistant"
-msgstr "Afbryd kontoassistenten"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail"
-msgstr "Åbn indstillinger/konfigurer KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Modify the default identity"
-msgstr "Ændr standardidentiteten"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email address"
-msgstr "indtast din e-postadresse"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+msgid "Thunderbird"
 msgstr ""
-"sikr dig at »postoffice.intern« er standarddomænet (faneblad avanceret)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click OK"
-msgstr "klik O.k."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose Accounts out of the menu"
-msgstr "Vælg konti fra menuen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click add"
-msgstr "klik tilføj"
-
-#. 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 "vælg imap-server (slip af med KWallet hver gang den popper op)"
-
-#. 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 "indtast »intern« som kontonavn og »postoffice.intern« som imap-server"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check if the username is present"
-msgstr "kontroller om brugernavnet er til stede"
-
-#. 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 ""
-"indtast ikke en adgangskode, da Kerberos' single sign on vil blive anvendt"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click the tab Advanced"
-msgstr "klik på faneblade Avanceret"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"click 'Auto detect', then change Authentication manually from 'Login' to "
-"'GSSAPI'"
+msgid "Start Thunderbird"
 msgstr ""
-"klik »Detekter automatisk«, ændr så godkendelse manuelt fra »Login« til "
-"»GSSAPI«"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click ok"
-msgstr "klik o.k."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "accept the certificate (forever)"
-msgstr "accepter certifikatet (for altid)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail to configure Sending"
-msgstr "Åbn indstillinger/konfigurer KMail for at konfigurere Send"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click Add"
-msgstr "klik Tilføj"
-
-#. 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 "indtast »intern« som navn og sæt den som standard, vælg SMTP"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click 'Create and Configure'"
-msgstr "klik »Opret og konfigurer«"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter 'postoffice.intern' as outgoing server name"
-msgstr "indtast »postoffice.intern« som udgående servernavn"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check 'server requires authentication'"
-msgstr "afkryds »server kræver godkendelse«"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter username; again, omit the password"
-msgstr "indtast brugernavn; igen, udelad adgangskoden"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click on the just configured server entry, click 'Modify'"
-msgstr "klik på den konfigurerede serverpost, klik »Ændr«"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click advanced configuration"
-msgstr "klik avanceret konfiguration"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click detect automatically"
-msgstr "klik detekter automatisk"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click two times OK"
-msgstr "klik to gange på O.k."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "You should now be able to read your welcome email (next message)."
-msgstr "Du bør nu kunne læse din velkomstbesked (næste besked)."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Icedove"
-msgstr "Icedove"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
-msgstr "Start Icedove"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
@@ -10591,6 +10510,13 @@ msgstr "Icinga2 erstatter Nagios som overvågningsværktøj. Icinga2"
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr "kde-spectacle erstatter ksnapshot som skærmbilledværktøj."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr "Ophavsret og forfattere"
@@ -13437,6 +13363,134 @@ msgstr ""
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #, fuzzy
+#~| msgid ""
+#~| "Backports are automatically updated (if available) just like other "
+#~| "packages. (Previously, extra configuration was needed to achieve this, "
+#~| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#~| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#~| "anymore]."
+#~ msgid ""
+#~ "Backports are automatically updated (if available) just like other "
+#~ "packages. (Previously, extra configuration was needed to achieve this, "
+#~ "but since 2011 this <ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+#~ "ulink>."
+#~ msgstr ""
+#~ "Backports bliver automatisk opdateret (hvis tilgængelige) ligesom andre "
+#~ "pakker. (Tidligere var ekstra konfiguration krævet, men siden 2011 "
+#~ "[[<ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/|er\"/> dette ikke krævet "
+#~ "længere]."
+
+#~ msgid "KMail"
+#~ msgstr "KMail"
+
+#~ msgid "Start KMail"
+#~ msgstr "Start KMail"
+
+#~ msgid "Close the tip of the day"
+#~ msgstr "Luk dagens fif"
+
+#~ msgid "Cancel the Account Assistant"
+#~ msgstr "Afbryd kontoassistenten"
+
+#~ msgid "Open Settings/Configure KMail"
+#~ msgstr "Åbn indstillinger/konfigurer KMail"
+
+#~ msgid "Modify the default identity"
+#~ msgstr "Ændr standardidentiteten"
+
+#~ msgid "enter your email address"
+#~ msgstr "indtast din e-postadresse"
+
+#~ msgid ""
+#~ "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+#~ msgstr ""
+#~ "sikr dig at »postoffice.intern« er standarddomænet (faneblad avanceret)"
+
+#~ msgid "click OK"
+#~ msgstr "klik O.k."
+
+#~ msgid "Choose Accounts out of the menu"
+#~ msgstr "Vælg konti fra menuen"
+
+#~ msgid "click add"
+#~ msgstr "klik tilføj"
+
+#~ msgid "choose imap-server (get rid of KWallet each time it pops up)"
+#~ msgstr "vælg imap-server (slip af med KWallet hver gang den popper op)"
+
+#~ msgid ""
+#~ "enter 'intern' as account name and 'postoffice.intern' as imap server"
+#~ msgstr ""
+#~ "indtast »intern« som kontonavn og »postoffice.intern« som imap-server"
+
+#~ msgid "check if the username is present"
+#~ msgstr "kontroller om brugernavnet er til stede"
+
+#~ msgid "don't enter the password, as Kerberos single sign on will be used"
+#~ msgstr ""
+#~ "indtast ikke en adgangskode, da Kerberos' single sign on vil blive anvendt"
+
+#~ msgid "click the tab Advanced"
+#~ msgstr "klik på faneblade Avanceret"
+
+#~ msgid ""
+#~ "click 'Auto detect', then change Authentication manually from 'Login' to "
+#~ "'GSSAPI'"
+#~ msgstr ""
+#~ "klik »Detekter automatisk«, ændr så godkendelse manuelt fra »Login« til "
+#~ "»GSSAPI«"
+
+#~ msgid "click ok"
+#~ msgstr "klik o.k."
+
+#~ msgid "accept the certificate (forever)"
+#~ msgstr "accepter certifikatet (for altid)"
+
+#~ msgid "Open Settings/Configure KMail to configure Sending"
+#~ msgstr "Åbn indstillinger/konfigurer KMail for at konfigurere Send"
+
+#~ msgid "click Add"
+#~ msgstr "klik Tilføj"
+
+#~ msgid "enter 'intern' as name and set it as default, choose SMTP"
+#~ msgstr "indtast »intern« som navn og sæt den som standard, vælg SMTP"
+
+#~ msgid "click 'Create and Configure'"
+#~ msgstr "klik »Opret og konfigurer«"
+
+#~ msgid "enter 'postoffice.intern' as outgoing server name"
+#~ msgstr "indtast »postoffice.intern« som udgående servernavn"
+
+#~ msgid "check 'server requires authentication'"
+#~ msgstr "afkryds »server kræver godkendelse«"
+
+#~ msgid "enter username; again, omit the password"
+#~ msgstr "indtast brugernavn; igen, udelad adgangskoden"
+
+#~ msgid "click on the just configured server entry, click 'Modify'"
+#~ msgstr "klik på den konfigurerede serverpost, klik »Ændr«"
+
+#~ msgid "click advanced configuration"
+#~ msgstr "klik avanceret konfiguration"
+
+#~ msgid "click detect automatically"
+#~ msgstr "klik detekter automatisk"
+
+#~ msgid "click two times OK"
+#~ msgstr "klik to gange på O.k."
+
+#~ msgid "You should now be able to read your welcome email (next message)."
+#~ msgstr "Du bør nu kunne læse din velkomstbesked (næste besked)."
+
+#~ msgid "Icedove"
+#~ msgstr "Icedove"
+
+#~ msgid "Start Icedove"
+#~ msgstr "Start Icedove"
+
+#, fuzzy
 #~| msgid "new optional desktop environment: MATE 1.8"
 #~ msgid "new optional desktop environment: MATE 1.16"
 #~ msgstr "nyt valgfrit skrivebordsmiljø: MATE 1.8"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index 692b04d..6b60c8a 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2017-02-20 17:42+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -5374,22 +5374,12 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Like the normal archive, backports has three sections: main, contrib and "
+#| "non-free."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-"Backports werden automatisch aktualisiert (falls verfügbar) - genauso wie "
-"andere Pakete. (Früher war eine zusätzliche Konfiguration erforderlich, um "
-"für installierte Backports automatisch Updates zu bekommen; seit 2011 ist "
-"dies wegen der Suite <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">squeeze-backports</ulink> "
-"überflüssig.)"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -8456,10 +8446,38 @@ msgstr "Samba in Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Samba (v3), since Debian Edu Wheezy (the previous release), has been "
+#| "fully prepared for use as an NT4-style domain controller with Windows XP, "
+#| "Windows Vista and Windows 7 as clients. After a machine has joined the "
+#| "domain, this machine can be fully managed with GOsa²."
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 "Seit Debian Edu Wheezy (dem vorherigen Release) ist Samba (v3) so "
 "vorkonfiguriert, dass Clients mit Windows XP, Windows Vista und Windows 7 "
@@ -8837,10 +8855,15 @@ msgid "HowTos for teaching and learning"
 msgstr "HowTos für Lehren und Lernen"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Debian packages on this page can be installed by running either "
+#| "<computeroutput>aptitude install <package></computeroutput> or "
+#| "<computeroutput>apt-get install <package></computeroutput> (as "
+#| "root)."
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 "Alle Debian-Pakete auf dieser Seite können entweder mittels "
 "<computeroutput>aptitude install <package></computeroutput> oder "
@@ -8908,13 +8931,21 @@ msgid "Monitoring pupils"
 msgstr "Schüler/-innen beobachten"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"https://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"https://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 "Einige Schule benutzen Überwachungs-Werkzeuge wie <ulink url=\"https://"
 "packages.debian.org/stable/controlaula#\">Controlaula</ulink> oder <ulink "
@@ -8972,7 +9003,9 @@ msgstr ""
 "und Schüler auf jedem Rechner zur Verfügung steht."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
+#, fuzzy
+#| msgid "Providing the repository on tjener"
+msgid "Providing the repository on the main server"
 msgstr "Das Depot auf »tjener« verfügbar machen"
 
 #. type: Content of: <article><section><section><section><para>
@@ -9062,8 +9095,12 @@ msgstr ""
 "Die folgende Anleitung gilt für das Aktualisieren von LTSP-Chroot-Umgebungen."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using an editor add the following lines to <computeroutput>/etc/apt/"
+#| "sources.list</computeroutput> in the chroot:"
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 "Mittels Editor die folgenden Zeilen der Datei <computeroutput>/etc/apt/"
@@ -9150,10 +9187,15 @@ msgstr ""
 "Browser."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using GOsa² to change the password ensures that Kerberos "
+#| "(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+#| "sambaLMPassword) passwords are the same."
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 "Die Verwendung von GOsa² zur Änderung des Passworts stellt sicher, dass die "
 "Passwörter von Kerberos (krbPrincipalKey), LDAP (userPassword) und Samba "
@@ -9205,9 +9247,16 @@ msgid "Using email"
 msgstr "Verwendung von E-Mail"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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>."
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -9219,11 +9268,16 @@ msgstr ""
 "reconfigure exim4-config</computeroutput> ist dazu ein erster Schritt."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Every user who wants to use KMail (or Icedove, not installed by default) "
+#| "needs to configure it as follows. For a user with username jdoe the "
+#| "internal email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+#| "\">jdoe at postoffice.intern</ulink>."
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 "Jeder Benutzer, der KMail (oder Icedove, standardmäßig nicht installiert) "
 "verwenden will, muss die Konfiguration wie folgt vornehmen (für einen "
@@ -9231,153 +9285,12 @@ msgstr ""
 "jdoe at postoffice.intern)."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr "KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start KMail"
-msgstr "KMail starten"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Close the tip of the day"
-msgstr "Den Tipp des Tages schließen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the Account Assistant"
-msgstr "Den Postfach-Assistenten abbrechen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail"
-msgstr "Das Fenster 'Einstellungen/KMail einrichten ...' öffnen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Modify the default identity"
-msgstr "Die Standard-Identität ändern"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email address"
-msgstr "die E-Mail-Adresse eingeben"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+msgid "Thunderbird"
 msgstr ""
-"sicherstellen, dass 'postoffice.intern' als Standard-Domain eingetragen ist "
-"(Reiter 'Erweitert')"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click OK"
-msgstr "auf OK klicken"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose Accounts out of the menu"
-msgstr "'Zugänge' aus dem Menü wählen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click add"
-msgstr "auf 'Hinzufügen' klicken"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "choose imap-server (get rid of KWallet each time it pops up)"
+msgid "Start Thunderbird"
 msgstr ""
-"die Option 'IMAP-Email-Server' wählen (KWallet immer abbrechen, wenn es "
-"erscheint)"
-
-#. 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 ""
-"als Namen des Zugangs 'intern' und als IMAP-Server 'postoffice.intern' "
-"eingeben"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check if the username is present"
-msgstr "kontrollieren, ob der Benutzername vorhanden ist"
-
-#. 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 ""
-"das Passwort nicht eingeben, da Single-Sign-On mittels Kerberos verwendet "
-"wird"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click the tab Advanced"
-msgstr "auf den Reiter 'Erweitert' klicken"
-
-#. 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 ""
-"auf 'Automatisch erkennen' klicken, dann die Authentifizierung von 'Login' "
-"auf 'GSSAPI' wechseln"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click ok"
-msgstr "auf OK klicken"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "accept the certificate (forever)"
-msgstr "das Zertifikat akzeptieren (dauerhaft)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail to configure Sending"
-msgstr ""
-"Das Fenster 'Einstellungen/KMail einrichten ...' öffnen, um den Versand zu "
-"konfigurieren"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click Add"
-msgstr "auf 'Hinzufügen' klicken"
-
-#. 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 ""
-"als Name 'intern' eingeben, 'SMTP' wählen und als Standard-Versandart setzen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click 'Create and Configure'"
-msgstr "auf 'Erstellen und einrichten' klicken"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter 'postoffice.intern' as outgoing server name"
-msgstr "als Namen für den Postausgangsserver 'postoffice.intern' eingeben"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check 'server requires authentication'"
-msgstr "die Option 'Server erfordert Authentifizierung' aktivieren"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter username; again, omit the password"
-msgstr "den Benutzernamen eingeben; das Passwort wieder weglassen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click on the just configured server entry, click 'Modify'"
-msgstr ""
-"auf den gerade konfigurierten Server-Eintrag klicken, dann auf 'Ändern'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click advanced configuration"
-msgstr "auf 'Erweiterte Einstellungen' klicken"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click detect automatically"
-msgstr "auf 'Automatisch erkennen' klicken"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click two times OK"
-msgstr "zweimal auf OK klicken"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "You should now be able to read your welcome email (next message)."
-msgstr ""
-"Sie sollten nun die Willkommens-E-Mail lesen können ('Nächste Nachricht')"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Icedove"
-msgstr "Icedove"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
-msgstr "Icedove starten"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
@@ -9922,6 +9835,13 @@ msgstr "Icinga ersetzt Nagios als Monitoring-Tool."
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr "kde-spectacle ersetzt ksnapshot als Screenshot-Tool."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr "Copyright und Autoren"
@@ -12748,5 +12668,138 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid ""
+#~ "Backports are automatically updated (if available) just like other "
+#~ "packages. (Previously, extra configuration was needed to achieve this, "
+#~ "but since 2011 this <ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+#~ "ulink>."
+#~ msgstr ""
+#~ "Backports werden automatisch aktualisiert (falls verfügbar) - genauso wie "
+#~ "andere Pakete. (Früher war eine zusätzliche Konfiguration erforderlich, "
+#~ "um für installierte Backports automatisch Updates zu bekommen; seit 2011 "
+#~ "ist dies wegen der Suite <ulink url=\"http://backports.debian.org/news/"
+#~ "squeeze-backports_and_lenny-backports-sloppy_started/\">squeeze-"
+#~ "backports</ulink> überflüssig.)"
+
+#~ msgid "KMail"
+#~ msgstr "KMail"
+
+#~ msgid "Start KMail"
+#~ msgstr "KMail starten"
+
+#~ msgid "Close the tip of the day"
+#~ msgstr "Den Tipp des Tages schließen"
+
+#~ msgid "Cancel the Account Assistant"
+#~ msgstr "Den Postfach-Assistenten abbrechen"
+
+#~ msgid "Open Settings/Configure KMail"
+#~ msgstr "Das Fenster 'Einstellungen/KMail einrichten ...' öffnen"
+
+#~ msgid "Modify the default identity"
+#~ msgstr "Die Standard-Identität ändern"
+
+#~ msgid "enter your email address"
+#~ msgstr "die E-Mail-Adresse eingeben"
+
+#~ msgid ""
+#~ "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+#~ msgstr ""
+#~ "sicherstellen, dass 'postoffice.intern' als Standard-Domain eingetragen "
+#~ "ist (Reiter 'Erweitert')"
+
+#~ msgid "click OK"
+#~ msgstr "auf OK klicken"
+
+#~ msgid "Choose Accounts out of the menu"
+#~ msgstr "'Zugänge' aus dem Menü wählen"
+
+#~ msgid "click add"
+#~ msgstr "auf 'Hinzufügen' klicken"
+
+#~ msgid "choose imap-server (get rid of KWallet each time it pops up)"
+#~ msgstr ""
+#~ "die Option 'IMAP-Email-Server' wählen (KWallet immer abbrechen, wenn es "
+#~ "erscheint)"
+
+#~ msgid ""
+#~ "enter 'intern' as account name and 'postoffice.intern' as imap server"
+#~ msgstr ""
+#~ "als Namen des Zugangs 'intern' und als IMAP-Server 'postoffice.intern' "
+#~ "eingeben"
+
+#~ msgid "check if the username is present"
+#~ msgstr "kontrollieren, ob der Benutzername vorhanden ist"
+
+#~ msgid "don't enter the password, as Kerberos single sign on will be used"
+#~ msgstr ""
+#~ "das Passwort nicht eingeben, da Single-Sign-On mittels Kerberos verwendet "
+#~ "wird"
+
+#~ msgid "click the tab Advanced"
+#~ msgstr "auf den Reiter 'Erweitert' klicken"
+
+#~ msgid ""
+#~ "click 'Auto detect', then change Authentication manually from 'Login' to "
+#~ "'GSSAPI'"
+#~ msgstr ""
+#~ "auf 'Automatisch erkennen' klicken, dann die Authentifizierung von "
+#~ "'Login' auf 'GSSAPI' wechseln"
+
+#~ msgid "click ok"
+#~ msgstr "auf OK klicken"
+
+#~ msgid "accept the certificate (forever)"
+#~ msgstr "das Zertifikat akzeptieren (dauerhaft)"
+
+#~ msgid "Open Settings/Configure KMail to configure Sending"
+#~ msgstr ""
+#~ "Das Fenster 'Einstellungen/KMail einrichten ...' öffnen, um den Versand "
+#~ "zu konfigurieren"
+
+#~ msgid "click Add"
+#~ msgstr "auf 'Hinzufügen' klicken"
+
+#~ msgid "enter 'intern' as name and set it as default, choose SMTP"
+#~ msgstr ""
+#~ "als Name 'intern' eingeben, 'SMTP' wählen und als Standard-Versandart "
+#~ "setzen"
+
+#~ msgid "click 'Create and Configure'"
+#~ msgstr "auf 'Erstellen und einrichten' klicken"
+
+#~ msgid "enter 'postoffice.intern' as outgoing server name"
+#~ msgstr "als Namen für den Postausgangsserver 'postoffice.intern' eingeben"
+
+#~ msgid "check 'server requires authentication'"
+#~ msgstr "die Option 'Server erfordert Authentifizierung' aktivieren"
+
+#~ msgid "enter username; again, omit the password"
+#~ msgstr "den Benutzernamen eingeben; das Passwort wieder weglassen"
+
+#~ msgid "click on the just configured server entry, click 'Modify'"
+#~ msgstr ""
+#~ "auf den gerade konfigurierten Server-Eintrag klicken, dann auf 'Ändern'"
+
+#~ msgid "click advanced configuration"
+#~ msgstr "auf 'Erweiterte Einstellungen' klicken"
+
+#~ msgid "click detect automatically"
+#~ msgstr "auf 'Automatisch erkennen' klicken"
+
+#~ msgid "click two times OK"
+#~ msgstr "zweimal auf OK klicken"
+
+#~ msgid "You should now be able to read your welcome email (next message)."
+#~ msgstr ""
+#~ "Sie sollten nun die Willkommens-E-Mail lesen können ('Nächste Nachricht')"
+
+#~ msgid "Icedove"
+#~ msgstr "Icedove"
+
+#~ msgid "Start Icedove"
+#~ msgstr "Icedove starten"
+
 #~ msgid "new optional desktop environment: MATE 1.16"
 #~ msgstr "neue optionale Desktop-Umgebung: MATE 1.16"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index dd8c2fe..7e287a1 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -5499,14 +5499,6 @@ msgstr "apt-get install -t jessie-backports tuxtype"
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -7874,10 +7866,32 @@ msgstr "Samba en Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -8207,9 +8221,8 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -8259,8 +8272,7 @@ msgid ""
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -8297,8 +8309,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
-msgstr ""
+#, fuzzy
+#| msgid "Services running on the main server"
+msgid "Providing the repository on the main server"
+msgstr "Servicios que corren en el servidor principal"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -8364,10 +8378,16 @@ msgid "The following instructions are for updating LTSP chroots."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If XDMCP is not accessible on your server which runs KDM, add the "
+#| "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
+"Si XDMCP no es accesible en su servidor, que correo KDM, agregue lo "
+"siguiente al archivo <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
 
 #. type: CDATA
 #, no-wrap
@@ -8434,9 +8454,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -8476,9 +8496,16 @@ msgid "Using email"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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>."
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -8490,144 +8517,17 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
+msgid "Thunderbird"
 msgstr ""
 
 #. 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"
-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 "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 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 "Icedove"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
+msgid "Start Thunderbird"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9122,6 +9022,13 @@ msgstr ""
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr "Copyright y authores"
@@ -11620,14 +11527,6 @@ msgstr ""
 #~ "El objetivo es permitir que el cliente ligero real, contacte al servidor "
 #~ "xdmcp en 192.168.0.254 (en una configuración estándar de Skolelinux). "
 
-#~ msgid ""
-#~ "If XDMCP is not accessible on your server which runs KDM, add the "
-#~ "following to <computeroutput>/etc/kde4/kdm/Xaccess</computeroutput>:"
-#~ msgstr ""
-#~ "Si XDMCP no es accesible en su servidor, que correo KDM, agregue lo "
-#~ "siguiente al archivo <computeroutput>/etc/kde4/kdm/Xaccess</"
-#~ "computeroutput>:"
-
 #~ msgid "* # any host can get a login window"
 #~ msgstr "* # any host can get a login window"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index f1cc35b..cf4da2e 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -6075,27 +6075,10 @@ msgstr "apt-get install -t jessie-backports tuxtype"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid ""
-#| "Backports are automatically updated (if available) just like other "
-#| "packages. (Previously, extra configuration was needed to achieve this, "
-#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
-#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
-#| "anymore]."
+#| "Like the normal archive, backports has three sections: main, contrib and "
+#| "non-free."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-"Les paquets rétroportés, s'ils sont disponibles, sont automatiquement mis à "
-"jour, comme n'importe quel autre paquet. (Auparavant, la mise à jour "
-"automatique des paquets rétroportés nécessitait une étape supplémentaire de "
-"configuration. Mais depuis 2011, <ulink url=\"http://backports.debian.org/"
-"news/squeeze-backports_and_lenny-backports-sloppy_started/\">cette étape</"
-"ulink>est maintenant inutile.)"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -9496,10 +9479,38 @@ msgstr "Samba dans Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Samba (v3), since Debian Edu Wheezy (the previous release), has been "
+#| "fully prepared for use as an NT4-style domain controller with Windows XP, "
+#| "Windows Vista and Windows 7 as clients. After a machine has joined the "
+#| "domain, this machine can be fully managed with GOsa²."
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 "La version 3 de Samba, depuis Debian Edu Wheezy (la version précédente), a "
 "été préparée pour être utilisée comme un contrôleur de domaine dans le style "
@@ -9881,10 +9892,15 @@ msgid "HowTos for teaching and learning"
 msgstr "Manuels pour enseigner et apprendre"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Debian packages on this page can be installed by running either "
+#| "<computeroutput>aptitude install <package></computeroutput> or "
+#| "<computeroutput>apt-get install <package></computeroutput> (as "
+#| "root)."
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 "Tous les paquets Debian sur cette page peuvent être installés en exécutant "
 "en tant que superutilisateur la commande <computeroutput>aptitude install "
@@ -9954,13 +9970,21 @@ msgid "Monitoring pupils"
 msgstr "Surveillance des élèves"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"https://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"https://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 "Certains établissements utilisent des outils de contrôle tels que <ulink url="
 "\"https://packages.debian.org/stable/controlaula#\">Controlaula</ulink> ou "
@@ -10019,7 +10043,9 @@ msgstr ""
 "élèves puissent se préparer depuis n'importe quel ordinateur :"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
+#, fuzzy
+#| msgid "Providing the repository on tjener"
+msgid "Providing the repository on the main server"
 msgstr "Mise à disposition du dépôt sur tjener"
 
 #. type: Content of: <article><section><section><section><para>
@@ -10107,8 +10133,12 @@ msgid "The following instructions are for updating LTSP chroots."
 msgstr "Les instructions suivantes concernent la mise à jour des chroots LTSP."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using an editor add the following lines to <computeroutput>/etc/apt/"
+#| "sources.list</computeroutput> in the chroot:"
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 "En utilisant un éditeur, ajoutez les lignes suivantes au fichier "
@@ -10194,10 +10224,15 @@ msgstr ""
 "www/gosa/</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using GOsa² to change the password ensures that Kerberos "
+#| "(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+#| "sambaLMPassword) passwords are the same."
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 "Utiliser GOsa² pour changer son mot de passe assure que les mots de passe "
 "Kerberos (krbPrincipalKey), LDAP (userPassword) et Samba (sambaNTPassword et "
@@ -10255,9 +10290,16 @@ msgid "Using email"
 msgstr "Utilisation du courrier électronique"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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>."
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -10270,11 +10312,16 @@ msgstr ""
 "computeroutput> est la première étape dans cette direction."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Every user who wants to use KMail (or Icedove, not installed by default) "
+#| "needs to configure it as follows. For a user with username jdoe the "
+#| "internal email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+#| "\">jdoe at postoffice.intern</ulink>."
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 "Tout utilisateur qui souhaiterait utiliser KMail (ou Icedove, non installé "
 "par défaut) doit le configurer comme indiqué ci-dessous. Pour un utilisateur "
@@ -10282,156 +10329,12 @@ msgstr ""
 "jdoe at postoffice.intern\">jdoepostoffice.intern</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr "KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start KMail"
-msgstr "Démarrez Kmail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Close the tip of the day"
-msgstr "Fermez l'astuce du jour."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the Account Assistant"
-msgstr "Annulez l'assistant de comptes."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail"
-msgstr "Ouvrez le menu Configuration/Configurer KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Modify the default identity"
-msgstr "Modifiez l'identité par défaut"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email address"
-msgstr "entrez votre adresse email"
-
-#. 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 ""
-"assurez-vous que « postoffice.intern » est le domaine par défaut (dans "
-"l'onglet « Avancées »)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click OK"
-msgstr "cliquez sur Ok"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose Accounts out of the menu"
-msgstr "Choisissez « Comptes » depuis le menu"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click add"
-msgstr "cliquez sur « Ajouter »"
-
-#. 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 ""
-"choisissez serveur IMAP (débarassez-vous de KWallet à chaque fois qu'il "
-"apparaît)"
-
-#. 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 ""
-"entrez « intern » comme nom de compte et « postoffice.intern » comme nom de "
-"serveur IMAP"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check if the username is present"
-msgstr "vérifiez si le nom d'utilisateur est indiqué"
-
-#. 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 ""
-"n'entrez pas le mot de passe, comme l'authentification unique Kerberos sera "
-"utilisée"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click the tab Advanced"
-msgstr "cliquez sur l'onglet « Avancé »"
-
-#. 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 ""
-"cliquez sur « Détecter automatiquement », puis changer manuellement le champ "
-"« Authentification » de « Login » à « GSSAPI »."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click ok"
-msgstr "cliquez ok"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "accept the certificate (forever)"
-msgstr "acceptez le certificat (définitivement)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail to configure Sending"
-msgstr ""
-"Ouvrez dans le menu Configuration/Configurer Kmail pour configurer l'envoi"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click Add"
-msgstr "cliquez « Ajouter »"
-
-#. 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 ""
-"entrez « intern » comme nom et choisissez-le comme valeur par défaut. "
-"Sélectionnez SMTP"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click 'Create and Configure'"
-msgstr "cliquez sur « Créer et configurer »"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter 'postoffice.intern' as outgoing server name"
-msgstr "Entrez « postoffice.intern » comme nom de service sortant"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check 'server requires authentication'"
-msgstr "cochez la case « le serveur exige une authentification »"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter username; again, omit the password"
+msgid "Thunderbird"
 msgstr ""
-"Entrez le nom d'utilisateur. Encore une fois, ne mettez pas le mot de passe."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click on the just configured server entry, click 'Modify'"
-msgstr ""
-"cliquez sur l'entrée correspondant sur le serveur fraîchement configuré. "
-"Cliquez sur « modifier »."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click advanced configuration"
-msgstr "cliquez sur configuration avancée"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click detect automatically"
-msgstr "cliquez sur détection automatique"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click two times OK"
-msgstr "cliquez deux fois sur OK"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "You should now be able to read your welcome email (next message)."
+msgid "Start Thunderbird"
 msgstr ""
-"Vous devriez maintenant être capable de lire votre message de bienvenue "
-"(message suivant)."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Icedove"
-msgstr "Icedove"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
-msgstr "Démarrez Icedove"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
@@ -11039,6 +10942,13 @@ msgstr ""
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr "Droits d'auteur et auteurs"
@@ -13978,6 +13888,149 @@ msgstr ""
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
 #, fuzzy
+#~| msgid ""
+#~| "Backports are automatically updated (if available) just like other "
+#~| "packages. (Previously, extra configuration was needed to achieve this, "
+#~| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#~| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#~| "anymore]."
+#~ msgid ""
+#~ "Backports are automatically updated (if available) just like other "
+#~ "packages. (Previously, extra configuration was needed to achieve this, "
+#~ "but since 2011 this <ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+#~ "ulink>."
+#~ msgstr ""
+#~ "Les paquets rétroportés, s'ils sont disponibles, sont automatiquement mis "
+#~ "à jour, comme n'importe quel autre paquet. (Auparavant, la mise à jour "
+#~ "automatique des paquets rétroportés nécessitait une étape supplémentaire "
+#~ "de configuration. Mais depuis 2011, <ulink url=\"http://backports.debian."
+#~ "org/news/squeeze-backports_and_lenny-backports-sloppy_started/\">cette "
+#~ "étape</ulink>est maintenant inutile.)"
+
+#~ msgid "KMail"
+#~ msgstr "KMail"
+
+#~ msgid "Start KMail"
+#~ msgstr "Démarrez Kmail"
+
+#~ msgid "Close the tip of the day"
+#~ msgstr "Fermez l'astuce du jour."
+
+#~ msgid "Cancel the Account Assistant"
+#~ msgstr "Annulez l'assistant de comptes."
+
+#~ msgid "Open Settings/Configure KMail"
+#~ msgstr "Ouvrez le menu Configuration/Configurer KMail"
+
+#~ msgid "Modify the default identity"
+#~ msgstr "Modifiez l'identité par défaut"
+
+#~ msgid "enter your email address"
+#~ msgstr "entrez votre adresse email"
+
+#~ msgid ""
+#~ "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+#~ msgstr ""
+#~ "assurez-vous que « postoffice.intern » est le domaine par défaut (dans "
+#~ "l'onglet « Avancées »)"
+
+#~ msgid "click OK"
+#~ msgstr "cliquez sur Ok"
+
+#~ msgid "Choose Accounts out of the menu"
+#~ msgstr "Choisissez « Comptes » depuis le menu"
+
+#~ msgid "click add"
+#~ msgstr "cliquez sur « Ajouter »"
+
+#~ msgid "choose imap-server (get rid of KWallet each time it pops up)"
+#~ msgstr ""
+#~ "choisissez serveur IMAP (débarassez-vous de KWallet à chaque fois qu'il "
+#~ "apparaît)"
+
+#~ msgid ""
+#~ "enter 'intern' as account name and 'postoffice.intern' as imap server"
+#~ msgstr ""
+#~ "entrez « intern » comme nom de compte et « postoffice.intern » comme nom "
+#~ "de serveur IMAP"
+
+#~ msgid "check if the username is present"
+#~ msgstr "vérifiez si le nom d'utilisateur est indiqué"
+
+#~ msgid "don't enter the password, as Kerberos single sign on will be used"
+#~ msgstr ""
+#~ "n'entrez pas le mot de passe, comme l'authentification unique Kerberos "
+#~ "sera utilisée"
+
+#~ msgid "click the tab Advanced"
+#~ msgstr "cliquez sur l'onglet « Avancé »"
+
+#~ msgid ""
+#~ "click 'Auto detect', then change Authentication manually from 'Login' to "
+#~ "'GSSAPI'"
+#~ msgstr ""
+#~ "cliquez sur « Détecter automatiquement », puis changer manuellement le "
+#~ "champ « Authentification » de « Login » à « GSSAPI »."
+
+#~ msgid "click ok"
+#~ msgstr "cliquez ok"
+
+#~ msgid "accept the certificate (forever)"
+#~ msgstr "acceptez le certificat (définitivement)"
+
+#~ msgid "Open Settings/Configure KMail to configure Sending"
+#~ msgstr ""
+#~ "Ouvrez dans le menu Configuration/Configurer Kmail pour configurer l'envoi"
+
+#~ msgid "click Add"
+#~ msgstr "cliquez « Ajouter »"
+
+#~ msgid "enter 'intern' as name and set it as default, choose SMTP"
+#~ msgstr ""
+#~ "entrez « intern » comme nom et choisissez-le comme valeur par défaut. "
+#~ "Sélectionnez SMTP"
+
+#~ msgid "click 'Create and Configure'"
+#~ msgstr "cliquez sur « Créer et configurer »"
+
+#~ msgid "enter 'postoffice.intern' as outgoing server name"
+#~ msgstr "Entrez « postoffice.intern » comme nom de service sortant"
+
+#~ msgid "check 'server requires authentication'"
+#~ msgstr "cochez la case « le serveur exige une authentification »"
+
+#~ msgid "enter username; again, omit the password"
+#~ msgstr ""
+#~ "Entrez le nom d'utilisateur. Encore une fois, ne mettez pas le mot de "
+#~ "passe."
+
+#~ msgid "click on the just configured server entry, click 'Modify'"
+#~ msgstr ""
+#~ "cliquez sur l'entrée correspondant sur le serveur fraîchement configuré. "
+#~ "Cliquez sur « modifier »."
+
+#~ msgid "click advanced configuration"
+#~ msgstr "cliquez sur configuration avancée"
+
+#~ msgid "click detect automatically"
+#~ msgstr "cliquez sur détection automatique"
+
+#~ msgid "click two times OK"
+#~ msgstr "cliquez deux fois sur OK"
+
+#~ msgid "You should now be able to read your welcome email (next message)."
+#~ msgstr ""
+#~ "Vous devriez maintenant être capable de lire votre message de bienvenue "
+#~ "(message suivant)."
+
+#~ msgid "Icedove"
+#~ msgstr "Icedove"
+
+#~ msgid "Start Icedove"
+#~ msgstr "Démarrez Icedove"
+
+#, fuzzy
 #~| msgid "new optional desktop environment: MATE 1.8"
 #~ msgid "new optional desktop environment: MATE 1.16"
 #~ msgstr "nouvel environnement de bureau proposé en option : MATE 1.8"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index f1cf725..1e1606d 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2015-05-04 19:34+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -5970,26 +5970,10 @@ msgstr "apt-get install -t jessie-backports tuxtype"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid ""
-#| "Backports are automatically updated (if available) just like other "
-#| "packages. (Previously, extra configuration was needed to achieve this, "
-#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
-#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
-#| "anymore]."
+#| "Like the normal archive, backports has three sections: main, contrib and "
+#| "non-free."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-"I backport sono aggiornati automaticamente (se disponibili) come gli altri "
-"pacchetti. (Precedentemente era necessaria un'ulteriore configurazione per "
-"raggiungere questo obiettivo, ma dal 2011 questo [[<ulink url=\"http://"
-"backports.debian.org/news/squeeze-backports_and_lenny-backports-"
-"sloppy_started/|non è\"/> più necessario]."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -9323,10 +9307,38 @@ msgstr "Samba in Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Samba (v3), since Debian Edu Wheezy (the previous release), has been "
+#| "fully prepared for use as an NT4-style domain controller with Windows XP, "
+#| "Windows Vista and Windows 7 as clients. After a machine has joined the "
+#| "domain, this machine can be fully managed with GOsa²."
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 "Con Debian Edu Wheezy (la versione precedente) Samba (v3) è stato "
 "completamente configurato per l'utilizzo come controller di dominio NT4 per "
@@ -9705,10 +9717,15 @@ msgid "HowTos for teaching and learning"
 msgstr "HowTo per insegnare e imparare"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Debian packages on this page can be installed by running either "
+#| "<computeroutput>aptitude install <package></computeroutput> or "
+#| "<computeroutput>apt-get install <package></computeroutput> (as "
+#| "root)."
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 "Tutti i pacchetti Debian di questa pagina possono essere installati "
 "eseguendo <computeroutput>aptitude install <pacchetto></"
@@ -9774,13 +9791,21 @@ msgid "Monitoring pupils"
 msgstr "Monitorare gli allievi"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"https://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"https://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 "Alcune scuole usano strumenti di controllo come <ulink url=\"https://"
 "packages.debian.org/stable/controlaula#\">Controlaula</ulink> o <ulink url="
@@ -9838,7 +9863,9 @@ msgstr ""
 "e studenti possono prepararsi per la lezione su ogni computer: "
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
+#, fuzzy
+#| msgid "Providing the repository on tjener"
+msgid "Providing the repository on the main server"
 msgstr "Fornire il repository su tjener"
 
 #. type: Content of: <article><section><section><section><para>
@@ -9927,8 +9954,12 @@ msgid "The following instructions are for updating LTSP chroots."
 msgstr "Le istruzioni che seguono sono per l'aggiornamento di chroot di LTSP."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using an editor add the following lines to <computeroutput>/etc/apt/"
+#| "sources.list</computeroutput> in the chroot:"
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 "Usare un editor per aggiungere le righe seguenti a <computeroutput>/etc/apt/"
@@ -10013,10 +10044,15 @@ msgstr ""
 "gosa/</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using GOsa² to change the password ensures that Kerberos "
+#| "(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+#| "sambaLMPassword) passwords are the same."
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 "L'uso di GOsa² per cambiare la password garantisce che le password di "
 "Kerberos (krbPrincipalKey), LDAP (userPassword) e di Samba (sabmaNTPassword "
@@ -10073,9 +10109,16 @@ msgid "Using email"
 msgstr "Usare la posta elettronica"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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>."
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -10087,11 +10130,16 @@ msgstr ""
 "eseguendo <computeroutput>dpkg-reconfigure exim4-config</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Every user who wants to use KMail (or Icedove, not installed by default) "
+#| "needs to configure it as follows. For a user with username jdoe the "
+#| "internal email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+#| "\">jdoe at postoffice.intern</ulink>."
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 "Ogni utente che vuol utilizzare KMail (o Icedove, non installato di default) "
 "ha bisogno di configurarli come segue. Per un utente con username jdoe "
@@ -10099,146 +10147,12 @@ msgstr ""
 "\">jdoe at postoffice.intern</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr "KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start KMail"
-msgstr "Avviare KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Close the tip of the day"
-msgstr "Chiudere il suggerimento del giorno"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the Account Assistant"
-msgstr "Cancellare l'account Assistant"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail"
-msgstr "Aprire Settings/Configure KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Modify the default identity"
-msgstr "Modificare l'identità predefinita"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email address"
-msgstr "inserire l'indirizzo email"
-
-#. 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 ""
-"assicurarsi che 'postoffice.intern' sia il dominio di default (tab Advanced)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click OK"
-msgstr "click OK"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose Accounts out of the menu"
-msgstr "Scegliere Accounts fuori dal menu"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click add"
-msgstr "click add"
-
-#. 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 "scegliere imap-server (disattivare KWallet ogni volta che appare)"
-
-#. 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 ""
-"inserire 'intern' come nome di account e 'postoffice.intern' come server imap"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check if the username is present"
-msgstr "verificare se il nome utente è presente"
-
-#. 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 "non inserire la password, dato che sarà utilizzata quella di Kerberos"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click the tab Advanced"
-msgstr "click sulla scheda Advanced"
-
-#. 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 ""
-"click su 'Auto detect', quindi cambiare manualmente l'autenticazione "
-"manually da 'Login' a 'GSSAPI'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click ok"
-msgstr "click ok"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "accept the certificate (forever)"
-msgstr "accettare il certificato (per sempre)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail to configure Sending"
-msgstr "Aprire Settings/Configure KMail per configurare Sending"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click Add"
-msgstr "click Add"
-
-#. 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 ""
-"inserire 'intern' come nome e impostarlo come predefinito, scegliere SMTP"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click 'Create and Configure'"
-msgstr "click 'Create and Configure'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter 'postoffice.intern' as outgoing server name"
+msgid "Thunderbird"
 msgstr ""
-"inserire 'postoffice.intern' come nome del server della posta in uscita"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check 'server requires authentication'"
-msgstr "spuntare 'server requires authentication'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter username; again, omit the password"
-msgstr "inserire il nome utente username; di nuovo non inserire la password"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click on the just configured server entry, click 'Modify'"
-msgstr "click su sulla voce server configurato, poi click su 'Modify'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click advanced configuration"
-msgstr "click su configurazione avanzata"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click detect automatically"
-msgstr "click su detect automatically"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click two times OK"
-msgstr "click due volte su OK"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "You should now be able to read your welcome email (next message)."
+msgid "Start Thunderbird"
 msgstr ""
-"Ora si dovrebbe essere in grado di leggere l'e-mail di benvenuto (messaggio "
-"successivo)."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Icedove"
-msgstr "Icedove"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
-msgstr "Avviare Icedove"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
@@ -10832,6 +10746,13 @@ msgstr ""
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr "Copyright e autori"
@@ -13722,6 +13643,140 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #, fuzzy
+#~| msgid ""
+#~| "Backports are automatically updated (if available) just like other "
+#~| "packages. (Previously, extra configuration was needed to achieve this, "
+#~| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#~| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#~| "anymore]."
+#~ msgid ""
+#~ "Backports are automatically updated (if available) just like other "
+#~ "packages. (Previously, extra configuration was needed to achieve this, "
+#~ "but since 2011 this <ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+#~ "ulink>."
+#~ msgstr ""
+#~ "I backport sono aggiornati automaticamente (se disponibili) come gli "
+#~ "altri pacchetti. (Precedentemente era necessaria un'ulteriore "
+#~ "configurazione per raggiungere questo obiettivo, ma dal 2011 questo "
+#~ "[[<ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/|non è\"/> più necessario]."
+
+#~ msgid "KMail"
+#~ msgstr "KMail"
+
+#~ msgid "Start KMail"
+#~ msgstr "Avviare KMail"
+
+#~ msgid "Close the tip of the day"
+#~ msgstr "Chiudere il suggerimento del giorno"
+
+#~ msgid "Cancel the Account Assistant"
+#~ msgstr "Cancellare l'account Assistant"
+
+#~ msgid "Open Settings/Configure KMail"
+#~ msgstr "Aprire Settings/Configure KMail"
+
+#~ msgid "Modify the default identity"
+#~ msgstr "Modificare l'identità predefinita"
+
+#~ msgid "enter your email address"
+#~ msgstr "inserire l'indirizzo email"
+
+#~ msgid ""
+#~ "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+#~ msgstr ""
+#~ "assicurarsi che 'postoffice.intern' sia il dominio di default (tab "
+#~ "Advanced)"
+
+#~ msgid "click OK"
+#~ msgstr "click OK"
+
+#~ msgid "Choose Accounts out of the menu"
+#~ msgstr "Scegliere Accounts fuori dal menu"
+
+#~ msgid "click add"
+#~ msgstr "click add"
+
+#~ msgid "choose imap-server (get rid of KWallet each time it pops up)"
+#~ msgstr "scegliere imap-server (disattivare KWallet ogni volta che appare)"
+
+#~ msgid ""
+#~ "enter 'intern' as account name and 'postoffice.intern' as imap server"
+#~ msgstr ""
+#~ "inserire 'intern' come nome di account e 'postoffice.intern' come server "
+#~ "imap"
+
+#~ msgid "check if the username is present"
+#~ msgstr "verificare se il nome utente è presente"
+
+#~ msgid "don't enter the password, as Kerberos single sign on will be used"
+#~ msgstr ""
+#~ "non inserire la password, dato che sarà utilizzata quella di Kerberos"
+
+#~ msgid "click the tab Advanced"
+#~ msgstr "click sulla scheda Advanced"
+
+#~ msgid ""
+#~ "click 'Auto detect', then change Authentication manually from 'Login' to "
+#~ "'GSSAPI'"
+#~ msgstr ""
+#~ "click su 'Auto detect', quindi cambiare manualmente l'autenticazione "
+#~ "manually da 'Login' a 'GSSAPI'"
+
+#~ msgid "click ok"
+#~ msgstr "click ok"
+
+#~ msgid "accept the certificate (forever)"
+#~ msgstr "accettare il certificato (per sempre)"
+
+#~ msgid "Open Settings/Configure KMail to configure Sending"
+#~ msgstr "Aprire Settings/Configure KMail per configurare Sending"
+
+#~ msgid "click Add"
+#~ msgstr "click Add"
+
+#~ msgid "enter 'intern' as name and set it as default, choose SMTP"
+#~ msgstr ""
+#~ "inserire 'intern' come nome e impostarlo come predefinito, scegliere SMTP"
+
+#~ msgid "click 'Create and Configure'"
+#~ msgstr "click 'Create and Configure'"
+
+#~ msgid "enter 'postoffice.intern' as outgoing server name"
+#~ msgstr ""
+#~ "inserire 'postoffice.intern' come nome del server della posta in uscita"
+
+#~ msgid "check 'server requires authentication'"
+#~ msgstr "spuntare 'server requires authentication'"
+
+#~ msgid "enter username; again, omit the password"
+#~ msgstr "inserire il nome utente username; di nuovo non inserire la password"
+
+#~ msgid "click on the just configured server entry, click 'Modify'"
+#~ msgstr "click su sulla voce server configurato, poi click su 'Modify'"
+
+#~ msgid "click advanced configuration"
+#~ msgstr "click su configurazione avanzata"
+
+#~ msgid "click detect automatically"
+#~ msgstr "click su detect automatically"
+
+#~ msgid "click two times OK"
+#~ msgstr "click due volte su OK"
+
+#~ msgid "You should now be able to read your welcome email (next message)."
+#~ msgstr ""
+#~ "Ora si dovrebbe essere in grado di leggere l'e-mail di benvenuto "
+#~ "(messaggio successivo)."
+
+#~ msgid "Icedove"
+#~ msgstr "Icedove"
+
+#~ msgid "Start Icedove"
+#~ msgstr "Avviare Icedove"
+
+#, fuzzy
 #~| msgid "new optional desktop environment: MATE 1.8"
 #~ msgid "new optional desktop environment: MATE 1.16"
 #~ msgstr "nuovo ambiente opzionale di desktop: MATE 1.8"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
index 596e454..2d09408 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2017-02-21 00:00+0900\n"
 "Last-Translator: victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -5128,20 +5128,12 @@ msgid "apt-get install -t stretch-backports tuxtype"
 msgstr "apt-get install -t stretch-backports tuxtype"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Like the normal archive, backports has three sections: main, contrib and "
+#| "non-free."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-"backports では他のパッケージと同様、更新されたパッケージが (利用可能になれ"
-"ば) 自動的に更新されます (以前は追加の設定がそのためには必要でしたが2011年以"
-"降これは<ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">必要なくなりました</ulink>)。"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -8017,10 +8009,38 @@ msgstr "Debian Edu の Samba"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Samba (v3), since Debian Edu Wheezy (the previous release), has been "
+#| "fully prepared for use as an NT4-style domain controller with Windows XP, "
+#| "Windows Vista and Windows 7 as clients. After a machine has joined the "
+#| "domain, this machine can be fully managed with GOsa²."
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 "Wheezy のバージョンから、Samba は全面的に NT4 形式のドメインコントローラーと"
 "して使うように設定されます。これはクライアントに Windows XP や Windows "
@@ -8388,10 +8408,15 @@ msgid "HowTos for teaching and learning"
 msgstr "クラスルーム HowTo"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Debian packages on this page can be installed by running either "
+#| "<computeroutput>aptitude install <package></computeroutput> or "
+#| "<computeroutput>apt-get install <package></computeroutput> (as "
+#| "root)."
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 "この節で説明している Debian パッケージは全て (root で) "
 "<computeroutput>aptitude install <パッケージ></computeroutput> や "
@@ -8456,13 +8481,21 @@ msgid "Monitoring pupils"
 msgstr "生徒の監視"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"https://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"https://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 "学校によっては <ulink url=\"https://packages.debian.org/stable/controlaula#"
 "\">Controlaula</ulink> や <ulink url=\"https://packages.debian.org/stable/"
@@ -8518,7 +8551,9 @@ msgstr ""
 "ことで教員や生徒は授業でどのコンピュータからも利用できるようになります:"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
+#, fuzzy
+#| msgid "Providing the repository on tjener"
+msgid "Providing the repository on the main server"
 msgstr "中心サーバでのリポジトリ提供"
 
 #. type: Content of: <article><section><section><section><para>
@@ -8607,8 +8642,12 @@ msgid "The following instructions are for updating LTSP chroots."
 msgstr "以下の指示は LTSP chroot 用です。"
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using an editor add the following lines to <computeroutput>/etc/apt/"
+#| "sources.list</computeroutput> in the chroot:"
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 "エディタを使って以下の行を chroot の <computeroutput>/etc/apt/sources.list</"
@@ -8686,10 +8725,15 @@ msgstr ""
 "使って <computeroutput>https://www/gosa/</computeroutput> にアクセスします。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using GOsa² to change the password ensures that Kerberos "
+#| "(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+#| "sambaLMPassword) passwords are the same."
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 "GOsa² を使ってパスワードを変更することで Kerberos (krbPrincipalKey)、LDAP "
 "(userPassword)、Samba (sambaNTPassword 及び sambaLMPassword) のパスワードの一"
@@ -8740,9 +8784,16 @@ msgid "Using email"
 msgstr "メールの利用"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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>."
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -8754,11 +8805,16 @@ msgstr ""
 "定を行う必要があります。"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Every user who wants to use KMail (or Icedove, not installed by default) "
+#| "needs to configure it as follows. For a user with username jdoe the "
+#| "internal email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+#| "\">jdoe at postoffice.intern</ulink>."
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 "KMail (や Icedove これはデフォルトではインストールされていません) を使いたい"
 "ユーザは以下のように設定する必要があります。ユーザ名が jdoe のユーザの内部"
@@ -8766,145 +8822,12 @@ msgstr ""
 "\">jdoe at postoffice.intern</ulink> となります。"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr "KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start KMail"
-msgstr "KMail の起動"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Close the tip of the day"
-msgstr "「tip of the day」を閉じます"
-
-#. 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 "「設定」→「KMail を設定」を開きます"
-
-#. 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"
-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)"
+msgid "Thunderbird"
 msgstr ""
-"(「詳細」タブで) デフォルトのドメインが「postoffice.intern」となっていること"
-"を確認します"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click OK"
-msgstr "「OK」をクリックします"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "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 "imap-server を選択します (KWallet のポップは毎回閉じてください)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter 'intern' as account name and 'postoffice.intern' as imap server"
+msgid "Start Thunderbird"
 msgstr ""
-"アカウント名に「intern」、IMAP サーバに「postoffice.intern」を入力します"
-
-#. 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 ""
-"Kerberos のシングルサインオンを利用するためパスワードは入力しないようにしてく"
-"ださい"
-
-#. 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 ""
-"「自動検出」をクリックし、認証を「Login」から「GSSAPI」に手で変更します"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click ok"
-msgstr "「OK」をクリックします"
-
-#. 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 to configure Sending"
-msgstr "「設定」→「KMail を設定」を開いて送信の設定を行います"
-
-#. 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 ""
-"名前として「intern」を入力するとともにデフォルトにセットし、SMTP を選択します"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click 'Create and Configure'"
-msgstr "「Create and Configure」をクリックします"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter 'postoffice.intern' as outgoing server name"
-msgstr "送信サーバに「postoffice.intern」を入力します"
-
-#. 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 "「advanced configuration」をクリックします"
-
-#. 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 "「OK」を2度クリックします"
-
-#. 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 "Icedove"
-msgstr "Icedove"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
-msgstr "Icedove を起動します"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
@@ -9411,6 +9334,13 @@ msgstr "監視ツールが Nagios から Icinga に替わりました"
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr "スクリーンショットツールが ksnapshot から kde-spectacle に替わりました"
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr "著作権と著者"
@@ -11909,3 +11839,128 @@ msgid ""
 msgstr ""
 "もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
 "skolelinux.no/info/cdbygging/news.html\"/> にあります。"
+
+#~ msgid ""
+#~ "Backports are automatically updated (if available) just like other "
+#~ "packages. (Previously, extra configuration was needed to achieve this, "
+#~ "but since 2011 this <ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+#~ "ulink>."
+#~ msgstr ""
+#~ "backports では他のパッケージと同様、更新されたパッケージが (利用可能になれ"
+#~ "ば) 自動的に更新されます (以前は追加の設定がそのためには必要でしたが2011年"
+#~ "以降これは<ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/\">必要なくなりました</"
+#~ "ulink>)。"
+
+#~ msgid "KMail"
+#~ msgstr "KMail"
+
+#~ msgid "Start KMail"
+#~ msgstr "KMail の起動"
+
+#~ msgid "Close the tip of the day"
+#~ msgstr "「tip of the day」を閉じます"
+
+#~ msgid "Cancel the Account Assistant"
+#~ msgstr "アカウントウィザードをキャンセルします"
+
+#~ msgid "Open Settings/Configure KMail"
+#~ msgstr "「設定」→「KMail を設定」を開きます"
+
+#~ msgid "Modify the default identity"
+#~ msgstr "デフォルトの「個人情報」を変更します"
+
+#~ msgid "enter your email address"
+#~ msgstr "メールアドレスを入力します"
+
+#~ msgid ""
+#~ "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+#~ msgstr ""
+#~ "(「詳細」タブで) デフォルトのドメインが「postoffice.intern」となっているこ"
+#~ "とを確認します"
+
+#~ msgid "click OK"
+#~ msgstr "「OK」をクリックします"
+
+#~ msgid "Choose Accounts out of the menu"
+#~ msgstr "メニューから「アカウント」を選択します"
+
+#~ msgid "click add"
+#~ msgstr "「追加」をクリックします"
+
+#~ msgid "choose imap-server (get rid of KWallet each time it pops up)"
+#~ msgstr "imap-server を選択します (KWallet のポップは毎回閉じてください)"
+
+#~ msgid ""
+#~ "enter 'intern' as account name and 'postoffice.intern' as imap server"
+#~ msgstr ""
+#~ "アカウント名に「intern」、IMAP サーバに「postoffice.intern」を入力します"
+
+#~ msgid "check if the username is present"
+#~ msgstr "ユーザ名が存在するか確認します"
+
+#~ msgid "don't enter the password, as Kerberos single sign on will be used"
+#~ msgstr ""
+#~ "Kerberos のシングルサインオンを利用するためパスワードは入力しないようにし"
+#~ "てください"
+
+#~ msgid "click the tab Advanced"
+#~ msgstr "「詳細」タブをクリックします"
+
+#~ msgid ""
+#~ "click 'Auto detect', then change Authentication manually from 'Login' to "
+#~ "'GSSAPI'"
+#~ msgstr ""
+#~ "「自動検出」をクリックし、認証を「Login」から「GSSAPI」に手で変更します"
+
+#~ msgid "click ok"
+#~ msgstr "「OK」をクリックします"
+
+#~ msgid "accept the certificate (forever)"
+#~ msgstr "証明書を (恒久的に) 受け入れます"
+
+#~ msgid "Open Settings/Configure KMail to configure Sending"
+#~ msgstr "「設定」→「KMail を設定」を開いて送信の設定を行います"
+
+#~ msgid "click Add"
+#~ msgstr "「追加」をクリックします"
+
+#~ msgid "enter 'intern' as name and set it as default, choose SMTP"
+#~ msgstr ""
+#~ "名前として「intern」を入力するとともにデフォルトにセットし、SMTP を選択し"
+#~ "ます"
+
+#~ msgid "click 'Create and Configure'"
+#~ msgstr "「Create and Configure」をクリックします"
+
+#~ msgid "enter 'postoffice.intern' as outgoing server name"
+#~ msgstr "送信サーバに「postoffice.intern」を入力します"
+
+#~ msgid "check 'server requires authentication'"
+#~ msgstr "「サーバは認証が必要」にチェックを入れます"
+
+#~ msgid "enter username; again, omit the password"
+#~ msgstr "ユーザ名を入力します。ここでもパスワードは入力しません"
+
+#~ msgid "click on the just configured server entry, click 'Modify'"
+#~ msgstr "設定したサーバの項目をクリックして「編集」をクリックします"
+
+#~ msgid "click advanced configuration"
+#~ msgstr "「advanced configuration」をクリックします"
+
+#~ msgid "click detect automatically"
+#~ msgstr "「自動検出」をクリックします"
+
+#~ msgid "click two times OK"
+#~ msgstr "「OK」を2度クリックします"
+
+#~ msgid "You should now be able to read your welcome email (next message)."
+#~ msgstr ""
+#~ "これでようこそメール (次のメッセージ) を読めるようになっているはずです"
+
+#~ msgid "Icedove"
+#~ msgstr "Icedove"
+
+#~ msgid "Start Icedove"
+#~ msgstr "Icedove を起動します"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index a547cf1..bb0a7e1 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2017-02-20 06:10+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -5634,26 +5634,10 @@ msgstr "apt-get install -t stretch-backports tuxtype"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid ""
-#| "Backports are automatically updated (if available) just like other "
-#| "packages. (Previously, extra configuration was needed to achieve this, "
-#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
-#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
-#| "anymore]."
+#| "Like the normal archive, backports has three sections: main, contrib and "
+#| "non-free."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-"Tilbakeførte pakker (backports) blir automatisk oppdatert (hvis "
-"tilgjengelig) akkurat som andre pakker. Tidligere trengtes et ekstra oppsett "
-"for å legge inn dette, men etter 2011 dette er [[<ulink url=\"http://"
-"backports.debian.org/news/squeeze-backports_and_lenny-backports-"
-"sloppy_started/\"/> ikke mer nødvendig]."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -8913,10 +8897,38 @@ msgstr "Installasjon av Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Samba (v3), since Debian Edu Wheezy (the previous release), has been "
+#| "fully prepared for use as an NT4-style domain controller with Windows XP, "
+#| "Windows Vista and Windows 7 as clients. After a machine has joined the "
+#| "domain, this machine can be fully managed with GOsa²."
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 "Samba (v3) i Debian Edu Wheezy er utarbeidet til bruk som en NT4-stil domene-"
 "kontroll med Windows XP, Windows Vista og Windovs 7 som klient. Etter at en "
@@ -9294,10 +9306,15 @@ msgid "HowTos for teaching and learning"
 msgstr "Veiledninger for undervisning og læring"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Debian packages on this page can be installed by running either "
+#| "<computeroutput>aptitude install <package></computeroutput> or "
+#| "<computeroutput>apt-get install <package></computeroutput> (as "
+#| "root)."
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 "Alle Debian-pakker på denne siden kan installeres ved å kjøre enten "
 "<computeroutput>aptitude install <pakke></computeroutput> eller "
@@ -9364,13 +9381,21 @@ msgid "Monitoring pupils"
 msgstr "Overvåkning av elever"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"https://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"https://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 "Noen skoler benytter styringsverktøy som <ulink url=\"https://packages."
 "debian.org/stable/controlaula#\">Controlaula</ulink> eller <ulink url=\" "
@@ -9427,7 +9452,9 @@ msgstr ""
 "kan forberede klassen på hver datamaskin."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
+#, fuzzy
+#| msgid "Providing the repository on tjener"
+msgid "Providing the repository on the main server"
 msgstr "Sørge for depotet på tjener"
 
 #. type: Content of: <article><section><section><section><para>
@@ -9514,8 +9541,12 @@ msgid "The following instructions are for updating LTSP chroots."
 msgstr "Følgende instruksjoner for oppdatering av LTSP-chroot."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using an editor add the following lines to <computeroutput>/etc/apt/"
+#| "sources.list</computeroutput> in the chroot:"
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 "Legg følgende linjer til i  <computeroutput>/etc/apt/preferences</"
@@ -9603,10 +9634,15 @@ msgstr ""
 "computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using GOsa² to change the password ensures that Kerberos "
+#| "(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+#| "sambaLMPassword) passwords are the same."
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 "Brukes GOsa² for å endre passordet, sørger man for at passordene i Kerberos "
 "(krbPrincipalKey), LDAP(userPassword) og Samba (sabmaNTPassword og "
@@ -9657,9 +9693,16 @@ msgid "Using email"
 msgstr "Bruk av e-post"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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>."
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -9671,11 +9714,16 @@ msgstr ""
 "config</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Every user who wants to use KMail (or Icedove, not installed by default) "
+#| "needs to configure it as follows. For a user with username jdoe the "
+#| "internal email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+#| "\">jdoe at postoffice.intern</ulink>."
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 "Alle brukere som ønsker å bruke KMail (eller Icedove, ikke installert som "
 "standard) må konfigurere den som følger. For en bruker med brukernavn jdoe "
@@ -9683,141 +9731,12 @@ msgstr ""
 "\">jdoe at postoffice.intern</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr "KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start KMail"
-msgstr "Start KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Close the tip of the day"
-msgstr "Lukke dagens tips"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the Account Assistant"
-msgstr "Annullere Account Assistenten"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail"
-msgstr "Åpne innstillinger/sette opp KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Modify the default identity"
-msgstr "Endre standardidentiteten "
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email address"
-msgstr "legg inn din e-postadresse"
-
-#. 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 "sørg for at «postoffice.intern» er standarddomene (i  Avansert-fanen)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click OK"
-msgstr "klikk OK"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose Accounts out of the menu"
-msgstr "Velge Accounts (kontoer) fra menyen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click add"
-msgstr "klikk add"
-
-#. 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 "velg imap-server (kvitte seg med KWallet hver gang den dukker opp)"
-
-#. 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 "velg «intern» som kontonavn og «postoffice.intern» som  imap-tjener"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check if the username is present"
-msgstr "sjekk om brukernavnet er der "
-
-#. 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 "ikke bruk passordet, ettersom Kerberos single sign-on vil bli brukt"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click the tab Advanced"
-msgstr "klikk på Advanced (avansert)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"click 'Auto detect', then change Authentication manually from 'Login' to "
-"'GSSAPI'"
+msgid "Thunderbird"
 msgstr ""
-"klikk «Auto detect», slik at Authentication (autentisering) kan endres "
-"manuelt fra «Login» til «GSSAPI»"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click ok"
-msgstr "klikk ok"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "accept the certificate (forever)"
-msgstr "aksepter sertifikatet (for alltid)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail to configure Sending"
-msgstr "Åpne Settings/Configure KMail for å sette opp Sending"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click Add"
-msgstr "klikk Add"
-
-#. 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 "sett «intern» som navn, og sett den som standard, velg SMTP"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click 'Create and Configure'"
-msgstr "klikk «Create and Configure» (Lag og Konfigurer)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter 'postoffice.intern' as outgoing server name"
-msgstr "oppgi «postoffice.intern» som navn for utgående server"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check 'server requires authentication'"
-msgstr "sjekk «server requires authentication» (server krever godkjenning)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter username; again, omit the password"
-msgstr "oppgi brukernavn; igjen, utelat passord"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click on the just configured server entry, click 'Modify'"
+msgid "Start Thunderbird"
 msgstr ""
-"klikk på den nettopp oppsatte adgangen til serveren, klikk «Modify» (endre)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click advanced configuration"
-msgstr "klikk på avansert oppsett"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click detect automatically"
-msgstr "klikk oppdag automatisk"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click two times OK"
-msgstr "klikk to ganger OK"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "You should now be able to read your welcome email (next message)."
-msgstr "Nå skal du være i stand til å lese din velkomst-e-post (neste melding)"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Icedove"
-msgstr "Icedove"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
-msgstr "Start Icedove"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
@@ -10386,6 +10305,13 @@ msgstr "Icinga2 erstatter Nagios som overvåkingsverktøy. Icinga2"
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr "kde-spectacle erstatter ksnapshot som verktøy for skjermbilder."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr "Opphavsrett og forfattere"
@@ -13227,6 +13153,135 @@ msgstr ""
 "skolelinux.no/info/cdbygging/news.html</ulink>."
 
 #, fuzzy
+#~| msgid ""
+#~| "Backports are automatically updated (if available) just like other "
+#~| "packages. (Previously, extra configuration was needed to achieve this, "
+#~| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#~| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#~| "anymore]."
+#~ msgid ""
+#~ "Backports are automatically updated (if available) just like other "
+#~ "packages. (Previously, extra configuration was needed to achieve this, "
+#~ "but since 2011 this <ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+#~ "ulink>."
+#~ msgstr ""
+#~ "Tilbakeførte pakker (backports) blir automatisk oppdatert (hvis "
+#~ "tilgjengelig) akkurat som andre pakker. Tidligere trengtes et ekstra "
+#~ "oppsett for å legge inn dette, men etter 2011 dette er [[<ulink url="
+#~ "\"http://backports.debian.org/news/squeeze-backports_and_lenny-backports-"
+#~ "sloppy_started/\"/> ikke mer nødvendig]."
+
+#~ msgid "KMail"
+#~ msgstr "KMail"
+
+#~ msgid "Start KMail"
+#~ msgstr "Start KMail"
+
+#~ msgid "Close the tip of the day"
+#~ msgstr "Lukke dagens tips"
+
+#~ msgid "Cancel the Account Assistant"
+#~ msgstr "Annullere Account Assistenten"
+
+#~ msgid "Open Settings/Configure KMail"
+#~ msgstr "Åpne innstillinger/sette opp KMail"
+
+#~ msgid "Modify the default identity"
+#~ msgstr "Endre standardidentiteten "
+
+#~ msgid "enter your email address"
+#~ msgstr "legg inn din e-postadresse"
+
+#~ msgid ""
+#~ "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+#~ msgstr ""
+#~ "sørg for at «postoffice.intern» er standarddomene (i  Avansert-fanen)"
+
+#~ msgid "click OK"
+#~ msgstr "klikk OK"
+
+#~ msgid "Choose Accounts out of the menu"
+#~ msgstr "Velge Accounts (kontoer) fra menyen"
+
+#~ msgid "click add"
+#~ msgstr "klikk add"
+
+#~ msgid "choose imap-server (get rid of KWallet each time it pops up)"
+#~ msgstr "velg imap-server (kvitte seg med KWallet hver gang den dukker opp)"
+
+#~ msgid ""
+#~ "enter 'intern' as account name and 'postoffice.intern' as imap server"
+#~ msgstr "velg «intern» som kontonavn og «postoffice.intern» som  imap-tjener"
+
+#~ msgid "check if the username is present"
+#~ msgstr "sjekk om brukernavnet er der "
+
+#~ msgid "don't enter the password, as Kerberos single sign on will be used"
+#~ msgstr "ikke bruk passordet, ettersom Kerberos single sign-on vil bli brukt"
+
+#~ msgid "click the tab Advanced"
+#~ msgstr "klikk på Advanced (avansert)"
+
+#~ msgid ""
+#~ "click 'Auto detect', then change Authentication manually from 'Login' to "
+#~ "'GSSAPI'"
+#~ msgstr ""
+#~ "klikk «Auto detect», slik at Authentication (autentisering) kan endres "
+#~ "manuelt fra «Login» til «GSSAPI»"
+
+#~ msgid "click ok"
+#~ msgstr "klikk ok"
+
+#~ msgid "accept the certificate (forever)"
+#~ msgstr "aksepter sertifikatet (for alltid)"
+
+#~ msgid "Open Settings/Configure KMail to configure Sending"
+#~ msgstr "Åpne Settings/Configure KMail for å sette opp Sending"
+
+#~ msgid "click Add"
+#~ msgstr "klikk Add"
+
+#~ msgid "enter 'intern' as name and set it as default, choose SMTP"
+#~ msgstr "sett «intern» som navn, og sett den som standard, velg SMTP"
+
+#~ msgid "click 'Create and Configure'"
+#~ msgstr "klikk «Create and Configure» (Lag og Konfigurer)"
+
+#~ msgid "enter 'postoffice.intern' as outgoing server name"
+#~ msgstr "oppgi «postoffice.intern» som navn for utgående server"
+
+#~ msgid "check 'server requires authentication'"
+#~ msgstr "sjekk «server requires authentication» (server krever godkjenning)"
+
+#~ msgid "enter username; again, omit the password"
+#~ msgstr "oppgi brukernavn; igjen, utelat passord"
+
+#~ msgid "click on the just configured server entry, click 'Modify'"
+#~ msgstr ""
+#~ "klikk på den nettopp oppsatte adgangen til serveren, klikk "
+#~ "«Modify» (endre)"
+
+#~ msgid "click advanced configuration"
+#~ msgstr "klikk på avansert oppsett"
+
+#~ msgid "click detect automatically"
+#~ msgstr "klikk oppdag automatisk"
+
+#~ msgid "click two times OK"
+#~ msgstr "klikk to ganger OK"
+
+#~ msgid "You should now be able to read your welcome email (next message)."
+#~ msgstr ""
+#~ "Nå skal du være i stand til å lese din velkomst-e-post (neste melding)"
+
+#~ msgid "Icedove"
+#~ msgstr "Icedove"
+
+#~ msgid "Start Icedove"
+#~ msgstr "Start Icedove"
+
+#, fuzzy
 #~| msgid "new optional desktop environment: MATE 1.8"
 #~ msgid "new optional desktop environment: MATE 1.16"
 #~ msgstr "Nytt valgfritt skrivebordsmiljø: MATE 1.8"
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index 010d7a8..2d98e0e 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2017-01-22 16:31+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"
@@ -5786,26 +5786,10 @@ msgstr "apt-get install -t stretch-backports tuxtype"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 #| msgid ""
-#| "Backports are automatically updated (if available) just like other "
-#| "packages. (Previously, extra configuration was needed to achieve this, "
-#| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
-#| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
-#| "anymore]."
+#| "Like the normal archive, backports has three sections: main, contrib and "
+#| "non-free."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-"Ook pakketten uit backports worden net als andere pakketten automatisch "
-"bijgewerkt (als er een bijgewerkte versie beschikbaar is). (Vroeger was "
-"bijkomende configuratie nodig om dit effect te bekomen, maar sinds 2011 is "
-"<ulink url=\"http://backports.debian.org/news/squeeze-backports_and_lenny-"
-"backports-sloppy_started/\">dit</ulink> niet langer nodig.)"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -9215,16 +9199,43 @@ msgstr "Samba in Debian Edu"
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "Samba (v3) in Debian Edu Jessie has been fully prepared for use as an NT4-"
+#| "style domain controller with Windows XP, Windows Vista and Windows 7 as "
+#| "clients. After a machine has joined the domain, this machine can be fully "
+#| "managed with GOsa²."
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
-"Samba (v3) is sinds Debian Edu Wheezy (de vorige uitgave) volledig "
-"klaargemaakt om te fungeren als een domeinbeheerder in NT4-stijl voor "
-"clientcomputers met Windows XP, Windows Vista en Windows 7. Nadat een "
-"machine aan het domein is toegevoegd, kan het beheer van die machine "
-"volledig met GOsa² gedaan worden."
+"Samba (v3) in Debian Edu Jessie is volledig klaargemaakt om te fungeren als "
+"een domeinbeheerder in NT4-stijl voor clientcomputers met Windows XP, "
+"Windows Vista and Windows 7. Nadat een machine aan het domein is toegevoegd, "
+"kan het beheer van die machine volledig met GOsa² gedaan worden."
 
 #. type: Content of: <article><section><section><title>
 msgid "Getting Started"
@@ -9608,10 +9619,15 @@ msgid "HowTos for teaching and learning"
 msgstr "HowTo's in verband met leren en onderrichten"
 
 #. type: Content of: <article><section><para>
+#, fuzzy
+#| msgid ""
+#| "All the Debian packages on this page can be installed by running either "
+#| "<computeroutput>aptitude install <package></computeroutput> or "
+#| "<computeroutput>apt-get install <package></computeroutput> (as "
+#| "root)."
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 "Alle pakketten van Debian op deze pagina kunt u installeren door (als "
 "systeembeheerder) ofwel de opdracht <computeroutput>aptitude install <"
@@ -9681,13 +9697,21 @@ msgid "Monitoring pupils"
 msgstr "Leerlingen opvolgen"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Some schools use control tools like <ulink url=\"https://packages.debian."
+#| "org/stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://"
+#| "packages.debian.org/stable/italc-master#\">iTALC</ulink> to supervise "
+#| "their students.  See also the <ulink url=\"http://sourceforge.net/apps/"
+#| "mediawiki/italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the "
+#| "documentation in bug <ulink url=\"https://bugs.debian.org/511387#"
+#| "\">511387</ulink>)."
 msgid ""
 "Some schools use control tools like <ulink url=\"https://packages.debian.org/"
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 "Sommige scholen gebruiken controlehulpmiddelen zoals <ulink url=\"https://"
 "packages.debian.org/stable/controlaula#\">Controlaula</ulink> of <ulink url="
@@ -9747,7 +9771,9 @@ msgstr ""
 "zich op de les voorbereiden vanop om het even welke computer:"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
+#, fuzzy
+#| msgid "Providing the repository on tjener"
+msgid "Providing the repository on the main server"
 msgstr "De pakketbron beschikbaar stellen op tjener"
 
 #. type: Content of: <article><section><section><section><para>
@@ -9837,8 +9863,12 @@ msgid "The following instructions are for updating LTSP chroots."
 msgstr "De volgende instructies gelden voor het bijwerken van LTSP-chroots."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using an editor add the following lines to <computeroutput>/etc/apt/"
+#| "sources.list</computeroutput> in the chroot:"
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 "In de chroot voegt u met een editor de volgende regels toe aan het bestand "
@@ -9925,10 +9955,15 @@ msgstr ""
 "www/gosa/</computeroutput> gaan."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Using GOsa² to change the password ensures that Kerberos "
+#| "(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+#| "sambaLMPassword) passwords are the same."
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 "GOsa² gebruiken om een wachtwoord te wijzigen garandeert dat de wachtwoorden "
 "voor Kerberos (krbPrincipalKey), LDAP (userPassword) en Samba "
@@ -9980,9 +10015,16 @@ msgid "Using email"
 msgstr "Het gebruik van e-mail"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "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>."
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -9995,11 +10037,16 @@ msgstr ""
 "reconfigure exim4-config</computeroutput>."
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Every user who wants to use KMail (or Icedove, not installed by default) "
+#| "needs to configure it as follows. For a user with username jdoe the "
+#| "internal email address is <ulink url=\"mailto:jdoe at postoffice.intern"
+#| "\">jdoe at postoffice.intern</ulink>."
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 "Elke gebruiker die KMail (of Icedove, maar dat wordt niet standaard "
 "geïnstalleerd) wenst te gebruiken, moet het op de volgende manier "
@@ -10008,146 +10055,12 @@ msgstr ""
 "intern</ulink>."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr "KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start KMail"
-msgstr "Start KMail"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Close the tip of the day"
-msgstr "Sluit de tip van de dag"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Cancel the Account Assistant"
-msgstr "Annuleer de account-assistent"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail"
-msgstr "Open Instellingen/KMail configureren"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Modify the default identity"
-msgstr "Wijzig de standaardidentiteit"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter your email address"
-msgstr "voer uw e-mailadres in"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+msgid "Thunderbird"
 msgstr ""
-"zorg ervoor dat 'postoffice.intern' als standaarddomein ingesteld wordt "
-"(tabblad geavanceerd)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click OK"
-msgstr "klik op OK"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Choose Accounts out of the menu"
-msgstr "Kies in het menu Accounts"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click add"
-msgstr "klik op toevoegen"
-
-#. 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 "kies imap-server (sluit KWallet af, telkens het opduikt)"
-
-#. 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 "vul 'intern' in als accountnaam en 'postoffice.intern' als imap-server"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check if the username is present"
-msgstr "controleer of de gebruikersnaam ingevuld staat"
-
-#. 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 ""
-"voer geen wachtwoord in, aangezien het 'single sign on'-systeem van Kerberos "
-"gebruikt zal worden"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click the tab Advanced"
-msgstr "klik op het tabblad geavanceerd"
-
-#. 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 ""
-"klik op 'Automatisch detecteren' en verander de  Aanmeldingscontrole "
-"handmatig van 'Login' in 'GSSAPI'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click ok"
-msgstr "klik op OK"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "accept the certificate (forever)"
-msgstr "accepteer het certificaat (permanent)"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Open Settings/Configure KMail to configure Sending"
-msgstr "Open Instellingen/KMail configureren om Versturen te configureren"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click Add"
-msgstr "klip op Toevoegen"
-
-#. 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 "voer 'intern' in als naam en stel het in als standaard, kies SMTP"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click 'Create and Configure'"
-msgstr "klik op 'Aanmaken en Instellen'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter 'postoffice.intern' as outgoing server name"
-msgstr "voer 'postoffice.intern' in als server voor uitgaande post"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "check 'server requires authentication'"
-msgstr "vink 'server vereist authenticatie' aan"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "enter username; again, omit the password"
-msgstr "voer gebruikersnaam in; vul opnieuw geen wachtwoord in"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click on the just configured server entry, click 'Modify'"
-msgstr "klik op het pas ingestelde servertype en klip op \"Bewerken\" "
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click advanced configuration"
-msgstr "klik op geavanceerde isntellingen"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click detect automatically"
-msgstr "klik op automatisch detecteren"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "click two times OK"
-msgstr "klik tweemaal op OK"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "You should now be able to read your welcome email (next message)."
+msgid "Start Thunderbird"
 msgstr ""
-"U zou nu in staat moeten zijn om het welkomstbericht te lezen (volgend "
-"bericht)"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Icedove"
-msgstr "Icedove"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
-msgstr "Start Icedove"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid "Click 'Skip this and use my existing email'"
@@ -10730,6 +10643,13 @@ msgstr "Icinga vervangt Nagios als monitoringsysteem."
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr "kde-spectacle vervangt ksnapshot als schermafdrukgereedschap."
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr "Auteursrechten en auteurs"
@@ -13640,6 +13560,151 @@ msgstr ""
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
 #, fuzzy
+#~| msgid ""
+#~| "Backports are automatically updated (if available) just like other "
+#~| "packages. (Previously, extra configuration was needed to achieve this, "
+#~| "but since 2011 this [[<ulink url=\"http://backports.debian.org/news/"
+#~| "squeeze-backports_and_lenny-backports-sloppy_started/|is\"/> not needed "
+#~| "anymore]."
+#~ msgid ""
+#~ "Backports are automatically updated (if available) just like other "
+#~ "packages. (Previously, extra configuration was needed to achieve this, "
+#~ "but since 2011 this <ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
+#~ "ulink>."
+#~ msgstr ""
+#~ "Ook pakketten uit backports worden net als andere pakketten automatisch "
+#~ "bijgewerkt (als er een bijgewerkte versie beschikbaar is). (Vroeger was "
+#~ "bijkomende configuratie nodig om dit effect te bekomen, maar sinds 2011 "
+#~ "is <ulink url=\"http://backports.debian.org/news/squeeze-"
+#~ "backports_and_lenny-backports-sloppy_started/\">dit</ulink> niet langer "
+#~ "nodig.)"
+
+#~ msgid ""
+#~ "Samba (v3), since Debian Edu Wheezy (the previous release), has been "
+#~ "fully prepared for use as an NT4-style domain controller with Windows XP, "
+#~ "Windows Vista and Windows 7 as clients. After a machine has joined the "
+#~ "domain, this machine can be fully managed with GOsa²."
+#~ msgstr ""
+#~ "Samba (v3) is sinds Debian Edu Wheezy (de vorige uitgave) volledig "
+#~ "klaargemaakt om te fungeren als een domeinbeheerder in NT4-stijl voor "
+#~ "clientcomputers met Windows XP, Windows Vista en Windows 7. Nadat een "
+#~ "machine aan het domein is toegevoegd, kan het beheer van die machine "
+#~ "volledig met GOsa² gedaan worden."
+
+#~ msgid "KMail"
+#~ msgstr "KMail"
+
+#~ msgid "Start KMail"
+#~ msgstr "Start KMail"
+
+#~ msgid "Close the tip of the day"
+#~ msgstr "Sluit de tip van de dag"
+
+#~ msgid "Cancel the Account Assistant"
+#~ msgstr "Annuleer de account-assistent"
+
+#~ msgid "Open Settings/Configure KMail"
+#~ msgstr "Open Instellingen/KMail configureren"
+
+#~ msgid "Modify the default identity"
+#~ msgstr "Wijzig de standaardidentiteit"
+
+#~ msgid "enter your email address"
+#~ msgstr "voer uw e-mailadres in"
+
+#~ msgid ""
+#~ "make sure that 'postoffice.intern' is the default domain (tab Advanced)"
+#~ msgstr ""
+#~ "zorg ervoor dat 'postoffice.intern' als standaarddomein ingesteld wordt "
+#~ "(tabblad geavanceerd)"
+
+#~ msgid "click OK"
+#~ msgstr "klik op OK"
+
+#~ msgid "Choose Accounts out of the menu"
+#~ msgstr "Kies in het menu Accounts"
+
+#~ msgid "click add"
+#~ msgstr "klik op toevoegen"
+
+#~ msgid "choose imap-server (get rid of KWallet each time it pops up)"
+#~ msgstr "kies imap-server (sluit KWallet af, telkens het opduikt)"
+
+#~ msgid ""
+#~ "enter 'intern' as account name and 'postoffice.intern' as imap server"
+#~ msgstr ""
+#~ "vul 'intern' in als accountnaam en 'postoffice.intern' als imap-server"
+
+#~ msgid "check if the username is present"
+#~ msgstr "controleer of de gebruikersnaam ingevuld staat"
+
+#~ msgid "don't enter the password, as Kerberos single sign on will be used"
+#~ msgstr ""
+#~ "voer geen wachtwoord in, aangezien het 'single sign on'-systeem van "
+#~ "Kerberos gebruikt zal worden"
+
+#~ msgid "click the tab Advanced"
+#~ msgstr "klik op het tabblad geavanceerd"
+
+#~ msgid ""
+#~ "click 'Auto detect', then change Authentication manually from 'Login' to "
+#~ "'GSSAPI'"
+#~ msgstr ""
+#~ "klik op 'Automatisch detecteren' en verander de  Aanmeldingscontrole "
+#~ "handmatig van 'Login' in 'GSSAPI'"
+
+#~ msgid "click ok"
+#~ msgstr "klik op OK"
+
+#~ msgid "accept the certificate (forever)"
+#~ msgstr "accepteer het certificaat (permanent)"
+
+#~ msgid "Open Settings/Configure KMail to configure Sending"
+#~ msgstr "Open Instellingen/KMail configureren om Versturen te configureren"
+
+#~ msgid "click Add"
+#~ msgstr "klip op Toevoegen"
+
+#~ msgid "enter 'intern' as name and set it as default, choose SMTP"
+#~ msgstr "voer 'intern' in als naam en stel het in als standaard, kies SMTP"
+
+#~ msgid "click 'Create and Configure'"
+#~ msgstr "klik op 'Aanmaken en Instellen'"
+
+#~ msgid "enter 'postoffice.intern' as outgoing server name"
+#~ msgstr "voer 'postoffice.intern' in als server voor uitgaande post"
+
+#~ msgid "check 'server requires authentication'"
+#~ msgstr "vink 'server vereist authenticatie' aan"
+
+#~ msgid "enter username; again, omit the password"
+#~ msgstr "voer gebruikersnaam in; vul opnieuw geen wachtwoord in"
+
+#~ msgid "click on the just configured server entry, click 'Modify'"
+#~ msgstr "klik op het pas ingestelde servertype en klip op \"Bewerken\" "
+
+#~ msgid "click advanced configuration"
+#~ msgstr "klik op geavanceerde isntellingen"
+
+#~ msgid "click detect automatically"
+#~ msgstr "klik op automatisch detecteren"
+
+#~ msgid "click two times OK"
+#~ msgstr "klik tweemaal op OK"
+
+#~ msgid "You should now be able to read your welcome email (next message)."
+#~ msgstr ""
+#~ "U zou nu in staat moeten zijn om het welkomstbericht te lezen (volgend "
+#~ "bericht)"
+
+#~ msgid "Icedove"
+#~ msgstr "Icedove"
+
+#~ msgid "Start Icedove"
+#~ msgstr "Start Icedove"
+
+#, fuzzy
 #~| msgid "new optional desktop environment: MATE 1.8"
 #~ msgid "new optional desktop environment: MATE 1.16"
 #~ msgstr "nieuwe optionele bureaubladomgeving: MATE 1.8"
@@ -14796,18 +14861,6 @@ msgstr ""
 #~ "onder Debian Edu Wheezy, met inbegrip van het gebruik van automount en "
 #~ "NFS en van een ander grafisch aanmeldscherm dan ldm:"
 
-#~ msgid ""
-#~ "Samba (v3) in Debian Edu Jessie has been fully prepared for use as an NT4-"
-#~ "style domain controller with Windows XP, Windows Vista and Windows 7 as "
-#~ "clients. After a machine has joined the domain, this machine can be fully "
-#~ "managed with GOsa²."
-#~ msgstr ""
-#~ "Samba (v3) in Debian Edu Jessie is volledig klaargemaakt om te fungeren "
-#~ "als een domeinbeheerder in NT4-stijl voor clientcomputers met Windows XP, "
-#~ "Windows Vista and Windows 7. Nadat een machine aan het domein is "
-#~ "toegevoegd, kan het beheer van die machine volledig met GOsa² gedaan "
-#~ "worden."
-
 #~ msgid "{{attachment:worldmap.png}}"
 #~ msgstr "{{attachment:worldmap.png}}"
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index d8543da..d146f60 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2017-02-01 08:31+0000\n"
 "Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -4458,14 +4458,6 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -6614,10 +6606,32 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6897,9 +6911,8 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6949,8 +6962,7 @@ msgid ""
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6986,9 +6998,12 @@ msgid ""
 "prepare for class on every computer:"
 msgstr ""
 
+# type: Content of: <article><section><section><section><title>
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
-msgstr ""
+#, fuzzy
+#| msgid "Services running on the main server"
+msgid "Providing the repository on the main server"
+msgstr "Usługi uruchamiane na serwerze głównym"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7055,7 +7070,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 
@@ -7123,9 +7138,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7167,7 +7182,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -7175,144 +7190,17 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr ""
-
-#. 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"
+msgid "Thunderbird"
 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"
-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 "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 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 "Icedove"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
+msgid "Start Thunderbird"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7737,6 +7625,13 @@ msgstr ""
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 9503adf..53cdd72 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+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"
@@ -3922,14 +3922,6 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -6069,10 +6061,32 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6352,9 +6366,8 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -6404,8 +6417,7 @@ msgid ""
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6442,7 +6454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
+msgid "Providing the repository on the main server"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -6510,7 +6522,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 
@@ -6576,9 +6588,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -6620,7 +6632,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -6628,144 +6640,17 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr ""
-
-#. 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"
+msgid "Thunderbird"
 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"
-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 "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 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 "Icedove"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
+msgid "Start Thunderbird"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7190,6 +7075,13 @@ msgstr ""
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 92e6e69..ac81e47 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -1643,9 +1643,7 @@ Click "This session only" if asked for the certificate.]]></screen>
 apt-get update]]></screen>
 <para>After which one can install backported packages easily, the following command will install a backported version of <emphasis>tuxtype</emphasis>: 
 </para><screen><![CDATA[apt-get install -t stretch-backports tuxtype]]></screen>
-<para>Backports are automatically updated (if available) just like other packages. (Previously, extra configuration was needed to achieve this, but since 2011 this <ulink url="http://backports.debian.org/news/squeeze-backports_and_lenny-backports-sloppy_started/">is not needed anymore</ulink>. 
-</para>
-<para>Like the normal archive, backports has three sections: main, contrib and non-free. 
+<para>Backports are automatically updated (if available) just like other packages. Like the normal archive, backports has three sections: main, contrib and non-free. 
 </para>
 </section>
 
@@ -2659,7 +2657,13 @@ logon home = ""]]></screen>
 <section id="Samba">
 <title>Samba in Debian Edu
 </title>
-<para>Samba (v3), since Debian Edu Wheezy (the previous release), has been fully prepared for use as an NT4-style domain controller with Windows XP, Windows Vista and Windows 7 as clients. After a machine has joined the domain, this machine can be fully managed with GOsa². 
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> The information in this chapter is outdated. Please read the information provided on the Samba wiki about supported Windows versions, needed registry patches and other procedures. Probably a line containing <computeroutput>server max protocol = NT1</computeroutput> needs to be added to <computeroutput>/etc/samba/smb-debian-edu.conf [...]
+</para>
+<para><ulink url="https://wiki.samba.org/index.php/Joining_a_Windows_Client_or_Server_to_a_Domain"/> 
+</para>
+<para> <ulink url="https://wiki.samba.org/index.php/Required_Settings_for_Samba_NT4_Domains"/> 
+</para>
+<para>Samba has been fully prepared for use as an NT4-style domain controller with Windows XP, Windows Vista and Windows 7 as clients. After a machine has joined the domain, this machine can be fully managed with GOsa². 
 </para>
 
 <section id="Samba--Getting_Started">
@@ -2820,7 +2824,7 @@ logon home = ""]]></screen>
 <section id="TeachAndLearn">
 <title>HowTos for teaching and learning
 </title>
-<para>All the Debian packages on this page can be installed by running either <computeroutput>aptitude install <package></computeroutput> or <computeroutput>apt-get install <package></computeroutput> (as root). 
+<para>All Debian packages mentioned in this section can be installed by running <computeroutput>apt install <package></computeroutput> (as root). 
 </para>
 
 <section id="TeachAndLearn--Moodle">
@@ -2842,7 +2846,7 @@ logon home = ""]]></screen>
 <section id="TeachAndLearn--Monitoring_pupils">
 <title>Monitoring pupils
 </title>
-<para>Some schools use control tools like <ulink url="https://packages.debian.org/stable/controlaula#">Controlaula</ulink> or <ulink url="https://packages.debian.org/stable/italc-master#">iTALC</ulink> to supervise their students.  See also the <ulink url="http://sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page">iTALC Wiki</ulink> (and the documentation in bug <ulink url="https://bugs.debian.org/511387#">511387</ulink>). 
+<para>Some schools use control tools like <ulink url="https://packages.debian.org/stable/controlaula#">Controlaula</ulink> or <ulink url="https://packages.debian.org/stable/italc-master#">iTALC</ulink> to supervise their students.  See also the <ulink url="http://sourceforge.net/apps/mediawiki/italc/index.php?title=Main_Page">iTALC Wiki</ulink>. 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> <emphasis role="strong">Warning</emphasis>: make sure you know the status of the laws about monitoring and restricting computer users' activities in your jurisdiction. 
 </para>
@@ -2861,8 +2865,8 @@ logon home = ""]]></screen>
 <para>Some schools use the products of <ulink url="http://smarttech.com">Smarttech</ulink> for their teaching. You need a workstation with drivers and software for this, Smarttech has published some working non-free Software in a Debian Repository as a download. A local copy of this repository needs to be put inside the school network, so that the smartboard software could be installed on our machines. So teachers and pupils can prepare for class on every computer: 
 </para>
 
-<section id="TeachAndLearn--Providing_the_repository_on_tjener">
-<title>Providing the repository on tjener
+<section id="TeachAndLearn--Providing_the_repository_on_the_main_server">
+<title>Providing the repository on the main server
 </title>
 <para>Download the repository as a tar.gz file from <ulink url="http://smarttech.com/us/Support/Browse+Support/Download+Software/Software/SMART+Notebook+collaborative+learning+software/Previous+versions/SMART+Notebook+10_2+for+Linux"/>. 
 </para><screen><![CDATA[# move the tar.gz file to a repository directory on the school network's webroot (by default located on tjener):
@@ -2894,7 +2898,7 @@ d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart
 </title>
 <para>The following instructions are for updating LTSP chroots. 
 </para>
-<para>Using an editor add the following lines to <computeroutput>/etc/apt/sources.list</computeroutput> in the chroot: 
+<para>Use an editor to add the following lines to <computeroutput>/etc/apt/sources.list</computeroutput> in the chroot: 
 </para><screen><![CDATA[### SMART Repo
 deb http://www/debian/ stable non-free]]></screen>
 <para>Start the editor like this: 
@@ -2931,7 +2935,7 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 </title>
 <para>Every user should change her or his password by using GOsa². To do so, just use a browser and go to <computeroutput>https://www/gosa/</computeroutput>. 
 </para>
-<para>Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) passwords are the same. 
+<para>Using GOsa² to change the password ensures that passwords for Kerberos (krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) are the same. 
 </para>
 <para>Changing passwords using PAM is working also at the GDM login prompt, but this will only update the Kerberos password, and not the Samba and GOsa² (LDAP) password. So after you changed your password at the login prompt, you really should also change it using GOsa². 
 </para>
@@ -2959,122 +2963,17 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 <section id="Users--Using_email">
 <title>Using email
 </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>All users can send and receive mails within the internal network. To allow mail outside the internal network, the administrator needs to configure the mailserver <computeroutput>exim4</computeroutput> to suit the local situation, starting with <computeroutput>dpkg-reconfigure exim4-config</computeroutput>. 
 </para>
-<para>Every user who wants to use KMail (or Icedove, not installed by default) needs to configure it as follows. For a user with username jdoe the internal email address is <ulink url="mailto:jdoe at postoffice.intern">jdoe at postoffice.intern</ulink>. 
+<para>Every user who wants to use Thunderbird needs to configure it as follows. For a user with username jdoe the internal email address is <ulink url="mailto:jdoe at postoffice.intern">jdoe at postoffice.intern</ulink>. 
 </para>
 
-<section id="Users--KMail">
-<title>KMail
+<section id="Users--Thunderbird">
+<title>Thunderbird
 </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>
-<itemizedlist>
-<listitem>
-<para>enter your email address 
-</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>Choose Accounts out of the menu 
-</para>
-<itemizedlist>
-<listitem>
-<para>click add 
-</para></listitem>
-<listitem>
-<para>choose imap-server (get rid of KWallet each time it pops up) 
-</para></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 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--Icedove">
-<title>Icedove
-</title>
-<itemizedlist>
-<listitem>
-<para>Start Icedove 
+<para>Start Thunderbird 
 </para></listitem>
 <listitem>
 <para>Click 'Skip this and use my existing email' 
@@ -3359,6 +3258,9 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 </para></listitem>
 <listitem>
 <para>kde-spectacle replaces ksnapshot as screenshot tool. 
+</para></listitem>
+<listitem>
+<para>The 32-bit PC support (known as the Debian architecture i386) now no longer covers a plain i586 processor. The new baseline is the i686, although some i586 processors (e.g. the "AMD Geode") will remain supported. 
 </para></listitem></itemizedlist>
 </section>
 </section>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
index f796c5d..428cb41 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-02-20 18:28+0000\n"
+"POT-Creation-Date: 2017-02-21 19:14+0000\n"
 "PO-Revision-Date: 2016-12-24 00:48+0800\n"
 "Last-Translator: Ma Yong <debuser at yeah.net>\n"
 "Language-Team: Chinese <debian-l10n-chinese at lists.debian.org>\n"
@@ -4645,14 +4645,6 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
-"(Previously, extra configuration was needed to achieve this, but since 2011 "
-"this <ulink url=\"http://backports.debian.org/news/squeeze-"
-"backports_and_lenny-backports-sloppy_started/\">is not needed anymore</"
-"ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
 "Like the normal archive, backports has three sections: main, contrib and non-"
 "free."
 msgstr ""
@@ -6802,10 +6794,32 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
-"prepared for use as an NT4-style domain controller with Windows XP, Windows "
-"Vista and Windows 7 as clients. After a machine has joined the domain, this "
-"machine can be fully managed with GOsa²."
+"The information in this chapter is outdated. Please read the information "
+"provided on the Samba wiki about supported Windows versions, needed registry "
+"patches and other procedures. Probably a line containing "
+"<computeroutput>server max protocol = NT1</computeroutput> needs to be added "
+"to <computeroutput>/etc/samba/smb-debian-edu.conf</computeroutput> on the "
+"main server. Please consider updating this chapter if you know how to "
+"configure Samba for Debian Edu."
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Joining_a_Windows_Client_or_Server_to_a_Domain\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"<ulink url=\"https://wiki.samba.org/index.php/"
+"Required_Settings_for_Samba_NT4_Domains\"/>"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid ""
+"Samba has been fully prepared for use as an NT4-style domain controller with "
+"Windows XP, Windows Vista and Windows 7 as clients. After a machine has "
+"joined the domain, this machine can be fully managed with GOsa²."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -7085,9 +7099,8 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 msgid ""
-"All the Debian packages on this page can be installed by running either "
-"<computeroutput>aptitude install <package></computeroutput> or "
-"<computeroutput>apt-get install <package></computeroutput> (as root)."
+"All Debian packages mentioned in this section can be installed by running "
+"<computeroutput>apt install <package></computeroutput> (as root)."
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
@@ -7137,8 +7150,7 @@ msgid ""
 "stable/controlaula#\">Controlaula</ulink> or <ulink url=\"https://packages."
 "debian.org/stable/italc-master#\">iTALC</ulink> to supervise their "
 "students.  See also the <ulink url=\"http://sourceforge.net/apps/mediawiki/"
-"italc/index.php?title=Main_Page\">iTALC Wiki</ulink> (and the documentation "
-"in bug <ulink url=\"https://bugs.debian.org/511387#\">511387</ulink>)."
+"italc/index.php?title=Main_Page\">iTALC Wiki</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7175,8 +7187,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Providing the repository on tjener"
-msgstr ""
+#, fuzzy
+#| msgid "Services running on the main server"
+msgid "Providing the repository on the main server"
+msgstr "运行在主服务器上的服务"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -7243,7 +7257,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Using an editor add the following lines to <computeroutput>/etc/apt/sources."
+"Use an editor to add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
 msgstr ""
 
@@ -7309,9 +7323,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
-"LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
-"passwords are the same."
+"Using GOsa² to change the password ensures that passwords for Kerberos "
+"(krbPrincipalKey), LDAP (userPassword) and Samba (sambaNTPassword and "
+"sambaLMPassword) are the same."
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
@@ -7353,7 +7367,7 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
-"mail outside the internal network, the adminstrator needs to configure the "
+"mail outside the internal network, the administrator needs to configure the "
 "mailserver <computeroutput>exim4</computeroutput> to suit the local "
 "situation, starting with <computeroutput>dpkg-reconfigure exim4-config</"
 "computeroutput>."
@@ -7361,144 +7375,17 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Every user who wants to use KMail (or Icedove, not installed by default) "
-"needs to configure it as follows. For a user with username jdoe the internal "
-"email address is <ulink url=\"mailto:jdoe at postoffice.intern"
-"\">jdoe at postoffice.intern</ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "KMail"
-msgstr ""
-
-#. 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"
-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 "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 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)."
+"Every user who wants to use Thunderbird needs to configure it as follows. "
+"For a user with username jdoe the internal email address is <ulink url="
+"\"mailto:jdoe at postoffice.intern\">jdoe at postoffice.intern</ulink>."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Icedove"
+msgid "Thunderbird"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Start Icedove"
+msgid "Start Thunderbird"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7930,6 +7817,13 @@ msgstr ""
 msgid "kde-spectacle replaces ksnapshot as screenshot tool."
 msgstr ""
 
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"The 32-bit PC support (known as the Debian architecture i386) now no longer "
+"covers a plain i586 processor. The new baseline is the i686, although some "
+"i586 processors (e.g. the \"AMD Geode\") will remain supported."
+msgstr ""
+
 #. type: Content of: <article><section><title>
 msgid "Copyright and authors"
 msgstr ""

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



More information about the debian-edu-commits mailing list