[l10n] Updated German doc translation

1 files changed, 1526 insertions, 960 deletions

diff --git a/help/de/de.po b/help/de/de.po
index e0ba64b914..75089e6315 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -29,13 +29,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: manual_evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-19 02:09+0000\n"
-"PO-Revision-Date: 2012-03-14 22:04+0100\n"
+"POT-Creation-Date: 2012-03-26 18:41+0000\n"
+"PO-Revision-Date: 2012-03-26 17:15+0100\n"
 "Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 0.3\n"
@@ -63,11 +63,10 @@ msgstr ""
 #: C/memos-usage.page:11(name) C/memos-usage-edit-memo.page:11(name)
 #: C/memos-usage-delete-memo.page:11(name)
 #: C/memos-usage-add-memo.page:11(name) C/memos-searching.page:16(name)
-#: C/mail-wrong-fonts-in-3-0.page:12(name)
 #: C/mail-working-offline.page:11(name) C/mail-word-wrap.page:11(name)
 #: C/mail-vertical-view.page:10(name)
 #: C/mail-usenet-subscriptions.page:12(name)
-#: C/mail-spam-settings.page:12(name) C/mail-spam.page:11(name)
+#: C/mail-spam-settings.page:14(name) C/mail-spam.page:11(name)
 #: C/mail-spam-marking.page:11(name)
 #: C/mail-spam-groupwise-unmark-message.page:11(name)
 #: C/mail-spam-groupwise-remove-from-list.page:11(name)
@@ -98,6 +97,7 @@ msgstr ""
 #: C/mail-receiving-options-imap-plus.page:11(name)
 #: C/mail-receiving-options-imap.page:11(name)
 #: C/mail-receiving-options-exchange-mapi.page:11(name)
+#: C/mail-receiving-options-exchange-ews.page:11(name)
 #: C/mail-receiving-options-evolution-exchange.page:11(name)
 #: C/mail-received-notification.page:11(name)
 #: C/mail-read-receipts.page:24(name)
@@ -109,7 +109,6 @@ msgstr ""
 #: C/mail-filters.page:11(name) C/mail-filters-not-working.page:16(name)
 #: C/mail-filters-conditions.page:11(name)
 #: C/mail-filters-actions.page:11(name)
-#: C/mail-error-folder-mismatch.page:15(name)
 #: C/mail-error-failed-to-append-to-sent-folder.page:15(name)
 #: C/mail-encryption-s-mime-signing-encrypting.page:11(name)
 #: C/mail-encryption-s-mime-manage.page:11(name)
@@ -125,12 +124,12 @@ msgstr ""
 #: C/mail-displaying-message.page:11(name)
 #: C/mail-displaying-images-in-html.page:12(name)
 #: C/mail-displaying-collapsible-headers.page:11(name)
-#: C/mail-displaying-character-encodings.page:11(name)
+#: C/mail-displaying-character-encodings.page:12(name)
 #: C/mail-delete-and-undelete.page:13(name)
 #: C/mail-default-folder-locations.page:23(name)
 #: C/mail-default-CC-and-BCC.page:23(name)
 #: C/mail-composer-write-new-message.page:11(name)
-#: C/mail-composer-spellcheck.page:11(name)
+#: C/mail-composer-spellcheck.page:13(name)
 #: C/mail-composer-several-recipients.page:14(name)
 #: C/mail-composer-search.page:12(name) C/mail-composer-reply.page:11(name)
 #: C/mail-composer-priority.page:11(name)
@@ -146,7 +145,7 @@ msgstr ""
 #: C/mail-composer-forward.page:11(name)
 #: C/mail-composer-forward-as-attachment.page:12(name)
 #: C/mail-composer-custom-header-lines.page:11(name)
-#: C/mail-composer-change-quotation-string.page:13(name)
+#: C/mail-composer-change-quotation-string.page:15(name)
 #: C/mail-change-time-format.page:10(name)
 #: C/mail-change-columns-in-message-list.page:11(name)
 #: C/mail-attachments-sending.page:12(name)
@@ -167,8 +166,9 @@ msgstr ""
 #: C/mail-account-manage-imap-plus.page:11(name)
 #: C/mail-account-manage-imap.page:11(name)
 #: C/mail-access-gmail-imap-account.page:13(name)
-#: C/intro-main-window.page:13(name) C/intro-first-run.page:11(name)
-#: C/index.page:14(name) C/import-supported-file-formats.page:11(name)
+#: C/intro-main-window.page:13(name) C/intro-first-run.page:13(name)
+#: C/intro-application.page:15(name) C/index.page:14(name)
+#: C/import-supported-file-formats.page:11(name)
 #: C/import-single-files.page:11(name) C/import-data.page:11(name)
 #: C/import-apps-outlook.page:11(name) C/import-apps-mozilla.page:11(name)
 #: C/groupwise-placeholder.page:11(name) C/google-services.page:9(name)
@@ -176,9 +176,9 @@ msgstr ""
 #: C/exporting-data-mail.page:11(name) C/exporting-data-contacts.page:11(name)
 #: C/exporting-data-calendar.page:11(name)
 #: C/exchange-placeholder.page:11(name)
-#: C/exchange-connectors-overview.page:11(name)
-#: C/deleting-to-free-disk-space.page:11(name) C/deleting-emails.page:16(name)
-#: C/deleting-appointments.page:11(name) C/default-browser.page:11(name)
+#: C/exchange-connectors-overview.page:13(name)
+#: C/deleting-to-free-disk-space.page:11(name) C/deleting-emails.page:17(name)
+#: C/deleting-appointments.page:11(name) C/default-browser.page:13(name)
 #: C/data-storage.page:11(name) C/credits.page:11(name)
 #: C/contacts-using-several-addressbooks.page:11(name)
 #: C/contacts-using-contact-lists.page:11(name) C/contacts-usage.page:11(name)
@@ -186,10 +186,12 @@ msgstr ""
 #: C/contacts-usage-delete-contact.page:11(name)
 #: C/contacts-usage-add-contact.page:11(name)
 #: C/contacts-searching.page:16(name) C/contacts-organizing.page:12(name)
-#: C/contacts-local.page:11(name) C/contacts-ldap.page:11(name)
-#: C/contacts-google.page:12(name) C/contacts-autocompletion.page:15(name)
+#: C/contacts-local.page:11(name) C/contacts-libreoffice.page:11(name)
+#: C/contacts-ldap.page:11(name) C/contacts-google.page:12(name)
+#: C/contacts-autocompletion.page:15(name)
 #: C/contacts-add-automatically.page:11(name)
-#: C/change-switcher-appearance.page:10(name) C/calendar-webdav.page:11(name)
+#: C/change-switcher-appearance.page:10(name)
+#: C/change-keyboard-shortcuts.page:9(name) C/calendar-webdav.page:11(name)
 #: C/calendar-weather.page:11(name)
 #: C/calendar-using-several-calendars.page:11(name)
 #: C/calendar-usage.page:12(name)
@@ -230,11 +232,10 @@ msgstr "Andre Klapper"
 #: C/memos-usage-edit-memo.page:12(email)
 #: C/memos-usage-delete-memo.page:12(email)
 #: C/memos-usage-add-memo.page:12(email) C/memos-searching.page:17(email)
-#: C/mail-wrong-fonts-in-3-0.page:13(email)
 #: C/mail-working-offline.page:12(email) C/mail-word-wrap.page:12(email)
 #: C/mail-vertical-view.page:11(email)
 #: C/mail-usenet-subscriptions.page:13(email)
-#: C/mail-spam-settings.page:13(email) C/mail-spam.page:12(email)
+#: C/mail-spam-settings.page:15(email) C/mail-spam.page:12(email)
 #: C/mail-spam-marking.page:12(email)
 #: C/mail-spam-groupwise-unmark-message.page:12(email)
 #: C/mail-spam-groupwise-remove-from-list.page:12(email)
@@ -265,6 +266,7 @@ msgstr "Andre Klapper"
 #: C/mail-receiving-options-imap-plus.page:12(email)
 #: C/mail-receiving-options-imap.page:12(email)
 #: C/mail-receiving-options-exchange-mapi.page:12(email)
+#: C/mail-receiving-options-exchange-ews.page:12(email)
 #: C/mail-receiving-options-evolution-exchange.page:12(email)
 #: C/mail-received-notification.page:12(email)
 #: C/mail-read-receipts.page:25(email)
@@ -276,7 +278,6 @@ msgstr "Andre Klapper"
 #: C/mail-filters.page:12(email) C/mail-filters-not-working.page:17(email)
 #: C/mail-filters-conditions.page:12(email)
 #: C/mail-filters-actions.page:12(email)
-#: C/mail-error-folder-mismatch.page:16(email)
 #: C/mail-error-failed-to-append-to-sent-folder.page:16(email)
 #: C/mail-encryption-s-mime-signing-encrypting.page:12(email)
 #: C/mail-encryption-s-mime-manage.page:12(email)
@@ -292,12 +293,12 @@ msgstr "Andre Klapper"
 #: C/mail-displaying-message.page:12(email)
 #: C/mail-displaying-images-in-html.page:13(email)
 #: C/mail-displaying-collapsible-headers.page:12(email)
-#: C/mail-displaying-character-encodings.page:12(email)
+#: C/mail-displaying-character-encodings.page:13(email)
 #: C/mail-delete-and-undelete.page:14(email)
 #: C/mail-default-folder-locations.page:24(email)
 #: C/mail-default-CC-and-BCC.page:24(email)
 #: C/mail-composer-write-new-message.page:12(email)
-#: C/mail-composer-spellcheck.page:12(email)
+#: C/mail-composer-spellcheck.page:14(email)
 #: C/mail-composer-several-recipients.page:15(email)
 #: C/mail-composer-search.page:13(email) C/mail-composer-reply.page:12(email)
 #: C/mail-composer-priority.page:12(email)
@@ -314,7 +315,7 @@ msgstr "Andre Klapper"
 #: C/mail-composer-forward.page:12(email)
 #: C/mail-composer-forward-as-attachment.page:13(email)
 #: C/mail-composer-custom-header-lines.page:12(email)
-#: C/mail-composer-change-quotation-string.page:14(email)
+#: C/mail-composer-change-quotation-string.page:16(email)
 #: C/mail-change-time-format.page:11(email)
 #: C/mail-change-columns-in-message-list.page:12(email)
 #: C/mail-attachments-sending.page:13(email)
@@ -336,8 +337,9 @@ msgstr "Andre Klapper"
 #: C/mail-account-manage-imap-plus.page:12(email)
 #: C/mail-account-manage-imap.page:12(email)
 #: C/mail-access-gmail-imap-account.page:14(email)
-#: C/intro-main-window.page:14(email) C/intro-first-run.page:12(email)
-#: C/index.page:15(email) C/import-supported-file-formats.page:12(email)
+#: C/intro-main-window.page:14(email) C/intro-first-run.page:14(email)
+#: C/intro-application.page:16(email) C/index.page:15(email)
+#: C/import-supported-file-formats.page:12(email)
 #: C/import-single-files.page:12(email) C/import-data.page:12(email)
 #: C/import-apps-outlook.page:12(email) C/import-apps-mozilla.page:12(email)
 #: C/groupwise-placeholder.page:12(email) C/google-services.page:10(email)
@@ -346,10 +348,10 @@ msgstr "Andre Klapper"
 #: C/exporting-data-contacts.page:12(email)
 #: C/exporting-data-calendar.page:12(email)
 #: C/exchange-placeholder.page:12(email)
-#: C/exchange-connectors-overview.page:12(email)
+#: C/exchange-connectors-overview.page:14(email)
 #: C/deleting-to-free-disk-space.page:12(email)
-#: C/deleting-emails.page:17(email) C/deleting-appointments.page:12(email)
-#: C/default-browser.page:12(email) C/data-storage.page:12(email)
+#: C/deleting-emails.page:18(email) C/deleting-appointments.page:12(email)
+#: C/default-browser.page:14(email) C/data-storage.page:12(email)
 #: C/credits.page:12(email)
 #: C/contacts-using-several-addressbooks.page:12(email)
 #: C/contacts-using-contact-lists.page:12(email)
@@ -358,11 +360,13 @@ msgstr "Andre Klapper"
 #: C/contacts-usage-delete-contact.page:12(email)
 #: C/contacts-usage-add-contact.page:12(email)
 #: C/contacts-searching.page:17(email) C/contacts-organizing.page:13(email)
-#: C/contacts-local.page:12(email) C/contacts-ldap.page:12(email)
-#: C/contacts-google.page:13(email) C/contacts-autocompletion.page:16(email)
+#: C/contacts-local.page:12(email) C/contacts-libreoffice.page:12(email)
+#: C/contacts-ldap.page:12(email) C/contacts-google.page:13(email)
+#: C/contacts-autocompletion.page:16(email)
 #: C/contacts-add-automatically.page:12(email)
 #: C/change-switcher-appearance.page:11(email)
-#: C/calendar-webdav.page:12(email) C/calendar-weather.page:12(email)
+#: C/change-keyboard-shortcuts.page:10(email) C/calendar-webdav.page:12(email)
+#: C/calendar-weather.page:12(email)
 #: C/calendar-using-several-calendars.page:12(email)
 #: C/calendar-usage.page:13(email)
 #: C/calendar-usage-edit-appointment.page:12(email)
@@ -393,7 +397,7 @@ msgstr "ak-47@gmx.net"
 #: C/memos-usage-add-memo.page:15(name) C/memos-searching.page:20(name)
 #: C/mail-working-offline.page:15(name) C/mail-vertical-view.page:14(name)
 #: C/mail-usenet-subscriptions.page:16(name)
-#: C/mail-spam-settings.page:20(name) C/mail-spam-marking.page:19(name)
+#: C/mail-spam-settings.page:28(name) C/mail-spam-marking.page:22(name)
 #: C/mail-spam-groupwise-unmark-message.page:15(name)
 #: C/mail-spam-groupwise-remove-from-list.page:15(name)
 #: C/mail-spam-groupwise-mark-message.page:15(name)
@@ -468,14 +472,14 @@ msgstr "Novell, Inc"
 #: C/sync-with-other-devices.page:18(p) C/searching-items.page:13(p)
 #: C/problems-reporting-bugs.page:16(p) C/problems-getting-help.page:16(p)
 #: C/problems-debug-how-to.page:16(p) C/organizing.page:13(p)
-#: C/minimize-to-system-tray.page:19(p) C/memos-usage.page:15(p)
-#: C/memos-usage-edit-memo.page:15(p) C/memos-usage-delete-memo.page:15(p)
-#: C/memos-usage-add-memo.page:18(p) C/memos-searching.page:23(p)
-#: C/mail-wrong-fonts-in-3-0.page:16(p) C/mail-working-offline.page:18(p)
+#: C/offline.page:19(p) C/minimize-to-system-tray.page:19(p)
+#: C/memos-usage.page:15(p) C/memos-usage-edit-memo.page:15(p)
+#: C/memos-usage-delete-memo.page:15(p) C/memos-usage-add-memo.page:18(p)
+#: C/memos-searching.page:23(p) C/mail-working-offline.page:18(p)
 #: C/mail-word-wrap.page:15(p) C/mail-vertical-view.page:17(p)
 #: C/mail-usenet-subscriptions.page:19(p) C/mail-two-trash-folders.page:15(p)
-#: C/mail-spam-settings.page:23(p) C/mail-spam.page:15(p)
-#: C/mail-spam-marking.page:22(p)
+#: C/mail-spam-settings.page:31(p) C/mail-spam.page:15(p)
+#: C/mail-spam-marking.page:25(p)
 #: C/mail-spam-groupwise-unmark-message.page:18(p)
 #: C/mail-spam-groupwise-remove-from-list.page:18(p)
 #: C/mail-spam-groupwise-mark-message.page:18(p)
@@ -502,6 +506,7 @@ msgstr "Novell, Inc"
 #: C/mail-receiving-options-imap-plus.page:18(p)
 #: C/mail-receiving-options-imap.page:18(p)
 #: C/mail-receiving-options-exchange-mapi.page:15(p)
+#: C/mail-receiving-options-exchange-ews.page:15(p)
 #: C/mail-receiving-options-evolution-exchange.page:18(p)
 #: C/mail-received-notification.page:15(p) C/mail-read-receipts.page:28(p)
 #: C/mail-reading-keyboard-shortcuts.page:19(p) C/mail-organizing.page:16(p)
@@ -512,7 +517,6 @@ msgstr "Novell, Inc"
 #: C/mail-filters.page:18(p) C/mail-filters-not-working.page:20(p)
 #: C/mail-filters-conditions.page:18(p) C/mail-filters-actions.page:18(p)
 #: C/mail-error-no-provider-available.page:15(p)
-#: C/mail-error-folder-mismatch.page:19(p)
 #: C/mail-error-failed-to-append-to-sent-folder.page:19(p)
 #: C/mail-encryption-s-mime-signing-encrypting.page:18(p)
 #: C/mail-encryption-s-mime-manage.page:18(p) C/mail-encryption.page:29(p)
@@ -525,12 +529,12 @@ msgstr "Novell, Inc"
 #: C/mail-displaying-no-css.page:16(p) C/mail-displaying-message.page:15(p)
 #: C/mail-displaying-images-in-html.page:23(p)
 #: C/mail-displaying-collapsible-headers.page:18(p)
-#: C/mail-displaying-character-encodings.page:15(p)
+#: C/mail-displaying-character-encodings.page:16(p)
 #: C/mail-delete-and-undelete.page:20(p)
 #: C/mail-default-folder-locations.page:27(p)
 #: C/mail-default-CC-and-BCC.page:27(p)
 #: C/mail-composer-write-new-message.page:18(p)
-#: C/mail-composer-spellcheck.page:15(p)
+#: C/mail-composer-spellcheck.page:17(p)
 #: C/mail-composer-several-recipients.page:21(p)
 #: C/mail-composer-search.page:16(p) C/mail-composer-reply.page:18(p)
 #: C/mail-composer-priority.page:18(p)
@@ -544,7 +548,7 @@ msgstr "Novell, Inc"
 #: C/mail-composer-forward.page:18(p)
 #: C/mail-composer-forward-as-attachment.page:16(p)
 #: C/mail-composer-custom-header-lines.page:18(p)
-#: C/mail-composer-change-quotation-string.page:17(p)
+#: C/mail-composer-change-quotation-string.page:19(p)
 #: C/mail-change-time-format.page:14(p)
 #: C/mail-change-columns-in-message-list.page:15(p)
 #: C/mail-cannot-see.page:15(p) C/mail-calendar-sending-invitations.page:16(p)
@@ -567,16 +571,17 @@ msgstr "Novell, Inc"
 #: C/mail-account-manage-imap.page:15(p)
 #: C/mail-access-gmail-pop-account.page:17(p)
 #: C/mail-access-gmail-imap-account.page:17(p) C/intro-main-window.page:24(p)
-#: C/intro-first-run.page:15(p) C/index.page:18(p)
-#: C/import-supported-file-formats.page:18(p) C/import-single-files.page:15(p)
-#: C/import-data.page:15(p) C/import-apps-outlook.page:18(p)
-#: C/import-apps-mozilla.page:15(p) C/groupwise-placeholder.page:15(p)
-#: C/google-services.page:13(p) C/express-mode.page:15(p)
-#: C/exporting-data.page:15(p) C/exporting-data-mail.page:15(p)
-#: C/exporting-data-contacts.page:18(p) C/exporting-data-calendar.page:15(p)
-#: C/exchange-placeholder.page:15(p) C/exchange-connectors-overview.page:15(p)
-#: C/deleting-to-free-disk-space.page:15(p) C/deleting-emails.page:20(p)
-#: C/deleting-appointments.page:15(p) C/default-browser.page:15(p)
+#: C/intro-first-run.page:17(p) C/intro-application.page:19(p)
+#: C/index.page:18(p) C/import-supported-file-formats.page:18(p)
+#: C/import-single-files.page:15(p) C/import-data.page:15(p)
+#: C/import-apps-outlook.page:18(p) C/import-apps-mozilla.page:15(p)
+#: C/groupwise-placeholder.page:15(p) C/google-services.page:13(p)
+#: C/express-mode.page:15(p) C/exporting-data.page:15(p)
+#: C/exporting-data-mail.page:15(p) C/exporting-data-contacts.page:18(p)
+#: C/exporting-data-calendar.page:15(p) C/exchange-placeholder.page:15(p)
+#: C/exchange-connectors-overview.page:17(p)
+#: C/deleting-to-free-disk-space.page:15(p) C/deleting-emails.page:21(p)
+#: C/deleting-appointments.page:15(p) C/default-browser.page:17(p)
 #: C/data-storage.page:15(p) C/credits.page:15(p)
 #: C/contacts-using-several-addressbooks.page:15(p)
 #: C/contacts-using-contact-lists.page:18(p) C/contacts-usage.page:15(p)
@@ -584,10 +589,11 @@ msgstr "Novell, Inc"
 #: C/contacts-usage-delete-contact.page:15(p)
 #: C/contacts-usage-add-contact.page:15(p) C/contacts-searching.page:23(p)
 #: C/contacts-organizing.page:16(p) C/contacts-local.page:15(p)
-#: C/contacts-ldap.page:18(p) C/contacts-google.page:16(p)
-#: C/contacts-autocompletion.page:22(p)
+#: C/contacts-libreoffice.page:15(p) C/contacts-ldap.page:18(p)
+#: C/contacts-google.page:16(p) C/contacts-autocompletion.page:22(p)
 #: C/contacts-add-automatically.page:19(p)
-#: C/change-switcher-appearance.page:14(p) C/calendar-webdav.page:15(p)
+#: C/change-switcher-appearance.page:14(p)
+#: C/change-keyboard-shortcuts.page:13(p) C/calendar-webdav.page:15(p)
 #: C/calendar-weather.page:15(p) C/calendar-using-several-calendars.page:18(p)
 #: C/calendar-usage.page:16(p) C/calendar-usage-edit-appointment.page:15(p)
 #: C/calendar-usage-delete-appointment.page:15(p)
@@ -622,12 +628,11 @@ msgid ""
 "category because he is a friend."
 msgstr ""
 "Eine andere Methode, wie Sie Kontakte, Termine, Aufgaben und Notizen (im "
-"Folgenden unter dem Begriff »Objekte« zusammengefasst) ordnen können, "
-"besteht darin, ihnen verschiedene Kategorien zuzuweisen. Sie können einem "
-"Objekt mehrere oder gar keine Kategorien zuordnen. Sie können zum Beispiel "
-"in Ihrem Adressbuch einen Freund in der Kategorie »Geschäftlich« einordnen, "
-"da er mit Ihnen arbeitet, und in die Kategorie »Freunde«, da er ein Freund "
-"ist."
+"Folgenden unter dem Begriff »Objekte« zusammengefasst) ordnen können, besteht "
+"darin, ihnen verschiedene Kategorien zuzuweisen. Sie können einem Objekt "
+"mehrere oder gar keine Kategorien zuordnen. Sie können zum Beispiel in Ihrem "
+"Adressbuch einen Freund in der Kategorie »Geschäftlich« einordnen, da er mit "
+"Ihnen arbeitet, und in die Kategorie »Freunde«, da er ein Freund ist."
 
 #: C/using-categories.page:29(p)
 msgid ""
@@ -686,7 +691,7 @@ msgstr ""
 "indirekt, wenn Sie ein Objekt bearbeiten:"
 
 #: C/using-categories.page:48(p)
-msgid "Double-click any object to bring up th corresponding editor."
+msgid "Double-click any object to bring up the corresponding editor."
 msgstr ""
 "Klicken Sie doppelt auf ein beliebiges Objekt, um den entsprechenden Editor "
 "zu öffnen."
@@ -782,11 +787,7 @@ msgid "Optionally choose a color that you prefer."
 msgstr "Wählen Sie optional die gewünschte Farbe."
 
 #: C/tasks-webdav.page:30(p) C/tasks-caldav.page:28(p)
-#: C/contacts-google.page:28(p) C/calendar-webdav.page:30(p)
-#: C/calendar-weather.page:30(p) C/calendar-google.page:32(p)
-#: C/calendar-caldav.page:31(p)
-msgid ""
-"Choose if you want to be able to view the content also when being offline."
+msgid "Choose if you want to be able to view the content also while offline."
 msgstr ""
 "Wählen Sie, ob Sie den Inhalt auch sehen können wollen, wenn Sie offline "
 "sind."
@@ -836,14 +837,14 @@ msgstr "Mehrere Aufgaben- oder Notizenlisten verwenden"
 msgid ""
 "You can have multiple task or memo lists and choose which of your lists get "
 "displayed. For example, you might have tasks for work, tasks for home, and "
-"tasks for the singing club that you are a member of. The side bar lists "
-"those lists, and you can select or deselect any of the boxes next to them to "
+"tasks for the singing club of which you are a member. The side bar shows "
+"these lists, and you can select or deselect any of the boxes next to them to "
 "show and hide the corresponding tasks or memos in your view."
 msgstr ""
-"Sie können mehrere Aufgaben- oder Notizenlisten verwenden und auswählen, "
+"Sie können mehrere Aufgaben- oder Notizlisten verwenden und auswählen, "
 "welche Ihrer Listen angezeigt werden. So können Sie zum Beispiel Aufgaben "
-"für die Arbeit, für zu Hause und für den Gesangverein, in dem Sie Mitglied "
-"sind, haben. In der Seitenleiste werden diese Listen aufgelistet, und Sie "
+"für die Arbeit, für zu Hause und für den Gesangverein haben, in dem Sie "
+"Mitglied sind. In der Seitenleiste werden diese Listen aufgelistet, und Sie "
 "können durch das Aus- und Abwählen der Ankreuzfelder neben den Namen "
 "entscheiden, ob die entsprechenden Aufgaben und Notizen in Ihrer Ansicht "
 "angezeigt oder verborgen werden."
@@ -1075,7 +1076,7 @@ msgid "Select the search condition from the list."
 msgstr "Wählen Sie das Suchkriterium aus der Liste aus."
 
 #: C/tasks-searching.page:36(p) C/memos-searching.page:36(p)
-#: C/mail-searching.page:36(p) C/contacts-searching.page:36(p)
+#: C/mail-searching.page:38(p) C/contacts-searching.page:36(p)
 #: C/calendar-searching.page:36(p)
 msgid "Enter the text you want to search for and press <key>Enter</key>."
 msgstr ""
@@ -1084,7 +1085,7 @@ msgstr ""
 
 #: C/tasks-searching.page:37(p) C/tasks-searching.page:43(p)
 #: C/memos-searching.page:37(p) C/memos-searching.page:43(p)
-#: C/mail-searching.page:37(p) C/contacts-searching.page:37(p)
+#: C/mail-searching.page:39(p) C/contacts-searching.page:37(p)
 #: C/contacts-searching.page:43(p) C/calendar-searching.page:37(p)
 #: C/calendar-searching.page:43(p)
 msgid "Evolution displays the search results."
@@ -1106,7 +1107,7 @@ msgid "Select the category from the list."
 msgstr "Wählen Sie die Kategorie aus der Liste aus."
 
 #: C/tasks-searching.page:45(p) C/memos-searching.page:45(p)
-#: C/mail-searching.page:41(p) C/contacts-searching.page:45(p)
+#: C/mail-searching.page:43(p) C/contacts-searching.page:45(p)
 #: C/calendar-searching.page:45(p)
 msgid ""
 "If you want to set several search conditions, you should use an Advanced "
@@ -1121,7 +1122,7 @@ msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
 #: C/tasks-searching.page:51(p) C/memos-searching.page:51(p)
-#: C/mail-searching.page:47(p) C/contacts-searching.page:51(p)
+#: C/mail-searching.page:49(p) C/contacts-searching.page:51(p)
 #: C/calendar-searching.page:51(p)
 msgid ""
 "Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu "
@@ -1131,7 +1132,7 @@ msgstr ""
 "guiseq>, um das entsprechende Fenster zu öffnen."
 
 #: C/tasks-searching.page:52(p) C/memos-searching.page:52(p)
-#: C/mail-searching.page:48(p) C/contacts-searching.page:52(p)
+#: C/mail-searching.page:50(p) C/contacts-searching.page:52(p)
 #: C/calendar-searching.page:52(p)
 msgid ""
 "Click <gui style=\"button\">Add Condition</gui> to add any number of rules."
@@ -1140,7 +1141,7 @@ msgstr ""
 "beliebige Anzahl Regeln hinzuzufügen."
 
 #: C/tasks-searching.page:53(p) C/memos-searching.page:53(p)
-#: C/mail-searching.page:49(p) C/contacts-searching.page:53(p)
+#: C/mail-searching.page:51(p) C/contacts-searching.page:53(p)
 #: C/calendar-searching.page:53(p)
 msgid ""
 "Select the condition from the dropdown list, and then type a search entry in "
@@ -1150,7 +1151,7 @@ msgstr ""
 "Suchbegriff in das Feld ein."
 
 #: C/tasks-searching.page:54(p) C/memos-searching.page:54(p)
-#: C/mail-searching.page:50(p) C/contacts-searching.page:54(p)
+#: C/mail-searching.page:52(p) C/contacts-searching.page:54(p)
 #: C/calendar-searching.page:54(p)
 msgid ""
 "Click <gui style=\"button\">OK</gui> to get the search results displayed."
@@ -1159,13 +1160,13 @@ msgstr ""
 "anzuzeigen."
 
 #: C/tasks-searching.page:60(title) C/memos-searching.page:60(title)
-#: C/mail-searching.page:56(title) C/contacts-searching.page:60(title)
+#: C/mail-searching.page:58(title) C/contacts-searching.page:60(title)
 #: C/calendar-searching.page:60(title)
 msgid "Clearing the Search results"
 msgstr "Das Suchfeld leeren"
 
 #: C/tasks-searching.page:61(p) C/memos-searching.page:61(p)
-#: C/mail-searching.page:57(p) C/contacts-searching.page:61(p)
+#: C/mail-searching.page:59(p) C/contacts-searching.page:61(p)
 #: C/calendar-searching.page:61(p)
 msgid ""
 "To clear your search view and get back to the default view, click the "
@@ -1181,13 +1182,13 @@ msgstr ""
 "keyseq> zum Leeren des Feldes drücken."
 
 #: C/tasks-searching.page:65(title) C/memos-searching.page:65(title)
-#: C/mail-searching.page:61(title) C/contacts-searching.page:65(title)
+#: C/mail-searching.page:63(title) C/contacts-searching.page:65(title)
 #: C/calendar-searching.page:65(title)
 msgid "Saved Searches"
 msgstr "Gespeicherte Suchen"
 
 #: C/tasks-searching.page:66(p) C/memos-searching.page:66(p)
-#: C/mail-searching.page:62(p) C/contacts-searching.page:66(p)
+#: C/mail-searching.page:64(p) C/contacts-searching.page:66(p)
 #: C/calendar-searching.page:66(p)
 msgid ""
 "If you search for something rather often, you will prefer not to type it "
@@ -1197,7 +1198,7 @@ msgstr ""
 "Tipparbeit zu sparen und gespeicherte Suchen einzusetzen."
 
 #: C/tasks-searching.page:67(p) C/memos-searching.page:67(p)
-#: C/mail-searching.page:63(p) C/contacts-searching.page:67(p)
+#: C/mail-searching.page:65(p) C/contacts-searching.page:67(p)
 #: C/calendar-searching.page:67(p)
 msgid ""
 "To save your search results, either click <gui>Save</gui> instead of "
@@ -1213,13 +1214,13 @@ msgstr ""
 "<gui>Suche</gui> verfügbar sein."
 
 #: C/tasks-searching.page:71(title) C/memos-searching.page:71(title)
-#: C/mail-searching.page:67(title) C/contacts-searching.page:71(title)
+#: C/mail-searching.page:69(title) C/contacts-searching.page:71(title)
 #: C/calendar-searching.page:71(title)
 msgid "Editing a Saved Search"
 msgstr "Eine gespeicherte Suche bearbeiten"
 
 #: C/tasks-searching.page:73(p) C/memos-searching.page:73(p)
-#: C/mail-searching.page:69(p) C/contacts-searching.page:73(p)
+#: C/mail-searching.page:71(p) C/contacts-searching.page:73(p)
 #: C/calendar-searching.page:73(p)
 msgid ""
 "Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from "
@@ -1229,7 +1230,7 @@ msgstr ""
 "bearbeiten</gui></guiseq>, um das entsprechende Fenster zu öffnen."
 
 #: C/tasks-searching.page:74(p) C/memos-searching.page:74(p)
-#: C/mail-searching.page:70(p) C/contacts-searching.page:74(p)
+#: C/mail-searching.page:72(p) C/contacts-searching.page:74(p)
 #: C/calendar-searching.page:74(p)
 msgid ""
 "Click the <gui style=\"button\">Edit</gui> button to open the <gui>Edit "
@@ -1239,13 +1240,13 @@ msgstr ""
 "<gui>Regel bearbeiten</gui>-Fenster zu öffnen."
 
 #: C/tasks-searching.page:75(p) C/memos-searching.page:75(p)
-#: C/mail-searching.page:71(p) C/contacts-searching.page:75(p)
+#: C/mail-searching.page:73(p) C/contacts-searching.page:75(p)
 #: C/calendar-searching.page:75(p)
 msgid "Edit the title or search conditions from the dialog box."
 msgstr "Ändern Sie den Titel oder die gewünschten Suchkriterien im Dialogfeld."
 
 #: C/tasks-searching.page:76(p) C/memos-searching.page:76(p)
-#: C/mail-searching.page:72(p) C/contacts-searching.page:76(p)
+#: C/mail-searching.page:74(p) C/contacts-searching.page:76(p)
 #: C/calendar-searching.page:76(p)
 msgid "Click <gui>OK</gui>."
 msgstr "Klicken Sie auf <gui>OK</gui>."
@@ -1350,8 +1351,8 @@ msgstr ""
 "Die Evolution-Daten mit Handheld-Geräten und Mobiltelefonen abgleichen."
 
 #: C/sync-with-other-devices.page:23(title)
-msgid "Synchronize <em>Evolution</em> with other devices"
-msgstr "<em>Evolution</em> mit anderen Geräten abgleichen"
+msgid "Synchronize <app>Evolution</app> with other devices"
+msgstr "<app>Evolution</app> mit anderen Geräten abgleichen"
 
 #: C/sync-with-other-devices.page:25(p)
 msgid "There are currently no \"recommended instructions\" for users."
@@ -1359,15 +1360,15 @@ msgstr "Derzeit gibt es keine »empfohlenen Anweisungen« für Benutzer."
 
 #: C/sync-with-other-devices.page:27(p)
 msgid ""
-"Many distributions provide the application <link href=\"http://syncevolution."
-"org/\">SyncEvolution</link> that can be used in combination with devices "
-"that support <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/"
-"SyncML\">SyncML</link>."
+"Many distributions provide the application <app><link href=\"http://"
+"syncevolution.org/\">SyncEvolution</link></app> that can be used in "
+"combination with devices that support <link href=\"https://secure.wikimedia."
+"org/wikipedia/en/wiki/SyncML\">SyncML</link>."
 msgstr ""
-"Viele Distributionen stellen die Anwendung <link href=\"http://syncevolution."
-"org/\">SyncEvolution</link> bereit, welches in Kombination mit Geräten, die "
-"<link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/SyncML\">SyncML</"
-"link> unterstützen, verwendet werden kann."
+"Viele Distributionen stellen die Anwendung <app><link href=\"http://"
+"syncevolution.org/\">SyncEvolution</link></app> bereit, welches in "
+"Kombination mit Geräten, die <link href=\"https://secure.wikimedia.org/"
+"wikipedia/en/wiki/SyncML\">SyncML</link> unterstützen, verwendet werden kann."
 
 #: C/sync-with-other-devices.page:29(p)
 msgid ""
@@ -1559,8 +1560,8 @@ msgid "Now your Palm OS device will synchronize data with Evolution."
 msgstr "Nun sollte Ihr Palm-OS-Gerät Daten mit Evolution abgleichen."
 
 #: C/searching-items.page:5(desc)
-msgid "Searching content and data within <em>Evolution</em>."
-msgstr "Nach Daten und Inhalten in <em>Evolution</em> suchen."
+msgid "Searching content and data within <app>Evolution</app>."
+msgstr "Nach Daten und Inhalten in <app>Evolution</app> suchen."
 
 #: C/searching-items.page:18(title)
 msgid "Searching items"
@@ -1578,7 +1579,7 @@ msgstr "Melden von Fehlern"
 msgid ""
 "If you do not need help for configuration but you are sure that you have "
 "found a mistake or wrong behavior in the Evolution software, or if you want "
-"to request a feature you can file a report in the <link href=\"http://"
+"to request a feature, you can file a report in the <link href=\"http://"
 "bugzilla.gnome.org\">GNOME bug tracking system</link>. Note that this "
 "requires registration first. Please try to avoid filing duplicates and check "
 "the <link href=\"https://bugzilla.gnome.org/page.cgi?id=bug-writing.html"
@@ -1586,20 +1587,19 @@ msgid ""
 msgstr ""
 "Wenn Sie keine Hilfe bei der Konfiguration brauchen, sondern sich sicher "
 "sind, einen Fehler oder unerwartetes Verhalten gefunden zu haben, oder ein "
-"neues Funktionsmerkmal zu wünschen, so erstellen Sie bitte einen "
-"Fehlerbericht in der <link href=\"http://bugzilla.gnome.org"
-"\">Fehlerdatenbank von GNOME</link>. Beachten Sie, dass Sie sich dazu "
-"zunächst anmelden müssen. Bitte vermeiden Sie doppelte Berichte, indem Sie "
-"die bestehenden durchsuchen. Lesen Sie zuerst bitte die <link href=\"https://"
-"bugzilla.gnome.org/page.cgi?id=bug-writing.html\">Anleitung zum Erstellen "
-"von Fehlerberichten</link>."
+"neues Funktionsmerkmal wünschen, so erstellen Sie bitte einen Fehlerbericht "
+"in der <link href=\"http://bugzilla.gnome.org\">Fehlerdatenbank von GNOME</"
+"link>. Beachten Sie, dass Sie sich dazu zunächst anmelden müssen. Bitte "
+"vermeiden Sie doppelte Berichte, indem Sie die bestehenden durchsuchen. "
+"Lesen Sie zuerst bitte die <link href=\"https://bugzilla.gnome.org/page.cgi?"
+"id=bug-writing.html\">Anleitung zum Erstellen von Fehlerberichten</link>."
 
 #: C/problems-reporting-bugs.page:23(p)
 msgid ""
 "Also note that GNOME distributions sometimes introduce their own changes in "
 "Evolution that are not included in GNOME Evolution. This is hard to "
 "recognize for users but if you are aware of it please file a bug report in "
-"<link xref=\"https://live.gnome.org/Bugsquad/TriageGuide/"
+"<link href=\"https://live.gnome.org/Bugsquad/TriageGuide/"
 "NonGnome#Bug_trackers_for_distributions\">the bug tracker of your GNOME "
 "distribution</link> instead."
 msgstr ""
@@ -1616,7 +1616,7 @@ msgid ""
 "When reporting bugs exact information is welcome as it makes it easier for "
 "others to reproduce and fix the issue. If possible please include "
 "information such as the Evolution version (under <guiseq><gui>Help</"
-"gui><gui>Contents</gui></guiseq>), your distribution, and exact steps to "
+"gui><gui>About</gui></guiseq>), your distribution, and exact steps to "
 "reproduce the problem, click by click. See the <link href=\"https://bugzilla."
 "gnome.org/page.cgi?id=bug-writing.html\">Bug Writing Guidelines</link> for "
 "more information."
@@ -1625,7 +1625,7 @@ msgstr ""
 "großem Vorteil, um das Problem nachzuvollziehen und zu beheben. Geben Sie "
 "nach Möglichkeit Informationen wie die Version von Evolution (einsehbar "
 "unter  <guiseq><gui>Hilfe</gui><gui>Info</gui></guiseq>), Ihre Distribution "
-"und die genauen Schritte zum Reproduzieren des Problems an. Lese Sie auch "
+"und die genauen Schritte zum Reproduzieren des Problems an. Lesen Sie auch "
 "<link href=\"https://bugzilla.gnome.org/page.cgi?id=bug-writing.html\">Bug "
 "Writing Guidelines</link> für weitere Informationen."
 
@@ -1643,13 +1643,15 @@ msgid ""
 "mail.gnome.org/mailman/listinfo/evolution-list\">Evolution mailing list</"
 "link> or talk to developers and other users in the IRC chat channel "
 "#evolution on the server irc.gimp.net. To connect to an IRC server you can "
-"for example use the internet messenger application Empathy."
+"for example <link href=\"help:empathy/irc-manage\">use the internet "
+"messenger application <app>Empathy</app></link>."
 msgstr ""
 "Um Hilfe bei Problemen zu erhalten, senden Sie bitte eine E-Mail an die "
 "<link href=\"http://mail.gnome.org/mailman/listinfo/evolution-list\">Mailing-"
 "Liste von Evolution</link> oder kontaktieren Sie die Entwickler und andere "
 "Benutzer im IRC-Chat im Kanal #evolution auf dem Server irc.gimp.net. "
-"Verwenden Sie z.B. Empathy, um sich mit einem IRC-Server zu verbinden."
+"Verwenden Sie z.B. <link href=\"help:empathy/irc-manage\"><app>Empathy</"
+"app></link>, um sich mit einem IRC-Server zu verbinden."
 
 #: C/problems-debug-how-to.page:5(desc)
 msgid "How to provide good information when tracking down a problem."
@@ -1694,12 +1696,87 @@ msgstr "Über das Organisieren und Auffinden Ihrer Daten in Evolution."
 msgid "Sorting and organizing"
 msgstr "Sortieren und organisieren"
 
+#: C/offline.page:5(desc)
+msgid "Make Evolution be online again."
+msgstr "So bringen Sie Evolution in den Online-Modus."
+
+#: C/offline.page:12(name) C/intro-application.page:11(name)
+msgid "Brian Grohe"
+msgstr "Brian Grohe"
+
+#: C/offline.page:13(email) C/intro-application.page:12(email)
+msgid "grohe43@gmail.com"
+msgstr "grohe43@gmail.com"
+
+#: C/offline.page:16(name) C/mail-spam-settings.page:18(name)
+msgid "Patrick O'Callaghan"
+msgstr "Patrick O'Callaghan"
+
+#: C/offline.page:23(title)
+msgid "Why is Evolution offline when my net connection is working?"
+msgstr ""
+"Warum ist Evolution im Offline-Modus, wenn eine funktionierende "
+"Netzverbindung verfügbar ist?"
+
+#: C/offline.page:24(p)
+msgid ""
+"You may have started Evolution with the <cmd>--offline</cmd> commandline "
+"option."
+msgstr ""
+"Sie könnten Evolution mit der Befehlszeilenoption <cmd>--offline</cmd> "
+"gestartet haben."
+
+#: C/offline.page:26(p)
+msgid ""
+"If this is not the case and Evolution normally works but has suddenly "
+"stopped connecting, you may have unintentionally clicked on the connection "
+"icon in the lower left corner. When connected, the icon resembles a pair of "
+"sockets joined together. If the sockets are open, there is no connection "
+"(and the <gui style=\"button\">Send/Receive</gui> button is grayed out). "
+"Click on the icon to change its state."
+msgstr ""
+"Wenn dies nicht der Fall ist und Evolution normalerweise funktioniert, aber "
+"plötzlich nicht mehr, so könnte es sein, dass Sie unabsichtlich auf das "
+"Verbindungssymbol ganz links unten geklickt haben. Bei Verbindung stellt das "
+"Symbol zwei verbundene Stecker dar. Wenn die Stecker nicht verbunden sind "
+"ist keine Verbindung hergestellt (und der Knopf <gui style=\"button\">Senden/"
+"Empfangen</gui> ist ausgegraut). Klicken Sie auf das Symbol, um den Status "
+"zu ändern."
+
+#: C/offline.page:28(p)
+msgid ""
+"If the problem persists and you are sure you have not clicked the icon, but "
+"you can still reach the network from other apps on your system (browsers, "
+"FTP, SSH, ping etc.) it may be that NetworkManager (NM) is not properly "
+"configured. Many Linux distributions now use NM to manage their connections, "
+"and if it is installed Evolution will use it to detect if the network is up. "
+"However NM can be installed but not properly configured, leaving the network "
+"working but not detectable by Evolution. (Note that other GNOME-based "
+"applications may also fail for the same reason.) The solution is to "
+"configure NM to manage your network interface. This is usually easy to do "
+"but is outside the scope of this document. For more information seek help "
+"from your distribution support forums, mailing lists etc."
+msgstr ""
+"Falls das Problem weiter besteht und Sie sicher sind, nicht auf das Symbol "
+"geklickt zu haben, und andere Netzwerk/Internet-Anwendungen (wie Web-"
+"Browser, FTP, SSH usw) funktionieren, so könnte es sein, dass NetworkManager "
+"(NM) nicht richtig eingestellt ist. Viele Linux-Distributionen setzen NM zur "
+"Verwaltung der Verbindungen ein. Wenn dieser installiert ist, so verwendet "
+"ihn Evolution zur Erkennung, ob das Netzwerk aktiviert ist. NM könnte "
+"installiert aber nicht richtig eingestellt sein, so dass das Netzwerk zwar "
+"funktioniert, aber Evolution dies nicht erkennt (Beachten Sie, dass andere "
+"GNOME-Anwendungen aus gleichem Grund auch Probleme haben können). Abhilfe "
+"bringt die Konfiguration von NM, so dass dieser Ihre Netzwerk-Schnittstellen "
+"verwaltet. Dies ist einfach zu erledigen, aber nicht Teil dieser "
+"Dokumentation. Für weitere Informationen ersuchen Sie bitte Hilfe aus "
+"Internet-Foren zu Ihrer Distribution, Mailing-Listen usw."
+
 #: C/minimize-to-system-tray.page:5(desc)
 msgid "On minimizing Evolution to the notification area."
 msgstr "Über das Minimieren von Evolution in das Benachrichtigungsfeld."
 
 #: C/minimize-to-system-tray.page:11(name)
-#: C/mail-two-trash-folders.page:11(name) C/mail-spam-settings.page:16(name)
+#: C/mail-two-trash-folders.page:11(name) C/mail-spam-settings.page:24(name)
 #: C/mail-spam-groupwise-manage-list.page:15(name)
 #: C/mail-spam-groupwise-add-to-list.page:15(name)
 #: C/mail-sorting-message-list.page:16(name)
@@ -1710,17 +1787,16 @@ msgstr "Über das Minimieren von Evolution in das Benachrichtigungsfeld."
 #: C/mail-moving-emails.page:11(name) C/mail-folders.page:16(name)
 #: C/mail-filters-not-working.page:12(name)
 #: C/mail-error-no-provider-available.page:11(name)
-#: C/mail-error-folder-mismatch.page:11(name)
 #: C/mail-error-failed-to-append-to-sent-folder.page:11(name)
 #: C/mail-duplicates.page:11(name)
 #: C/mail-displaying-images-in-html.page:16(name)
 #: C/mail-access-gmail-pop-account.page:13(name)
-#: C/deleting-emails.page:12(name)
+#: C/deleting-emails.page:13(name)
 msgid "April Gonzales"
 msgstr "April Gonzales"
 
 #: C/minimize-to-system-tray.page:12(email)
-#: C/mail-two-trash-folders.page:12(email) C/mail-spam-settings.page:17(email)
+#: C/mail-two-trash-folders.page:12(email) C/mail-spam-settings.page:25(email)
 #: C/mail-spam-groupwise-manage-list.page:16(email)
 #: C/mail-spam-groupwise-add-to-list.page:16(email)
 #: C/mail-sorting-message-list.page:17(email)
@@ -1731,12 +1807,11 @@ msgstr "April Gonzales"
 #: C/mail-moving-emails.page:12(email) C/mail-folders.page:17(email)
 #: C/mail-filters-not-working.page:13(email)
 #: C/mail-error-no-provider-available.page:12(email)
-#: C/mail-error-folder-mismatch.page:12(email)
 #: C/mail-error-failed-to-append-to-sent-folder.page:12(email)
 #: C/mail-duplicates.page:12(email)
 #: C/mail-displaying-images-in-html.page:17(email)
 #: C/mail-access-gmail-pop-account.page:14(email)
-#: C/deleting-emails.page:13(email)
+#: C/deleting-emails.page:14(email)
 msgid "loonycookie@gmail.com"
 msgstr "loonycookie@gmail.com"
 
@@ -1763,9 +1838,9 @@ msgstr ""
 msgid ""
 "In GNOME version 2 you may modify the notification area and set it up to "
 "become a system tray by using external software such as <link href=\"http://"
-"alltray.trausch.us/\"> Alltray</link> that might be available for "
+"alltray.trausch.us/\">Alltray</link> that might be available for "
 "installation in the software management tool of your distribution. This is "
-"not possible in GNOME 3 anymore."
+"no longer possible in GNOME 3."
 msgstr ""
 "In GNOME 2 kann das Benachrichtigungsfeld so angepasst werden, dass es mit "
 "externer Software wie <link href=\"http://alltray.trausch.us/\">Alltray</"
@@ -1783,10 +1858,11 @@ msgstr "Notizen hinzufügen, bearbeiten und löschen"
 
 #: C/memos-usage.page:22(p)
 msgid ""
-"Currently there is no support for syncing memos with the Tomboy or Gnote "
-"applications."
+"Currently there is no support for syncing memos with the <app>Tomboy</app> "
+"or <app>Gnote</app> applications."
 msgstr ""
-"Derzeit wird der Abgleich von Notizen mit Tomboy und Gnote nicht unterstützt."
+"Derzeit wird der Abgleich von Notizen mit <app>Tomboy</app> und <app>Gnote</"
+"app> nicht unterstützt."
 
 #: C/memos-usage-edit-memo.page:5(desc)
 msgid "Editing a memo in your memo list."
@@ -1801,13 +1877,17 @@ msgid "If you want to change a memo that already exists in your memo lists,"
 msgstr "Wenn Sie bereits bestehende Notizen in der Notizliste ändern möchten,"
 
 #: C/memos-usage-edit-memo.page:25(p)
+#, fuzzy
+#| msgid ""
+#| "Double-click on the memo that you want to edit in the list of contacts, "
+#| "or right-click on the memo and click <gui>Open Memo</gui>."
 msgid ""
-"Double-click on the memo that you want to edit in the list of contacts, or "
-"right-click on the memo and click <key>Open Memo</key>."
+"Double-click on the memo that you want to edit in the list of memos, or "
+"right-click on the memo and click <gui>Open Memo</gui>."
 msgstr ""
 "Klicken Sie in der Kontaktliste zweimal auf die zu bearbeitende Notiz oder "
 "klicken Sie mit der rechten Maustaste auf die Notiz und wählen Sie "
-"<key>Notiz öffnen</key>."
+"<gui>Notiz öffnen</gui>."
 
 #: C/memos-usage-edit-memo.page:26(p)
 msgid "Edit the memo information."
@@ -1935,16 +2015,15 @@ msgstr ""
 
 #: C/memos-usage-add-memo.page:47(p)
 msgid "Enter a brief summary in the Summary field."
-msgstr ""
-"Geben Sie eine kurze Zusammenfassung in das »Zusammenfassung«-Feld ein."
+msgstr "Geben Sie eine kurze Zusammenfassung in das »Zusammenfassung«-Feld ein."
 
 #: C/memos-usage-add-memo.page:48(p)
 msgid ""
 "In the Start Date field, type the date this shared memo should appear in the "
 "recipients' calendars."
 msgstr ""
-"Geben Sie in das Feld »Startdatum« ein, an welchem Datum die gemeinsame "
-"Notiz im Kalender des Empfängers angezeigt werden soll."
+"Geben Sie in das Feld »Startdatum« ein, an welchem Datum die gemeinsame Notiz "
+"im Kalender des Empfängers angezeigt werden soll."
 
 #: C/memos-searching.page:5(desc)
 msgid "Searching memos."
@@ -1962,49 +2041,6 @@ msgstr ""
 "Durchsuchen Sie zügig die Notizen nach Zusammenfassung oder Kategorie in der "
 "Notizenansicht."
 
-#: C/mail-wrong-fonts-in-3-0.page:5(desc)
-msgid "A known problem that is fixed in newer versions."
-msgstr "Ein bekanntes Problem, das in neueren Versionen beseitigt ist."
-
-#: C/mail-wrong-fonts-in-3-0.page:21(title)
-msgid "Message fonts are not the same fonts as in other applications"
-msgstr ""
-"Nachrichtenschriften sind nicht dieselben Schriften wie in anderen "
-"Anwendungen"
-
-#: C/mail-wrong-fonts-in-3-0.page:23(p)
-msgid ""
-"In version 3.0 it can happen that <guiseq><gui>Edit</gui><gui>Preferences</"
-"gui><gui>Mail Preferences</gui><gui>General</gui><gui>Message Fonts</"
-"gui><gui>Use the same fonts as other applications</gui></guiseq> is enabled "
-"but Evolution still uses different fonts than other parts of the system."
-msgstr ""
-"In Version 3.0 kann es passieren, dass <guiseq><gui>Bearbeiten</"
-"gui><gui>Einstellungen</gui><gui>E-Mail-Einstellungen</gui><gui>Allgemein</"
-"gui><gui>Nachrichtenschriftarten</gui><gui>Dieselben Schriften wie andere "
-"Anwendungen verwenden</gui></guiseq> aktiviert ist, aber Evolution dennoch "
-"andere Schriften als andere Teile der Arbeitsumgebung verwendet."
-
-#: C/mail-wrong-fonts-in-3-0.page:25(p)
-msgid ""
-"This bug is fixed from Evolution version 3.0.3 (stable series) and 3.1.4 "
-"(unstable development series) onwards. If this is not the case, please add a "
-"comment to the corresponding <link href=\"https://bugzilla.gnome.org/"
-"show_bug.cgi?id=655002\">bug report</link>. Note that from version 3.2 "
-"onwards this setting is located under <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
-"gui><gui>Message Display</gui><gui>Use the same fonts as other applications</"
-"gui></guiseq>."
-msgstr ""
-"Dieser Fehler ist ab Evolution Version 3.0.3 (stabil) und 3.1.4 "
-"(Entwicklerversion) behoben. Falls dem nicht so sein sollte, schreiben Sie "
-"bitte einen Kommentar in den zugehörigen <link href=\"https://bugzilla.gnome."
-"org/show_bug.cgi?id=655002\">Fehlerbericht</link>. Beachten Sie, dass ab "
-"Version 3.2 diese Einstellung unter <guiseq><gui>Bearbeiten</"
-"gui><gui>Einstellungen</gui><gui>E-Mail-Einstellungen</gui><gui>Allgemein</"
-"gui><gui>Nachrichtenanzeige</gui><gui>Dieselben Schriften wie andere "
-"Anwendungen verwenden</gui></guiseq> zu finden ist."
-
 #: C/mail-working-offline.page:5(desc)
 msgid "Work with your mail while not being connected to the network."
 msgstr ""
@@ -2102,7 +2138,7 @@ msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
 "and automatically switches on when the network is up again. Ensure that your "
-"system has Network Manager installed on to enable this feature."
+"system has Network Manager installed to enable this feature."
 msgstr ""
 "Evolution erkennt automatisch den Netzwerkstatus und verhält sich "
 "dementsprechend. Evolution geht automatisch in den Offline-Modus, wenn die "
@@ -2273,57 +2309,82 @@ msgstr ""
 "Beachten Sie, dass der Ordner <gui>Unerwünscht</gui> ebenfalls ein "
 "Suchordner ist und auch doppelt erscheinen könnte."
 
-#: C/mail-spam-settings.page:5(desc)
+#: C/mail-spam-settings.page:7(desc)
 msgid "How to set up handling unwanted junk/spam mail."
 msgstr "So legen Sie den Umgang mit unerwünschten E-Mails fest."
 
-#: C/mail-spam-settings.page:28(title)
+#: C/mail-spam-settings.page:21(name) C/mail-spam-marking.page:15(name)
+msgid "Pete Biggs"
+msgstr "Pete Biggs"
+
+#: C/mail-spam-settings.page:36(title)
 msgid "Junk Mail Settings"
 msgstr "Einstellungen zu unerwünschten Nachrichten"
 
-#: C/mail-spam-settings.page:30(p)
+#: C/mail-spam-settings.page:39(title)
+msgid "Tools"
+msgstr "Werkzeuge"
+
+#: C/mail-spam-settings.page:40(p)
 msgid ""
-"Evolution lets you check for unwanted junk or spam emails by using the "
-"Bogofilter or SpamAssassin tools. To use these tools, you need to make sure "
-"that they are installed via the software management tool of your "
-"distribution and you need enable their respective plugins."
+"<app>Evolution</app> lets you check for unwanted junk or spam emails by "
+"using the <app>Bogofilter</app> or <app>SpamAssassin</app> tools. To use "
+"these tools, you need to make sure that they are installed via the software "
+"management tool of your distribution."
 msgstr ""
-"Evolution ermöglicht die Prüfung auf unerwünschte E-Mails mit Hilfe der "
-"Werkzeuge Bogofilter und SpamAssassin. Stellen Sie vor dem Einsatz sicher, "
-"dass diese mit der Softwareverwaltung Ihrer Distribution installiert wurden "
-"und die entsprechenden Plugins aktiviert sind."
+"<app>Evolution</app> ermöglicht die Prüfung auf unerwünschte E-Mails mit "
+"Hilfe der Werkzeuge <app>Bogofilter</app> und <app>SpamAssassin</app>. "
+"Stellen Sie vor dem Einsatz sicher, dass diese mit der Softwareverwaltung "
+"Ihrer Distribution installiert wurden."
 
-#: C/mail-spam-settings.page:31(link)
-msgid "Install bogofilter now."
-msgstr "Bogofilter jetzt installieren."
+#: C/mail-spam-settings.page:43(p) C/mail-composer-spellcheck.page:31(p)
+msgid "You might need to install one of these packages to perform these steps."
+msgstr ""
+"Sie müssen eventuell eines dieser Pakete installieren, um die Schritte "
+"auszuführen."
 
-#: C/mail-spam-settings.page:32(link)
-msgid "Install spamassassin now."
-msgstr "Spamassassin jetzt installieren."
+#: C/mail-spam-settings.page:46(link)
+msgid "Install bogofilter"
+msgstr "Bogofilter installieren"
 
-#: C/mail-spam-settings.page:34(p)
-msgid "To enable the plugins:"
-msgstr "So aktivieren Sie die Plugins:"
+#: C/mail-spam-settings.page:47(link)
+msgid "Install spamassassin"
+msgstr "Spamassassin installieren"
 
-#: C/mail-spam-settings.page:36(p)
-msgid "Click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
+#: C/mail-spam-settings.page:52(p)
+msgid ""
+"SpamAssassin works through a set of predefined rules, hence it can determine "
+"spam straight away. Bogofilter does not come with a default set of spam "
+"criteria so it will not automatically filter anything after installing it. "
+"You must <link xref=\"mail-spam-marking\">train it</link> first to make it "
+"work. You can modify the actions of SpamAssassin by training it as well."
 msgstr ""
-"Klicken Sie auf <guiseq><gui>Bearbeiten</gui><gui>Plugins</gui></guiseq>."
+"SpamAssassin arbeitet über einen Satz vordefinierter Regeln, so dass es "
+"unerwünschte E-Mails unmittelbar erkennen kann. Bogofilter  wird nicht mit "
+"einer Reihe von Kriterien ausgeliefert und filtert demnach auch nichts "
+"automatisch nach der Installation. Sie müssen diesen erst <link xref=\"mail-"
+"spam-marking\">trainieren</link>. Sie können die Aktionen von SpamAssassin "
+"ebenfalls durch Training beeinflussen."
 
-#: C/mail-spam-settings.page:37(p)
+#: C/mail-spam-settings.page:56(title)
+msgid "Junk Mail Folder"
+msgstr "Unerwünscht-Nachrichtenordner"
+
+#: C/mail-spam-settings.page:57(p)
 msgid ""
-"Select the plugins you wish to enable. You can select either Bogofilter or "
-"SpamAssassin, or both."
+"Messages that are marked as junk (either manually by the user or "
+"automatically via SpamAssassin or Bogofilter) will be moved to the "
+"<gui>Junk</gui> mail folder."
 msgstr ""
-"Wählen Sie die gewünschten Plugins zur Aktivierung. Sie haben die Wahl "
-"zwischen Bogofilter oder SpamAssassin, oder beiden."
+"Als unerwünscht (entweder manuell oder automatisch durch SpamAssassin oder "
+"Bogofilter) markierte Nachrichten werden in den E-Mail-Ordner "
+"<gui>Unerwünscht</gui> verschoben."
 
-#: C/mail-spam-settings.page:38(p) C/mail-composer-html-table.page:29(p)
-#: C/mail-composer-html-rule.page:28(p) C/mail-composer-html-link.page:29(p)
-msgid "Click <gui>Close</gui>."
-msgstr "Klicken Sie auf <gui>Schließen</gui>."
+#: C/mail-spam-settings.page:61(title)
+msgid "Junk Mail Preferences"
+msgstr "Unerwünscht-Einstellungen"
 
-#: C/mail-spam-settings.page:41(p)
+#: C/mail-spam-settings.page:62(p)
 msgid ""
 "The junk mail options discussed in this page refer only to POP and Local "
 "Delivery. For handling junk mails on IMAP, see the Evolution settings under "
@@ -2337,11 +2398,7 @@ msgstr ""
 "gui><gui style=\"button\">Bearbeiten</gui><gui>Empfangsoptionen</gui></"
 "guiseq> zuständig."
 
-#: C/mail-spam-settings.page:44(title)
-msgid "Junk Mail Preferences"
-msgstr "Unerwünscht-Einstellungen"
-
-#: C/mail-spam-settings.page:45(p)
+#: C/mail-spam-settings.page:63(p)
 msgid ""
 "You can modify how Evolution handles junk mail by changing the Junk Mail "
 "Preferences:"
@@ -2349,7 +2406,7 @@ msgstr ""
 "Legen Sie den Umgang von Evolution mit unerwünschten Nachrichten in den "
 "Unerwünscht-Einstellungen fest:"
 
-#: C/mail-spam-settings.page:47(p)
+#: C/mail-spam-settings.page:65(p)
 msgid ""
 "Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press "
 "<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>."
@@ -2358,21 +2415,21 @@ msgstr ""
 "guiseq> oder drücken Sie <keyseq><key>Umschalttaste</key><key>Strg</"
 "key><key>S</key></keyseq>."
 
-#: C/mail-spam-settings.page:48(p)
+#: C/mail-spam-settings.page:66(p)
 msgid "Select <gui>Mail Preferences</gui>."
 msgstr "Wählen Sie <gui>E-Mail-Einstellungen</gui>."
 
-#: C/mail-spam-settings.page:49(p)
+#: C/mail-spam-settings.page:67(p)
 msgid "Click on the <gui>Junk</gui> tab. Here, you can specify the following:"
 msgstr ""
 "Im Reiter <gui>Unerwünscht</gui> haben Sie die Wahl zwischen folgenden "
 "Einstellungen:"
 
-#: C/mail-spam-settings.page:51(p)
+#: C/mail-spam-settings.page:69(p)
 msgid "Checking incoming mail for junk messages."
 msgstr "Eingehende E-Mail auf Unerwünschtheit prüfen."
 
-#: C/mail-spam-settings.page:52(p)
+#: C/mail-spam-settings.page:70(p)
 msgid ""
 "Deleting junk messages upon exit, and how often junk messages are to be "
 "deleted."
@@ -2380,27 +2437,37 @@ msgstr ""
 "Unerwünscht-Ordner beim Beenden leeren, und wie oft unerwünschte Nachrichten "
 "gelöscht werden sollen."
 
-#: C/mail-spam-settings.page:53(p)
+#: C/mail-spam-settings.page:71(p)
 msgid "Checking custom headers for junk."
 msgstr "Benutzerdefinierte Kopfzeilen auf Unerwünschtheit prüfen."
 
-#: C/mail-spam-settings.page:54(p)
+#: C/mail-spam-settings.page:72(p)
 msgid "Marking messages as not junk if the sender is in the address book."
 msgstr ""
 "Nachrichten nicht als Unerwünscht markieren, wenn der Absender im Adressbuch "
 "ist."
 
-#: C/mail-spam-settings.page:55(p)
+#: C/mail-spam-settings.page:73(p)
 msgid "The default junk filter."
 msgstr "Der vorgegebene Unerwünscht-Filter."
 
-#: C/mail-spam-settings.page:56(p)
+#: C/mail-spam-settings.page:74(p)
+msgid "Bogofilter and SpamAssassin options."
+msgstr "Optionen für Bogofilter und SpamAssassin."
+
+#: C/mail-spam-settings.page:79(p)
 msgid ""
-"Bogofilter and SpamAssassin options. These options are available only if the "
-"plugins are enabled."
+"For more information and specific Bogofilter or SpamAssassin configuration "
+"questions it is recommended to check out the Frequently Asked Questions for "
+"<link href=\"http://bogofilter.sourceforge.net/faq.shtml\">Bogofilter</link> "
+"resp. <link href=\"http://wiki.apache.org/spamassassin/"
+"FrequentlyAskedQuestions\">SpamAssassin</link>."
 msgstr ""
-"Einstellungen für Bogofilter und SpamAssassin. Sie sind nur eingeblendet, "
-"wenn die Plugins aktiviert sind."
+"Wir empfehlen für weitere Informationen und Konfigurationsfragen zu "
+"Bogofilter und SpamAssassin die häufig gestellten Fragen (FAQ) unter <link "
+"href=\"http://bogofilter.sourceforge.net/faq.shtml\">Bogofilter</link> bzw. "
+"<link href=\"http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions"
+"\">SpamAssassin</link> zu lesen."
 
 #: C/mail-spam.page:5(desc)
 msgid "How to automatically handle unwanted mail."
@@ -2418,94 +2485,68 @@ msgstr "Spezielle Unterschiede für Novell GroupWise"
 msgid "How to mark unwanted junk and spam mail."
 msgstr "So markieren Sie unerwünschte Nachrichten."
 
-#: C/mail-spam-marking.page:15(name)
+#: C/mail-spam-marking.page:18(name)
 #: C/mail-receiving-options-pop.page:15(name)
 #: C/contacts-add-automatically.page:15(name)
 msgid "Barbara Tobias"
 msgstr "Barbara Tobias"
 
-#: C/mail-spam-marking.page:16(email)
+#: C/mail-spam-marking.page:19(email)
 #: C/mail-receiving-options-pop.page:16(email)
 #: C/intro-main-window.page:18(email)
 #: C/contacts-add-automatically.page:16(email)
 msgid "barbtobias09@gmail.com"
 msgstr "barbtobias09@gmail.com"
 
-#: C/mail-spam-marking.page:27(title)
-msgid "Marking Junk Mail"
-msgstr "Eine Nachricht als Unerwünscht markieren"
+#: C/mail-spam-marking.page:30(title)
+msgid "Marking Mail as Junk"
+msgstr "Nachrichten als Unerwünscht markieren"
 
-#: C/mail-spam-marking.page:28(p)
-msgid ""
-"Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
-"or Bogofilter with trainable Bayesian filters to perform the spam check. "
-"When the software detects mail that appears to be junk mail, it will flag it "
-"and hide it from your view. Messages that are flagged as junk mail are "
-"displayed only in the Junk folder."
-msgstr ""
-"Evolution kann nach unerwünschten Nachrichten suchen. Evolution nutzt "
-"SpamAssassin* und/oder Bogofilter* mit trainierbaren Bayes-Filtern, um zu "
-"suchen. Wenn das Programm entdeckt, dass eine Nachricht wahrscheinlich "
-"unerwünscht ist, so wird die Nachricht als unerwünscht markiert und Ihnen "
-"nicht im jeweiligen normalen E-Mail-Ordner, sondern einzig im Unerwünscht-"
-"Ordner angezeigt."
-
-#: C/mail-spam-marking.page:29(p)
-msgid ""
-"The junk mail filter can learn which kinds of mail are legitimate and which "
-"are not if you train it by marking as junk incoming mail that you determine "
-"is spam. When you first start using junk mail blocking, check the Junk "
-"folder frequently to be sure that legitimate mail doesn't get flagged as "
-"junk mail."
-msgstr ""
-"Der Filter für unerwünschte Nachrichten kann erlernen, welche Nachrichten "
-"berechtigt sind und welche nicht, wenn Sie ihn trainieren, indem Sie "
-"eingehende Nachrichten als unerwünscht erkennen und markieren. Prüfen Sie "
-"beim erstmaligen Blockieren von unerwünschten Nachrichten Ihren Unerwünscht-"
-"Ordner regelmäßig, um sicherzustellen, dass seriöse Nachrichten nicht "
-"versehentlich als unerwünscht markiert wurden."
-
-#: C/mail-spam-marking.page:30(p)
-msgid ""
-"If legitimate mail is incorrectly flagged, remove it from the Junk folder by "
-"right-clicking it and selecting <gui>Mark as Not Junk</gui> or pressing "
-"<keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>. If Evolution "
-"misses junk mail, right-click the message, then click <gui>Mark as Junk</"
-"gui> or press <keyseq><key>Ctrl</key><key>J</key></keyseq>. When you correct "
-"it, the filter can recognize similar messages in the future, and becomes "
-"more accurate as time goes on."
+#: C/mail-spam-marking.page:32(p)
+msgid ""
+"While SpamAssassin comes with a set of predefined rules, Bogofilter needs to "
+"be taught first before it will automatically filter junk mail. If you only "
+"train Bogofilter on bad messages, it will assume all mail is bad (because it "
+"does not know any difference) hence it will not make any decisions until the "
+"database is sufficiently large to determine what is and is not spam. In any "
+"case, when you first start using junk mail blocking, check the <gui>Junk</"
+"gui> mail folder frequently to be sure that legitimate mail doesn't get "
+"flagged as junk mail."
 msgstr ""
-"Wenn erwünschte E-Mails versehentlich falsch markiert werden, entfernen Sie "
-"diese aus dem »Unerwünscht«-Ordner, in dem Sie die E-Mail auswählen und auf "
-"den »Erwünscht«-Knopf in der Werkzeugleiste klicken, oder "
-"<keyseq><key>Umschalttaste</key><key>Strg</key><key>J</key></keyseq> "
-"drücken. Falls unerwünschte E-Mails nicht erkannt werden, so klicken Sie mit "
-"der rechten Maustaste auf diese und wählen Sie <gui>Nachricht als "
-"unerwünscht markieren</gui>, oder drücken Sie <keyseq><key>Strg</key><key>J</"
-"key></keyseq>. Mit jeder Korrektur kann der Filter ähnliche Nachrichten in "
-"Zukunft besser erkennen und mit der Zeit immer zuverlässiger arbeiten."
 
-#: C/mail-spam-marking.page:31(p)
+#: C/mail-spam-marking.page:35(title)
+msgid "Manually Marking Junk Mail"
+msgstr "Eine Nachricht manuell als Unerwünscht markieren"
+
+#: C/mail-spam-marking.page:36(p)
 msgid ""
-"You can also flag mail as junk by selecting it and clicking the Junk icon in "
-"the menu bar; you can flag mail in the junk folder as \"Not Junk\" by "
-"selecting it and clicking the <gui>Not Junk</gui> icon."
+"If Evolution misses junk mail, right-click the message, then click <gui>Mark "
+"as Junk</gui>, or mark the message and press <keyseq><key>Ctrl</key><key>J</"
+"key></keyseq> or click the <gui>Junk</gui> button in the tool bar. When you "
+"correct it, the filter can recognize similar messages in the future, and "
+"becomes more accurate as time goes on."
 msgstr ""
-"Markieren Sie Nachrichten als unerwünscht, indem Sie diese auswählen und "
-"dann auf das Symbol Unerwünscht im Menü klicken. Markieren Sie Nachrichten "
-"im Unerwünscht-Ordner als erwünscht, indem Sie diese auswählen und dann auf "
-"das Symbol <gui>Erwünscht</gui> im Menü klicken."
+"Falls unerwünschte E-Mails nicht erkannt werden, so klicken Sie mit der "
+"rechten Maustaste auf diese und wählen Sie <gui>Nachricht als unerwünscht "
+"markieren</gui>, oder wählen Sie die Nachricht und drücken Sie "
+"<keyseq><key>Strg</key><key>J</key></keyseq>. Alternativ klicken Sie auf den "
+"Knopf <gui>Unerwünscht</gui> in der Werkzeugleiste. Mit jeder Korrektur kann "
+"der Filter ähnliche Nachrichten in Zukunft besser erkennen und mit der Zeit "
+"immer zuverlässiger arbeiten."
 
-#: C/mail-spam-marking.page:32(p)
+#: C/mail-spam-marking.page:37(p)
 msgid ""
-"Each time you flag a message as Junk, the sender is added to your Spam List; "
-"each time you flag a message as Not Junk, the sender is removed from your "
-"Spam List."
+"If legitimate mail is incorrectly flagged, remove it from the <gui>Junk</"
+"gui> folder by right-clicking it and selecting <gui>Mark as Not Junk</gui> "
+"or pressing <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>, or "
+"mark the message and click the <gui>Not Junk</gui> button."
 msgstr ""
-"Jedes mal, wenn Sie Nachrichten als unerwünscht markieren, wird der Absender "
-"zu Ihrer Liste unerwünschter Absender hinzugefügt. Jedes mal, wenn Sie "
-"Nachrichten als erwünscht markieren, wird der Absender von Ihrer Liste "
-"unerwünschter Absender entfernt."
+"Wenn erwünschte E-Mails versehentlich falsch markiert werden, entfernen Sie "
+"diese aus dem »Unerwünscht«-Ordner, in dem Sie die E-Mail auswählen und auf "
+"den »Erwünscht«-Knopf in der Werkzeugleiste klicken, oder "
+"<keyseq><key>Umschalttaste</key><key>Strg</key><key>J</key></keyseq> "
+"drücken.  Alternativ wählen Sie die Nachricht und klicken Sie auf den Knopf "
+"<gui>Erwünscht</gui> in der Werkzeugleiste."
 
 #: C/mail-spam-groupwise-unmark-message.page:5(desc)
 msgid "How to mark a message in Novell Groupwise as not junk."
@@ -2661,37 +2702,19 @@ msgid "Sorting the message list"
 msgstr "Die E-Mail-Liste sortieren"
 
 #: C/mail-sorting-message-list.page:30(p)
-msgid "Evolution lets you organize your emails by letting you sort messages."
-msgstr ""
-"Evolution ermöglicht das Organisieren Ihrer E-Mails, indem Sie Ihre "
-"Nachrichten sortieren."
-
-#: C/mail-sorting-message-list.page:31(p)
-msgid ""
-"To view the complete headers for a message, click <guiseq><gui>View</"
-"gui><gui>All Message Headers</gui></guiseq>. This will display the complete "
-"header data on the viewing pane."
-msgstr ""
-"Um alle Kopfzeilen einer Nachricht zu sehen, klicken Sie in der Menüleiste "
-"auf <guiseq><gui>Ansicht</gui><gui>Alle Nachrichtenköpfe</gui></guiseq>. So "
-"werden alle Nachrichtenkopfdaten in der Ansicht dargestellt."
-
-#: C/mail-sorting-message-list.page:32(p)
 msgid ""
-"To view the message data, click on <guiseq><gui>View</gui><gui>Message "
-"Source</gui></guiseq> or press <keyseq><key>Ctrl</key><key>U</key></keyseq>. "
-"This will display the message data in a pop-up window."
+"Evolution lets you organize your emails by letting you sort messages in the "
+"<link xref=\"intro-main-window#e-mail\">message list</link>."
 msgstr ""
-"Klicken Sie zum Ansehen der Nachrichtendaten auf  <guiseq><gui>Ansicht</"
-"gui><gui>Nachrichten-Quelltext</gui></guiseq> oder drücken Sie "
-"<keyseq><key>Strg</key><key>U</key></keyseq>. Die Nachrichtendaten werden "
-"daraufhin in einem Einblendfenster angezeigt."
+"Evolution ermöglicht das Organisieren Ihrer E-Mails, indem Sie Ihre "
+"Nachrichten in der <link xref=\"intro-main-window#e-mail\">Nachrichtenliste</"
+"link> sortieren."
 
-#: C/mail-sorting-message-list.page:35(title)
+#: C/mail-sorting-message-list.page:33(title)
 msgid "Sorting Mail in Email Threads"
 msgstr "E-Mails in E-Mail-Threads sortieren"
 
-#: C/mail-sorting-message-list.page:36(p)
+#: C/mail-sorting-message-list.page:34(p)
 msgid ""
 "You can use a threaded message view to sort emails. To enable this feature, "
 "click on <guiseq><gui>View</gui><gui>Group By Threads</gui></guiseq> or "
@@ -2701,7 +2724,7 @@ msgstr ""
 "<guiseq><gui>Ansicht</gui><gui>Nach Threads gruppieren</gui></guiseq> "
 "klicken oder <keyseq><key>Strg</key><key>T</key></keyseq> drücken."
 
-#: C/mail-sorting-message-list.page:37(p)
+#: C/mail-sorting-message-list.page:35(p)
 msgid ""
 "This feature, when enabled, groups replies with the original email and "
 "allows you to follow the flow of the conversation from one message to the "
@@ -2711,7 +2734,7 @@ msgstr ""
 "ursprünglichen Nachricht angeordnet und Sie können so den Verlauf der "
 "Nachrichten nachvollziehen."
 
-#: C/mail-sorting-message-list.page:38(p)
+#: C/mail-sorting-message-list.page:36(p)
 msgid ""
 "When a new message arrives, it will be added below the parent message. "
 "Threads are sorted and displayed based on the date of the most recent "
@@ -2721,23 +2744,39 @@ msgstr ""
 "Nachricht hinzugefügt. Threads werden nach Datum der zuletzt erhaltenen "
 "Nachricht sortiert und angezeigt."
 
-#: C/mail-sorting-message-list.page:39(p)
+#: C/mail-sorting-message-list.page:37(p)
 msgid ""
-"For Advanced Users: There is a GConf key that allows you to toggle between "
-"the collapsed and expanded state of the email threads. The collapsed state "
-"is enabled by default and may be modified at /apps/evolution/mail/display/"
-"thread_expand."
+"For Advanced Users: There is a GSettings key that allows you to toggle "
+"between the collapsed and expanded state of the email threads. The collapsed "
+"state is enabled by default. It can be changed by starting the "
+"<app>Terminal</app> application and running the command <cmd>gsettings set "
+"org.gnome.evolution.mail thread-expand true</cmd>"
 msgstr ""
-"Für fortgeschrittene Anwender: Es gibt einen GConf-Schlüssel, der das "
+"Für fortgeschrittene Anwender: Es gibt einen GSettings-Schlüssel, der das "
 "Umschalten zwischen eingeklapptem und ausgeklapptem Zustand der E-Mail-"
-"Threads ermöglicht. Der eingeklappte Zustand ist voreingestellt und kann "
-"unter /apps/evolution/mail/display/thread_expand angepasst werden."
+"Threads ermöglicht. Der eingeklappte Zustand ist voreingestellt und kann im "
+"<app>Terminal</app> mit dem Befehl <cmd>gsettings set org.gnome.evolution."
+"mail thread-expand true</cmd> angepasst werden."
 
-#: C/mail-sorting-message-list.page:44(title)
+#: C/mail-sorting-message-list.page:39(p)
+#: C/change-keyboard-shortcuts.page:21(p)
+msgid "Open the <app>Terminal</app> application."
+msgstr "Öffnen Sie die Anwendung <app>Terminal</app>."
+
+#: C/mail-sorting-message-list.page:40(p)
+#: C/change-keyboard-shortcuts.page:22(p)
+msgid ""
+"Run the command <cmd>gsettings set org.gnome.desktop.interface can-change-"
+"accels true</cmd>"
+msgstr ""
+"Führen Sie folgenden Befehl aus: <cmd>gsettings set org.gnome.desktop."
+"interface can-change-accels true</cmd>"
+
+#: C/mail-sorting-message-list.page:46(title)
 msgid "Sorting Mail with Column Headers"
 msgstr "E-Mails sortieren mit Spaltenköpfen"
 
-#: C/mail-sorting-message-list.page:45(p)
+#: C/mail-sorting-message-list.page:47(p)
 msgid ""
 "The message list displays columns that indicate whether a message has been "
 "read, whether it has attachments, how important the message is, the sender, "
@@ -2749,22 +2788,22 @@ msgstr ""
 "besitzt, oder wie wichtig sie ist. So können Sie die Reihenfolge der Spalten "
 "in der Nachrichtenliste ändern:"
 
-#: C/mail-sorting-message-list.page:47(p)
+#: C/mail-sorting-message-list.page:49(p)
 msgid "Drag and drop the column header bars"
 msgstr "Verschieben Sie die Flächen der Spaltenköpfe"
 
-#: C/mail-sorting-message-list.page:48(p)
+#: C/mail-sorting-message-list.page:50(p)
 msgid "Right-click on the header."
 msgstr "Klicken Sie mit der rechten Maustaste auf die Kopfzeile."
 
-#: C/mail-sorting-message-list.page:49(p)
+#: C/mail-sorting-message-list.page:51(p)
 msgid ""
 "Select the <gui>Remove This Column</gui> or <gui>Add a Column</gui> option."
 msgstr ""
 "Wählen Sie die Option <gui>Diese Spalte entfernen</gui> oder <gui>Eine "
 "Spalte hinzufügen</gui>."
 
-#: C/mail-sorting-message-list.page:52(p)
+#: C/mail-sorting-message-list.page:54(p)
 msgid ""
 "Evolution allows you to sort your messages using these columns. Just click "
 "on the column label to sort the emails. The direction of the arrow next to "
@@ -2775,156 +2814,156 @@ msgstr ""
 "Die Richtung des Pfeils neben der Beschriftung gibt die Sortierreihenfolge "
 "an."
 
-#: C/mail-sorting-message-list.page:56(title)
+#: C/mail-sorting-message-list.page:58(title)
 msgid "Using Other Sorting Options"
 msgstr "Weitere Sortieroptionen anwenden"
 
-#: C/mail-sorting-message-list.page:57(p)
+#: C/mail-sorting-message-list.page:59(p)
 msgid ""
 "Evolution provides other ways for sorting email messages. You can use Sort "
 "By, Sort Ascending, Sort Descending, or Unsort."
 msgstr ""
 "Evolution bietet auch andere Möglichkeiten zur Sortierung von E-Mails. "
-"Möglich sind »Sortieren nach«, »Aufsteigend sortieren«, »Absteigend "
-"sortieren« und »Unsortiert«."
+"Möglich sind »Sortieren nach«, »Aufsteigend sortieren«, »Absteigend sortieren« "
+"und »Unsortiert«."
 
-#: C/mail-sorting-message-list.page:59(title)
+#: C/mail-sorting-message-list.page:61(title)
 msgid "Sort By"
 msgstr "Sortieren nach"
 
-#: C/mail-sorting-message-list.page:60(p)
+#: C/mail-sorting-message-list.page:62(p)
 msgid "You can also sort email messages using the <gui>Sort By</gui> list."
 msgstr ""
 "Nachrichten können ebenso mit Hilfe der Liste <gui>Sortieren nach</gui> "
 "sortiert werden."
 
-#: C/mail-sorting-message-list.page:62(p)
-#: C/mail-sorting-message-list.page:92(p)
-#: C/mail-sorting-message-list.page:101(p)
-#: C/mail-sorting-message-list.page:110(p)
+#: C/mail-sorting-message-list.page:64(p)
+#: C/mail-sorting-message-list.page:94(p)
+#: C/mail-sorting-message-list.page:103(p)
+#: C/mail-sorting-message-list.page:112(p)
 msgid "Right-click on the message list column headers."
 msgstr ""
 "Klicken Sie mit der rechten Maustaste auf die Spaltenbezeichnung in der E-"
 "Mail-Liste."
 
-#: C/mail-sorting-message-list.page:63(p)
+#: C/mail-sorting-message-list.page:65(p)
 msgid "Select the <gui>Sort By</gui> option."
 msgstr "Wählen Sie die Optionen <gui>Sortieren nach</gui>."
 
-#: C/mail-sorting-message-list.page:63(p)
+#: C/mail-sorting-message-list.page:65(p)
 msgid "This brings up this list of criteria for sorting email messages:"
 msgstr "Die Liste der Sortierkriterien für E-Mails wird daraufhin angezeigt:"
 
-#: C/mail-sorting-message-list.page:65(p)
+#: C/mail-sorting-message-list.page:67(p)
 msgid "Subject - Trimmed"
 msgstr "Betreff - Gekürzt"
 
-#: C/mail-sorting-message-list.page:66(p)
+#: C/mail-sorting-message-list.page:68(p)
 msgid "Labels"
 msgstr "Beschriftungen"
 
-#: C/mail-sorting-message-list.page:67(p)
+#: C/mail-sorting-message-list.page:69(p)
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: C/mail-sorting-message-list.page:68(p)
+#: C/mail-sorting-message-list.page:70(p)
 msgid "Sender"
 msgstr "Absender"
 
-#: C/mail-sorting-message-list.page:69(p)
+#: C/mail-sorting-message-list.page:71(p)
 msgid "Location"
 msgstr "Ort"
 
-#: C/mail-sorting-message-list.page:70(p)
+#: C/mail-sorting-message-list.page:72(p)
 msgid "Due By"
 msgstr "Fällig am"
 
-#: C/mail-sorting-message-list.page:71(link)
+#: C/mail-sorting-message-list.page:73(link)
 msgid "Follow Up Flag"
 msgstr "Folgenachricht-Markierung"
 
-#: C/mail-sorting-message-list.page:72(p)
+#: C/mail-sorting-message-list.page:74(p)
 msgid "Flag Status"
 msgstr "Markierungsstatus"
 
-#: C/mail-sorting-message-list.page:73(p)
+#: C/mail-sorting-message-list.page:75(p)
 msgid "Size"
 msgstr "Größe"
 
-#: C/mail-sorting-message-list.page:74(p)
+#: C/mail-sorting-message-list.page:76(p)
 msgid "To"
 msgstr "An"
 
-#: C/mail-sorting-message-list.page:75(p)
+#: C/mail-sorting-message-list.page:77(p)
 msgid "Received"
 msgstr "Erhalten"
 
-#: C/mail-sorting-message-list.page:76(p)
+#: C/mail-sorting-message-list.page:78(p)
 msgid "Date"
 msgstr "Datum"
 
-#: C/mail-sorting-message-list.page:77(p)
+#: C/mail-sorting-message-list.page:79(p)
 msgid "Subject"
 msgstr "Betreff"
 
-#: C/mail-sorting-message-list.page:78(p)
+#: C/mail-sorting-message-list.page:80(p)
 msgid "From"
 msgstr "Von"
 
-#: C/mail-sorting-message-list.page:79(p)
+#: C/mail-sorting-message-list.page:81(p)
 msgid "Attachment"
 msgstr "Anlage"
 
-#: C/mail-sorting-message-list.page:80(p)
+#: C/mail-sorting-message-list.page:82(p)
 msgid "Flagged"
 msgstr "Markiert"
 
-#: C/mail-sorting-message-list.page:81(p)
+#: C/mail-sorting-message-list.page:83(p)
 msgid "Status"
 msgstr "Status"
 
-#: C/mail-sorting-message-list.page:82(p)
+#: C/mail-sorting-message-list.page:84(p)
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: C/mail-sorting-message-list.page:85(p)
+#: C/mail-sorting-message-list.page:87(p)
 msgid "Select the option you wish to use in sorting email messages."
 msgstr ""
 "Wählen Sie die Sortierreihenfolge zum Sortieren der E-Mail-Nachrichten."
 
-#: C/mail-sorting-message-list.page:90(title)
+#: C/mail-sorting-message-list.page:92(title)
 msgid "Sort Ascending"
 msgstr "Aufsteigend sortieren"
 
-#: C/mail-sorting-message-list.page:93(p)
+#: C/mail-sorting-message-list.page:95(p)
 msgid "Select the <gui>Sort Ascending</gui> option."
 msgstr "Wählen Sie die Option <gui>Aufsteigend sortieren</gui>."
 
-#: C/mail-sorting-message-list.page:95(p)
+#: C/mail-sorting-message-list.page:97(p)
 msgid "The messages will be displayed with the most recent at the bottom."
 msgstr "Die jüngsten Nachrichten werden unten angezeigt."
 
-#: C/mail-sorting-message-list.page:99(title)
+#: C/mail-sorting-message-list.page:101(title)
 msgid "Sort Descending"
 msgstr "Absteigend sortieren"
 
-#: C/mail-sorting-message-list.page:102(p)
+#: C/mail-sorting-message-list.page:104(p)
 msgid "Select the <gui>Sort Descending</gui> option."
 msgstr "Wählen Sie die Option <gui>Absteigend sortieren</gui>."
 
-#: C/mail-sorting-message-list.page:104(p)
+#: C/mail-sorting-message-list.page:106(p)
 msgid "The messages will be displayed with the most recent at the top."
 msgstr "Die jüngsten Nachrichten werden oben angezeigt."
 
-#: C/mail-sorting-message-list.page:108(title)
+#: C/mail-sorting-message-list.page:110(title)
 msgid "Unsort"
 msgstr "Nicht sortieren"
 
-#: C/mail-sorting-message-list.page:111(p)
+#: C/mail-sorting-message-list.page:113(p)
 msgid "Select the <gui>Unsort</gui> option."
 msgstr "Wählen Sie die Optionen <gui>Nicht sortieren</gui>."
 
-#: C/mail-sorting-message-list.page:113(p)
+#: C/mail-sorting-message-list.page:115(p)
 msgid ""
 "This removes sorting from the column, reverting to the order of messages as "
 "they were added to the folder."
@@ -3063,7 +3102,7 @@ msgid "Force sending and receiving emails."
 msgstr "Verschicken und Abrufen von E-Mails erzwingen."
 
 #: C/mail-send-and-receive-manual.page:20(title)
-msgid "Manually send and receive message"
+msgid "Manually send and receive messages"
 msgstr "Nachrichten manuell senden und abrufen"
 
 #: C/mail-send-and-receive-manual.page:21(p)
@@ -3071,8 +3110,7 @@ msgid ""
 "To receive new messages from the mail server and to send messages you have "
 "written that are in the local Outbox, click the <gui style=\"button\">Send / "
 "Receive</gui> button in the toolbar, or press <key>F9</key>, or choose "
-"<guiseq><gui>File</gui><gui>Send / Receive </gui></guiseq> from the main "
-"menu."
+"<guiseq><gui>File</gui><gui>Send / Receive</gui></guiseq> from the main menu."
 msgstr ""
 "Um neue Nachrichten vom E-Mail-Server abzurufen und geschriebene Nachrichten "
 "des Ausgangsordners zu verschicken, klicken Sie auf den Knopf <gui style="
@@ -3107,16 +3145,14 @@ msgstr "Automatisch regelmäßig neue E-Mail-Nachrichten abrufen."
 msgid "Automatically check for new mail"
 msgstr "Automatisch nach neuen E-Mails sehen"
 
-# Falsch übersetzt, aber trotzdem richtig:
-# https://bugzilla.gnome.org/show_bug.cgi?id=668359
 #: C/mail-send-and-receive-automatically.page:21(p)
 msgid ""
 "If you want Evolution to check automatically for new messages, enable the "
 "option <gui>Check for new messages every ... minutes</gui> in the "
-"<gui>Receiving Email</gui> page of the mail account settings (accessible via "
-"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
-"style=\"button\">Edit</gui><gui>Receiving Email</gui></guiseq>) and select "
-"the frequency in minutes."
+"<gui>Receiving Options</gui> page of the mail account settings (accessible "
+"via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui style=\"button\">Edit</gui><gui>Receiving Options</gui></guiseq>) "
+"and select the frequency in minutes."
 msgstr ""
 "Wenn Evolution automatisch neue Nachrichten abrufen soll, so aktivieren Sie "
 "die Option <gui>Automatisch nach neuen E-Mails sehen alle … Minuten</gui> im "
@@ -3153,7 +3189,18 @@ msgid "Select the scope from the drop-down list right to the text box."
 msgstr ""
 "Wählen Sie den Bereich aus der Auswahlliste rechts neben dem Textfeld aus."
 
-#: C/mail-searching.page:39(p)
+#: C/mail-searching.page:36(p)
+msgid ""
+"For the <gui>Current Account</gui> scope, the term \"account\" refers to top-"
+"level nodes in the <link xref=\"intro-main-window#e-mail\"> mail folder "
+"list</link>, like \"On this computer\" and remote mail accounts."
+msgstr ""
+"Für den Geltungsbereich <gui>Aktuelles Konto</gui> bezieht sich der Begriff "
+"»Konto« auf die obersten Knoten in der <link xref=\"intro-main-window#e-mail"
+"\">E-Mail-Ordnerliste</link>, wie z.B. »Auf diesem Rechner« und entfernten E-"
+"Mail-Konten."
+
+#: C/mail-searching.page:41(p)
 msgid ""
 "If you start directly from the fourth step, text will be searched in mail's "
 "subjects and addresses and scope will be \"Current folder\"."
@@ -3161,7 +3208,7 @@ msgstr ""
 "Wenn Sie direkt mit Schritt vier beginnen, so wird im aktuellen Ordner nach "
 "dem Suchbegriff im Betreff und den E-Mail-Adressen aller Nachrichten gesucht."
 
-#: C/mail-searching.page:40(p)
+#: C/mail-searching.page:42(p)
 msgid ""
 "If you search for messages that are not in the same folder rather often you "
 "might want to create a search folder instead; see <link xref=\"mail-search-"
@@ -3172,7 +3219,7 @@ msgstr ""
 "Lesen Sie bitte <link xref=\"mail-search-folders\">Suchordner verwenden</"
 "link> für weitere Informationen."
 
-#: C/mail-searching.page:45(title)
+#: C/mail-searching.page:47(title)
 msgid "Advanced Search:"
 msgstr "Erweiterte Suche:"
 
@@ -3395,10 +3442,10 @@ msgstr ""
 "Falls eine Nachricht die gleiche Kopfzeile mehr als einmal benutzt, so "
 "wertet Evolution nur ihr erstes Auftreten aus, selbst wenn die Nachricht die "
 "Kopfzeile beim zweiten Mal anders definiert. Wenn zum Beispiel eine "
-"Nachricht die Kopfzeile »Resent-From:« als »engineering@example.com« und "
-"dann nochmals als »marketing@example.com« definiert, so filtert Evolution, "
-"als ob der zweite Wert nicht existierte. Verwenden Sie reguläre Ausdrücke, "
-"um Nachrichten zu filtern, welche die gleichen Kopfzeilen mehr als einmal "
+"Nachricht die Kopfzeile »Resent-From:« als »engineering@example.com« und dann "
+"nochmals als »marketing@example.com« definiert, so filtert Evolution, als ob "
+"der zweite Wert nicht existierte. Verwenden Sie reguläre Ausdrücke, um "
+"Nachrichten zu filtern, welche die gleichen Kopfzeilen mehr als einmal "
 "definieren."
 
 #: C/mail-search-folders-conditions.page:48(p)
@@ -3591,7 +3638,7 @@ msgid ""
 "letters, so that you can find, for example, all words that start with a and "
 "end with m, and are between six and fifteen letters long, or all messages "
 "that declare a particular header twice. For information about how to use "
-"regular expressions, check the man page for the grep command."
+"regular expressions, check the man page for the <cmd>grep</cmd> command."
 msgstr ""
 "(Nur für Programmierer) Falls Sie sich mit <link href=\"https://secure."
 "wikimedia.org/wikipedia/en/wiki/Regular_expression\">regulären Ausdrücken</"
@@ -3601,7 +3648,7 @@ msgstr ""
 "sechs und fünfzehn Buchstaben lang sind, oder alle Nachrichten, in denen "
 "eine bestimmte Kopfzeile doppelt vorhanden ist. Für weitere Informationen "
 "darüber, wie reguläre Ausdrücke genutzt werden können, lesen Sie die "
-"Hilfeseite für den Befehl »grep«."
+"Hilfeseite für den Befehl <cmd>grep</cmd>."
 
 #: C/mail-search-folders-conditions.page:87(p)
 msgid "Message Location:"
@@ -3808,8 +3855,9 @@ msgstr "Empfangsoptionen für Usenet-Nachrichten"
 #: C/mail-receiving-options-imap-plus.page:26(title)
 #: C/mail-receiving-options-imap.page:26(title)
 #: C/mail-receiving-options-exchange-mapi.page:23(title)
+#: C/mail-receiving-options-exchange-ews.page:23(title)
 #: C/mail-receiving-options-evolution-exchange.page:26(title)
-#: C/intro-first-run.page:36(title)
+#: C/intro-first-run.page:38(title)
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
@@ -3824,6 +3872,7 @@ msgstr "Abrufen von E-Mails"
 #: C/mail-receiving-options-imap-plus.page:28(p)
 #: C/mail-receiving-options-imap.page:28(p)
 #: C/mail-receiving-options-exchange-mapi.page:25(p)
+#: C/mail-receiving-options-exchange-ews.page:25(p)
 #: C/mail-receiving-options-evolution-exchange.page:28(p)
 msgid ""
 "On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</"
@@ -3875,6 +3924,7 @@ msgstr ""
 #: C/mail-receiving-options-imap-plus.page:34(p)
 #: C/mail-receiving-options-imap.page:34(p)
 #: C/mail-receiving-options-exchange-mapi.page:31(p)
+#: C/mail-receiving-options-exchange-ews.page:31(p)
 #: C/mail-receiving-options-evolution-exchange.page:35(p)
 msgid ""
 "Select your authentication type in the Authentication list, or click <gui "
@@ -3908,6 +3958,7 @@ msgstr "Wählen Sie, ob Evolution sich an Ihr Passwort erinnern soll."
 #: C/mail-receiving-options-imap-plus.page:41(title)
 #: C/mail-receiving-options-imap.page:41(title)
 #: C/mail-receiving-options-exchange-mapi.page:39(title)
+#: C/mail-receiving-options-exchange-ews.page:37(title)
 #: C/mail-receiving-options-evolution-exchange.page:42(title)
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
@@ -3923,6 +3974,7 @@ msgstr "Empfangsoptionen"
 #: C/mail-receiving-options-imap-plus.page:43(p)
 #: C/mail-receiving-options-imap.page:43(p)
 #: C/mail-receiving-options-exchange-mapi.page:41(p)
+#: C/mail-receiving-options-exchange-ews.page:39(p)
 #: C/mail-receiving-options-evolution-exchange.page:44(p)
 msgid ""
 "On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</"
@@ -3944,6 +3996,7 @@ msgstr ""
 #: C/mail-receiving-options-imap-plus.page:46(p)
 #: C/mail-receiving-options-imap.page:46(p)
 #: C/mail-receiving-options-exchange-mapi.page:44(p)
+#: C/mail-receiving-options-exchange-ews.page:42(p)
 #: C/mail-receiving-options-evolution-exchange.page:47(p)
 msgid ""
 "If you want Evolution to check automatically for new messages, click the "
@@ -3991,6 +4044,7 @@ msgstr ""
 #: C/mail-receiving-options-imap-plus.page:58(p)
 #: C/mail-receiving-options-imap.page:57(p)
 #: C/mail-receiving-options-exchange-mapi.page:52(p)
+#: C/mail-receiving-options-exchange-ews.page:52(p)
 #: C/mail-receiving-options-evolution-exchange.page:58(p)
 msgid ""
 "If you came to this page from the first-run wizard help page, click <link "
@@ -4097,15 +4151,15 @@ msgstr ""
 msgid "Mail Receiving Options"
 msgstr "Empfangsoptionen"
 
-#: C/mail-receiving-options.page:21(title) C/intro-first-run.page:42(title)
+#: C/mail-receiving-options.page:21(title) C/intro-first-run.page:44(title)
 msgid "Common server types"
 msgstr "Häufige Servertypen"
 
-#: C/mail-receiving-options.page:24(title) C/intro-first-run.page:55(title)
+#: C/mail-receiving-options.page:24(title) C/intro-first-run.page:57(title)
 msgid "Corporate server types"
 msgstr "Servertypen im Unternehmensumfeld"
 
-#: C/mail-receiving-options.page:27(title) C/intro-first-run.page:70(title)
+#: C/mail-receiving-options.page:27(title) C/intro-first-run.page:96(title)
 msgid "Local account server types"
 msgstr "Servertypen für lokale Konten"
 
@@ -4119,6 +4173,7 @@ msgstr "Novell GroupWise-Empfangsoptionen"
 
 #: C/mail-receiving-options-novell-groupwise.page:34(p)
 #: C/mail-receiving-options-exchange-mapi.page:30(p)
+#: C/mail-receiving-options-exchange-ews.page:30(p)
 #: C/mail-receiving-options-evolution-exchange.page:34(p)
 msgid ""
 "If you are in an organizational environment, you may want to contact your "
@@ -4245,6 +4300,7 @@ msgstr ""
 "Passwort ein."
 
 #: C/mail-receiving-options-exchange-mapi.page:45(p)
+#: C/mail-receiving-options-exchange-ews.page:43(p)
 #: C/mail-receiving-options-evolution-exchange.page:48(p)
 msgid ""
 "You can also define if Evolution checks for new messages in all folders."
@@ -4252,6 +4308,44 @@ msgstr ""
 "Sie können auch festlegen, ob Evolution nach neuen Nachrichten in allen "
 "Ordnern schauen soll."
 
+#: C/mail-receiving-options-exchange-ews.page:5(desc)
+msgid "Receiving options for Exchange Web Services accounts."
+msgstr "Empfangsoptionen für Exchange-Webdienste-Konten."
+
+#: C/mail-receiving-options-exchange-ews.page:20(title)
+msgid "Exchange Web Services receiving options"
+msgstr "Empfangsoptionen für Exchange-Webdienste"
+
+#: C/mail-receiving-options-exchange-ews.page:28(p)
+#: C/mail-receiving-options-evolution-exchange.page:31(p)
+msgid "Enter your username for that server."
+msgstr "Geben Sie Ihren Benutzernamen für den Server ein."
+
+#: C/mail-receiving-options-exchange-ews.page:29(p)
+msgid ""
+"Either manually enter the Host URL and OAB URL, or click <gui style=\"button"
+"\">Fetch URL</gui> which will ask you for your password and then try to "
+"automatically fill in the values."
+msgstr ""
+
+#: C/mail-receiving-options-exchange-ews.page:44(p)
+msgid ""
+"If you would like to have a copy of the address book on the server for "
+"offline access to it, enable <gui>Cache offline address book</gui> and click "
+"<gui style=\"button\">Fetch list</gui>. Afterwards, select the address book "
+"from the available options."
+msgstr ""
+
+#: C/mail-receiving-options-exchange-ews.page:45(p)
+msgid ""
+"If you want <link xref=\"mail-filters\">Filters</link> to be automatically "
+"used for new messages in your inbox, enable <gui>Apply filters to new "
+"messages in Inbox on this server</gui>."
+msgstr ""
+"Wenn <link xref=\"mail-filters\">Filter</link> automatisch auf Nachrichten "
+"in Ihrem Posteingang angewendet werden sollen, so aktivieren Sie <gui>Filter "
+"auf neue Nachrichten im Eingang dieses Servers anwenden</gui>."
+
 #: C/mail-receiving-options-evolution-exchange.page:5(desc)
 msgid "Receiving options for Evolution Exchange accounts."
 msgstr "Empfangsoptionen für Evolution Exchange-Konten."
@@ -4260,10 +4354,6 @@ msgstr "Empfangsoptionen für Evolution Exchange-Konten."
 msgid "Evolution Exchange receiving options"
 msgstr "Evolution Exchange-Empfangsoptionen"
 
-#: C/mail-receiving-options-evolution-exchange.page:31(p)
-msgid "Enter your username for that server."
-msgstr "Geben Sie Ihren Benutzernamen für den Server ein."
-
 #: C/mail-receiving-options-evolution-exchange.page:32(p)
 msgid "Enter the OWA URL for that server."
 msgstr "Geben Sie Ihre OWA-Adresse für den Server ein."
@@ -4332,12 +4422,12 @@ msgstr "Benachrichtigungen bei neuen E-Mails"
 #: C/mail-received-notification.page:22(p)
 msgid ""
 "Evolution always notifies you of new messages by adding a yellow star to the "
-"mailer icon in the window <link xref=\"change-switcher-appearance.page"
+"mailer icon in the window <link xref=\"change-switcher-appearance"
 "\">switcher</link>."
 msgstr ""
 "Evolution benachrichtigt Sie immer über neue Nachrichten mit einem gelben "
 "Sternchen, dass dem Symbol des E-Mail-Programms im <link xref=\"change-"
-"switcher-appearance.page\">Umschalter</link> vorangestellt wird."
+"switcher-appearance\">Umschalter</link> vorangestellt wird."
 
 #: C/mail-received-notification.page:25(p)
 #: C/mail-received-notification.page:30(p)
@@ -4347,7 +4437,7 @@ msgstr ""
 
 #: C/mail-received-notification.page:28(p)
 msgid ""
-"In order to get also notified of new messages in the GNOME Notification area "
+"In order to also be notified of new messages in the GNOME Notification area "
 "at the bottom of the screen, make sure that <guiseq><gui>Edit</"
 "gui><gui>Plugins</gui><gui>Mail Notification</gui></guiseq> is enabled and "
 "that you have set your preferred options in the <gui>Configuration</gui> tab."
@@ -4431,7 +4521,7 @@ msgstr "So schauen Sie sich in Nachrichten um"
 
 #: C/mail-reading-keyboard-shortcuts.page:33(p)
 msgid ""
-"To read mail with the keyboard, you can click the <key>Spacebar</key> to "
+"To read mail with the keyboard, you can press the <key>Spacebar</key> to "
 "page down and press <key>Backspace</key> to page up while reading an email. "
 "Ensure that you use the keys when the message list is focused."
 msgstr ""
@@ -4773,7 +4863,7 @@ msgstr ""
 "Legen Sie fest, welche E-Mail-Kopfzeilen mit IMAP heruntergeladen werden."
 
 #: C/mail-imap-headers.page:25(title)
-#: C/mail-account-manage-imap.page:51(title)
+#: C/mail-account-manage-imap.page:52(title)
 msgid "IMAP Headers"
 msgstr "IMAP-Kopfzeilen"
 
@@ -4834,9 +4924,9 @@ msgstr "Gewöhnliche und Mailinglisten-Kopfzeilen (Vorgabe):"
 msgid ""
 "Enable this option to have filters based on mailing list headers (like list "
 "ID) so that in addition to the basic headers, the headers that correspond to "
-"mailing-lists are also fetched. Mailing list headers will have the "
-"informations such as the mailinglist-ID, owner of the mailing list, and so "
-"on with which you can create mailing list filters."
+"mailing-lists are also fetched. Mailing list headers will have information "
+"such as the mailinglist-ID, owner of the mailing list, and so on with which "
+"you can create mailing list filters."
 msgstr ""
 "Wählen Sie diese Option, falls Sie nach Mailinglisten-Kopfzeilen (wie List-"
 "ID) filtern, damit zusätzlich zu den grundlegenden Kopfzeilen auch diese "
@@ -5148,21 +5238,22 @@ msgstr ""
 #: C/mail-filters.page:27(p)
 msgid ""
 "Filters will be automatically applied to incoming messages for local "
-"accounts (such as POP). Mail serves for remote accounts (such as IMAP) often "
-"already filter mail directly on the server as this is faster. If you want to "
-"apply your Evolution filters to remote accounts, you can enable this under "
-"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
-"gui><gui>Edit</gui><gui>Receiving Options</gui><gui>Options</gui><gui>Apply "
-"filters to new messages in Inbox on this server</gui></guiseq>."
+"accounts (such as POP). Mail servers for remote accounts (such as IMAP) "
+"often already filter mail directly on the server as this is faster. If you "
+"want to apply your Evolution filters to remote accounts, you can enable this "
+"under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui style=\"button\">Edit</gui><gui>Receiving Options</"
+"gui><gui>Options</gui><gui>Apply filters to new messages in Inbox on this "
+"server</gui></guiseq>."
 msgstr ""
 "Filter werden automatisch auf eingehende Nachrichten für lokale Konten (wie "
 "z.B. POP) angewendet. E-Mail-Server von entfernten Konten (wie z.B. IMAP) "
 "filtern häufig E-Mails bereits auf dem Server, weil es schneller ist. Wenn "
 "die Filter in Evolution auf entfernte Konten angewendet werden sollen, so "
 "schalten Sie dies unter <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</"
-"gui><gui>E-Mail-Konten</gui><gui>Bearbeiten</gui><gui>Empfangsoptionen</"
-"gui><gui>Optionen</gui><gui>Filter auf neue Nachrichten im Eingang dieses "
-"Servers anwenden</gui></guiseq> ein."
+"gui><gui>E-Mail-Konten</gui><gui style=\"button\">Bearbeiten</"
+"gui><gui>Empfangsoptionen</gui><gui>Optionen</gui><gui>Filter auf neue "
+"Nachrichten im Eingang dieses Servers anwenden</gui></guiseq> ein."
 
 #: C/mail-filters.page:29(p)
 msgid ""
@@ -5534,10 +5625,10 @@ msgstr "Lässt Evolution eine Anwendung ausführen."
 
 #: C/mail-filters-actions.page:66(p)
 msgid ""
-"Sends the message to a program of your choice. No return value is expected. "
-"This feature can be used to create automatic Web postings from email "
-"messages or to perform additional message post processing not supported by "
-"Evolution."
+"Sends the message to an application of your choice. No return value is "
+"expected. This feature can be used to create automatic Web postings from "
+"email messages or to perform additional message post processing not "
+"supported by Evolution."
 msgstr ""
 "Sendet die Nachricht an ein Programm Ihrer Wahl. Es wird kein Rückgabewert "
 "erwartet. Diese Funktion kann genutzt werden, um automatische Web-Postings "
@@ -5554,7 +5645,6 @@ msgid "Forwards the message to another email address."
 msgstr "Leitet die Nachricht an eine andere E-Mail-Adresse weiter."
 
 #: C/mail-error-no-provider-available.page:5(desc)
-#: C/mail-error-folder-mismatch.page:5(desc)
 #: C/mail-error-failed-to-append-to-sent-folder.page:5(desc)
 msgid "What to do when this error is shown."
 msgstr "Wie bei dem gezeigten Fehler zu handeln ist."
@@ -5634,107 +5724,17 @@ msgstr ""
 msgid ""
 "Advanced users may also be interested in this write up: <link href=\"https://"
 "thomas.apestaart.org/thomas/trac/wiki/Evolution\">How to keep the Evolution "
-"filters in sync on multiple machines by Thomas Vander Stichele </link>"
+"filters in sync on multiple machines by Thomas Vander Stichele</link>"
 msgstr ""
 "Fortgeschrittene Anwender könnte dieser Beitrag interessieren: <link href="
 "\"https://thomas.apestaart.org/thomas/trac/wiki/Evolution\">How to keep the "
 "Evolution filters in sync on multiple machines by Thomas Vander Stichele</"
 "link>"
 
-#: C/mail-error-folder-mismatch.page:24(title)
-msgid ""
-"Error message \"Summary and folder mismatch\" after synchronizing folders"
-msgstr ""
-"Fehlermeldung »Zusammenfassung und Ordner stimmen nicht überein« nach dem "
-"Ordnerabgleich"
-
-# Fehlermeldung nicht (mehr) in der aktuellen GUI
-#: C/mail-error-folder-mismatch.page:26(p)
-msgid ""
-"If the error message: <gui>Error while Expunging folder. Error storing `~/."
-"local/share/evolution/mail/local/Inbox (mbox)': Summary and folder mismatch, "
-"even after a sync.</gui> pops up, perform the following steps:"
-msgstr ""
-"Falls die Fehlermeldung <gui>Fehler beim Löschen der Ordner. Fehler beim "
-"Speichern von »~/.local/share/evolution/mail/local/Inbox (mbox)«: "
-"Zusammenfassung und Ordner stimmen nicht überein, auch nach einem Abgleich.</"
-"gui> erscheint, so führen Sie bitte die folgenden Schritte aus:"
-
-#: C/mail-error-folder-mismatch.page:28(p)
-msgid ""
-"These steps apply to the versions 3.0 and 3.2. Note that Evolution's file "
-"locations in 2.30 and 2.32 are different (<file>~/.evolution/mail/local/</"
-"file> instead of <file>~/.local/share/evolution/mail/local/</file>)."
-msgstr ""
-"Die folgenden Schritte beziehen sich auf die Versionen 3.0 und 3.2. Beachten "
-"Sie, dass die Speicherorte der Evolution-Dateien in Version 2.30 und 2.32 "
-"verschieden sind (<file>~/.evolution/mail/local/</file> anstelle von "
-"<file>~/.local/share/evolution/mail/local/</file>)."
-
-#: C/mail-error-folder-mismatch.page:31(p)
-msgid ""
-"Open the Terminal application (category <gui>System Tools</gui>) and type in "
-"the command <code>evolution --force-shutdown</code>. This command stops "
-"Evolution and all the processes related to it."
-msgstr ""
-"Öffnen Sie eine Terminal-Anwendung (Teil der <gui>Systemwerkzeuge</gui>) und "
-"geben Sie folgenden Befehl ein: <code>evolution --force-shutdown</code>. "
-"Damit wird Evolution einschließlich aller zugehöriger Prozesse beendet."
-
-#: C/mail-error-folder-mismatch.page:32(p)
-msgid "Remove the files ending in:"
-msgstr "Dateien mit folgender Endung entfernen:"
-
-#: C/mail-error-folder-mismatch.page:34(file)
-msgid ".ev-summary"
-msgstr ".ev-summary"
-
-#: C/mail-error-folder-mismatch.page:35(file)
-msgid ".ibex.index"
-msgstr ".ibex.index"
-
-#: C/mail-error-folder-mismatch.page:37(p)
-msgid ""
-"To do this, navigate to the hidden directory <file>~/.local/share/evolution/"
-"mail/local/</file> and locate the specified files. You can do this in the "
-"GNOME File Manager (Nautilus) by either showing hidden files, or by entering "
-"the directory via <guiseq><gui>Go</gui><gui>Location...</gui></guiseq> from "
-"the menu bar."
-msgstr ""
-"Öffnen Sie dazu den versteckten Ordner <file>~/.local/share/evolution/mail/"
-"local/</file> und suchen Sie die angegebenen Dateien. Sie können dies mit "
-"der GNOME-Dateiverwaltung Nautilus erledigen, indem Sie versteckte Dateien "
-"anzeigen lassen oder indem Sie den Ort direkt über die Menüleiste "
-"<guiseq><gui>Gehe zu</gui><gui>Ort …</gui></guiseq> angeben."
-
-#: C/mail-error-folder-mismatch.page:40(p)
-msgid ""
-"Restart Evolution. Note that restarting the application may take some time "
-"since it will need to rebuild the indexes deleted in the previous step."
-msgstr ""
-"Starten Sie Evolution neu. Bedenken Sie, dass die Anwendung nach dem "
-"Neustart für einige Zeit die zuvor gelöschten Indizes neu aufbauen muss."
-
-#: C/mail-error-folder-mismatch.page:44(p)
-msgid "You may lose your mail labels when performing this operation."
-msgstr ""
-"Eventuell gehen bei diesem Vorgang Ihre E-Mail-Beschriftungen verloren."
-
-#: C/mail-error-folder-mismatch.page:48(p)
-msgid ""
-"This problem is expected to be fixed in version 3.0 according to the "
-"corresponding <link href=\"https://bugzilla.gnome.org/show_bug.cgi?"
-"id=550414\">bug report</link>. Please add a comment if this is not the case."
-msgstr ""
-"Dieses Problem sollte mit Version 3.0 behoben sein laut <link href=\"https://"
-"bugzilla.gnome.org/show_bug.cgi?id=550414\">Fehlerbericht</link>. Bitte "
-"schreiben Sie dort einen Kommentar, falls dem nicht so ist."
-
 #: C/mail-error-failed-to-append-to-sent-folder.page:24(title)
 msgid "Error message \"Failed to append to...\" after sending message"
 msgstr ""
-"Fehlermeldung »Anhängen an … gescheitert« nach dem Verschicken einer "
-"Nachricht"
+"Fehlermeldung »Anhängen an … gescheitert« nach dem Verschicken einer Nachricht"
 
 #: C/mail-error-failed-to-append-to-sent-folder.page:26(p)
 msgid ""
@@ -5866,7 +5866,15 @@ msgstr ""
 "gui><gui>Zertifikate</gui></guiseq> Zertifikate importieren, anschauen, "
 "(alle bis auf eigene) bearbeiten und löschen."
 
-#: C/mail-encryption-s-mime-manage.page:27(p)
+#: C/mail-encryption-s-mime-manage.page:28(p)
+msgid ""
+"If you get the error \"Peer's certificate issuer has been marked as not "
+"trusted by the user. (-8172) - Cannot add SMIMEEncKeyPrefs attribute\" after "
+"adding your mail certificate, go to <gui>Authorities</gui> and enable "
+"<gui>Trust this CA to identify email users</gui> for the certificate."
+msgstr ""
+
+#: C/mail-encryption-s-mime-manage.page:30(p)
 msgid ""
 "<gui>Your Certificates</gui> displays a list of certificates that you own. "
 "To add a signing certificate, click <gui style=\"button\">Import</gui>, "
@@ -5879,7 +5887,7 @@ msgstr ""
 "klicken dann auf <gui style=\"button\">Öffnen</gui> und geben ein Passwort "
 "ein."
 
-#: C/mail-encryption-s-mime-manage.page:28(p)
+#: C/mail-encryption-s-mime-manage.page:31(p)
 msgid ""
 "<gui>Contact Certificates</gui> displays a list of certificates that you "
 "have for contacts. These certificates allow you to decrypt messages as well "
@@ -5890,10 +5898,10 @@ msgstr ""
 "Zertifikate ermöglichen Ihnen das Entschlüsseln von Nachrichten und das "
 "Prüfen von signierten Nachrichten."
 
-#: C/mail-encryption-s-mime-manage.page:29(p)
+#: C/mail-encryption-s-mime-manage.page:32(p)
 msgid ""
 "<gui>Authorities</gui> displays a list of trusted certificate authorities "
-"who verify that your own certificate is valid."
+"that verify that your own certificate is valid."
 msgstr ""
 "Klicken Sie auf den <gui>Zertifizierungsstellen</gui>-Reiter, um eine Liste "
 "der vertrauenswürdigen Zertifizierungsstellen angezeigt zu bekommen, die "
@@ -6001,13 +6009,13 @@ msgstr ""
 #: C/mail-encryption-gpg-set-up.page:38(p)
 msgid ""
 "Evolution requires that you know your key ID. If you do not remember it, you "
-"can find it by typing <code>gpg --list-keys</code> in a terminal window. "
-"Your key ID is an eight-character string with random numbers and letters."
+"can find it by typing <cmd>gpg --list-keys</cmd> in a terminal window. Your "
+"key ID is an eight-character string with random numbers and letters."
 msgstr ""
 "Evolution benötigt hier Ihre Schlüsselkennung. Falls Sie diese nicht kennen, "
-"so können Sie diese herausfinden, indem Sie den Befehl <command>gpg --list-"
-"keys</command> in einem Terminal-Fenster eingeben. Ihre Schlüsselkennung "
-"besteht aus zufälligen Buchstaben und Zahlen mit insgesamt 8 Stellen."
+"so können Sie diese herausfinden, indem Sie den Befehl <cmd>gpg --list-keys</"
+"cmd> in einem Terminal-Fenster eingeben. Ihre Schlüsselkennung besteht aus "
+"zufälligen Buchstaben und Zahlen mit insgesamt 8 Stellen."
 
 #: C/mail-encryption-gpg-getting-keys.page:5(desc)
 msgid "Getting and Using GPG Public Keys."
@@ -6032,24 +6040,24 @@ msgstr ""
 
 #: C/mail-encryption-gpg-getting-keys.page:28(p)
 msgid ""
-"To get public keys from a public key server, enter the command <code>gpg --"
-"recv-keys --keyserver wwwkeys.pgp.net keyid</code>, substituting "
-"<code>keyid</code> by your recipient's ID. You need to enter your password, "
-"and the ID is automatically added to your keyring."
+"To get public keys from a public key server, enter the command <cmd>gpg --"
+"recv-keys --keyserver wwwkeys.pgp.net keyid</cmd>, substituting <code>keyid</"
+"code> by your recipient's ID. You need to enter your password, and the ID is "
+"automatically added to your keyring."
 msgstr ""
 "Um öffentliche Schlüssel von einem öffentlichen Schlüssel-Server zu holen, "
-"geben Sie den Befehl <code>gpg --recv-keys --keyserver wwwkeys.pgp.net "
-"keyid</code> ein und ersetzen Sie <code>keyid</code> durch die "
-"Schlüsselkennung (ID) des Empfängers. Geben Sie auf Nachfrage Ihr Passwort "
-"ein, und die Kennung wird automatisch zu Ihrem Schlüsselbund hinzugefügt."
+"geben Sie den Befehl <cmd>gpg --recv-keys --keyserver wwwkeys.pgp.net keyid</"
+"cmd> ein und ersetzen Sie <cmd>keyid</cmd> durch die Schlüsselkennung (ID) "
+"des Empfängers. Geben Sie auf Nachfrage Ihr Passwort ein, und die Kennung "
+"wird automatisch zu Ihrem Schlüsselbund hinzugefügt."
 
 #: C/mail-encryption-gpg-getting-keys.page:30(p)
 msgid ""
 "If someone sends you a public key directly, save it as a plain text file and "
-"enter the command <code>gpg --import</code> to add it to your keyring."
+"enter the command <cmd>gpg --import</cmd> to add it to your keyring."
 msgstr ""
 "Falls Ihnen jemand einen öffentlichen Schlüssel direkt zuschickt, speichern "
-"Sie diesen als Textdatei und geben Sie den Befehl <code>gpg --import</code> "
+"Sie diesen als Textdatei und geben Sie den Befehl <cmd>gpg --import</cmd> "
 "ein, um den Schlüssel zu Ihrem Schlüsselbund hinzuzufügen."
 
 #: C/mail-encryption-gpg-decrypting.page:5(desc)
@@ -6125,9 +6133,9 @@ msgstr ""
 "müssen Sie Ihren öffentlichen und privaten Schlüssel mit GPG erstellen."
 
 #: C/mail-encryption-gpg-create-key.page:30(p)
-msgid "Open a terminal window and enter <code>gpg --gen-key</code>."
+msgid "Open a terminal window and enter <cmd>gpg --gen-key</cmd>."
 msgstr ""
-"Öffnen Sie ein Terminalfenster und geben Sie <code>gpg --gen-key</code> ein."
+"Öffnen Sie ein Terminalfenster und geben Sie <cmd>gpg --gen-key</cmd> ein."
 
 #: C/mail-encryption-gpg-create-key.page:31(p)
 msgid "Select an algorithm, then press Enter."
@@ -6172,17 +6180,17 @@ msgstr "Bewegen Sie Ihre Maus zufällig, um die Schlüssel zu erstellen."
 #: C/mail-encryption-gpg-create-key.page:42(p)
 msgid ""
 "After the keys are generated, you can view your key information by entering "
-"<code>gpg --list-keys</code>. You should see something similar to this: "
+"<cmd>gpg --list-keys</cmd>. You should see something similar to this: "
 "<code> /home/you/.gnupg/pubring.gpg ----------------------------  pub "
 "1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 "
 "2011-06-20 [expires: 2012-11-14]</code>"
 msgstr ""
 "Nachdem Ihre Schlüssel erstellt wurden, können Sie Ihre "
-"Schlüsselinformationen betrachten, indem Sie <code>gpg --list-keys</code> "
-"eingeben. Sie sollten etwas ähnliches wie dieses erhalten: <code> /home/you/."
-"gnupg/pubring.gpg ----------------------------  pub 1024D/32j38dk2 "
-"2001-06-20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 "
-"[expires: 2002-11-14]  </code>"
+"Schlüsselinformationen betrachten, indem Sie <cmd>gpg --list-keys</cmd> "
+"eingeben. Sie sollten etwas ähnliches wie dieses erhalten: <cmd> /home/you/."
+"gnupg/pubring.gpg ----------------------------  pub 1024D/32j38dk2 2001-06-"
+"20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-"
+"11-14]  </cmd>"
 
 #: C/mail-encryption-gpg-create-key.page:43(p)
 msgid ""
@@ -6216,13 +6224,12 @@ msgstr ""
 
 #: C/mail-encryption-gpg-create-key.page:47(p)
 msgid ""
-"Enter the command <code>gpg --send-keys --keyserver wwwkeys.pgp.net "
-"32j38dk2</code>. Substitute your key ID for <code>32j38dk2</code>. You need "
-"your password to do this."
+"Enter the command <cmd>gpg --send-keys --keyserver wwwkeys.pgp.net 32j38dk2</"
+"cmd>. Substitute your key ID for <code>32j38dk2</code>. You need your "
+"password to do this."
 msgstr ""
-"Geben Sie den Befehl <code>gpg --send-keys --keyserver wwwkeys.pgp.net "
-"32j38dk2</code> ein. Sie benötigen Ihr Passwort, um diesen Befehl "
-"auszuführen."
+"Geben Sie den Befehl <cmd>gpg --send-keys --keyserver wwwkeys.pgp.net "
+"32j38dk2</cmd> ein. Sie benötigen Ihr Passwort, um diesen Befehl auszuführen."
 
 #: C/mail-encryption-gpg-create-key.page:50(p)
 msgid ""
@@ -6374,8 +6381,8 @@ msgstr ""
 "verantwortlich ist)."
 
 #: C/mail-displaying-no-css.page:24(p)
-msgid "This will likely be fixed in version 3.4."
-msgstr "Dies wird wahrscheinlich in Version 3.4 korrigiert."
+msgid "This will likely be fixed in version 3.6."
+msgstr "Dies wird wahrscheinlich in Version 3.6 korrigiert."
 
 #: C/mail-displaying-no-css.page:25(p)
 msgid ""
@@ -6405,6 +6412,10 @@ msgstr "Darstellung einer E-Mail und Umgang mit Anhängen."
 msgid "Display of a message"
 msgstr "Nachrichtenanzeige"
 
+#: C/mail-displaying-message.page:23(title)
+msgid "Advanced"
+msgstr "Erweitert"
+
 #: C/mail-displaying-images-in-html.page:5(desc)
 msgid "On embedded pictures in received HTML messages."
 msgstr "Über eingebettete Bilder in empfangenen HTML-Nachrichten."
@@ -6559,20 +6570,23 @@ msgstr ""
 "kleine Bildschirme nützlich."
 
 #: C/mail-displaying-character-encodings.page:5(desc)
-msgid "When characters in an email are not shown correctly or missing."
+msgid "When letters in an email are not shown correctly or missing."
 msgstr ""
-"Wenn Zeichen in einer E-Mail nicht richtig angezeigt werden oder fehlen."
+"Wenn Buchstaben in einer E-Mail nicht richtig angezeigt werden oder fehlen."
+
+#: C/mail-displaying-character-encodings.page:21(title)
+msgid "Character Encodings"
+msgstr "Zeichenkodierungen"
 
-#: C/mail-displaying-character-encodings.page:20(title)
-msgid "Character Encodings and Sets"
-msgstr "Zeichenkodierungen und Zeichensätze"
+#: C/mail-displaying-character-encodings.page:24(title)
+msgid "Received mail"
+msgstr "Empfangene E-Mails"
 
-#. TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655021 is fixed
-#: C/mail-displaying-character-encodings.page:24(p)
+#: C/mail-displaying-character-encodings.page:26(p)
 msgid ""
-"If the email program of the sender is broken or misconfigured, plain text "
-"emails might not include information about the character encoding used. If "
-"you receive such messages, choose <guiseq><gui>View</gui><gui>Character "
+"If the email application of the sender is broken or misconfigured, plain "
+"text emails might not include information about the character encoding used. "
+"If you receive such messages, choose <guiseq><gui>View</gui><gui>Character "
 "Encoding</gui></guiseq> from the main menu and change the currently chosen "
 "character encoding to an appropriate one that might be the encoding used by "
 "the sender. You have to make this change every time you view the message."
@@ -6585,9 +6599,9 @@ msgstr ""
 "dem Zeichensatz des Absenders entspricht. Sie müssen diese Anpassung jedes "
 "Mal beim Öffnen der Nachricht anwenden."
 
-#: C/mail-displaying-character-encodings.page:25(p)
+#: C/mail-displaying-character-encodings.page:27(p)
 msgid ""
-"To constantly change this setting, go to <guiseq><gui>Edit</"
+"To make this the default setting, go to <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
 "gui><gui>Message Display</gui><gui>Default character encoding</gui></guiseq>."
 msgstr ""
@@ -6596,6 +6610,33 @@ msgstr ""
 "Einstellungen</gui><gui>Allgemein</gui><gui>Nachrichtenanzeige</"
 "gui><gui>Voreingestellte Zeichenkodierung</gui></guiseq>."
 
+#. Do not rename, we link to it from the subpages
+#: C/mail-displaying-character-encodings.page:32(title)
+#: C/intro-first-run.page:116(title)
+msgid "Sending mail"
+msgstr "Abrufen von E-Mails"
+
+#: C/mail-displaying-character-encodings.page:34(p)
+msgid ""
+"In the unlikely event that you would like to change the default character "
+"encoding for messages that you send, go to <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default "
+"Behavior</gui><gui>Character encoding</gui></guiseq>."
+msgstr ""
+"Für den unwahrscheinlichen Fall, dass Sie den voreingestellten Zeichensatz "
+"für ausgehende Nachrichten ändern möchten, so erledigen Sie dies unter "
+"<guiseq><gui>Bearbeiten</gui><gui>Einstellungen</"
+"gui><gui>Editoreinstellungen</gui><gui>Vorgabeverhalten</"
+"gui><gui>Zeichensatz</gui></guiseq>."
+
+#: C/mail-displaying-character-encodings.page:35(p)
+msgid ""
+"This setting only refers to Plain Text messages as <link xref=\"mail-"
+"composer-html\">HTML messages</link> always use UTF-8 encoding."
+msgstr ""
+"Diese Einstellung bezieht sich nur auf Textnachrichten, weil <link xref="
+"\"mail-composer-html\">HTML-Nachrichten</link> immer als UTF-8 codiert sind."
+
 #: C/mail-delete-and-undelete.page:5(desc)
 msgid "Deleting, expunging, and undeleting mail."
 msgstr "So löschen und säubern Sie E-Mails und stellen diese wieder her."
@@ -6773,43 +6814,43 @@ msgstr ""
 "gui> oder drücken Sie <keyseq><key>Strg</key><key>Eingabetaste</key></"
 "keyseq>."
 
-#: C/mail-composer-spellcheck.page:5(desc)
+#: C/mail-composer-spellcheck.page:7(desc)
 msgid "On spell checking your mail in the composer."
 msgstr "Über die Rechtschreibprüfung im E-Mail-Editor"
 
-#: C/mail-composer-spellcheck.page:20(title)
+#: C/mail-composer-spellcheck.page:22(title)
 msgid "Spell checking"
 msgstr "Rechtschreibprüfung"
 
-#: C/mail-composer-spellcheck.page:25(title)
+#: C/mail-composer-spellcheck.page:27(title)
 msgid "Prerequirements"
 msgstr "Voraussetzungen"
 
-#: C/mail-composer-spellcheck.page:26(p)
+#: C/mail-composer-spellcheck.page:28(p)
 msgid ""
 "To use spell checking for the emails that you write you first need to make "
-"sure that the <em>hunspell</em> package for your specific language and the "
-"<em>enchant</em> package are installed via the software management tool of "
+"sure that the <sys>hunspell</sys> package for your specific language and the "
+"<sys>enchant</sys> package are installed via the software management tool of "
 "your distribution."
 msgstr ""
 "Um für die zu schreibenden Nachrichten eine Rechtschreibprüfung zu "
-"verwenden, müssen sie zunächst sicher stellen, dass die Pakete <em>hunspell</"
-"em> für Ihre Sprache sowie <em>enchant</em> installiert sind. Verwenden Sie "
-"hierzu das Paketverwaltungswerkzeug Ihrer Distribution."
+"verwenden, müssen sie zunächst sicher stellen, dass die Pakete "
+"<sys>hunspell</sys> für Ihre Sprache sowie <sys>enchant</sys> installiert "
+"sind. Verwenden Sie hierzu das Paketverwaltungswerkzeug Ihrer Distribution."
 
-#: C/mail-composer-spellcheck.page:27(link)
-msgid "Install hunspell now."
-msgstr "Hunspell jetzt installieren."
+#: C/mail-composer-spellcheck.page:34(link)
+msgid "Install hunspell"
+msgstr "Hunspell installieren"
 
-#: C/mail-composer-spellcheck.page:28(link)
-msgid "Install enchant now."
-msgstr "Enchant jetzt installieren."
+#: C/mail-composer-spellcheck.page:35(link)
+msgid "Install enchant"
+msgstr "Enchant installieren"
 
-#: C/mail-composer-spellcheck.page:32(title)
+#: C/mail-composer-spellcheck.page:42(title)
 msgid "Global Preferences"
 msgstr "Globale Einstellungen"
 
-#: C/mail-composer-spellcheck.page:34(p)
+#: C/mail-composer-spellcheck.page:44(p)
 msgid ""
 "Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer "
 "Preferences</gui><gui>Spell Checking</gui><gui>Options</gui></guiseq> you "
@@ -6817,25 +6858,34 @@ msgid ""
 "is used for underlining words that are misspelled."
 msgstr ""
 
-#: C/mail-composer-spellcheck.page:36(p)
+#: C/mail-composer-spellcheck.page:46(p)
 msgid ""
 "You can also define which installed languages are used for spell checking in "
 "the list available under <guiseq><gui>Edit</gui><gui>Preferences</"
 "gui><gui>Composer Preferences</gui><gui>Spell Checking</gui><gui>Languages</"
 "gui></guiseq>."
 msgstr ""
+"Legen Sie in der Liste unter <guiseq><gui>Bearbeiten</"
+"gui><gui>Einstellungen</gui><gui>Editoreinstellungen</"
+"gui><gui>Rechtschreibprüfung</gui><gui>Sprachen</gui></guiseq> fest, welche "
+"installierten Sprachen für die Rechtschreibprüfung verwendet werden sollen."
 
-#: C/mail-composer-spellcheck.page:40(title)
+#: C/mail-composer-spellcheck.page:50(title)
 msgid "Manual spell checking in the composer"
 msgstr "Manuelle Rechtschreibprüfung im E-Mail-Editor"
 
-#: C/mail-composer-spellcheck.page:41(p)
+#: C/mail-composer-spellcheck.page:51(p)
 msgid ""
 "If you do not have <gui>Checking spelling while I type</gui> enabled in the "
 "<link xref=\"#global-preferences\">Composer Preferences</link> you can run a "
 "spell check in the email composer by clicking <guiseq><gui>Edit</"
 "gui><gui>Spell Checking</gui></guiseq> or by pressing <key>F7</key>."
 msgstr ""
+"Wenn <gui>Rechtschreibprüfung während der Eingabe durchführen</gui> nicht in "
+"den <link xref=\"#global-preferences\">Editoreinstellungen</link> aktiviert "
+"ist, so können Sie eine Prüfung im Editor starten, indem Sie auf "
+"<guiseq><gui>Bearbeiten</gui><gui>Rechtschreibprüfung</gui></guiseq> klicken "
+"oder <key>F7</key> drücken."
 
 #: C/mail-composer-several-recipients.page:5(desc)
 msgid "Sending to more than one person and using CC or BCC."
@@ -6875,6 +6925,11 @@ msgid ""
 "field. The <gui>Cc:</gui> text field is used for recipients that are meant "
 "to receive a copy of your message but are not the primary recipients."
 msgstr ""
+"E-Mail-Nachrichten haben bis zu drei verschiedene Empfängertypen. Die "
+"einfachste Möglichkeit besteht darin, eine E-Mail-Addresse oder mehrere "
+"Addressen in das Textfeld <gui>An:</gui> einzugeben. Das <gui>Kopie an:</"
+"gui>-Textfeld ist für Empfänger vorgesehen, die eine Kopie der Nachricht "
+"erhalten sollen, aber keine primären Empfänger sind."
 
 #: C/mail-composer-several-recipients.page:36(p)
 msgid ""
@@ -6902,6 +6957,10 @@ msgid ""
 "\">Autocompletion</link> feature of the Evolution address book for entering "
 "addresses. By using this you avoid typos and save time."
 msgstr ""
+"Es ist empfehlenswert, das Funktionsmerkmal <link xref=\"contacts-"
+"autocompletion\">Automatische Vervollständigung</link> im Adressbuch von "
+"Evolution zur Eingabe von Adressen einzusetzen. Sie ersparen sich damit "
+"Tippfehler und sparen Zeit."
 
 #: C/mail-composer-several-recipients.page:45(title)
 msgid "Using the buttons"
@@ -6981,6 +7040,9 @@ msgid ""
 "<link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/"
 "Regular_expression\">Regular expressions</link> for searching."
 msgstr ""
+"Mit technischem Hintergrundwissen haben Sie auch die Option <link href="
+"\"https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression"
+"\">reguläre Ausdrücke</link> zum Suchen einzusetzen."
 
 #: C/mail-composer-reply.page:5(desc)
 msgid "Answering a received email."
@@ -6997,24 +7059,25 @@ msgstr "Auf E-Mail-Nachrichten antworten"
 #: C/mail-composer-reply.page:27(p)
 msgid ""
 "To reply to a message, select the message to reply to in the message list "
-"and click the Reply button in the toolbar, or right-click within the message "
-"and select Reply to Sender. This opens the message composer. The <gui>To:</"
-"gui> and <gui>Subject:</gui> fields are already filled, although you can "
-"alter them if you prefer. In addition, the full text of the old message is "
-"inserted into the new message, either in grey with a blue line on one side "
-"(for HTML display) or with the &gt; character before each line (in plain "
-"text mode), to indicate that it is part of the previous message."
+"and click the <gui>Reply</gui> button in the toolbar, or right-click within "
+"the message and select <gui>Reply to Sender</gui>. This opens the message "
+"composer. The <gui>To:</gui> and <gui>Subject:</gui> fields are already "
+"filled, although you can alter them if you prefer. In addition, the full "
+"text of the old message is inserted into the new message, either in grey "
+"with a blue line on one side (for HTML display) or with the &gt; character "
+"before each line (in plain text mode), to indicate that it is part of the "
+"previous message."
 msgstr ""
 "Um auf eine Nachricht zu antworten, wählen Sie die Nachricht in der E-Mail-"
-"Liste aus und klicken Sie auf den Antwort-Knopf in der Werkzeugleiste, oder "
-"klicken Sie mit der rechten Maustaste auf die Nachricht und wählen Sie "
-"»Antwort an Absender«. Das <gui>An:</gui>-Feld und die <gui>Betreffzeile</"
-"gui> sind bereits ausgefüllt, können aber nach Bedarf geändert werden. "
-"Zusätzlich wird der gesamte Text der zu beantwortenden Nachricht in die neue "
-"Nachricht eingefügt. Dies geschieht entweder in grauer Schrift mit einer "
-"blauen seitlichen Linie (bei HTML-Darstellung) oder mit einem »&gt;«-Zeichen "
-"vor jeder Reihe (im Textmodus), um anzudeuten, dass es sich um einen Teil "
-"der vorherigen Nachricht handelt."
+"Liste aus und klicken Sie auf den <gui>Antwort</gui>-Knopf in der "
+"Werkzeugleiste, oder klicken Sie mit der rechten Maustaste auf die Nachricht "
+"und wählen Sie <gui>Antwort an Absender</gui>. Das <gui>An:</gui>-Feld und "
+"die <gui>Betreffzeile</gui> sind bereits ausgefüllt, können aber nach Bedarf "
+"geändert werden. Zusätzlich wird der gesamte Text der zu beantwortenden "
+"Nachricht in die neue Nachricht eingefügt. Dies geschieht entweder in grauer "
+"Schrift mit einer blauen seitlichen Linie (bei HTML-Darstellung) oder mit "
+"einem »&gt;«-Zeichen vor jeder Reihe (im Textmodus), um anzudeuten, dass es "
+"sich um einen Teil der vorherigen Nachricht handelt."
 
 #: C/mail-composer-reply.page:28(p)
 msgid ""
@@ -7106,13 +7169,17 @@ msgstr "Umschalttaste"
 msgid "Default settings"
 msgstr "Vorgabe-Einstellungen"
 
-#: C/mail-composer-reply.page:54(p) C/mail-composer-forward.page:41(p)
+#: C/mail-composer-reply.page:54(p)
 msgid ""
 "The default settings for replying and forwarding can be changed under "
 "<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</"
-"gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Forward style</"
-"gui></guiseq>."
+"gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Reply style</gui></"
+"guiseq>."
 msgstr ""
+"Die Vorgabeeinstellung zum Antworten und Weiterleiten können Sie ändern "
+"unter <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</"
+"gui><gui>Editoreinstellungen</gui><gui>Allgemein</gui><gui>Antworten und "
+"Weiterleiten</gui></guiseq>."
 
 #: C/mail-composer-priority.page:5(desc)
 msgid "Setting a priority for messages to be sent."
@@ -7125,12 +7192,12 @@ msgstr "Ausgehende Nachrichten priorisieren"
 #: C/mail-composer-priority.page:25(p)
 msgid ""
 "You can prioritize a message to be sent, so that the recipient sees its "
-"relative importance. To prioritize a message, click <guiseq><gui>Insert</"
+"relative importance. To prioritize a message, click <guiseq><gui>Options</"
 "gui><gui>Prioritize Message</gui></guiseq> in the composer window."
 msgstr ""
 "Sie können eine zu sendende Nachricht priorisieren, so dass der Empfänger "
 "die relative Wichtigkeit der Nachricht erkennen kann. Um eine Nachricht zu "
-"priorisieren, klicken Sie auf <guiseq><gui>Einfügen</gui><gui>Nachricht "
+"priorisieren, klicken Sie auf <guiseq><gui>Optionen</gui><gui>Nachricht "
 "priorisieren</gui></guiseq> im E-Mail-Editor."
 
 #: C/mail-composer-priority.page:27(p)
@@ -7165,6 +7232,9 @@ msgid ""
 "To enable the Message Template Plugin, click <guiseq><gui>Edit</"
 "gui><gui>Plugins</gui></guiseq> and enable <gui>Templates</gui>."
 msgstr ""
+"Zur Aktivierung des Plugins für Nachrichtenvorlagen klicken Sie auf "
+"<guiseq><gui>Bearbeiten</gui><gui>Plugins</gui></guiseq> und aktivieren "
+"<gui>Nachrichtenvorlagen</gui>."
 
 #: C/mail-composer-message-templates.page:31(title)
 msgid "Creating a Message Template from an existing Message"
@@ -7338,8 +7408,8 @@ msgid ""
 "$key is replaced by the value set for it in the Configuration tab of the "
 "Templates plugin."
 msgstr ""
-"$key wird durch den Wert ersetzt, der in dem Karteireiter »Konfiguration« "
-"des Vorlagen-Plugins festgelegt ist."
+"$key wird durch den Wert ersetzt, der in dem Karteireiter »Konfiguration« des "
+"Vorlagen-Plugins festgelegt ist."
 
 #: C/mail-composer-message-templates.page:91(p)
 msgid ""
@@ -7369,15 +7439,15 @@ msgstr "Voreingestellte Signatur für Konto"
 msgid ""
 "You can define a default <link xref=\"mail-composer-mail-signatures"
 "\">signature</link> for each of your mail accounts. This can be edited under "
-"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
-"gui><gui>Edit</gui><gui>Identity</gui><gui>Optional Information</gui></"
-"guiseq>."
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
+"style=\"button\">Edit</gui><gui>Identity</gui><gui>Optional Information</"
+"gui></guiseq>."
 msgstr ""
 "Sie können eine Vorgabe-<link xref=\"mail-composer-mail-signatures"
 "\">Signatur</link> für jedes Ihrer E-Mail-Konten festlegen. Diese wird "
 "jeweils unter <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui><gui>E-"
-"Mail-Konten</gui><gui>Bearbeiten</gui><gui>Identität</gui><gui>Zusätzliche "
-"Informationen</gui></guiseq> bearbeitet."
+"Mail-Konten</gui><gui style=\"button\">Bearbeiten</gui><gui>Identität</"
+"gui><gui>Zusätzliche Informationen</gui></guiseq> bearbeitet."
 
 #: C/mail-composer-mail-signatures-per-account.page:36(p)
 msgid ""
@@ -7408,6 +7478,8 @@ msgid ""
 "The term \"signature\" is also differently used in terms of <link xref="
 "\"mail-encryption\">encryption</link>."
 msgstr ""
+"Der Begriff »Signatur« hat im Gebiet der <link xref=\"mail-encryption"
+"\">Verschlüsselung</link> eine andere Bedeutung."
 
 #: C/mail-composer-mail-signatures-manage.page:5(desc)
 msgid "Add, change, edit or delete email signatures."
@@ -7423,6 +7495,9 @@ msgid ""
 "gui><gui>Preferences</gui><gui>Composer preferences</gui><gui>Signatures</"
 "gui></guiseq>."
 msgstr ""
+"Sie können Signaturen hinzufügen, bearbeiten und löschen unter "
+"<guiseq><gui>Bearbeiten</gui><gui>Einstellungen</"
+"gui><gui>Editoreinstellungen</gui><gui>Signaturen</gui></guiseq>."
 
 #: C/mail-composer-mail-signatures-manage.page:23(p)
 msgid ""
@@ -7645,6 +7720,11 @@ msgstr ""
 "Optional: Wählen Sie eine Hintergrundfarbe oder ein Hintergrundbild für die "
 "Tabelle."
 
+#: C/mail-composer-html-table.page:29(p) C/mail-composer-html-rule.page:28(p)
+#: C/mail-composer-html-link.page:29(p)
+msgid "Click <gui>Close</gui>."
+msgstr "Klicken Sie auf <gui>Schließen</gui>."
+
 #: C/mail-composer-html-rule.page:5(desc)
 msgid "Insert a horizontal line in the mail composer."
 msgstr "Eine horizontale Trennlinie in den E-Mail-Editor einfügen."
@@ -7689,15 +7769,15 @@ msgstr "Verwendung des HTML-Formats zum Erweitern von E-Mails"
 #: C/mail-composer-html.page:23(p)
 msgid ""
 "Normally, you cannot set text styles or insert pictures in email. However, "
-"most newer email programs can display images and text styles in addition to "
-"basic alignment and paragraph formatting. They do this with HTML, just like "
-"web pages do."
+"most newer email applications can display images and text styles in addition "
+"to basic alignment and paragraph formatting. They do this with HTML, just "
+"like web pages do."
 msgstr ""
 "Normalerweise lassen sich für E-Mails keine Textformatierungen bestimmen "
-"oder Bilder einfügen. Moderne E-Mail-Programme können jedoch zusätzlich zur "
-"klassischen E-Mail auch Bilder und Textformatierungen darstellen. Dies "
-"geschieht durch Verwendung von HTML, genauso wie HTML zur Darstellung von "
-"Internetseiten verwendet wird."
+"oder Bilder einfügen. Moderne E-Mail-Programme können jedoch zusätzlich zu "
+"grundlegender Formatierung auch Bilder und Textformatierungen darstellen. "
+"Dies geschieht durch Verwendung von HTML, genauso wie HTML zur Darstellung "
+"von Internetseiten verwendet wird."
 
 #: C/mail-composer-html.page:25(p)
 msgid ""
@@ -7712,12 +7792,13 @@ msgstr ""
 
 #: C/mail-composer-html.page:27(p)
 msgid ""
-"You can change the format of an email message from plain text to HTML by "
-"choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar."
+"You can change the format of an email message from plain text to HTML in the "
+"email composer by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> "
+"from the menu bar."
 msgstr ""
 "Sie können das Format einer E-Mail-Nachricht von Text zu HTML ändern, indem "
-"Sie in der Menüleiste <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> "
-"auswählen."
+"Sie im E-Mail-Editor in der Menüleiste <guiseq><gui>Format</gui><gui>HTML</"
+"gui></guiseq> auswählen."
 
 #: C/mail-composer-html.page:28(p)
 msgid ""
@@ -7886,6 +7967,18 @@ msgstr ""
 "wenn Sie die Originalnachricht beigelegt weiterleiten. Zitierte Nachrichten "
 "leiten keine Anhänge weiter."
 
+#: C/mail-composer-forward.page:41(p)
+msgid ""
+"The default settings for replying and forwarding can be changed under "
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</"
+"gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Forward style</"
+"gui></guiseq>."
+msgstr ""
+"Die Vorgabeeinstellung zum Antworten und Weiterleiten können Sie ändern "
+"unter <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</"
+"gui><gui>Editoreinstellungen</gui><gui>Allgemein</gui><gui>Antworten und "
+"Weiterleiten</gui><gui>Weiterleitungsstil</gui></guiseq>."
+
 #: C/mail-composer-forward-as-attachment.page:5(desc)
 msgid "How to forward a message with its attachments."
 msgstr "Nachrichten mit Anlagen weiterleiten."
@@ -7977,22 +8070,44 @@ msgstr ""
 msgid "Set the values for the header fields by using the dropdown list."
 msgstr "Legen Sie die Werte für die Kopffelder mit der Auswahlliste fest."
 
-#: C/mail-composer-change-quotation-string.page:5(desc)
+#: C/mail-composer-change-quotation-string.page:7(desc)
 msgid ""
 "It is not possible to change the quotation introduction added when answering "
 "mail."
 msgstr ""
 
-#: C/mail-composer-change-quotation-string.page:22(title)
-msgid "Changing the \"On <em>date, person</em> wrote:\" string when replying"
+#: C/mail-composer-change-quotation-string.page:24(title)
+msgid "Changing the \"On date, person wrote:\" string when replying"
+msgstr ""
+
+#: C/mail-composer-change-quotation-string.page:26(p)
+msgid "Advanced users can change this string."
+msgstr ""
+
+#: C/mail-composer-change-quotation-string.page:29(p)
+msgid "Open the <app>dconf-editor</app> application."
+msgstr ""
+
+#: C/mail-composer-change-quotation-string.page:30(p)
+msgid "Navigate to <code>org.gnome.evolution.mail</code>."
 msgstr ""
 
-#: C/mail-composer-change-quotation-string.page:24(p)
+#: C/mail-composer-change-quotation-string.page:31(p)
 msgid ""
-"Advanced users can change this string by editing the gconf key <file>/apps/"
-"evolution/mail/composer/message_attribution</file> via gconf-editor."
+"Enter the prefered quotation string as the value for the key <gui>composer-"
+"message-attribution</gui>."
 msgstr ""
 
+#: C/mail-composer-change-quotation-string.page:35(p)
+msgid ""
+"You might need to install the <sys>dconf-editor</sys> package to perform "
+"these steps."
+msgstr ""
+
+#: C/mail-composer-change-quotation-string.page:38(link)
+msgid "Install dconf-editor"
+msgstr "dconf-editor installieren"
+
 #: C/mail-change-time-format.page:5(desc)
 msgid "Changing the date and time format in the message list."
 msgstr "Das Format von Datum und Uhrzeit in der Nachrichtenliste ändern."
@@ -8013,8 +8128,8 @@ msgstr ""
 #: C/calendar-layout-appointment-display.page:50(p)
 msgid ""
 "The placeholders in the format expression are strftime formats. For a "
-"complete list of available strftime formats, run <code>date --help</code> in "
-"a terminal window."
+"complete list of available strftime formats, run <cmd>date --help</cmd> in a "
+"terminal window."
 msgstr ""
 
 #: C/mail-change-columns-in-message-list.page:5(desc)
@@ -8052,6 +8167,19 @@ msgstr ""
 "die Spalte <gui>Absender</gui> ersetzen, so dass nur der Absendername "
 "dargestellt wird."
 
+#: C/mail-change-columns-in-message-list.page:25(p)
+msgid ""
+"If you would like to have the same column layout in all mail folders except "
+"for the <gui>Sent</gui> folder, you can enable <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
+"gui><gui>Apply the same view settings to all folders</gui></guiseq>."
+msgstr ""
+"Wenn Sie die gleiche Spaltenanordnung in allen E-Mail-Ordnern außer dem "
+"<gui>Verschickt</gui>-Ordner haben möchten, so aktivieren Sie bitte "
+"<guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui><gui>E-Mail-"
+"Einstellungen</gui><gui>Allgemein</gui><gui>Ansichtseinstellungen auf alle "
+"ORdner anwenden</gui></guiseq>."
+
 #: C/mail-cannot-see.page:5(desc)
 msgid "If you received or sent an email, but you cannot find it anywhere."
 msgstr ""
@@ -8101,9 +8229,12 @@ msgstr ""
 
 #: C/mail-cannot-see.page:38(p)
 msgid ""
-"Click <guiseq><gui>Edit</gui><gui>Show Hidden Messages</gui></guiseq> to "
+"Click <guiseq><gui>Edit</gui><gui>Show Deleted Messages</gui></guiseq> to "
 "make sure all messages are visible."
 msgstr ""
+"Klicken Sie auf <guiseq><gui>Bearbeiten</gui><gui>Gelöschte Nachrichten "
+"anzeigen</gui></guiseq>, um sicherzugehen, dass alle Nachrichten sichtbar "
+"sind.."
 
 #: C/mail-cannot-see.page:41(p)
 msgid ""
@@ -8382,64 +8513,66 @@ msgstr "Konteneditor"
 #: C/mail-account-manage-imap-plus.page:24(p)
 #: C/mail-account-manage-imap.page:24(p)
 msgid ""
-"Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</"
-"gui><gui>Mail Accounts</gui><gui style=\"button\">Add</gui></guiseq>. The "
-"steps are mostly the same as for the <link xref=\"intro-first-run\">First-"
-"Run Assistant</link>, except for not getting asked whether to import data "
-"from other applications or to restore from a backup file."
+"Mail accounts can be added by choosing <guiseq><gui>File</gui><gui>New</"
+"gui><gui>Mail Account</gui></guiseq> or via <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button\">Add</"
+"gui></guiseq>. The steps are mostly the same as for the <link xref=\"intro-"
+"first-run\">First-Run Assistant</link>, except for not getting asked whether "
+"to import data from other applications or to restore from a backup file."
 msgstr ""
 
 #: C/mail-account-manage-usenet-news.page:25(p)
-#: C/mail-account-manage-unix-mbox-spool-file.page:25(p)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:25(p)
-#: C/mail-account-manage-pop.page:25(p)
 #: C/mail-account-manage-novell-groupwise.page:26(p)
 #: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(p)
 #: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(p)
 #: C/mail-account-manage-microsoft-exchange-evo-ews.page:26(p)
-#: C/mail-account-manage-mh-format-directories.page:25(p)
-#: C/mail-account-manage-local-delivery.page:25(p)
 #: C/mail-account-manage-imap-plus.page:25(p)
 #: C/mail-account-manage-imap.page:25(p)
 msgid ""
 "Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</"
-"gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui></guiseq>. The "
-"following settings are available when editing an existing account:"
-msgstr ""
-
-#: C/mail-account-manage-usenet-news.page:28(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:28(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:28(title)
-#: C/mail-account-manage-pop.page:28(title)
-#: C/mail-account-manage-novell-groupwise.page:29(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:29(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:29(title)
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:29(title)
-#: C/mail-account-manage-mh-format-directories.page:28(title)
-#: C/mail-account-manage-maildir-format-directories.page:28(title)
-#: C/mail-account-manage-local-delivery.page:28(title)
-#: C/mail-account-manage-imap-plus.page:28(title)
-#: C/mail-account-manage-imap.page:28(title) C/intro-first-run.page:25(title)
+"gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui></guiseq> or by "
+"right-clicking on the respective top-level node in the folder list and "
+"choosing <gui>Properties</gui>."
+msgstr ""
+"E-Mail-Konten können bearbeitet werden unter <guiseq><gui>Bearbeiten</"
+"gui><gui>Einstellungen</gui><gui>E-Mail-Konten</gui><gui style=\"button"
+"\">Bearbeiten</gui></guiseq>, oder indem Sie auf den entsprechenden "
+"übergeordneten Knoten in der Ordnerliste mit der rechten Maustaste klicken "
+"und <gui>Eigenschaften</gui> wählen."
+
+#: C/mail-account-manage-usenet-news.page:26(p)
+#: C/mail-account-manage-unix-mbox-spool-file.page:26(p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:26(p)
+#: C/mail-account-manage-pop.page:26(p)
+#: C/mail-account-manage-novell-groupwise.page:27(p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:27(p)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:27(p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:27(p)
+#: C/mail-account-manage-mh-format-directories.page:26(p)
+#: C/mail-account-manage-maildir-format-directories.page:26(p)
+#: C/mail-account-manage-local-delivery.page:26(p)
+#: C/mail-account-manage-imap-plus.page:26(p)
+#: C/mail-account-manage-imap.page:26(p)
+msgid "The following settings are available when editing an existing account:"
+msgstr ""
+
+#: C/mail-account-manage-usenet-news.page:29(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:29(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:29(title)
+#: C/mail-account-manage-pop.page:29(title)
+#: C/mail-account-manage-novell-groupwise.page:30(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:30(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:30(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:30(title)
+#: C/mail-account-manage-mh-format-directories.page:29(title)
+#: C/mail-account-manage-maildir-format-directories.page:29(title)
+#: C/mail-account-manage-local-delivery.page:29(title)
+#: C/mail-account-manage-imap-plus.page:29(title)
+#: C/mail-account-manage-imap.page:29(title) C/intro-first-run.page:27(title)
 msgid "Identity"
 msgstr "Identität"
 
 #. TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866
-#: C/mail-account-manage-usenet-news.page:30(p)
-#: C/mail-account-manage-unix-mbox-spool-file.page:30(p)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:30(p)
-#: C/mail-account-manage-pop.page:30(p)
-#: C/mail-account-manage-novell-groupwise.page:31(p)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:31(p)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:31(p)
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:31(p)
-#: C/mail-account-manage-mh-format-directories.page:30(p)
-#: C/mail-account-manage-maildir-format-directories.page:30(p)
-#: C/mail-account-manage-local-delivery.page:30(p)
-#: C/mail-account-manage-imap-plus.page:30(p)
-#: C/mail-account-manage-imap.page:30(p) C/intro-first-run.page:26(p)
-msgid "Here you define your name and your email address."
-msgstr "Hier können Sie Ihren Namen und Ihre E-Mail-Adresse angeben."
-
 #: C/mail-account-manage-usenet-news.page:31(p)
 #: C/mail-account-manage-unix-mbox-spool-file.page:31(p)
 #: C/mail-account-manage-unix-mbox-spool-directory.page:31(p)
@@ -8452,7 +8585,23 @@ msgstr "Hier können Sie Ihren Namen und Ihre E-Mail-Adresse angeben."
 #: C/mail-account-manage-maildir-format-directories.page:31(p)
 #: C/mail-account-manage-local-delivery.page:31(p)
 #: C/mail-account-manage-imap-plus.page:31(p)
-#: C/mail-account-manage-imap.page:31(p) C/intro-first-run.page:27(p)
+#: C/mail-account-manage-imap.page:31(p) C/intro-first-run.page:28(p)
+msgid "Here you define your name and your email address."
+msgstr "Hier können Sie Ihren Namen und Ihre E-Mail-Adresse angeben."
+
+#: C/mail-account-manage-usenet-news.page:32(p)
+#: C/mail-account-manage-unix-mbox-spool-file.page:32(p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:32(p)
+#: C/mail-account-manage-pop.page:32(p)
+#: C/mail-account-manage-novell-groupwise.page:33(p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:33(p)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:33(p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:33(p)
+#: C/mail-account-manage-mh-format-directories.page:32(p)
+#: C/mail-account-manage-maildir-format-directories.page:32(p)
+#: C/mail-account-manage-local-delivery.page:32(p)
+#: C/mail-account-manage-imap-plus.page:32(p)
+#: C/mail-account-manage-imap.page:32(p) C/intro-first-run.page:29(p)
 msgid ""
 "Optionally you can make this account your default account (e.g. when writing "
 "emails), set a Reply-To email address (if you want replies to messages sent "
@@ -8465,75 +8614,75 @@ msgstr ""
 "eine andere Adresse erfolgen sollen) und eine Organisation angeben (z.B Ihre "
 "Firma oder sonstige Institution, in deren Auftrag Sie arbeiten)."
 
-#: C/mail-account-manage-usenet-news.page:35(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:35(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:35(title)
-#: C/mail-account-manage-pop.page:35(title)
-#: C/mail-account-manage-novell-groupwise.page:36(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:36(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:36(title)
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:36(title)
-#: C/mail-account-manage-mh-format-directories.page:35(title)
-#: C/mail-account-manage-maildir-format-directories.page:35(title)
-#: C/mail-account-manage-local-delivery.page:35(title)
-#: C/mail-account-manage-imap-plus.page:35(title)
-#: C/mail-account-manage-imap.page:35(title)
+#: C/mail-account-manage-usenet-news.page:36(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:36(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:36(title)
+#: C/mail-account-manage-pop.page:36(title)
+#: C/mail-account-manage-novell-groupwise.page:37(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:37(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:37(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:37(title)
+#: C/mail-account-manage-mh-format-directories.page:36(title)
+#: C/mail-account-manage-maildir-format-directories.page:36(title)
+#: C/mail-account-manage-local-delivery.page:36(title)
+#: C/mail-account-manage-imap-plus.page:36(title)
+#: C/mail-account-manage-imap.page:36(title)
 msgid "Receiving Email and Receiving options"
 msgstr "Nachrichten empfangen und Empfangsoptionen"
 
-#: C/mail-account-manage-usenet-news.page:39(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:39(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:39(title)
-#: C/mail-account-manage-pop.page:39(title)
-#: C/mail-account-manage-mh-format-directories.page:39(title)
-#: C/mail-account-manage-maildir-format-directories.page:39(title)
-#: C/mail-account-manage-local-delivery.page:39(title)
-#: C/mail-account-manage-imap-plus.page:39(title)
-#: C/mail-account-manage-imap.page:39(title)
+#: C/mail-account-manage-usenet-news.page:40(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:40(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:40(title)
+#: C/mail-account-manage-pop.page:40(title)
+#: C/mail-account-manage-mh-format-directories.page:40(title)
+#: C/mail-account-manage-maildir-format-directories.page:40(title)
+#: C/mail-account-manage-local-delivery.page:40(title)
+#: C/mail-account-manage-imap-plus.page:40(title)
+#: C/mail-account-manage-imap.page:40(title)
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: C/mail-account-manage-usenet-news.page:43(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:43(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:43(title)
-#: C/mail-account-manage-pop.page:43(title)
-#: C/mail-account-manage-novell-groupwise.page:40(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:40(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:40(title)
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:40(title)
-#: C/mail-account-manage-mh-format-directories.page:43(title)
-#: C/mail-account-manage-maildir-format-directories.page:43(title)
-#: C/mail-account-manage-local-delivery.page:43(title)
-#: C/mail-account-manage-imap-plus.page:43(title)
-#: C/mail-account-manage-imap.page:43(title)
+#: C/mail-account-manage-usenet-news.page:44(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:44(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:44(title)
+#: C/mail-account-manage-pop.page:44(title)
+#: C/mail-account-manage-novell-groupwise.page:41(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:41(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:41(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:41(title)
+#: C/mail-account-manage-mh-format-directories.page:44(title)
+#: C/mail-account-manage-maildir-format-directories.page:44(title)
+#: C/mail-account-manage-local-delivery.page:44(title)
+#: C/mail-account-manage-imap-plus.page:44(title)
+#: C/mail-account-manage-imap.page:44(title)
 msgid "Defaults"
 msgstr "Vorgaben"
 
-#: C/mail-account-manage-usenet-news.page:47(title)
-#: C/mail-account-manage-unix-mbox-spool-file.page:47(title)
-#: C/mail-account-manage-unix-mbox-spool-directory.page:47(title)
-#: C/mail-account-manage-pop.page:47(title)
-#: C/mail-account-manage-novell-groupwise.page:45(title)
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:49(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:49(title)
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:44(title)
-#: C/mail-account-manage-mh-format-directories.page:47(title)
-#: C/mail-account-manage-maildir-format-directories.page:47(title)
-#: C/mail-account-manage-local-delivery.page:47(title)
-#: C/mail-account-manage-imap-plus.page:47(title)
-#: C/mail-account-manage-imap.page:47(title)
+#: C/mail-account-manage-usenet-news.page:48(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:48(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:48(title)
+#: C/mail-account-manage-pop.page:48(title)
+#: C/mail-account-manage-novell-groupwise.page:46(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:50(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:50(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:45(title)
+#: C/mail-account-manage-mh-format-directories.page:48(title)
+#: C/mail-account-manage-maildir-format-directories.page:48(title)
+#: C/mail-account-manage-local-delivery.page:48(title)
+#: C/mail-account-manage-imap-plus.page:48(title)
+#: C/mail-account-manage-imap.page:48(title)
 msgid "Security"
 msgstr "Sicherheit"
 
-#: C/mail-account-manage-usenet-news.page:53(title)
-#: C/mail-account-manage-imap-plus.page:55(title)
-#: C/mail-account-manage-imap.page:57(title)
+#: C/mail-account-manage-usenet-news.page:54(title)
+#: C/mail-account-manage-imap-plus.page:56(title)
+#: C/mail-account-manage-imap.page:58(title)
 msgid "Other settings"
 msgstr "Andere Einstellungen"
 
-#: C/mail-account-manage-usenet-news.page:54(p)
-#: C/mail-account-manage-imap-plus.page:56(p)
-#: C/mail-account-manage-imap.page:58(p)
+#: C/mail-account-manage-usenet-news.page:55(p)
+#: C/mail-account-manage-imap-plus.page:57(p)
+#: C/mail-account-manage-imap.page:59(p)
 msgid ""
 "Other account related settings that are not located in the <gui>Account "
 "Editor</gui>:"
@@ -8549,6 +8698,20 @@ msgstr ""
 msgid "Standard Unix mbox Spool File account settings"
 msgstr "Einstellungen für Konto mit Standard-Unix-mbox-Spool-Datei"
 
+#: C/mail-account-manage-unix-mbox-spool-file.page:25(p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:25(p)
+#: C/mail-account-manage-pop.page:25(p)
+#: C/mail-account-manage-mh-format-directories.page:25(p)
+#: C/mail-account-manage-maildir-format-directories.page:25(p)
+#: C/mail-account-manage-local-delivery.page:25(p)
+msgid ""
+"Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui></guiseq>."
+msgstr ""
+"E-Mail-Konten können bearbeitet werden unter <guiseq><gui>Bearbeiten</"
+"gui><gui>Einstellungen</gui><gui>E-Mail-Konten</gui><gui style=\"button"
+"\">Bearbeiten</gui></guiseq>."
+
 #: C/mail-account-manage-unix-mbox-spool-directory.page:5(desc)
 msgid "Add and edit a Standard Unix mbox Spool Directory account in Evolution."
 msgstr ""
@@ -8575,11 +8738,11 @@ msgstr "GroupWise-Konto in Evolution hinzufügen und bearbeiten."
 msgid "Novell Groupwise account settings"
 msgstr "Einstellungen für Novell Groupwise-Konten"
 
-#: C/mail-account-manage-novell-groupwise.page:49(title)
+#: C/mail-account-manage-novell-groupwise.page:50(title)
 msgid "Proxy"
 msgstr "Vertretung"
 
-#: C/mail-account-manage-novell-groupwise.page:50(p)
+#: C/mail-account-manage-novell-groupwise.page:51(p)
 msgid "Settings for having somebody else handle your account."
 msgstr ""
 
@@ -8607,12 +8770,12 @@ msgstr "Microsoft Exchange-2007-Konto in Evolution hinzufügen und bearbeiten."
 msgid "Exchange MAPI account settings"
 msgstr "Einstellungen für Exchange MAPI-Konten"
 
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:44(title)
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:44(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:45(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:45(title)
 msgid "Exchange Settings"
 msgstr "Exchange-Einstellungen"
 
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:45(p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:46(p)
 msgid "In this section you can view the size of all Exchange folders."
 msgstr "In diesem Bereich können Sie die Größe aller Exchange-Ordner sehen."
 
@@ -8621,13 +8784,13 @@ msgid "Add and edit a Microsoft Exchange 2000/2003 account in Evolution."
 msgstr ""
 "Microsoft Exchange-2000/2003-Konto in Evolution hinzufügen und bearbeiten."
 
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:45(p)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:46(p)
 msgid ""
 "In this section you can define your \"Out of Office\" status, change the "
 "password for your Exchange account, and manage the delegation settings."
 msgstr ""
 
-#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:45(p)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:46(p)
 msgid "You can also view the size of all Exchange folders."
 msgstr "Sie können auch die Größe aller Exchange-Ordner anzeigen lassen."
 
@@ -8679,13 +8842,6 @@ msgstr ""
 msgid "Maildir Format Mail Directories account settings"
 msgstr "Kontoeinstellungen für E-Mail-Ordner im Maildir-Format"
 
-#: C/mail-account-manage-maildir-format-directories.page:25(p)
-msgid ""
-"Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</"
-"gui><gui>Mail Accounts</gui><gui>Edit</gui></guiseq>. The following settings "
-"are available when editing an existing account:"
-msgstr ""
-
 #: C/mail-account-manage-local-delivery.page:5(desc)
 msgid "Add and edit a Local Delivery account in Evolution."
 msgstr ""
@@ -8712,25 +8868,24 @@ msgid "IMAP mail account settings"
 msgstr "E-Mail-Konteneinstellungen für IMAP"
 
 #: C/mail-access-gmail-pop-account.page:5(desc)
-msgid "How to set up a GMail POP Account."
+msgid "How to set up a Gmail POP Account."
 msgstr "So richten Sie ein GMail-POP-Konto ein."
 
 #: C/mail-access-gmail-pop-account.page:24(title)
-msgid "Access a GMail POP Account via Evolution"
+msgid "Access a Gmail POP Account via Evolution"
 msgstr "Zugriff auf ein GMail-POP-Konto mit Evolution"
 
 #: C/mail-access-gmail-pop-account.page:26(p)
-msgid "Follow these steps to set up your GMail POP Account in Evolution:"
+msgid "Follow these steps to set up your Gmail POP Account in Evolution:"
 msgstr ""
 "Befolgen Sie folgende Schritte, um Ihr GMail-POP-Konto in Evolution "
 "einzurichten:"
 
 #: C/mail-access-gmail-pop-account.page:29(p)
-msgid "Log in to your gmail account."
+msgid "Log in to your Gmail account."
 msgstr "Melden Sie sich an Ihrem GMail-Konto an."
 
 #: C/mail-access-gmail-pop-account.page:30(p)
-#, fuzzy
 msgid ""
 "Go to <guiseq><gui>Settings</gui><gui>Forwarding and POP/IMAP</gui></"
 "guiseq>. Refer to the POP Download section."
@@ -8776,12 +8931,12 @@ msgstr ""
 "Konten-Einstellungen."
 
 #: C/mail-access-gmail-imap-account.page:5(desc)
-msgid "How to set up a GMail IMAP Account."
+msgid "How to set up a Gmail IMAP Account."
 msgstr "So richten Sie ein GMail-IMAP-Konto ein."
 
 #. Page only exists for the <note>, apart from that nothing special.
 #: C/mail-access-gmail-imap-account.page:24(title)
-msgid "Access a GMail IMAP Account via Evolution"
+msgid "Access a Gmail IMAP Account via Evolution"
 msgstr "Zugriff auf ein GMail-IMAP-Konto mit Evolution"
 
 #: C/mail-access-gmail-imap-account.page:26(p)
@@ -8794,9 +8949,9 @@ msgstr ""
 
 #: C/mail-access-gmail-imap-account.page:28(p)
 msgid ""
-"To access GMail via IMAP you must turn on IMAP in your Google account. See "
-"the <link href=\"https://mail.google.com/support/bin/answer.py?"
-"answer=77695\">GMail Help</link> for more information."
+"To access Gmail via IMAP you must turn on IMAP in your Google account. See "
+"the <link href=\"https://mail.google.com/support/bin/answer.py?answer=77695"
+"\">Gmail Help</link> for more information."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -8879,8 +9034,8 @@ msgid "Barbara M. Tobias"
 msgstr "Barbara M. Tobias"
 
 #: C/intro-main-window.page:29(title)
-msgid "The <em>Evolution</em> main window"
-msgstr "Das Hauptfenster von <em>Evolution</em>"
+msgid "The <app>Evolution</app> main window"
+msgstr "Das Hauptfenster von <app>Evolution</app>"
 
 #. This section fixes https://bugzilla.gnome.org/show_bug.cgi?id=657028
 #: C/intro-main-window.page:32(p)
@@ -9216,15 +9371,15 @@ msgstr ""
 "Sie können die Kontaktvorschau über <guiseq><gui>Ansicht</gui><gui>Vorschau</"
 "gui><gui>Kontaktvorschau</gui></guiseq> ein- oder ausblenden."
 
-#: C/intro-first-run.page:5(desc)
+#: C/intro-first-run.page:7(desc)
 msgid "Running Evolution for the very first time."
 msgstr "Evolution zum allerersten Mal starten."
 
-#: C/intro-first-run.page:20(title)
-msgid "Starting <em>Evolution</em> for the first time"
-msgstr "<em>Evolution</em> zum ersten Mal starten"
+#: C/intro-first-run.page:22(title)
+msgid "Starting <app>Evolution</app> for the first time"
+msgstr "<app>Evolution</app> zum ersten Mal starten"
 
-#: C/intro-first-run.page:22(p)
+#: C/intro-first-run.page:24(p)
 msgid ""
 "The first time you run Evolution, it opens the First-Run Assistant to help "
 "you set up email accounts and <link xref=\"import-data\">import data from "
@@ -9235,29 +9390,29 @@ msgstr ""
 "gegebenenfalls <link xref=\"import-data\">Daten aus anderen Programmen zu "
 "importieren</link>."
 
-#: C/intro-first-run.page:31(title)
+#: C/intro-first-run.page:33(title)
 msgid "Restore from backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
-#: C/intro-first-run.page:32(p)
+#: C/intro-first-run.page:34(p)
 msgid ""
-"You will get asked whether to restore from a backup of a previous version. "
-"If you have such a backup, continue <link xref=\"backup-restore#restore"
-"\">here</link>. Otherwise, go to the next page."
+"You will be asked whether to restore from a backup of a previous version. If "
+"you have such a backup, continue <link xref=\"backup-restore#restore\">here</"
+"link>. Otherwise, go to the next page."
 msgstr ""
 "Sie werden gefragt werden, ob eine Sicherungskopie einer vorhergehenden "
 "Version wiederhergestellt werden soll. Wenn Sie dies tun möchten, so setzen "
 "Sie bitte <link xref=\"backup-restore#restore\">hier</link> fort. "
 "Andernfalls gehen Sie zur nächsten Seite weiter."
 
-#: C/intro-first-run.page:37(p)
+#: C/intro-first-run.page:39(p)
 msgid ""
-"First, choose the server type from the <gui>Server Type</gui> dropdown-list."
+"First, choose the server type from the <gui>Server Type</gui> drop-down list."
 msgstr ""
 "Wählen Sie zuerst den gewünschten Servertyp aus der Auswahlliste "
 "<gui>Servertyp</gui> aus."
 
-#: C/intro-first-run.page:38(p)
+#: C/intro-first-run.page:40(p)
 msgid ""
 "If you are unsure about the type of server to choose, ask your system "
 "administrator or Internet Service Provider."
@@ -9266,19 +9421,19 @@ msgstr ""
 "wenden Sie sich bitte an Ihren Systemadministrator oder Internet-"
 "Dienstanbieter."
 
-#: C/intro-first-run.page:43(p)
+#: C/intro-first-run.page:45(p)
 msgid "The most common available server types for normal users are:"
 msgstr "Die häufigsten Servertypen für Benutzer sind folgende:"
 
-#: C/intro-first-run.page:45(p)
+#: C/intro-first-run.page:47(p)
 msgid "None: If you do not plan to use Evolution for receiving email."
 msgstr "Keiner: Wenn Sie mit Evolution keine E-Mails abrufen möchten."
 
-#: C/intro-first-run.page:45(p)
+#: C/intro-first-run.page:47(p)
 msgid "Continue <link xref=\"#sending\">here</link> for configuration."
 msgstr "Setzen Sie die Konfiguration <link xref=\"#sending\">hier</link> fort."
 
-#: C/intro-first-run.page:46(p)
+#: C/intro-first-run.page:48(p)
 msgid ""
 "IMAP: Keeps the mail on the server so you can access your mail from multiple "
 "systems."
@@ -9286,7 +9441,7 @@ msgstr ""
 "IMAP: Behält E-Mails auf dem Server, so dass Sie auf Ihre E-Mails von "
 "verschiedenen Rechnern zugreifen können."
 
-#: C/intro-first-run.page:46(p)
+#: C/intro-first-run.page:48(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-imap\">here</link> for "
 "configuration."
@@ -9294,7 +9449,7 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-imap"
 "\">hier</link> fort."
 
-#: C/intro-first-run.page:48(p)
+#: C/intro-first-run.page:50(p)
 msgid ""
 "IMAP+: Keeps the mail on the server so you can access your mail from "
 "multiple systems."
@@ -9302,7 +9457,7 @@ msgstr ""
 "IMAP+: Behält E-Mails auf dem Server, so dass Sie auf Ihre E-Mails von "
 "verschiedenen Rechnern zugreifen können."
 
-#: C/intro-first-run.page:48(p)
+#: C/intro-first-run.page:50(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-imap-plus\">here</link> for "
 "configuration."
@@ -9310,11 +9465,11 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-imap-plus"
 "\">hier</link> fort."
 
-#: C/intro-first-run.page:49(p)
+#: C/intro-first-run.page:51(p)
 msgid "POP: Downloads your email to your hard disk."
 msgstr "POP: Lädt die E-Mails auf Ihren Rechner herunter."
 
-#: C/intro-first-run.page:49(p)
+#: C/intro-first-run.page:51(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-pop\">here</link> for "
 "configuration."
@@ -9322,7 +9477,7 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-pop\">hier</"
 "link> fort."
 
-#: C/intro-first-run.page:50(p)
+#: C/intro-first-run.page:52(p)
 msgid ""
 "USENET News: Connects to a news server and downloads a list of available "
 "news digests."
@@ -9330,7 +9485,7 @@ msgstr ""
 "USENET-News: Verbindet mit einem News-Server und lädt eine Liste verfügbarer "
 "Nachrichten aus Newsgroups herunter."
 
-#: C/intro-first-run.page:50(p)
+#: C/intro-first-run.page:52(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-usenet-news\">here</link> for "
 "configuration."
@@ -9338,11 +9493,36 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-usenet-news"
 "\">hier</link> fort."
 
-#: C/intro-first-run.page:56(p)
+#: C/intro-first-run.page:58(p)
 msgid "Available server types for corporate users are:"
 msgstr "Verfügbare Servertypen im Unternehmensumfeld sind:"
 
-#: C/intro-first-run.page:59(p)
+#: C/intro-first-run.page:60(p)
+msgid ""
+"Exchange EWS: For connecting to a Microsoft Exchange 2007/2010 or OpenChange "
+"server. Note that this is currently under development and will replace the "
+"<gui>Exchange MAPI</gui> account type in the future. It might not be "
+"available yet for your distribution."
+msgstr ""
+
+#: C/intro-first-run.page:60(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-exchange-ews\">here</link> for "
+"configuration."
+msgstr ""
+"Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-exchange-ews"
+"\"hier</link> fort."
+
+#: C/intro-first-run.page:62(p)
+msgid "This requires having the <sys>evolution-ews</sys> package installed."
+msgstr ""
+
+#: C/intro-first-run.page:65(link)
+#: C/exchange-connectors-overview.page:48(link)
+msgid "Install evolution-ews"
+msgstr "evolution-ews installieren"
+
+#: C/intro-first-run.page:71(p)
 msgid ""
 "Exchange MAPI: For connecting to a Microsoft Exchange 2007/2010 or "
 "OpenChange server."
@@ -9350,7 +9530,7 @@ msgstr ""
 "Exchange MAPI: Zum Verbinden mit einem Microsoft Exchange 2007/2010- oder "
 "OpenChange-Server."
 
-#: C/intro-first-run.page:59(p)
+#: C/intro-first-run.page:71(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-exchange-mapi\">here</link> for "
 "configuration."
@@ -9358,24 +9538,23 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-exchange-"
 "mapi\">hier</link> fort."
 
-#: C/intro-first-run.page:60(p)
-msgid ""
-"This requires having the evolution-mapi package installed. <link action="
-"\"install:evolution-mapi\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
-"evolution-mapi/\">Install evolution-mapi now.</link>"
+#: C/intro-first-run.page:73(p)
+msgid "This requires having the <sys>evolution-mapi</sys> package installed."
 msgstr ""
-"Dafür muss das Paket »evolution-mapi« installiert sein. <link action="
-"\"install:evolution-mapi\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
-"evolution-mapi/\">Evolution-mapi jetzt installieren.</link>"
 
-#: C/intro-first-run.page:62(p)
+#: C/intro-first-run.page:76(link)
+#: C/exchange-connectors-overview.page:39(link)
+msgid "Install evolution-mapi"
+msgstr "evolution-mapi installieren"
+
+#: C/intro-first-run.page:81(p)
 msgid ""
 "Microsoft Exchange: For connecting to a Microsoft Exchange 2000 or 2003 "
 "server."
 msgstr ""
 "Microsoft Exchange: zum Verbinden mit Microsoft Exchange 2000 oder 2003."
 
-#: C/intro-first-run.page:62(p)
+#: C/intro-first-run.page:81(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-evolution-exchange\">here</"
 "link> for configuration."
@@ -9383,21 +9562,21 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-evolution-"
 "exchange\">hier</link> fort."
 
-#: C/intro-first-run.page:63(p)
+#: C/intro-first-run.page:83(p)
 msgid ""
-"This requires having the evolution-exchange package installed. <link action="
-"\"install:evolution-exchange\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
-"evolution-exchange/\">Install evolution-exchange now.</link>"
+"This requires having the <sys>evolution-exchange</sys> package installed."
 msgstr ""
-"Dafür muss das Paket »evolution-exchange« installiert sein. <link action="
-"\"install:evolution-exchange\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
-"evolution-exchange/\">Evolution-exchange jetzt installieren.</link>"
 
-#: C/intro-first-run.page:65(p)
+#: C/intro-first-run.page:86(link)
+#: C/exchange-connectors-overview.page:30(link)
+msgid "Install evolution-exchange"
+msgstr "evolution-exchange installieren"
+
+#: C/intro-first-run.page:91(p)
 msgid "Novell Groupwise: For connecting to a Novell GroupWise server."
 msgstr "Novell Groupwise: zum Verbinden mit einem Novell GroupWise-Server."
 
-#: C/intro-first-run.page:65(p)
+#: C/intro-first-run.page:91(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-novell-groupwise\">here</link> "
 "for configuration."
@@ -9405,12 +9584,12 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-novell-"
 "groupwise\">hier</link> fort."
 
-#: C/intro-first-run.page:71(p)
+#: C/intro-first-run.page:97(p)
 msgid "Available local account server types for advanced users are:"
 msgstr ""
 "Verfügbare Servertypen für lokale Konten für fortgeschrittene Benutzer sind:"
 
-#: C/intro-first-run.page:73(p)
+#: C/intro-first-run.page:99(p)
 msgid ""
 "Local delivery: If you want to move email from the spool (the location where "
 "mail waits for delivery) and store it in your home directory. You need to "
@@ -9424,7 +9603,7 @@ msgstr ""
 "benutzt werden soll. Falls die E-Mails im Spool verbleiben sollen, wählen "
 "Sie stattdessen die Option <gui>Standard-UNIX-mbox-Spool</gui>."
 
-#: C/intro-first-run.page:73(p)
+#: C/intro-first-run.page:99(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-local-delivery\">here</link> "
 "for configuration."
@@ -9432,20 +9611,20 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-local-"
 "delivery\">hier</link> fort."
 
-#: C/intro-first-run.page:75(p)
+#: C/intro-first-run.page:101(p)
 msgid ""
 "MH-Format Mail Directories: For downloading email using MH or another MH-"
-"style program."
+"style application."
 msgstr ""
 "E-Mail-Ordner im MH-Format: Zum Herunterladen von E-Mails per MH oder durch "
 "eine MH-gleiche Anwendung."
 
-#: C/intro-first-run.page:75(p) C/intro-first-run.page:77(p)
-#: C/intro-first-run.page:81(p)
+#: C/intro-first-run.page:101(p) C/intro-first-run.page:103(p)
+#: C/intro-first-run.page:107(p)
 msgid "You need to provide the path to the directory you want to use."
 msgstr "Sie müssen den Pfad zum Ordner angeben, der benutzt werden soll."
 
-#: C/intro-first-run.page:75(p)
+#: C/intro-first-run.page:101(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-mh-format-directories\">here</"
 "link> for configuration."
@@ -9453,15 +9632,15 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-mh-format-"
 "directories\">hier</link> fort."
 
-#: C/intro-first-run.page:77(p)
+#: C/intro-first-run.page:103(p)
 msgid ""
 "Maildir-Format Mail Directories: For downloading your email using Qmail or "
-"another Maildir-style program."
+"another Maildir-style application."
 msgstr ""
 "E-Mail-Ordner im Maildir-Format: Wählen Sie diese Option, falls Sie E-Mails "
 "per Qmail oder durch eine Maildir-gleiche Anwendung herunterladen möchten."
 
-#: C/intro-first-run.page:77(p)
+#: C/intro-first-run.page:103(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-maildir-format-directories"
 "\">here</link> for configuration."
@@ -9469,7 +9648,7 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-maildir-"
 "format-directories\">hier</link> fort."
 
-#: C/intro-first-run.page:79(p)
+#: C/intro-first-run.page:105(p)
 msgid ""
 "Standard Unix mbox spool file: For reading and storing email in the mail "
 "spool file on your local system."
@@ -9477,13 +9656,13 @@ msgstr ""
 "Standard Unix mbox-spool-Datei: Zum Lesen und Speichern von E-Mails in einer "
 "Mail-Spool-Datei auf Ihrem lokalen System."
 
-#: C/intro-first-run.page:79(p)
+#: C/intro-first-run.page:105(p)
 msgid "You need to provide the path to the mail spool file you want to use."
 msgstr ""
 "Hierfür müssen Sie den Pfad zur Mail-Spool-Datei angeben, die benutzt werden "
 "soll."
 
-#: C/intro-first-run.page:79(p)
+#: C/intro-first-run.page:105(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-unix-mbox-spool-file\">here</"
 "link> for configuration."
@@ -9491,7 +9670,7 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-unix-mbox-"
 "spool-file\">hier</link> fort."
 
-#: C/intro-first-run.page:81(p)
+#: C/intro-first-run.page:107(p)
 msgid ""
 "Standard Unix mbox spool directory: For reading and storing email in the "
 "mail spool directory on your local system."
@@ -9499,7 +9678,7 @@ msgstr ""
 "Standard Unix mbox-spool-Ordner: Zum Lesen und Speichern von E-Mails in "
 "einem Mail-Spool-Ordner auf Ihrem lokalen System."
 
-#: C/intro-first-run.page:81(p)
+#: C/intro-first-run.page:107(p)
 msgid ""
 "Continue <link xref=\"mail-receiving-options-unix-mbox-spool-directory"
 "\">here</link> for configuration."
@@ -9507,7 +9686,7 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-receiving-options-unix-mbox-"
 "spool-directory\">hier</link> fort."
 
-#: C/intro-first-run.page:84(p)
+#: C/intro-first-run.page:110(p)
 msgid ""
 "Later on, if you want to change an account, or if you want to create another "
 "one, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
@@ -9522,16 +9701,11 @@ msgstr ""
 "\"button\">Bearbeiten</gui>. Ein neues Konto kann hinzugefügt werden, indem "
 "Sie auf <gui style=\"button\">Hinzufügen</gui> klicken."
 
-#. Do not rename, we link to it from the subpages
-#: C/intro-first-run.page:90(title)
-msgid "Sending mail"
-msgstr "Abrufen von E-Mails"
-
-#: C/intro-first-run.page:91(p)
+#: C/intro-first-run.page:117(p)
 msgid "Available server types are:"
 msgstr "Folgende Servertypen sind verfügbar:"
 
-#: C/intro-first-run.page:93(p)
+#: C/intro-first-run.page:119(p)
 msgid ""
 "SMTP: Sends mail using an outbound mail server. This is the most common "
 "choice for sending mail."
@@ -9539,7 +9713,7 @@ msgstr ""
 "SMTP: E-Mails an einen externen E-Mail-Server verschicken. Dies ist die "
 "üblichste Methode zum Verschicken von E-Mails."
 
-#: C/intro-first-run.page:93(p)
+#: C/intro-first-run.page:119(p)
 msgid ""
 "Continue <link xref=\"mail-sending-options-smtp\">here</link> for "
 "configuration."
@@ -9547,29 +9721,30 @@ msgstr ""
 "Setzen Sie die Konfiguration <link xref=\"mail-sending-options-smtp\">hier</"
 "link> fort."
 
-#: C/intro-first-run.page:94(p)
+#: C/intro-first-run.page:120(p)
 msgid ""
-"Sendmail: Uses the Sendmail program to send mail from your system. It is not "
-"easy to configure, so you should select this option only if you know how to "
-"set up a Sendmail service."
+"Sendmail: Uses the <app>Sendmail</app> application to send mail from your "
+"system. It is not easy to configure, so you should select this option only "
+"if you know how to set up a Sendmail service."
 msgstr ""
-"Sendmail: Nutzt das Sendmail-Programm auf Ihrem Rechner. Sendmail bietet "
-"mehr Flexibilität, allerdings ist es schwieriger einzustellen. Sie sollten "
-"diese Option nur wählen, falls Sie mit Sendmail vertraut sind."
+"Sendmail: Nutzt das <app>Sendmail</app>-Programm auf Ihrem Rechner. "
+"<app>Sendmail</app> bietet mehr Flexibilität, allerdings ist es schwieriger "
+"einzustellen. Sie sollten diese Option nur wählen, falls Sie mit Sendmail "
+"vertraut sind."
 
-#: C/intro-first-run.page:99(title)
+#: C/intro-first-run.page:125(title)
 msgid "Account Information"
 msgstr "Konteninformation"
 
-#: C/intro-first-run.page:100(p)
+#: C/intro-first-run.page:126(p)
 msgid "Give the account any name you prefer."
 msgstr "Geben Sie dem Konto einen beliebigen Namen Ihrer Wahl."
 
-#: C/intro-first-run.page:104(title)
+#: C/intro-first-run.page:130(title)
 msgid "Importing Mail (Optional)"
 msgstr "E-Mails importieren (optional)"
 
-#: C/intro-first-run.page:105(p)
+#: C/intro-first-run.page:131(p)
 msgid ""
 "Continue with <link xref=\"import-data\">Importing data from another "
 "application</link>."
@@ -9577,6 +9752,33 @@ msgstr ""
 "Setzen Sie bei <link xref=\"import-data\">Daten aus anderen Programmen "
 "importieren</link> fort."
 
+#: C/intro-application.page:5(desc)
+msgid "An introduction to Evolution."
+msgstr "Eine Einführung in Evolution."
+
+#: C/intro-application.page:24(title) C/index.page:31(title)
+msgid "Getting Started"
+msgstr "Erste Schritte"
+
+#: C/intro-application.page:25(p)
+msgid ""
+"Evolution is a stable and versatile personal information manager for the "
+"GNOME project. Evolution allows you to keep your calendar, email, address "
+"book and tasks in one place. Evolution has the ability to <link type=\"topic"
+"\" xref=\"mail-spam\">filter Junk/Spam Mail</link>, add your favorite web "
+"calenders, and <link type=\"topic\" xref=\"mail-encryption\">to keep your "
+"information safe and secure</link>."
+msgstr ""
+
+#: C/intro-application.page:27(p)
+msgid ""
+"By default Evolution opens the mail client view. This is were you can view "
+"all your mail. You can change to other aspects of the application by going "
+"to the bottom of the left pane in the window (the so-called \"switcher\") "
+"and selecting the desired view. <link type=\"topic\" xref=\"intro-main-window"
+"\">Click here</link> for more information on the elements of the window."
+msgstr ""
+
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/index.page:6(None) C/index.page:24(None)
@@ -9600,10 +9802,6 @@ msgstr ""
 "<media type=\"image\" src=\"figures/evolutionlogo.png\"> Evolution-Logo </"
 "media> Evolution E-Mail und Kalender"
 
-#: C/index.page:31(title)
-msgid "Getting Started"
-msgstr "Erste Schritte"
-
 #: C/index.page:35(title)
 msgid "Mail Management"
 msgstr "Nachrichtenverwaltung"
@@ -9787,18 +9985,20 @@ msgstr ""
 "Evolution, Microsoft Outlook und Mozilla gespeichert wurden."
 
 #: C/import-supported-file-formats.page:80(p)
-msgid "Personal Storage Table (.pst):"
-msgstr "Persönliche Outlook-Ordner (.pst):"
+msgid "Outlook Personal Folders (.pst):"
+msgstr "Persönliche Ordner aus Outlook (.pst):"
 
 #: C/import-supported-file-formats.page:82(p)
 msgid ""
 "A file format used to store local copies of messages, calendar events, and "
 "other items within Microsoft software such as Microsoft Exchange Client, "
-"Windows Messaging, and Microsoft Outlook."
+"Windows Messaging, and Microsoft Outlook. It is also called \"Personal "
+"Storage Table\"."
 msgstr ""
 "Ein Dateiformat, welches zum Speichern von lokalen Kopien von Nachrichten, "
-"Kalendereinträgen und weiteren Dingen von Microsoft Software mit Microsoft "
-"Exchange Client, Windows Messaging und Microsoft Outlook benutzt wird."
+"Kalendereinträgen und weiteren Objekten von  Microsoft Exchange Client, "
+"Windows Messaging und Microsoft Outlook benutzt wird. Es wird auch »Personal "
+"Storage Table« genannt."
 
 #: C/import-single-files.page:5(desc)
 msgid "Importing single files."
@@ -9905,6 +10105,7 @@ msgstr "Windows XP"
 msgid "Outlook 2010"
 msgstr "Outlook 2010"
 
+# Windows 7/Vista
 #: C/import-apps-outlook.page:38(file)
 #, fuzzy
 msgid "C:\\Users\\username\\My Documents\\Outlook Files"
@@ -9913,7 +10114,6 @@ msgstr ""
 "\\Anwendungsdaten\\Microsoft\\Outlook"
 
 #: C/import-apps-outlook.page:38(file)
-#, fuzzy
 msgid "C:\\Documents and Settings\\username\\My Documents\\Outlook Files"
 msgstr ""
 "C:\\Dokumente und Einstellungen\\Benutzername\\Lokale Einstellungen"
@@ -9923,6 +10123,7 @@ msgstr ""
 msgid "Outlook 2007 and earlier"
 msgstr "Outlook 2007 und früher"
 
+# Windows 7/Vista
 #: C/import-apps-outlook.page:41(file)
 #, fuzzy
 msgid "C:\\Users\\username\\AppData\\Local\\Microsoft\\Outlook"
@@ -9978,7 +10179,7 @@ msgstr ""
 "Kopieren Sie alle E-Mail-Dateien in Ihren persönlichen Ordner oder an einen "
 "anderen gewünschten Ort."
 
-#: C/import-apps-outlook.page:57(p)
+#: C/import-apps-outlook.page:57(p) C/change-keyboard-shortcuts.page:23(p)
 msgid "Start Evolution."
 msgstr "Starten Sie Evolution."
 
@@ -10072,20 +10273,20 @@ msgstr ""
 #: C/express-mode.page:25(p)
 msgid ""
 "You can also explicitly open Evolution in a specific component. For the "
-"calendar, use <code>evolution --express --component=calendar</code>."
+"calendar, use <cmd>evolution --express --component=calendar</cmd>."
 msgstr ""
 
 #: C/exporting-data.page:5(desc)
-msgid "How to export data from <em>Evolution</em>."
-msgstr "Daten aus <em>Evolution</em> exportieren."
+msgid "How to export data from <app>Evolution</app>."
+msgstr "Daten aus <app>Evolution</app> exportieren."
 
 #: C/exporting-data.page:20(title)
 msgid "Exporting data from <em>Evolution</em>"
 msgstr "Daten aus <em>Evolution</em> exportieren"
 
 #: C/exporting-data-mail.page:5(desc)
-msgid "How to export mail data from <em>Evolution</em>."
-msgstr "Über den Export von Nachrichtendaten aus <em>Evolution</em>."
+msgid "How to export mail data from <app>Evolution</app>."
+msgstr "Über den Export von Nachrichtendaten aus <app>Evolution</app>."
 
 #: C/exporting-data-mail.page:20(title)
 msgid "Exporting mail data"
@@ -10106,8 +10307,8 @@ msgid ""
 msgstr ""
 
 #: C/exporting-data-contacts.page:5(desc)
-msgid "How to export contacts data from <em>Evolution</em>."
-msgstr "Über den Export von Kontaktdaten aus <em>Evolution</em>."
+msgid "How to export contacts data from <app>Evolution</app>."
+msgstr "Über den Export von Kontaktdaten aus <app>Evolution</app>."
 
 #: C/exporting-data-contacts.page:23(title)
 msgid "Exporting contacts data"
@@ -10134,8 +10335,8 @@ msgid ""
 msgstr ""
 
 #: C/exporting-data-calendar.page:5(desc)
-msgid "How to export calendar data from <em>Evolution</em>."
-msgstr "Das Exportieren von Kalenderdaten aus <em>Evolution</em>."
+msgid "How to export calendar data from <app>Evolution</app>."
+msgstr "Das Exportieren von Kalenderdaten aus <app>Evolution</app>."
 
 #: C/exporting-data-calendar.page:20(title)
 msgid "Exporting calendar data"
@@ -10168,17 +10369,19 @@ msgstr ""
 "href=\"http://library.gnome.org/users/evolution/2.32/usage-exchange.html.de"
 "\">alte Evolution-Handbuch</link>."
 
-#: C/exchange-connectors-overview.page:5(desc)
+#: C/exchange-connectors-overview.page:7(desc)
 msgid ""
 "Which additional package to install in order to connect to an Exchange "
 "server."
 msgstr ""
+"Welche zusätzlichen Pakete installiert werden sollten, um mit Exchange-"
+"Servern zu verbinden."
 
-#: C/exchange-connectors-overview.page:20(title)
+#: C/exchange-connectors-overview.page:22(title)
 msgid "Choosing the right connector"
 msgstr "Die richtige Anbindung wählen"
 
-#: C/exchange-connectors-overview.page:22(p)
+#: C/exchange-connectors-overview.page:24(p)
 msgid ""
 "Depending on the version of the Microsoft Exchange server that you would "
 "like to connect to it is required to make sure that an additional package is "
@@ -10189,33 +10392,30 @@ msgstr ""
 "zusätzliches Paket installiert ist, welches diese Funktionalität "
 "bereitstellt."
 
-#: C/exchange-connectors-overview.page:24(p)
+#: C/exchange-connectors-overview.page:26(p)
 msgid ""
 "For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of "
 "Exchange that use Outlook Web Access) it is recommended to use the package "
-"evolution-exchange. <link action=\"install:evolution-exchange\" href="
-"\"http://projects.gnome.org/evolution/download\">Install evolution-exchange "
-"now.</link>"
+"<sys>evolution-exchange</sys>."
 msgstr ""
+"Für Microsoft Exchange 2000 und 2003 (und möglicherweise frühere Versionen "
+"von Exchange, die Outlook Web Access verwenden) wird empfohlen, dass Paket "
+"<sys>evolution-exchange</sys> zu verwenden."
 
-#: C/exchange-connectors-overview.page:26(p)
+#: C/exchange-connectors-overview.page:35(p)
 msgid ""
 "For Microsoft Exchange 2007 and 2010 (and possibly earlier versions that "
-"support MAPI) it is recommended to use the package evolution-mapi. <link "
-"action=\"install:evolution-mapi\" href=\"http://projects.gnome.org/evolution/"
-"download\">Install evolution-mapi now.</link>"
+"support MAPI) it is recommended to use the package <sys>evolution-mapi</sys>."
 msgstr ""
 
-#: C/exchange-connectors-overview.page:27(p)
+#: C/exchange-connectors-overview.page:44(p)
 msgid ""
-"For Microsoft Exchange 2007 and 2010 the package evolution-ews is currently "
-"under development and will replace evolution-mapi in the future. It might "
-"not be available yet for your distribution. <link action=\"install:evolution-"
-"ews\" href=\"http://projects.gnome.org/evolution/download\">Install "
-"evolution-ews now.</link>"
+"For Microsoft Exchange 2007 and 2010 the package <sys>evolution-ews</sys> is "
+"currently under development and will replace <sys>evolution-mapi</sys> in "
+"the future. It might not be available yet for your distribution."
 msgstr ""
 
-#: C/exchange-connectors-overview.page:29(p)
+#: C/exchange-connectors-overview.page:53(p)
 msgid ""
 "If you are unsure which Microsoft Exchange server version is used, you may "
 "want to contact your system administrator for more information."
@@ -10240,38 +10440,49 @@ msgid "Deleting emails or attachments to reduce the size of the mailbox."
 msgstr ""
 "Nachrichten oder Anhänge löschen, um die Größe des Postfachs zu verringern."
 
-#: C/deleting-emails.page:25(title)
+#: C/deleting-emails.page:26(title)
 msgid "Deleting emails or attachments permanently"
 msgstr "Nachrichten oder Anhänge dauerhaft löschen"
 
-#: C/deleting-emails.page:28(title)
+#: C/deleting-emails.page:29(title)
 msgid "Emails"
 msgstr "E-Mails"
 
-#: C/deleting-emails.page:29(p)
+#: C/deleting-emails.page:30(p)
 msgid ""
 "Evolution deletes emails on IMAP servers by <em>marking</em> the messages "
 "for deletion; space is not freed until you <em>expunge</em> the marked "
 "emails."
 msgstr ""
+"Evolution löscht E-Mails auf IMAP-Servern, indem die Nachrichten zum Löschen "
+"<em>markiert</em> werden. Der Speicherplatz wird nicht freigegeben, bis Sie "
+"die markierten E-Mails <em>löschen</em>."
 
-#: C/deleting-emails.page:31(p)
+#: C/deleting-emails.page:32(p)
 msgid ""
 "To Expunge a specific folder, go to <guiseq><gui>Folder</gui><gui>Expunge</"
 "gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>. To "
 "Expunge all folders, go to <guiseq><gui>File</gui><gui>Empty Trash</gui></"
 "guiseq>. This applies to other types of accounts as well."
 msgstr ""
+"Um einen spezifischen Ordner zu löschen, wählen Sie <guiseq><gui>Ordner</"
+"gui><gui>Löschen</gui></guiseq> oder drücken Sie <keyseq><key>Strg</"
+"key><key>E</key></keyseq>. Um alle Ordner zu löschen, wählen Sie "
+"<guiseq><gui>Datei</gui><gui>Müll leeren</gui></guiseq>. Dies funktioniert "
+"auch mit anderen Kontentypen."
 
-#: C/deleting-emails.page:35(title)
+#: C/deleting-emails.page:36(title)
 msgid "Attachments"
 msgstr "Anlagen"
 
-#: C/deleting-emails.page:36(p)
+#: C/deleting-emails.page:37(p)
 msgid ""
 "To delete the attachments of an email, select the message and click "
 "<guiseq><gui>Message</gui><gui>Remove Attachments</gui></guiseq>."
 msgstr ""
+"Um die Dateianhänge einer E-Mail zu löschen, wählen Sie die Nachricht und "
+"klicken Sie auf <guiseq><gui>Nachricht</gui><gui>Anlagen löschen</gui></"
+"guiseq>."
 
 #: C/deleting-appointments.page:5(desc)
 msgid "Deleting calendar entries to reduce the size of the mailbox."
@@ -10289,37 +10500,64 @@ msgid ""
 "will be applied to the currently opened calendar (selected in the list of "
 "calendars on the left); other calendars remain unchanged."
 msgstr ""
+"Um alte Einträge aus einem Kalender zu entfernen, wählen Sie "
+"<guiseq><gui>Aktionen</gui><gui>Säubern</gui></guiseq> in der Kalender-"
+"Ansicht. Sie werden daraufhin gefragt, wie alt die zu entfernenden Einträge "
+"höchstens sein sollen. Die Aktion wird in dem aktuell geöffneten Kalender "
+"ausgeführt (ausgewählt in der Liste der Kalenders links). Andere Kalender "
+"bleiben unberührt."
 
-#: C/default-browser.page:5(desc)
+#: C/default-browser.page:7(desc)
 msgid "How to define the default browser to open links with."
 msgstr "Den Standardbrowser zum Öffnen von Verweisen festlegen."
 
-#: C/default-browser.page:20(title)
+#: C/default-browser.page:22(title)
 msgid "Setting the default browser"
 msgstr "Einrichten des vorgegebenen Browsers"
 
 #. For GNOME2 the steps are to define the gconf keys /desktop/gnome/url-handlers/http and /https
-#: C/default-browser.page:24(p)
+#: C/default-browser.page:26(p)
+#, fuzzy
 msgid ""
 "You can set the system-wide default browser in GNOME 3 under "
 "<guiseq><gui>Activities</gui><gui>Applications</gui><gui>System Settings</"
 "gui><gui>System</gui><gui>System Info</gui><gui>Default Applications</gui></"
 "guiseq>."
 msgstr ""
+"Sie können den systemweit voreingestellten Web-Browser in GNOME 3 unter "
+"<guiseq><gui>Aktivitäten</gui><gui>Anwendungen</"
+"gui><gui>Systemeinstellungen</gui><gui>System</gui><gui>System-"
+"Informationen</gui><gui>Voreingestellte Anwendungen</gui></guiseq> festlegen."
 
-#: C/default-browser.page:25(p)
+#: C/default-browser.page:27(p)
 msgid ""
 "If the preferred browser is set as default application but still does not "
 "work correctly please contact your distribution via their forum or bug "
 "tracker."
 msgstr ""
+"Wenn der bevorzugte Browser voreingestellt ist, aber dennoch nicht wie "
+"erwartet funktioniert, so kontaktieren Sie bitte Ihre Distribution über ein "
+"Internet-Forum oder eine Fehlerdatenbank."
 
-#: C/default-browser.page:26(p)
+#: C/default-browser.page:29(p)
 msgid ""
 "GNOME 3 users with a technical background can tweak these settings by "
 "defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps."
 "list</file>."
 msgstr ""
+"Anwender von GNOME 3 mit technischem Hintergrundwissen können diese "
+"Einstellungen anpassen, indem scheme-handler in <file>$HOME/.local/share/"
+"applications/mimeapps.list</file> definiert werden."
+
+#: C/default-browser.page:32(p)
+msgid ""
+"If the error message \"Could not open the link: Operation not supported\" is "
+"shown, you need to install the package <sys>gvfs</sys>."
+msgstr ""
+
+#: C/default-browser.page:35(link)
+msgid "Install gvfs"
+msgstr "gvfs installieren"
 
 #: C/data-storage.page:5(desc)
 msgid "Where does Evolution store my data on the harddisk?"
@@ -10330,24 +10568,26 @@ msgid "Data storage locations"
 msgstr "Orte zur Datenspeicherung"
 
 #: C/data-storage.page:23(p)
-msgid ""
-"This is only interesting for advanced users that want to debug problems."
+msgid "This is only interesting for advanced users who want to debug problems."
 msgstr ""
 "Dies ist nur für erfahrene Anwender interessant, die Probleme "
 "diagnostizieren möchten."
 
 #: C/data-storage.page:26(p)
 msgid ""
-"If you run Evolution 2.32.0 or later, data will be stored according to the "
-"<link href=\"http://www.freedesktop.org/wiki/Specifications/basedir-spec"
-"\">XDG Base Directory Specification</link>. By default this means:"
+"Evolution 3.4 and later stores its data according to the <link href=\"http://"
+"www.freedesktop.org/wiki/Specifications/basedir-spec\">XDG Base Directory "
+"Specification</link>. By default this means:"
 msgstr ""
+"Evolution 3.4 und neuere speichern die Daten gemäß der <link href=\"http://"
+"www.freedesktop.org/wiki/Specifications/basedir-spec\">XDG Base Directory "
+"Specification</link>. Dies bedeutet naturgemäß:"
 
 #: C/data-storage.page:30(title)
 msgid "The user's data files"
 msgstr "Die Dateien mit den Benutzerdaten"
 
-#: C/data-storage.page:31(p)
+#: C/data-storage.page:31(file)
 msgid "$HOME/.local/share/evolution"
 msgstr "$HOME/.local/share/evolution"
 
@@ -10355,7 +10595,7 @@ msgstr "$HOME/.local/share/evolution"
 msgid "Various configuration and state files"
 msgstr "Verschiedene Konfigurations- und Statusdateien"
 
-#: C/data-storage.page:35(p)
+#: C/data-storage.page:35(file)
 msgid "$HOME/.config/evolution"
 msgstr "$HOME/.config/evolution"
 
@@ -10363,17 +10603,17 @@ msgstr "$HOME/.config/evolution"
 msgid "Disposable data caches"
 msgstr "Entbehrliche Daten-Zwischenspeicher"
 
-#: C/data-storage.page:39(p)
+#: C/data-storage.page:39(file)
 msgid "$HOME/.cache/evolution"
 msgstr "$HOME/.cache/evolution"
 
 #: C/data-storage.page:42(title)
-msgid "Configuration settings in GConf"
-msgstr "Konfigurationseinstellungen in GConf"
+msgid "Configuration settings in GSettings"
+msgstr "Konfigurationseinstellungen in GSettings"
 
-#: C/data-storage.page:43(p)
-msgid "$HOME/.gconf/apps/evolution"
-msgstr "$HOME/.gconf/apps/evolution"
+#: C/data-storage.page:43(file)
+msgid "$HOME/.config/dconf"
+msgstr "$HOME/.config/dconf"
 
 #: C/credits.page:5(desc)
 msgid "Credits and Acknowledgment."
@@ -10384,10 +10624,10 @@ msgid "Credits and Acknowledgment"
 msgstr "Danksagungen"
 
 #: C/credits.page:23(title)
-msgid "Authors of the Evolution User Documentation"
-msgstr "Die Autoren des Benutzerhandbuchs von Evolution"
+msgid "Authors of the <app>Evolution</app> User Documentation"
+msgstr "Die Autoren des Benutzerhandbuchs von <app>Evolution</app>"
 
-#: C/credits.page:25(p) C/credits.page:49(p)
+#: C/credits.page:25(p) C/credits.page:55(p)
 msgid "André Klapper"
 msgstr "André Klapper"
 
@@ -10396,72 +10636,81 @@ msgid "April Gonzalez"
 msgstr "April Gonzalez"
 
 #: C/credits.page:41(title)
+msgid "Translators of the <app>Evolution</app> User Documentation"
+msgstr "Die Übersetzer des Benutzerhandbuchs von <app>Evolution</app>"
+
+#. TO TRANSLATORS: This is shown in the 'Translators of the User Documentation' section. Please REPLACE this string by adding your own names here so you get some well-deserved fame on the interwebs! Thanks for all your hard work! andre
+#: C/credits.page:43(p)
+msgid "(Not applicable to the English version)"
+msgstr "Christian Kirbach, Gabor Karsay, Mario Blättermann"
+
+#: C/credits.page:47(title)
 msgid "Authors of the previous version"
 msgstr "Die Autoren der vorherigen Version"
 
-#: C/credits.page:43(p)
+#: C/credits.page:49(p)
 msgid "Aaron Weber"
 msgstr "Aaron Weber"
 
-#: C/credits.page:46(p)
+#: C/credits.page:52(p)
 msgid "Akhil Laddha"
 msgstr "Akhil Laddha"
 
-#: C/credits.page:52(p)
+#: C/credits.page:58(p)
 msgid "Duncan Mak"
 msgstr "Duncan Mak"
 
-#: C/credits.page:55(p)
+#: C/credits.page:61(p)
 msgid "Ettore Perazzoli"
 msgstr "Ettore Perazzoli"
 
-#: C/credits.page:58(p)
+#: C/credits.page:64(p)
 msgid "Francisco Javier F. Serrador"
 msgstr "Francisco Javier F. Serrador"
 
-#: C/credits.page:61(p)
+#: C/credits.page:67(p)
 msgid "Jessica Prabhakar"
 msgstr "Jessica Prabhakar"
 
-#: C/credits.page:64(p)
+#: C/credits.page:70(p)
 msgid "Kevin Breit"
 msgstr "Kevin Breit"
 
-#: C/credits.page:67(p)
+#: C/credits.page:73(p)
 msgid "Mark Moulder"
 msgstr "Mark Moulder"
 
-#: C/credits.page:70(p)
+#: C/credits.page:76(p)
 msgid "Novell, Inc."
 msgstr "Novell, Inc."
 
-#: C/credits.page:73(p)
+#: C/credits.page:79(p)
 msgid "Radhika Nair"
 msgstr "Radhika Nair"
 
-#: C/credits.page:76(p)
+#: C/credits.page:82(p)
 msgid "Srinivasa Ragavan"
 msgstr "Srinivasa Ragavan"
 
-#: C/credits.page:83(title)
+#: C/credits.page:89(title)
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: C/credits.page:84(p)
+#: C/credits.page:90(p)
 msgid "The GNOME Documentation Project:"
 msgstr "Das GNOME-Dokumentationsprojekt:"
 
-#: C/credits.page:87(link)
+#: C/credits.page:93(link)
 msgid "Website"
 msgstr "Webseite"
 
-#: C/credits.page:90(link)
+#: C/credits.page:96(link)
 msgid "Mailing list"
 msgstr "Mailingliste"
 
 #: C/contacts-using-several-addressbooks.page:5(desc)
 msgid "Adding and using more than one address book and different types."
-msgstr ""
+msgstr "So verwenden Sie mehr als ein Adressbuch und verschiedene Typen."
 
 #: C/contacts-using-several-addressbooks.page:20(title)
 msgid "Using several address books"
@@ -10473,12 +10722,19 @@ msgid ""
 "book for work related contacts and one for private contacts. The side bar "
 "lists those address books, and you can select which address book is shown."
 msgstr ""
+"Sie können mit mehreren Adressbüchern arbeiten. Sie könnten z.B. ein "
+"Adressbuch mit beruflichen Kollegen und eines mit privaten Kontakten führen. "
+"Die Seitenleiste listet die Adressbücher auf und Sie können wählen, welches "
+"Adressbuch angezeigt wird."
 
 #: C/contacts-using-several-addressbooks.page:24(p)
 msgid ""
 "You can also use address books that are not on your computer, such as on the "
 "internet (e.g. Google) or in a local network (e.g. LDAP)."
 msgstr ""
+"Sie können auch Adressbücher verwenden, die nicht auf Ihrem Rechner "
+"gespeichert sind, wie solche aus dem Internet (z.B. Google) oder im lokalen "
+"Netzwerk (z.B. LDAP)."
 
 #: C/contacts-using-contact-lists.page:5(desc)
 msgid "Using contact lists for grouping contacts."
@@ -10512,9 +10768,9 @@ msgid ""
 msgstr ""
 "Sie können zum Beispiel in Evolution einen Kontakt für jedes "
 "Familienmitglied erstellen und dann all diese Kontakte zu einer Kontaktliste "
-"hinzufügen, die Sie »Familie« nennen. Danach können Sie, anstelle jede E-"
-"Mail-Adresse der Familienmitglieder einzeln einzugeben, einfach eine E-Mail "
-"an »Familie« schreiben und die E-Mail wird automatisch an alle einzelnen "
+"hinzufügen, die Sie »Familie« nennen. Danach können Sie, anstelle jede E-Mail-"
+"Adresse der Familienmitglieder einzeln einzugeben, einfach eine E-Mail an "
+"»Familie« schreiben und die E-Mail wird automatisch an alle einzelnen "
 "Familienmitglieder versendet."
 
 #: C/contacts-using-contact-lists.page:30(title)
@@ -10533,6 +10789,8 @@ msgstr ""
 msgid ""
 "Select the address book under <gui>Where:</gui> to which it will be added."
 msgstr ""
+"Wählen Sie das Adressbuch unter <gui>Wo:</gui>, zu welchem er hinzugefügt "
+"werden soll."
 
 #: C/contacts-using-contact-lists.page:35(p)
 msgid ""
@@ -10648,10 +10906,15 @@ msgstr "Einen Kontakt hinzufügen"
 #: C/contacts-usage-add-contact.page:23(p)
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or "
-"right-click in a blank space in the list of contacts and click \"New "
-"Contact...\", or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></"
-"keyseq>."
+"right-click in a blank space in the list of contacts and click <gui>New "
+"Contact...</gui>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</"
+"key></keyseq>."
 msgstr ""
+"Klicken Sie auf <guiseq><gui>Datei</gui><gui>Neu</gui><gui>Kontakt</gui></"
+"guiseq>, oder klicken Sie mit der rechten Maustaste in einen leeren Bereich "
+"der Kontaktliste und klicken Sie auf <gui>Neuer Kontakt …</gui>, oder "
+"drücken Sie <keyseq><key>Umschalttaste</key><key>Strg</key><key>C</key></"
+"keyseq>."
 
 #: C/contacts-usage-add-contact.page:25(p)
 msgid "Enter the contact information. Note that there are several tabs."
@@ -10664,6 +10927,9 @@ msgid ""
 "You can add a photograph to the contact by clicking the large field (showing "
 "a stylized person) next to <gui>Full Name</gui> and <gui>Categories</gui>."
 msgstr ""
+"Sie können dem Kontakt ein Foto hinzufügen, indem Sie in das große Feld "
+"(jenes mit der Körpersilhouette) neben <gui>Voller Name</gui> und "
+"<gui>Kategorien</gui> klicken."
 
 #: C/contacts-usage-add-contact.page:31(title)
 msgid "Contact Quick-Add from the Email Window"
@@ -10690,6 +10956,10 @@ msgid ""
 "<gui>Contact Editor</gui>, or click <gui style=\"button\">OK</gui> to "
 "directly add the contact to the chosen address book."
 msgstr ""
+"Drücken Sie entweder <gui style=\"button\">?</gui> , um den ganzen "
+"<gui>Kontakt-Editor</gui> zuöffnen, oder klciken Sie auf <gui style=\"button"
+"\">OK</gui>, um den Kontakt unmittelbar dem gewählten Adressbuch "
+"hinzuzufügen."
 
 #: C/contacts-searching.page:5(desc)
 msgid "Searching contacts."
@@ -10701,9 +10971,11 @@ msgstr "Nach Kontakten suchen"
 
 #: C/contacts-searching.page:31(p)
 msgid ""
-"In the Calendar view, you can quickly search for contacts either by category "
+"In the Contacts view, you can quickly search for contacts either by category "
 "or by contact's info."
 msgstr ""
+"Suchen Sie zügig nach Kontakten entweder nach Kategorie oder anhand der "
+"Kontaktinfomationenen in der Kalenderansicht."
 
 #: C/contacts-searching.page:32(p)
 msgid "Searching by contact's info:"
@@ -10735,10 +11007,11 @@ msgstr "Ein weiteres lokales Adressbuch hinzufügen."
 msgid "Adding another local address book"
 msgstr "Ein weiteres lokales Adressbuch hinzufügen"
 
-#: C/contacts-local.page:22(p) C/calendar-local.page:22(p)
+#: C/contacts-local.page:22(p)
 msgid ""
-"To add another local calendar to Evolution, perform the following steps:"
-msgstr "Sie fügen wie folgt eine weiteren lokalen Kalender zu Evolution hinzu:"
+"To add another local address book to Evolution, perform the following steps:"
+msgstr ""
+"Sie fügen wie folgt ein weiteres lokales Adressbuch zu Evolution hinzu:"
 
 #: C/contacts-local.page:24(p) C/contacts-ldap.page:31(p)
 #: C/contacts-google.page:25(p)
@@ -10754,6 +11027,87 @@ msgid ""
 msgstr ""
 "Das Adressbuch wird zur Liste aller Adressbücher in Evolution hinzugefügt."
 
+#: C/contacts-libreoffice.page:5(desc)
+msgid "Using data from Evolution address books in LibreOffice documents."
+msgstr ""
+"So verwenden Sie Daten aus Adressbüchern von Evolution in LibreOffice-"
+"Dokumenten."
+
+#: C/contacts-libreoffice.page:20(title)
+msgid "Contacts in LibreOffice"
+msgstr "Kontakte in LibreOffice"
+
+#: C/contacts-libreoffice.page:22(p)
+msgid ""
+"You can use your Evolution address books in LibreOffice as a data source. "
+"The following steps refer to LibreOffice version 3.3.3."
+msgstr ""
+"Sie können Ihre Evolution-Adressbücher in LibreOffice als Datenquelle "
+"nutzen. Die folgenden Schritte beziehen sich auf LibreOffice 3.3.3."
+
+#: C/contacts-libreoffice.page:25(p)
+msgid ""
+"Click <guiseq><gui>Edit</gui><gui>Exchange Database...</gui></guiseq> in the "
+"menu bar. This will bring up the <gui>Exchange databases</gui> dialog box."
+msgstr ""
+"Klicken Sie in der Menüleiste auf <guiseq><gui>Bearbeiten</gui><gui>Exchange-"
+"Datenbank…</gui></guiseq>. Daraufhin öffnet sich der Dialog <gui>Exchange-"
+"Datenbank</gui>."
+
+#: C/contacts-libreoffice.page:26(p)
+msgid ""
+"In the right pane under <gui>Available Databases</gui>, <gui>EvolutionLocal</"
+"gui> is available as a source. Click on the small triangle to get the list "
+"of your Evolution address books."
+msgstr ""
+"In der rechten Leiste ist unter <gui>Verfügbare Datenbasis</gui> "
+"<gui>EvolutionLocal</gui> als Quelle verfügbar. Klicken Sie auf das kleine "
+"Dreieck, um die Liste Ihrer Evolution-Adressbücher einzusehen."
+
+#: C/contacts-libreoffice.page:27(p)
+msgid "Choose an addressbook and click <gui style=\"button\">Define</gui>."
+msgstr ""
+"Wählen Sie ein Adressbuch und klicken Sie auf <gui style=\"button"
+"\">Definieren</gui>."
+
+#: C/contacts-libreoffice.page:28(p)
+msgid ""
+"In case it is not listed already, click <gui style=\"button\">Browse...</"
+"gui>. A file chooser dialog opens."
+msgstr ""
+"Falls es dort nicht schon aufgeführt ist, klicken Sie auf <gui style=\"button"
+"\">Durchsuchen …</gui>. Daraufhin öffnet sich ein Dateiwähler."
+
+#: C/contacts-libreoffice.page:29(p)
+msgid ""
+"As Evolution stores its data in a hidden directory, press <keyseq><key>Ctrl</"
+"key><key>L</key></keyseq> to get the location bar displayed."
+msgstr ""
+"Weil Evolution seine Daten in einem versteckten Ordner speichert, drücken "
+"Sie <keyseq><key>Strg</key><key>L</key></keyseq>, um zur Ortsleiste zu "
+"gelangen."
+
+#: C/contacts-libreoffice.page:30(p)
+msgid ""
+"Go to <file>/home/username/.local/share/evolution/addressbook/system/"
+"addressbook.db</file> and click <gui style=\"button\">Open</gui>."
+msgstr ""
+"Suchen Sie nach <file>/home/username/.local/share/evolution/addressbook/"
+"system/addressbook.db</file> und klicken Sie auf <gui style=\"button"
+"\">Öffnen</gui>."
+
+#: C/contacts-libreoffice.page:33(p)
+msgid ""
+"This makes the Evolution address book the default data source for "
+"LibreOffice. You can now select a field to insert into an LibreOffice "
+"document via <guiseq><gui>Insert</gui><gui>Fields</gui><gui>Other</gui></"
+"guiseq>."
+msgstr ""
+"Damit wird das Evolution-Adressbuch die vorausgewählte Datenquelle für "
+"LibreOffice. Sie können nun ein Feld wählen, um es in ein LibreOffice-"
+"Dokument einzufügen mit <guiseq><gui>Einfügen</gui><gui>Felder</"
+"gui><gui>Andere</gui></guiseq>."
+
 #: C/contacts-ldap.page:5(desc)
 msgid "Use shared address books on a local network."
 msgstr "Die freigegebenen Adressbücher im Netzwerk verwenden."
@@ -10962,6 +11316,15 @@ msgstr ""
 msgid "Select the type <gui>Google</gui>."
 msgstr "Wählen Sie den Typ <gui>Google</gui>."
 
+#: C/contacts-google.page:28(p) C/calendar-webdav.page:30(p)
+#: C/calendar-weather.page:30(p) C/calendar-google.page:32(p)
+#: C/calendar-caldav.page:31(p)
+msgid ""
+"Choose if you want to be able to view the content also when being offline."
+msgstr ""
+"Wählen Sie, ob Sie den Inhalt auch sehen können wollen, wenn Sie offline "
+"sind."
+
 #: C/contacts-google.page:29(p) C/calendar-google.page:33(p)
 msgid "Enter your Google username."
 msgstr "Geben Sie Ihren Google-Benutzernamen ein."
@@ -10983,6 +11346,9 @@ msgid ""
 "recipients text field and Evolution will present you with a list of matches "
 "from your address books."
 msgstr ""
+"Sobald sie die ersten drei Buchstaben eines Namens oder einer E-Mail-Adresse "
+"in das Textfeld für Empfänger eingeben, wird Evolution eine Liste mit "
+"Suchtreffern aus Ihrem Adressbuch anbieten."
 
 #: C/contacts-autocompletion.page:30(p)
 msgid ""
@@ -10990,6 +11356,10 @@ msgid ""
 "gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq> and choose the "
 "address books from the list that Evolution should look in for matches."
 msgstr ""
+"Um automatische Vervollständigung zu aktivieren, wählen Sie "
+"<guiseq><gui>bearbeiten</gui><gui>Einstellungen</gui><gui>Kontakte</"
+"gui><gui>Auto-Vervolsltändigung</gui></guiseq> und wählen Sie das Adressbuch "
+"aus der Liste, in welches Evolution nach Treffern suchen soll."
 
 #: C/contacts-autocompletion.page:32(p)
 msgid ""
@@ -11030,8 +11400,8 @@ msgstr "Personen automatisch in meine Kontakte aufnehmen"
 msgid ""
 "You can add people automatically to your contacts when you reply to received "
 "email. Enable the plugin <gui>Automatic Contacts</gui> by going to "
-"<guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on \"Automatic "
-"Contacts\" so that it shows a check mark. Then go to <guiseq><gui>Edit</"
+"<guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on <gui>Automatic "
+"Contacts</gui> so that it shows a check mark. Then go to <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Contacts</gui><gui>Automatic Contacts</gui></"
 "guiseq> and enable the <gui>Create address book entries when sending emails</"
 "gui> option and select an address book in the drop-down field below that "
@@ -11092,6 +11462,35 @@ msgstr "Werkzeugleistenstil"
 msgid "Show Buttons"
 msgstr "Knöpfe anzeigen"
 
+#: C/change-keyboard-shortcuts.page:5(desc)
+msgid "Changing keyboard shortcuts."
+msgstr "Tastenkombinationen anpassen."
+
+#: C/change-keyboard-shortcuts.page:18(title)
+msgid "Changing keyboard shortcuts"
+msgstr "Tastenkombinationen anpassen"
+
+#: C/change-keyboard-shortcuts.page:24(p)
+msgid ""
+"Hover your mouse cursor over the menu bar item for which you want to add or "
+"change the keyboard shortcut."
+msgstr ""
+
+#: C/change-keyboard-shortcuts.page:25(p)
+msgid "Type the shortcut that you want on the keyboard."
+msgstr "Tippen Sie die gewünschte Tastenkombination auf der Tastatur.."
+
+#: C/change-keyboard-shortcuts.page:28(p)
+msgid ""
+"Note that this setting is desktop-wide and that you can disable it again "
+"after your changes by using the command <cmd>gsettings set org.gnome.desktop."
+"interface can-change-accels false</cmd>"
+msgstr ""
+
+#: C/change-keyboard-shortcuts.page:30(p)
+msgid "You can also use the <app>dconf-editor</app> application to do this."
+msgstr ""
+
 #: C/calendar-webdav.page:5(desc)
 msgid "Using an online Webcal/WebDAV calendar."
 msgstr "So nutzen Sie einen Online-Webcal/WebDAV-Kalender."
@@ -11163,7 +11562,7 @@ msgstr "Verschiedene Kalender verwenden"
 
 #: C/calendar-using-several-calendars.page:25(p)
 msgid ""
-"You can have multiple calendars and overlay them one over the next. For "
+"You can have multiple calendars and overlay them one over the other. For "
 "example, you might have a schedule of events for work, one for home, and one "
 "for your favorite sports team. The side bar lists those calendars, and you "
 "can select or deselect the boxes next to them to show and hide the "
@@ -11171,19 +11570,19 @@ msgid ""
 "appointments, you can be sure to avoid conflicts, while keeping a minimum of "
 "clutter in your view."
 msgstr ""
-"In Evolution können Sie mehrere Kalender verwenden und diese gleichzeitig "
+"In Evolution können Sie mehrere Kalender verwalten und diese gleichzeitig "
 "darstellen lassen. So können Sie zum Beispiel einen Kalender für Ihre "
 "Arbeitstermine, einen Kalender für Ihre privaten Termine und einen für Ihre "
 "Lieblingssportmannschaft führen. In der Seitenleiste werden diese Kalender "
-"aufgelistet, und Sie können durch das Aus- und Abwählen der Ankreuzfelder "
-"neben den Namen entscheiden, welche Einträge in Ihrer Kalenderansicht "
-"angezeigt werden sollen. Indem Sie verschiedene Auswahlen von Termine "
-"anzeigen lassen, können Sie Terminkonflikte und zu viel Durcheinander in der "
-"Kalenderansicht vermeiden."
+"aufgelistet, und Sie können dort durch das Aus- und Abwählen der "
+"Ankreuzfelder neben den Namen entscheiden, welche Einträge in Ihrer "
+"Kalenderansicht angezeigt werden sollen. Indem Sie verschiedene Auswahlen "
+"von Termine anzeigen lassen, können Sie Terminkonflikte und zu viel "
+"Durcheinander in der Kalenderansicht vermeiden."
 
 #: C/calendar-using-several-calendars.page:27(p)
-msgid "Appointments for each calendar appear as a different color."
-msgstr "Die Termine jeden Kalenders erscheinen in einer anderen Farbe."
+msgid "Appointments for each calendar appear in different color."
+msgstr "Die Termine jedes Kalenders erscheinen in einer anderen Farbe."
 
 #: C/calendar-using-several-calendars.page:29(p)
 msgid ""
@@ -11243,7 +11642,7 @@ msgstr ""
 "Optionen)."
 
 #: C/calendar-usage-delete-appointment.page:5(desc)
-msgid "Deleting in appointment in your calendar."
+msgid "Deleting an appointment in your calendar."
 msgstr "Einen Termin in Ihrem Kalender löschen."
 
 #: C/calendar-usage-delete-appointment.page:20(title)
@@ -11740,6 +12139,11 @@ msgstr "Einen weiteren lokalen Kalender hinzufügen."
 msgid "Adding another local calendar"
 msgstr "Einen weiteren lokalen Kalender hinzufügen"
 
+#: C/calendar-local.page:22(p)
+msgid ""
+"To add another local calendar to Evolution, perform the following steps:"
+msgstr "Sie fügen wie folgt eine weiteren lokalen Kalender zu Evolution hinzu:"
+
 #: C/calendar-layout-views.page:5(desc)
 msgid "Using date ranges (day, week, month) to look at the calendar."
 msgstr ""
@@ -12012,8 +12416,10 @@ msgstr ""
 "verwendet werden soll."
 
 #: C/calendar-free-busy.page:5(desc)
-msgid "Using the Free/Busy view for setting up meetings."
-msgstr "Die Verfügbarkeitsansicht zum Planen von Besprechungen benutzen."
+msgid "Using the Free/Busy view on a groupware server to set up meetings."
+msgstr ""
+"Die Verfügbarkeitsansicht auf einem Groupware-Server zum Planen von "
+"Besprechungen benutzen."
 
 #: C/calendar-free-busy.page:23(title)
 msgid "Free/Busy information"
@@ -12097,21 +12503,34 @@ msgid ""
 "schedule the appointment. Individuals have visible scheduling information "
 "only if they use the same Novell GroupWise or Microsoft Exchange server you "
 "do (that is, if they are in the same organization as you), or if they "
-"publish free/busy information at a URL you can reach and you have entered "
-"that URL into their contact cards using the contact editor."
+"publish free/busy information at a web address (URL) that you can reach and "
+"you have entered that web address for the specific contact in the <link xref="
+"\"contacts-usage-edit-contact\">Contact Editor</link> under "
+"<guiseq><gui>Personal information</gui><gui>Web Addresses</gui><gui>Free/"
+"Busy</gui></guiseq>."
 msgstr ""
 "Das Planungsgitter zeigt die Verfügbarkeitsinformationen der Personen an, "
 "die Sie eingeladen haben. Hier können Sie die Kalender verschiedener "
 "Personen vergleichen, um Zeit für ein gemeinsames Treffen zu finden. "
-"Verfügbarkeitsinformationen können nur eingesehen werden, wenn Sie den "
-"selben Novell GroupWise- oder Microsoft Exchange-Server benutzen wie Sie, "
-"oder falls die Person ihre Verfügbarkeitsinformationen unter einer Web-"
-"Adresse veröffentlicht, auf die Sie zugreifen können und welche Sie bereits "
-"als URL im Evolution-Adressbuch in die jeweiligen Kontaktinformationen "
-"eingegeben haben."
+"Verfügbarkeitsinformationen einzelner können nur eingesehen werden, wenn "
+"diese den selben Novell GroupWise- oder Microsoft Exchange-Server verwenden "
+"wie Sie (z.B. in der gleichen Firma), oder falls die Person ihre "
+"Verfügbarkeitsinformationen unter einer Web-Adresse veröffentlicht, auf die "
+"Sie zugreifen können und welche Sie bereits im Evolution-Adressbuch in die "
+"jeweiligen <link xref=\"contacts-usage-edit-contact\">Kontaktinformationen</"
+"link> eingegeben haben unter <guiseq><gui>Persönliche Angaben</gui><gui>Web-"
+"Adressen</gui><gui>Verfügbarkeitsinformationen</gui></guiseq>."
 
 #: C/calendar-free-busy.page:43(p)
 msgid ""
+"In corporate environments you can publish Calendar and Free/Busy information "
+"to an Exchange or Groupwise server. Note that you must use the top-level "
+"Exchange calendar if you want others to be able to access your Free / Busy "
+"information when inviting you to a meeting."
+msgstr ""
+
+#: C/calendar-free-busy.page:44(p)
+msgid ""
 "The default server can be defined under <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Publishing "
 "Information</gui><gui>Default Free/Busy Server</gui></guiseq>."
@@ -12121,11 +12540,11 @@ msgstr ""
 "gui><gui>Informationen zur Veröffentlichung</gui><gui>Vorgabe-Verfügbarkeits-"
 "Server</gui></guiseq> eingestellt."
 
-#: C/calendar-free-busy.page:47(title)
+#: C/calendar-free-busy.page:48(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Verfügbarkeitsinformationen abrufen ohne einen GroupWare-Server"
 
-#: C/calendar-free-busy.page:49(p)
+#: C/calendar-free-busy.page:50(p)
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their web calendar, "
 "you can add the URL under <guiseq><gui>Personal Information</gui><gui>Web "
@@ -12269,31 +12688,41 @@ msgstr ""
 "Wählen Sie einen Dateinamen und den Ordner, in dem Sie die Sicherungsdatei "
 "speichern wollen, und klicken Sie auf <gui style=\"button\">Speichern</gui>."
 
-#: C/backup-restore.page:30(p) C/backup-restore.page:39(p)
+#: C/backup-restore.page:30(p) C/backup-restore.page:40(p)
 msgid ""
-"You will get asked to close Evolution. Answer with <gui style=\"button"
-"\">Yes</gui>."
+"You will be asked to close Evolution. Answer with <gui style=\"button\">Yes</"
+"gui>."
 msgstr ""
 "Sie werden darum gebeten, Evolution zu schließen. Antworten Sie mit <gui "
 "style=\"button\">Ja</gui>."
 
-#: C/backup-restore.page:35(title)
+#: C/backup-restore.page:32(p)
+msgid ""
+"Note that your <link xref=\"mail-spam\">spam filtering</link> settings are "
+"not included in the backup file, as these settings are not controlled by "
+"Evolution and as developers of spam filtering tools might change "
+"implementation details. If you use Bogofilter you will need to back up "
+"<file>~/.bogofilter/</file>. If you use SpamAssassin you will need to back "
+"up <file>~/.spamassassin/</file>."
+msgstr ""
+
+#: C/backup-restore.page:36(title)
 msgid "Restoring"
 msgstr "Wiederherstellung"
 
-#: C/backup-restore.page:37(p)
+#: C/backup-restore.page:38(p)
 msgid ""
 "Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>."
 msgstr ""
 "Wählen Sie <guiseq><gui>Datei</gui><gui>Evolution-Daten wiederherstellen …</"
 "gui></guiseq>"
 
-#: C/backup-restore.page:38(p)
+#: C/backup-restore.page:39(p)
 msgid "Choose the file, and click <gui style=\"button\">Open</gui>."
 msgstr ""
 "Wählen Sie die Datei und klicken Sie auf <gui style=\"button\">Öffnen</gui>."
 
-#: C/backup-restore.page:41(p)
+#: C/backup-restore.page:42(p)
 msgid ""
 "In the <link xref=\"intro-first-run\">first-run assistant</link>, you can "
 "restore Evolution data from a backup file."
@@ -12310,3 +12739,140 @@ msgstr ""
 "Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010, 2011, "
 "2012\n"
 "Gabor Karsay <gabor.karsay@gmx.at>, 2011, 2012."
+
+#~ msgid "A known problem that is fixed in newer versions."
+#~ msgstr "Ein bekanntes Problem, das in neueren Versionen beseitigt ist."
+
+#~ msgid "Message fonts are not the same fonts as in other applications"
+#~ msgstr ""
+#~ "Nachrichtenschriften sind nicht dieselben Schriften wie in anderen "
+#~ "Anwendungen"
+
+#~ msgid ""
+#~ "In version 3.0 it can happen that <guiseq><gui>Edit</"
+#~ "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
+#~ "gui><gui>Message Fonts</gui><gui>Use the same fonts as other "
+#~ "applications</gui></guiseq> is enabled but Evolution still uses different "
+#~ "fonts than other parts of the system."
+#~ msgstr ""
+#~ "In Version 3.0 kann es passieren, dass <guiseq><gui>Bearbeiten</"
+#~ "gui><gui>Einstellungen</gui><gui>E-Mail-Einstellungen</"
+#~ "gui><gui>Allgemein</gui><gui>Nachrichtenschriftarten</gui><gui>Dieselben "
+#~ "Schriften wie andere Anwendungen verwenden</gui></guiseq> aktiviert ist, "
+#~ "aber Evolution dennoch andere Schriften als andere Teile der "
+#~ "Arbeitsumgebung verwendet."
+
+#~ msgid ""
+#~ "This bug is fixed from Evolution version 3.0.3 (stable series) and 3.1.4 "
+#~ "(unstable development series) onwards. If this is not the case, please "
+#~ "add a comment to the corresponding <link href=\"https://bugzilla.gnome."
+#~ "org/show_bug.cgi?id=655002\">bug report</link>. Note that from version "
+#~ "3.2 onwards this setting is located under <guiseq><gui>Edit</"
+#~ "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
+#~ "gui><gui>Message Display</gui><gui>Use the same fonts as other "
+#~ "applications</gui></guiseq>."
+#~ msgstr ""
+#~ "Dieser Fehler ist ab Evolution Version 3.0.3 (stabil) und 3.1.4 "
+#~ "(Entwicklerversion) behoben. Falls dem nicht so sein sollte, schreiben "
+#~ "Sie bitte einen Kommentar in den zugehörigen <link href=\"https://"
+#~ "bugzilla.gnome.org/show_bug.cgi?id=655002\">Fehlerbericht</link>. "
+#~ "Beachten Sie, dass ab Version 3.2 diese Einstellung unter "
+#~ "<guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui><gui>E-Mail-"
+#~ "Einstellungen</gui><gui>Allgemein</gui><gui>Nachrichtenanzeige</"
+#~ "gui><gui>Dieselben Schriften wie andere Anwendungen verwenden</gui></"
+#~ "guiseq> zu finden ist."
+
+#~ msgid "To enable the plugins:"
+#~ msgstr "So aktivieren Sie die Plugins:"
+
+#~ msgid "Click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
+#~ msgstr ""
+#~ "Klicken Sie auf <guiseq><gui>Bearbeiten</gui><gui>Plugins</gui></guiseq>."
+
+#~ msgid ""
+#~ "Select the plugins you wish to enable. You can select either Bogofilter "
+#~ "or SpamAssassin, or both."
+#~ msgstr ""
+#~ "Wählen Sie die gewünschten Plugins zur Aktivierung. Sie haben die Wahl "
+#~ "zwischen Bogofilter oder SpamAssassin, oder beiden."
+
+#~ msgid ""
+#~ "Bogofilter and SpamAssassin options. These options are available only if "
+#~ "the plugins are enabled."
+#~ msgstr ""
+#~ "Einstellungen für Bogofilter und SpamAssassin. Sie sind nur eingeblendet, "
+#~ "wenn die Plugins aktiviert sind."
+
+#~ msgid ""
+#~ "Evolution can check for junk mail for you. Evolution uses SpamAssassin "
+#~ "and/or Bogofilter with trainable Bayesian filters to perform the spam "
+#~ "check. When the software detects mail that appears to be junk mail, it "
+#~ "will flag it and hide it from your view. Messages that are flagged as "
+#~ "junk mail are displayed only in the Junk folder."
+#~ msgstr ""
+#~ "Evolution kann nach unerwünschten Nachrichten suchen. Evolution nutzt "
+#~ "SpamAssassin* und/oder Bogofilter* mit trainierbaren Bayes-Filtern, um zu "
+#~ "suchen. Wenn das Programm entdeckt, dass eine Nachricht wahrscheinlich "
+#~ "unerwünscht ist, so wird die Nachricht als unerwünscht markiert und Ihnen "
+#~ "nicht im jeweiligen normalen E-Mail-Ordner, sondern einzig im Unerwünscht-"
+#~ "Ordner angezeigt."
+
+#~ msgid ""
+#~ "The junk mail filter can learn which kinds of mail are legitimate and "
+#~ "which are not if you train it by marking as junk incoming mail that you "
+#~ "determine is spam. When you first start using junk mail blocking, check "
+#~ "the Junk folder frequently to be sure that legitimate mail doesn't get "
+#~ "flagged as junk mail."
+#~ msgstr ""
+#~ "Der Filter für unerwünschte Nachrichten kann erlernen, welche Nachrichten "
+#~ "berechtigt sind und welche nicht, wenn Sie ihn trainieren, indem Sie "
+#~ "eingehende Nachrichten als unerwünscht erkennen und markieren. Prüfen Sie "
+#~ "beim erstmaligen Blockieren von unerwünschten Nachrichten Ihren "
+#~ "Unerwünscht-Ordner regelmäßig, um sicherzustellen, dass seriöse "
+#~ "Nachrichten nicht versehentlich als unerwünscht markiert wurden."
+
+#~ msgid ""
+#~ "You can also flag mail as junk by selecting it and clicking the Junk icon "
+#~ "in the menu bar; you can flag mail in the junk folder as \"Not Junk\" by "
+#~ "selecting it and clicking the <gui>Not Junk</gui> icon."
+#~ msgstr ""
+#~ "Markieren Sie Nachrichten als unerwünscht, indem Sie diese auswählen und "
+#~ "dann auf das Symbol Unerwünscht im Menü klicken. Markieren Sie "
+#~ "Nachrichten im Unerwünscht-Ordner als erwünscht, indem Sie diese "
+#~ "auswählen und dann auf das Symbol <gui>Erwünscht</gui> im Menü klicken."
+
+#~ msgid ""
+#~ "Each time you flag a message as Junk, the sender is added to your Spam "
+#~ "List; each time you flag a message as Not Junk, the sender is removed "
+#~ "from your Spam List."
+#~ msgstr ""
+#~ "Jedes mal, wenn Sie Nachrichten als unerwünscht markieren, wird der "
+#~ "Absender zu Ihrer Liste unerwünschter Absender hinzugefügt. Jedes mal, "
+#~ "wenn Sie Nachrichten als erwünscht markieren, wird der Absender von Ihrer "
+#~ "Liste unerwünschter Absender entfernt."
+
+#~ msgid ""
+#~ "To view the complete headers for a message, click <guiseq><gui>View</"
+#~ "gui><gui>All Message Headers</gui></guiseq>. This will display the "
+#~ "complete header data on the viewing pane."
+#~ msgstr ""
+#~ "Um alle Kopfzeilen einer Nachricht zu sehen, klicken Sie in der "
+#~ "Menüleiste auf <guiseq><gui>Ansicht</gui><gui>Alle Nachrichtenköpfe</"
+#~ "gui></guiseq>. So werden alle Nachrichtenkopfdaten in der Ansicht "
+#~ "dargestellt."
+
+#~ msgid ""
+#~ "To view the message data, click on <guiseq><gui>View</gui><gui>Message "
+#~ "Source</gui></guiseq> or press <keyseq><key>Ctrl</key><key>U</key></"
+#~ "keyseq>. This will display the message data in a pop-up window."
+#~ msgstr ""
+#~ "Klicken Sie zum Ansehen der Nachrichtendaten auf  <guiseq><gui>Ansicht</"
+#~ "gui><gui>Nachrichten-Quelltext</gui></guiseq> oder drücken Sie "
+#~ "<keyseq><key>Strg</key><key>U</key></keyseq>. Die Nachrichtendaten werden "
+#~ "daraufhin in einem Einblendfenster angezeigt."
+
+#~ msgid ""
+#~ "Error message \"Summary and folder mismatch\" after synchronizing folders"
+#~ msgstr ""
+#~ "Fehlermeldung »Zusammenfassung und Ordner stimmen nicht überein« nach dem "
+#~ "Ordnerabgleich"