[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Stretch manual from the wiki.
Holger Levsen
holger at layer-acht.org
Wed May 24 12:27:06 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 027ba8d4640d491b719cb3fd56c214e130a0c360
Author: Holger Levsen <holger at layer-acht.org>
Date: Wed May 24 14:26:51 2017 +0200
Update Debian Edu Stretch manual from the wiki.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
.../debian-edu-stretch-manual.da.po | 37 +++---
.../debian-edu-stretch-manual.de.po | 46 ++++---
.../debian-edu-stretch-manual.es.po | 19 ++-
.../debian-edu-stretch-manual.fi.po | 19 ++-
.../debian-edu-stretch-manual.fr.po | 41 ++++---
.../debian-edu-stretch-manual.it.po | 80 +++++--------
.../debian-edu-stretch-manual.ja.po | 50 +++++---
.../debian-edu-stretch-manual.nb.po | 133 +++++++++++----------
.../debian-edu-stretch-manual.nl.po | 50 +++++---
.../debian-edu-stretch-manual.pl.po | 19 ++-
.../debian-edu-stretch-manual.pot | 19 ++-
.../debian-edu-stretch-manual.xml | 12 +-
.../debian-edu-stretch-manual.zh.po | 19 ++-
13 files changed, 287 insertions(+), 257 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 ce02a75..d30508b 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+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"
@@ -10188,7 +10188,8 @@ msgstr "Brug af e-post"
#| "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 "
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -10246,26 +10247,23 @@ msgid "Click 'Continue'"
msgstr "Klik »Fortsæt«"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr "Klik »Manuel konfiguration«"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
-msgstr "Under godkendelse, ændr den til »Kerberos/GSSAPI« også for SMTP"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Click 'Done'"
msgstr "Klik »Færdig«"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-"En advarsel bliver vist, afkryds »Jeg forstår risikoen« og klik »Færdig«"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "First time accessing the inbox click 'Confirm Security Exception' to "
+#| "accept the certificate"
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
"Første gang du tilgå indboksen klik »Bekræft sikkerhedsundtagelse« for at "
"acceptere certifikatet"
@@ -12525,6 +12523,17 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Click 'Manual config'"
+#~ msgstr "Klik »Manuel konfiguration«"
+
+#~ msgid ""
+#~ "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+#~ msgstr "Under godkendelse, ændr den til »Kerberos/GSSAPI« også for SMTP"
+
+#~ msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+#~ msgstr ""
+#~ "En advarsel bliver vist, afkryds »Jeg forstår risikoen« og klik »Færdig«"
+
#~ msgid ""
#~ "apt-get update\n"
#~ "apt-get -y upgrade"
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 9141232..eb34c00 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+0000\n"
"PO-Revision-Date: 2017-04-27 20:35+0200\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -9473,8 +9473,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 administrator 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 "
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -9529,28 +9537,23 @@ msgid "Click 'Continue'"
msgstr "Auf 'Weiter' klicken"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr "Auf 'Manuell bearbeiten' klicken"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
msgstr ""
-"Unter 'Authentifizierung' auch für SMTP auf 'Kerberos/GSSAPI' einstellen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Click 'Done'"
msgstr "Auf 'Fertig' klicken"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-"Bei der erscheinenden Warnung die Option 'Ich verstehe die Risiken' "
-"aktivieren, dann auf 'Fertig' klicken"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "First time accessing the inbox click 'Confirm Security Exception' to "
+#| "accept the certificate"
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
"Beim erstmaligen Zugriff auf den Posteingang auf 'Sicherheits-Ausnahmeregel "
"bestätigen' klicken, um das Zertifikat zu akzeptieren"
@@ -11693,6 +11696,19 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid "Click 'Manual config'"
+#~ msgstr "Auf 'Manuell bearbeiten' klicken"
+
+#~ msgid ""
+#~ "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+#~ msgstr ""
+#~ "Unter 'Authentifizierung' auch für SMTP auf 'Kerberos/GSSAPI' einstellen"
+
+#~ msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+#~ msgstr ""
+#~ "Bei der erscheinenden Warnung die Option 'Ich verstehe die Risiken' "
+#~ "aktivieren, dann auf 'Fertig' klicken"
+
#~ msgid ""
#~ "If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
#~ "jessie):"
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 da7e3f8..c4f3e52 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+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"
@@ -8739,7 +8739,8 @@ msgstr ""
#| "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 "
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -8786,11 +8787,9 @@ msgid "Click 'Continue'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8798,13 +8797,9 @@ msgid "Click 'Done'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
#. type: Content of: <article><section><section><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
index 982a2ba..38372ab 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+0000\n"
"PO-Revision-Date: 2017-04-17 06:21+0000\n"
"Last-Translator: ekeimaja <ekeimaja at gmail.com>\n"
"Language-Team: Finnish <https://hosted.weblate.org/projects/debian-edu-"
@@ -6841,7 +6841,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"All users can send and receive mails within the internal network. To allow "
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -6884,11 +6885,9 @@ msgid "Click 'Continue'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6896,13 +6895,9 @@ msgid "Click 'Done'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
#. type: Content of: <article><section><section><section><title>
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 72becc8..2232cc8 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+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"
@@ -10569,7 +10569,8 @@ msgstr "Utilisation du courrier électronique"
#| "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 "
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -10630,29 +10631,23 @@ msgid "Click 'Continue'"
msgstr "Cliquez sur « Continuer »"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr "Cliquez sur « Configuration manuelle »"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
msgstr ""
-"Dans « Authentification », changer le paramètre à « Kerberos/GSSAPI » pour "
-"IMAP et SMTP"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Click 'Done'"
msgstr "Cliquez sur « Terminé »"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-"Une fenêtre surgit, cochez « Je comprends les risques » et cliquez sur « "
-"Terminé »"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "First time accessing the inbox click 'Confirm Security Exception' to "
+#| "accept the certificate"
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
"La première fois que vous accédez à la boîte de réception, cliquez sur "
"« Confirmez l'exception de sécurité » pour accepter le certificat"
@@ -12989,6 +12984,20 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid "Click 'Manual config'"
+#~ msgstr "Cliquez sur « Configuration manuelle »"
+
+#~ msgid ""
+#~ "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+#~ msgstr ""
+#~ "Dans « Authentification », changer le paramètre à « Kerberos/GSSAPI » "
+#~ "pour IMAP et SMTP"
+
+#~ msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+#~ msgstr ""
+#~ "Une fenêtre surgit, cochez « Je comprends les risques » et cliquez sur « "
+#~ "Terminé »"
+
#~ msgid ""
#~ "apt-get update\n"
#~ "apt-get -y upgrade"
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 4f4d058..743bbea 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+0000\n"
"PO-Revision-Date: 2017-05-15 20:10+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -2714,11 +2714,6 @@ msgstr ""
"<computeroutput>sudo</computeroutput> per diventare root."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "See the information about Debian Edu specific <ulink url=\"https://wiki."
-#| "debian.org/DebianEdu/Documentation/Stretch//"
-#| "Architecture#File_system_access_configuration\">file system access "
-#| "configuration</ulink> before adding users."
msgid ""
"See the information about Debian Edu specific <link linkend=\"Architecture--"
"File_system_access_configuration\">file system access configuration</link> "
@@ -4605,11 +4600,6 @@ msgstr ""
"debian.org/releases/stretch/releasenotes\"/>)"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Don't use X, use a virtual console, log in as root. Read all debconf "
-#| "information carefully, choose 'keep your currently-installed version'; in "
-#| "most cases hitting return will be fine. Press 'q' to quit the apt-"
-#| "listchanges pager once you've read the information."
msgid ""
"Don't use X, use a virtual console, log in as root. Read all debconf "
"information carefully, choose 'keep your currently-installed version' unless "
@@ -4635,11 +4625,6 @@ msgstr ""
"l'installazione andata a buon fine)."
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If <computeroutput>apt-get</computeroutput> finishes with an error, try "
-#| "to fix it and/or run <computeroutput>apt-get -f install</computeroutput> "
-#| "and then <computeroutput>apt-get -y dist-upgrade</computeroutput> once "
-#| "again."
msgid ""
"If <computeroutput>apt</computeroutput> finishes with an error, try to fix "
"it and/or run <computeroutput>apt -f install</computeroutput> and then "
@@ -4650,20 +4635,15 @@ msgstr ""
"<computeroutput>apt -y full-upgrade</computeroutput> ancora una volta."
#. type: Content of: <article><section><section><section><title>
-#| msgid "Upgrade the server side"
msgid "Upgrading the main server"
msgstr "Aggiornare il server principale"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "Make sure the current system is up-to-date."
msgid "Start by making sure the current system is up-to-date:"
msgstr "Iniziare assicurandosi che il sistema attuale sia aggiornato:"
#. type: CDATA
#, no-wrap
-#| msgid ""
-#| "apt-get update\n"
-#| "apt-get upgrade"
msgid ""
"apt update\n"
"apt full-upgrade"
@@ -4734,8 +4714,6 @@ msgstr ""
"<computeroutput>lightdm</computeroutput>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Add users to the new group <computeroutput>sshusers</computeroutput>."
msgid ""
"Configuring Kerberos Authentication: Enter <computeroutput>kerberos</"
"computeroutput> as hostname."
@@ -4752,9 +4730,6 @@ msgstr ""
"scegliere <Yes>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Consider an optional step (Debian bug <ulink url=\"https://bugs.debian."
-#| "org/779646#\">779646</ulink>)."
msgid ""
"tftp (etc/inetd.conf): Choose <Yes>. (See atftpd bug <ulink url="
"\"https://bugs.debian.org/789667#\">789667</ulink>)"
@@ -4778,13 +4753,6 @@ msgstr "Risolvi rinominando Squid3 con Squid:"
#. type: CDATA
#, no-wrap
-#| msgid ""
-#| "service squid stop\n"
-#| "umount /var/spool/squid\n"
-#| "sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab\n"
-#| "mount /var/spool/squid3\n"
-#| "service squid3 start\n"
-#| "apt-get -y purge squid squid-common"
msgid ""
"service squid stop # This usually takes some time!\n"
"rm -rf /var/spool/squid\n"
@@ -4823,7 +4791,6 @@ msgstr ""
"(Enter 'y' to modify the LDAP data base.)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "click advanced configuration"
msgid "Apply and adjust configuration:"
msgstr "Applicare e regolare la configurazione:"
@@ -4860,7 +4827,6 @@ msgstr ""
"apt install education-ltsp-server # Only if profile 'LTSP-Server' is installed."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid "New features in Debian Edu Stretch"
msgid "Get the new Debian Edu Stretch artwork:"
msgstr "Caricare la nuova grafica di Debian Edu Stretch:"
@@ -9371,8 +9337,16 @@ msgid "Using email"
msgstr "Usare la posta elettronica"
#. type: Content of: <article><section><section><para>
-msgid ""
-"All users can send and receive mails within the internal network. To allow "
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -9423,25 +9397,23 @@ msgid "Click 'Continue'"
msgstr "Click su 'Continue'"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr "Click su 'Manual config'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
-msgstr "Sotto Authentication, cambiare 'Kerberos/GSSAPI' per SMTP"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Click 'Done'"
msgstr "Click su 'Done'"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr "si apre un avviso, spunta 'Ho compreso i rischi' e click su 'Done'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "First time accessing the inbox click 'Confirm Security Exception' to "
+#| "accept the certificate"
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
"Al primo accesso nella inbox click su 'Confirm Security Exception' per "
"accettare il certificato"
@@ -10332,7 +10304,7 @@ msgstr ""
"lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
#. <remark>
-#. status ignore</remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -11599,6 +11571,16 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Click 'Manual config'"
+#~ msgstr "Click su 'Manual config'"
+
+#~ msgid ""
+#~ "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+#~ msgstr "Sotto Authentication, cambiare 'Kerberos/GSSAPI' per SMTP"
+
+#~ msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+#~ msgstr "si apre un avviso, spunta 'Ho compreso i rischi' e click su 'Done'"
+
#~ msgid ""
#~ "apt-get update\n"
#~ "apt-get -y upgrade"
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 1567030..eb6037c 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+0000\n"
"PO-Revision-Date: 2017-02-24 06:55+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -9004,8 +9004,16 @@ msgid "Using email"
msgstr "メールの利用"
#. type: Content of: <article><section><section><para>
-msgid ""
-"All users can send and receive mails within the internal network. To allow "
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -9058,28 +9066,23 @@ msgid "Click 'Continue'"
msgstr "「続ける」をクリックします"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr "「手動設定」をクリックします"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
-msgstr "認証の設定で SMTP も同様、「Kerberos/GSSAPI」に変更します"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Click 'Done'"
msgstr "「完了」をクリックします"
-# http://ccweb.cc.sophia.ac.jp/faq/mail/maili_tb_pop/
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-"警告が出てきます。「I understand the risks」にチェックを入れて「Change "
-"Settimgs」をクリックします"
-
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "First time accessing the inbox click 'Confirm Security Exception' to "
+#| "accept the certificate"
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
"受信箱への初回アクセス時に「セキュリティ例外を承認」をクリックして証明書を受"
"け入れます"
@@ -11055,6 +11058,19 @@ msgstr ""
"もっと古いリリースについてのさらなる情報は <ulink url=\"http://developer."
"skolelinux.no/info/cdbygging/news.html\"/> にあります。"
+#~ msgid "Click 'Manual config'"
+#~ msgstr "「手動設定」をクリックします"
+
+#~ msgid ""
+#~ "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+#~ msgstr "認証の設定で SMTP も同様、「Kerberos/GSSAPI」に変更します"
+
+# http://ccweb.cc.sophia.ac.jp/faq/mail/maili_tb_pop/
+#~ msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+#~ msgstr ""
+#~ "警告が出てきます。「I understand the risks」にチェックを入れて「Change "
+#~ "Settimgs」をクリックします"
+
#~ msgid ""
#~ "apt-get update\n"
#~ "apt-get -y upgrade"
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 53a3d72..2ff5d4d 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+0000\n"
"PO-Revision-Date: 2017-05-15 09:28+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -2379,9 +2379,9 @@ msgid ""
msgstr ""
"Noen innstillinger kan ikke bli forhåndsutfylt med forhåndsutfyllingsfil da "
"de trengs i forkant av at forhåndsutfyllingsfilen lastes ned. Disse er satt "
-"opp i PXElinux-baserte oppstart-argumenter tilgjengelig fra "
-"<computeroutput>/var/lib/tftproot/debian-edu/install.cfg</computeroutput>. "
-"Språk, tastaturoppsett og skrivebord er eksempler på slike innstillinger."
+"opp i PXElinux-baserte oppstart-argumenter tilgjengelig fra <computeroutput>/"
+"var/lib/tftproot/debian-edu/install.cfg</computeroutput>. Språk, "
+"tastaturoppsett og skrivebord er eksempler på slike innstillinger."
#. type: Content of: <article><section><section><section><title>
msgid "Custom images"
@@ -3508,10 +3508,8 @@ msgid ""
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
"enter password:"
msgstr ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t "
-"workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] "
-"id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
@@ -4125,10 +4123,10 @@ msgid ""
"weekly, monthly and yearly basis, and provides the system administrator with "
"help when looking for bottlenecks and the source of system problems."
msgstr ""
-"Trendrapportsystemet Munin er tilgjengelig fra <ulink url=\""
-"https://www/munin/\"/>. Det viser grafer for systemstatus på en daglig, "
-"ukentlig, månedlig og årlig basis. Dette gir systemadministrator hjelp til å "
-"se etter flaskehalser og kilden for systemproblemer."
+"Trendrapportsystemet Munin er tilgjengelig fra <ulink url=\"https://www/"
+"munin/\"/>. Det viser grafer for systemstatus på en daglig, ukentlig, "
+"månedlig og årlig basis. Dette gir systemadministrator hjelp til å se etter "
+"flaskehalser og kilden for systemproblemer."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4146,9 +4144,9 @@ msgstr ""
"Alle tjenere med pakken Munin-node installert, blir registrert for "
"overvåking av Munin. Det vil vanligvis gå ett døgn fra en maskin blir "
"installert til monitorering starter på grunn av rekkefølgen til Cron-"
-"jobbene. For å fart på denne prosessen kan du kjøre <computeroutput"
-">sitesummary-update-munin</computeroutput> som rot på Sitesummary-tjeneren ("
-"vanligvis hovedtjeneren). Dette vil oppdatere "
+"jobbene. For å fart på denne prosessen kan du kjøre "
+"<computeroutput>sitesummary-update-munin</computeroutput> som rot på "
+"Sitesummary-tjeneren (vanligvis hovedtjeneren). Dette vil oppdatere "
"<computeroutput>/etc/munin/munin.conf</computeroutput>-filen."
#. type: Content of: <article><section><section><section><para>
@@ -4188,8 +4186,8 @@ msgid ""
"<computeroutput>nagios-nrpe-server</computeroutput> package on the "
"workstation."
msgstr ""
-"Nagios system- og tjenesteovervåkning er tilgjengelig fra <ulink url=\""
-"https://www/icinga/\"/>. Utvalget av maskiner og tjenester som blir "
+"Nagios system- og tjenesteovervåkning er tilgjengelig fra <ulink url="
+"\"https://www/icinga/\"/>. Utvalget av maskiner og tjenester som blir "
"overvåket er automatisk generert etter informasjon innsamlet av Sitesummary-"
"systemet. Maskinene som kjører profilene hovedtjener og LTSP-tjener blir "
"fullstendig overvåket, mens arbeidsstasjoner og tynnklienter vil få en "
@@ -4224,9 +4222,9 @@ msgid ""
msgstr ""
"Som standard fra Debian- Edu 3.0r1 så sender ikke Icinga ut e-post. Dette "
"kan endres ved å bytte ut <computeroutput>notify-by-nothing</computeroutput> "
-"med <computeroutput>host-notify-by-email</computeroutput> og <computeroutput"
-">notify-by-email</computeroutput> i fila <computeroutput>/etc/icinga/debian-"
-"edu/contacts.cfg</computeroutput>."
+"med <computeroutput>host-notify-by-email</computeroutput> og "
+"<computeroutput>notify-by-email</computeroutput> i fila <computeroutput>/etc/"
+"icinga/debian-edu/contacts.cfg</computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4235,11 +4233,10 @@ msgid ""
"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
"with the list of hosts and services to monitor."
msgstr ""
-"Nagiosoppsettsfilen - filen som brukes er "
-"<computeroutput>/etc/icinga/sitesummary.cfg</computeroutput>. Cron-jobben i "
-"Sitesummary genererer <computeroutput>/var/lib/sitesummary/icinga-"
-"generated.cfg</computeroutput> med listen over verter og tjenester som skal "
-"overvåkes."
+"Nagiosoppsettsfilen - filen som brukes er <computeroutput>/etc/icinga/"
+"sitesummary.cfg</computeroutput>. Cron-jobben i Sitesummary genererer "
+"<computeroutput>/var/lib/sitesummary/icinga-generated.cfg</computeroutput> "
+"med listen over verter og tjenester som skal overvåkes."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -4324,10 +4321,10 @@ msgid ""
"all new packages every night. This will not upgrade the LTSP chroots."
msgstr ""
"Hvis du ikke ønsker å oppgradere pakker manuelt, og stoler på at Debian gjør "
-"en god jobb med nye versjoner, kan du installere pakken <computeroutput"
-">unattended-upgrades</computeroutput>, og sette den opp til å automatisk "
-"oppgradere alle nye pakker hver natt. Dette vil ikke oppgradere LTSP-"
-"chrooter."
+"en god jobb med nye versjoner, kan du installere pakken "
+"<computeroutput>unattended-upgrades</computeroutput>, og sette den opp til å "
+"automatisk oppgradere alle nye pakker hver natt. Dette vil ikke oppgradere "
+"LTSP-chrooter."
#. type: Content of: <article><section><section><section><section><section><para>
msgid ""
@@ -4400,26 +4397,26 @@ msgid ""
msgstr ""
"Sitesummary (Site Summary) brukes til å samle informasjon fra alle "
"datamaskiner i nettverket, og sender dette til en sentral server. "
-"Informasjonen som er samlet er tilgjengelig i "
-"<computeroutput>/var/lib/sitesummary/entries/</computeroutput> . Scripts som "
-"finnes i <computeroutput>/usr/lib/sitesummary/</computeroutput> muliggjør "
-"generering av ulike rapporter."
+"Informasjonen som er samlet er tilgjengelig i <computeroutput>/var/lib/"
+"sitesummary/entries/</computeroutput> . Scripts som finnes i "
+"<computeroutput>/usr/lib/sitesummary/</computeroutput> muliggjør generering "
+"av ulike rapporter."
#. type: Content of: <article><section><section><section><para>
msgid ""
"A simple report from sitesummary without any details is available from "
"<ulink url=\"https://www/sitesummary/\"/>."
msgstr ""
-"En enkel rapport fra Sitesummary er tilgjenglig fra <ulink url=\""
-"https://www/sitesummary/\"/>."
+"En enkel rapport fra Sitesummary er tilgjenglig fra <ulink url=\"https://www/"
+"sitesummary/\"/>."
#. type: Content of: <article><section><section><section><para>
msgid ""
"Some documentation on sitesummary is available from <ulink url=\"http://wiki."
"debian.org/DebianEdu/HowTo/SiteSummary\"/>"
msgstr ""
-"Noe dokumentasjon for Sitesummary er tilgjengelig fra <ulink url=\""
-"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+"Noe dokumentasjon for Sitesummary er tilgjengelig fra <ulink url=\"http://"
+"wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
#. type: Content of: <article><section><section><title>
msgid "More information about Debian Edu customisations"
@@ -4434,8 +4431,8 @@ msgid ""
msgstr ""
"Mer informasjon om nyttige tilpasninger i Debian Edu for "
"systemadministratorer finnes i <link linkend=\"Administration\">kapittelet "
-"om Administrasjonsoppskrifter</link> og i <link linkend=\""
-"AdvancedAdministration\">kapittelet om Avanserte "
+"om Administrasjonsoppskrifter</link> og i <link linkend="
+"\"AdvancedAdministration\">kapittelet om Avanserte "
"administrasjonsoppskrifter</link>"
#. type: Content of: <article><section><title>
@@ -4478,8 +4475,8 @@ msgid ""
msgstr ""
"Oppgradering av Debian fra en distro (distribution) til en annen er generelt "
"enkelt. For Debian Edu er det ikke så enkelt ennå da vi har kraftig "
-"modifisert konfigurasjonsfiler på måter vi ikke skulle gjort (se Debian bug <"
-"ulink url=\"http://bugs.debian.org/311188\">311188</ulink> for mer info.) "
+"modifisert konfigurasjonsfiler på måter vi ikke skulle gjort (se Debian bug "
+"<ulink url=\"http://bugs.debian.org/311188\">311188</ulink> for mer info.) "
"Oppgradering er fremdeles mulig, men krever mye arbeid."
#. type: Content of: <article><section><section><para>
@@ -4528,10 +4525,10 @@ msgid ""
msgstr ""
"Det kan også være lurt å vente litt, og kjøre Sarge noen uker lenger, slik "
"andre kan teste oppgraderingen, erfare problemer og dokumentere dem. Debian "
-"Edu Sarge vil fortsatt få støtte en stund ennå. Men når Debian <ulink url=\""
-"http://www.debian.org/security/faq#lifespan\">avslutter støtten for "
-"Sarge</ulink>, vil Debian Edu også måtte gjøre det. Dette var forventet å "
-"skje i april 2008."
+"Edu Sarge vil fortsatt få støtte en stund ennå. Men når Debian <ulink url="
+"\"http://www.debian.org/security/faq#lifespan\">avslutter støtten for Sarge</"
+"ulink>, vil Debian Edu også måtte gjøre det. Dette var forventet å skje i "
+"april 2008."
#. type: Content of: <article><section><section><title>
msgid "Upgrades from Debian Edu Jessie"
@@ -7469,8 +7466,7 @@ msgstr ""
" for i in $MY_SERVER_LIST; do\n"
" rank=$RANDOM\n"
" let \"rank %= 100\"\n"
-" TMP_LIST=\"$TMP_LIST\\n"
-"${rank}_$i\"\n"
+" TMP_LIST=\"$TMP_LIST\\n${rank}_$i\"\n"
" done\n"
" TMP_LIST=$(echo -e $TMP_LIST | sort)\n"
" for i in $TMP_LIST; do\n"
@@ -9197,8 +9193,16 @@ msgid "Using email"
msgstr "Bruk av e-post"
#. type: Content of: <article><section><section><para>
-msgid ""
-"All users can send and receive mails within the internal network. To allow "
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -9251,25 +9255,23 @@ msgid "Click 'Continue'"
msgstr "Klikk «Continue»"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr "Klikk «Manual config»"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
-msgstr "Under Authentication, bytt til «Kerberos/GSSAPI» også for SMTP"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Click 'Done'"
msgstr "Klikk «Done»"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr "En advarsel dukker opp, sjekk «I understand the risks» og klikk «Done»"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "First time accessing the inbox click 'Confirm Security Exception' to "
+#| "accept the certificate"
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
"Første gang du åpner innboksen klikk «Bekreft sikkerhetsunntak » for å godta "
"sertifikatet"
@@ -11381,6 +11383,17 @@ msgstr ""
"developer.skolelinux.no/info/cdbygging/news.html'>http://developer."
"skolelinux.no/info/cdbygging/news.html</ulink>."
+#~ msgid "Click 'Manual config'"
+#~ msgstr "Klikk «Manual config»"
+
+#~ msgid ""
+#~ "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+#~ msgstr "Under Authentication, bytt til «Kerberos/GSSAPI» også for SMTP"
+
+#~ msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+#~ msgstr ""
+#~ "En advarsel dukker opp, sjekk «I understand the risks» og klikk «Done»"
+
#~ msgid ""
#~ "apt-get update\n"
#~ "apt-get -y upgrade"
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 4927a01..6128802 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+0000\n"
"PO-Revision-Date: 2017-04-28 21:49+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -9654,8 +9654,16 @@ msgid "Using email"
msgstr "Het gebruik van e-mail"
#. type: Content of: <article><section><section><para>
-msgid ""
-"All users can send and receive mails within the internal network. To allow "
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -9710,29 +9718,23 @@ msgid "Click 'Continue'"
msgstr "Klik op 'Doorgaan'"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr "Klik op 'Handmatig instellen'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
msgstr ""
-"Wijzig de instelling onder Authenticatie in 'Kerberos/GSSAPI' en doe "
-"hetzelfde voor SMTP"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Click 'Done'"
msgstr "Klik op 'Klaar'"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-"Een waarschuwingsbericht verschijnt, kruis 'Ik begrijp de risico's' aan en "
-"klik op 'Klaar'"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "First time accessing the inbox click 'Confirm Security Exception' to "
+#| "accept the certificate"
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
"De eerste keer dat u het Postvak IN opent, klikt u op "
"'Beveiligingsuitzondering bevestigen' om het certificaat te aanvaarden"
@@ -11900,6 +11902,20 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "Click 'Manual config'"
+#~ msgstr "Klik op 'Handmatig instellen'"
+
+#~ msgid ""
+#~ "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+#~ msgstr ""
+#~ "Wijzig de instelling onder Authenticatie in 'Kerberos/GSSAPI' en doe "
+#~ "hetzelfde voor SMTP"
+
+#~ msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
+#~ msgstr ""
+#~ "Een waarschuwingsbericht verschijnt, kruis 'Ik begrijp de risico's' aan "
+#~ "en klik op 'Klaar'"
+
#~ msgid ""
#~ "If the upgrade breaks due to sitesummary (this is a bug not yet fixed in "
#~ "jessie):"
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 6868521..6194fdb 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+0000\n"
"PO-Revision-Date: 2017-05-09 07:23+0000\n"
"Last-Translator: Stanisław Krukowski <ack0079 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -7358,7 +7358,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"All users can send and receive mails within the internal network. To allow "
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -7401,11 +7402,9 @@ msgid "Click 'Continue'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7413,13 +7412,9 @@ msgid "Click 'Done'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
#. type: Content of: <article><section><section><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 3d8ad12..4e5ece8 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-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+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"
@@ -6839,7 +6839,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"All users can send and receive mails within the internal network. To allow "
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -6882,11 +6883,9 @@ msgid "Click 'Continue'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6894,13 +6893,9 @@ msgid "Click 'Done'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
#. type: Content of: <article><section><section><section><title>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 3199d69..a7652fc 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -3086,7 +3086,7 @@ 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 administrator 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; self-signed certificates are provided to allow TLS secured connections. 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 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>
@@ -3114,19 +3114,13 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
<para>Click 'Continue'
</para></listitem>
<listitem>
-<para>Click 'Manual config'
-</para></listitem>
-<listitem>
-<para>Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well
+<para>For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/GSSAPI'; adjust if not detected automatically
</para></listitem>
<listitem>
<para>Click 'Done'
</para></listitem>
<listitem>
-<para>A warning pops up, check 'I understand the risks' and click 'Done'
-</para></listitem>
-<listitem>
-<para>First time accessing the inbox click 'Confirm Security Exception' to accept the certificate
+<para>First time accessing the inbox click 'Confirm Security Exception' to accept the certificate; same applies if sending mail for the first time.
</para></listitem></itemizedlist>
</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 7dcb1a7..6647691 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2017-05-14 13:08+0000\n"
+"POT-Creation-Date: 2017-05-24 11:42+0000\n"
"PO-Revision-Date: 2017-05-11 08:07+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -7486,7 +7486,8 @@ msgstr "使用电子邮件"
#. type: Content of: <article><section><section><para>
msgid ""
-"All users can send and receive mails within the internal network. To allow "
+"All users can send and receive mails within the internal network; self-"
+"signed certificates are provided to allow TLS secured connections. 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</"
@@ -7529,11 +7530,9 @@ msgid "Click 'Continue'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Click 'Manual config'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Under Authentication, change it to 'Kerberos/GSSAPI' for SMTP as well"
+msgid ""
+"For both IMAP and SMTP the settings should be 'STARTTLS' and 'Kerberos/"
+"GSSAPI'; adjust if not detected automatically"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -7541,13 +7540,9 @@ msgid "Click 'Done'"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "A warning pops up, check 'I understand the risks' and click 'Done'"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"First time accessing the inbox click 'Confirm Security Exception' to accept "
-"the certificate"
+"the certificate; same applies if sending mail for the first time."
msgstr ""
#. type: Content of: <article><section><section><section><title>
--
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