Merge remote-tracking branch 'origin/doc/11503-icedove-autoconfig' into testing

Fix-committed: #11503

3 files changed, 25 insertions, 35 deletions

diff --git a/wiki/src/doc.de.po b/wiki/src/doc.de.po
index d77fa82..182b75a 100644
--- a/wiki/src/doc.de.po
+++ b/wiki/src/doc.de.po
@@ -7,19 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tails website\n"
 "POT-Creation-Date: 2016-04-29 13:53+0000\n"
-"PO-Revision-Date: 2016-03-28 11:22+0200\n"
+"PO-Revision-Date: 2016-05-30 16:40-0000\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: Tails translators <tails-l10n@boum.org>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta title=\"Documentation\"]]\n"
-msgstr "[[!meta title=\"Benutzerdokumentation\"]]\n"
+msgstr "[[!meta title=\"Dokumentation\"]]\n"
 
 #. type: Plain text
 msgid "This documentation is a work in progress and a collective task."
@@ -75,13 +75,13 @@ msgstr "Herunterladen und installieren"
 #. type: Bullet: '  - '
 msgid "[[Install from another Tails (for PC)|install/win/clone/overview]]"
 msgstr ""
-"[[Installieren von einem anderen Tails aus (für PC)|install/win/clone/"
+"[[Von einem anderen Tails aus installieren (für PC)|install/win/clone/"
 "overview]]"
 
 #. type: Bullet: '  - '
 msgid "[[Install from another Tails (for Mac)|install/mac/clone/overview]]"
 msgstr ""
-"[[Installieren von einem anderen Tails aus (für Mac)|install/mac/clone/"
+"[[Von einem anderen Tails aus installieren (für Mac)|install/mac/clone/"
 "overview]]"
 
 #. type: Bullet: '  - '
@@ -89,34 +89,30 @@ msgid "[[Install from Windows|install/win/usb/overview]]"
 msgstr "[[Installation unter Windows|install/win/usb/overview]]"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid "[[Install from Ubuntu|install/debian/usb/overview]]"
 msgid "[[Install from Debian or Ubuntu|install/debian/usb/overview]]"
-msgstr "[[Installation unter Ubuntu|install/debian/usb/overview]]"
+msgstr ""
+"[[Von Debian oder Ubuntu aus installieren|install/debian/usb/overview]]"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "[[Install from Ubuntu and the command line|install/expert/usb/overview]]"
 msgid ""
 "[[Install from Debian or Ubuntu using the command line and GnuPG|install/"
 "expert/usb/overview]]"
 msgstr ""
-"[[Installation von Ubuntu aus unter Nutzung der Kommandozeile|install/expert/"
-"usb/overview]]"
+"[[Installation von Debian oder Ubuntu aus unter Nutzung der Kommandozeile "
+"und GnuPG|install/expert/usb/overview]]"
 
 #. type: Bullet: '  - '
 msgid "[[Install from other Linux distributions|install/linux/usb/overview]]"
 msgstr ""
-"[[Unter anderen Linux-Distributionen installieren|install/linux/usb/"
+"[[Von anderen Linux-Distributionen aus installieren|install/linux/usb/"
 "overview]]"
 
 #. type: Bullet: '  - '
 msgid ""
 "[[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]"
 msgstr ""
-"[[Unter Mac OS X eine DVD brennen und anschließend installieren|install/mac/"
-"dvd/overview]]"
+"[[Von Mac OS X aus eine DVD brennen und anschließend installieren|install/"
+"mac/dvd/overview]]"
 
 #. type: Bullet: '  - '
 msgid "[[Install from Mac OS X and the command line|install/mac/usb/overview]]"
@@ -133,10 +129,10 @@ msgid "[[Download without installing|install/download]]"
 msgstr "[[Ohne Installation herunterladen|install/download]]"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid "[[Download without installing|install/download]]"
 msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
-msgstr "[[Ohne Installation herunterladen|install/download]]"
+msgstr ""
+"[[Ohne Installation herunterladen und mit OpenPGP verifizieren|install/"
+"download/openpgp]]"
 
 #. type: Title #
 #, no-wrap
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn
index 0fef722..c6d3523 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn
+++ b/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn
@@ -21,11 +21,17 @@
 
    <a id="protocol"></a>
 
-1. Specify which protocol to use to connect to your email provider.
+1. Click <span class="guilabel">Continue</span>.
+
+1. The assistant tries to configure automatically the correct parameters
+   to connect to your email provider based on your email address.
 
-   <span class="application">Icedove</span> can connect to your email
-   provider using either the <span class="guilabel">IMAP</span> or
-   <span class="guilabel">POP</span> protocol.
+   If the automatic configuration fails, consult your email provider
+   about how to configure your email account manually.
+
+1. If the automatic configuration succeeds, you might have to specify
+   which protocol to use to connect to your email provider, either
+   <span class="guilabel">IMAP</span> or <span class="guilabel">POP</span>.
 
       - With <span class="guilabel">IMAP</span>,
         <span class="application">Icedove</span> constantly synchronizes
@@ -43,15 +49,3 @@
    IMAP](https://help.riseup.net/en/email/clients/#choose-imap-or-pop) by
    Riseup.
 
-1. Click <span class="guilabel">Continue</span>.
-
-   <div class="bug">
-   <p>After this first screen, the <a href="https://support.mozilla.org/en-US/kb/automatic-account-configuration">automatic
-   account configuration</a> of <span class="application">Icedove</span>
-   is currently disabled in Tails for security reasons. You should consult
-   the documentation of your email provider to finish configuring your
-   email account manually.</p>
-
-   <p>We will enable again the automatic account configuration in Tails
-   in the future. See [[!tails_ticket 6154]].</p>
-   </div>
diff --git a/wiki/src/doc/anonymous_internet/icedove/assistant.png b/wiki/src/doc/anonymous_internet/icedove/assistant.png
index 7d93193..0d2157e 100644
--- a/wiki/src/doc/anonymous_internet/icedove/assistant.png
+++ b/wiki/src/doc/anonymous_internet/icedove/assistant.png