[evolution] Updated German translation



commit f29524ffa120a260a2ca1e6b6e6c08ef93ba9b36
Author: Christian Kirbach <Christian Kirbach gmail com>
Date:   Tue Aug 4 20:59:28 2015 +0000

    Updated German translation

 po/de.po | 4723 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 2678 insertions(+), 2045 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 418fc83..523bb4e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -30,16 +30,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N&component=Miscellaneous\n";
-"POT-Creation-Date: 2015-03-18 17:19+0000\n"
-"PO-Revision-Date: 2015-03-19 22:57+0100\n"
-"Last-Translator: Benjamin Steinwender <b stbe at>\n"
+"POT-Creation-Date: 2015-08-04 17:40+0000\n"
+"PO-Revision-Date: 2015-08-04 22:58+0100\n"
+"Last-Translator: Christian Kirbach <christian kirbach gmail com>\n"
 "Language-Team: German <nome-de gnome org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.1\n"
+"X-Generator: Poedit 1.7.5\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -180,8 +180,8 @@ msgstr "Ein Kontakt mit dieser Adresse existiert bereits. Soll trotzdem eine neu
 #: ../addressbook/addressbook.error.xml.h:34 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8 
../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4 ../calendar/gui/dialogs/event-page.ui.h:22 
../calendar/gui/dialogs/recurrence-page.ui.h:19 ../calendar/gui/dialogs/task-page.ui.h:30
 #: ../e-util/e-mail-signature-manager.c:327 ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16 
../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
-#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625 ../mail/mail-config.ui.h:54 
../modules/mail/em-composer-prefs.c:416
-#: ../plugins/attachment-reminder/attachment-reminder.c:557 
../plugins/email-custom-header/email-custom-header.c:839 ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625 ../mail/mail-config.ui.h:55 
../modules/mail/em-composer-prefs.c:417
+#: ../plugins/attachment-reminder/attachment-reminder.c:438 
../plugins/email-custom-header/email-custom-header.c:839 ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "_Hinzufügen"
@@ -210,7 +210,7 @@ msgstr "Liste »{0}« existiert bereits in dieser Kontaktliste."
 msgid "A contact list named '{0}' is already in this contact list. Would you like to add it anyway?"
 msgstr "Eine Kontaktliste namens »{0}« existiert bereits in diesem Ordner. Soll sie dennoch hinzugefügt 
werden?"
 
-#: ../addressbook/addressbook.error.xml.h:41 ../addressbook/gui/widgets/e-addressbook-view.c:1250
+#: ../addressbook/addressbook.error.xml.h:41 ../addressbook/gui/widgets/e-addressbook-view.c:1252
 msgid "Failed to delete contact"
 msgstr "Kontakt konnte nicht gelöscht werden"
 
@@ -237,8 +237,8 @@ msgid "Cannot save a contact to the address book '{0}', because it is still open
 msgstr ""
 "Der Kontakt kann nicht ins Adressbuch »{0}« gespeichert werden. Das Adressbuch wird noch immer geöffnet. 
Warten Sie, bis es entweder geöffnet ist, oder wählen Sie ein anderes Adressbuch."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1 
../addressbook/gui/contact-editor/e-contact-editor.c:722 
../addressbook/gui/contact-editor/e-contact-editor.c:744
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1 
../addressbook/gui/contact-editor/e-contact-editor.c:727 
../addressbook/gui/contact-editor/e-contact-editor.c:749
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -295,7 +295,7 @@ msgstr "Kontakt"
 msgid "_Home Page:"
 msgstr "_Homepage:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15 ../calendar/gui/dialogs/event-page.c:709 
../calendar/gui/dialogs/event-page.ui.h:25 ../modules/itip-formatter/itip-view.c:1908
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15 ../calendar/gui/dialogs/event-page.c:709 
../calendar/gui/dialogs/event-page.ui.h:25 ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -311,7 +311,7 @@ msgstr "_Video-Chat:"
 msgid "Home Page:"
 msgstr "Homepage:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19 
../modules/cal-config-google/e-cal-config-google.c:93
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19 
../modules/cal-config-google/e-cal-config-google.c:92
 msgid "Calendar:"
 msgstr "Kalender:"
 
@@ -381,7 +381,8 @@ msgstr "_Geburtstag:"
 msgid "_Anniversary:"
 msgstr "_Jahrestag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37 
../addressbook/gui/widgets/eab-contact-formatter.c:875 ../calendar/gui/e-calendar-view.c:1996
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37 
../addressbook/gui/widgets/eab-contact-formatter.c:875 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../calendar/gui/e-calendar-view.c:2049
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -390,7 +391,8 @@ msgstr "Jahrestag"
 #. Get the icon file for some default category.  Doesn't matter
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38 
../addressbook/gui/widgets/eab-contact-formatter.c:874 ../calendar/gui/e-calendar-view.c:1995 
../shell/main.c:127
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38 
../addressbook/gui/widgets/eab-contact-formatter.c:874 
../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../calendar/gui/e-calendar-view.c:2048 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -437,7 +439,7 @@ msgid "Work"
 msgstr "Geschäftlich"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49 
../addressbook/gui/widgets/eab-contact-formatter.c:83 ../addressbook/gui/widgets/eab-contact-formatter.c:512
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:909 ../calendar/gui/e-cal-model.c:3034
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909 ../calendar/gui/e-cal-model.c:3791
 msgid "Other"
 msgstr "Weitere"
 
@@ -449,132 +451,231 @@ msgstr "Postadresse"
 msgid "Notes"
 msgstr "Notizen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52 ../calendar/gui/dialogs/comp-editor.c:1249 
../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-preferences-window.c:379
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+msgid "Add _PGP"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+msgid "Add _X.509"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10 
../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:23 ../calendar/gui/dialogs/recurrence-page.ui.h:21 
../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:475
+#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367 
../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391
+#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:56 
../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../plugins/email-custom-header/email-custom-header.c:849 
../plugins/publish-calendar/publish-calendar.c:791 ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "_Entfernen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+msgid "Load P_GP"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "_Load X.509"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57 
../addressbook/gui/contact-editor/e-contact-editor.c:3507 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../addressbook/gui/widgets/eab-contact-merging.c:721 ../calendar/calendar.error.xml.h:47 
../calendar/gui/dialogs/comp-editor.c:1305 ../composer/e-composer-actions.c:215
+#: ../composer/e-composer-actions.c:355 ../e-util/e-attachment-store.c:636 
../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3230
+#: ../e-util/gal-view-instance-save-as-dialog.c:270 ../shell/e-shell-content.c:660 
../shell/e-shell-utils.c:135 ../smime/gui/certificate-manager.c:655
+#: ../smime/gui/certificate-manager.c:732
+msgid "_Save"
+msgstr "_Speichern"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58 ../modules/addressbook/e-book-shell-backend.c:314
+msgid "Certificates"
+msgstr "Zertifikate"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59 ../calendar/gui/dialogs/comp-editor.c:1277 
../calendar/gui/dialogs/comp-editor.c:1363 ../e-util/e-preferences-window.c:379
 #: ../e-util/e-send-options.ui.h:41 ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2 
../shell/e-shell-window-actions.c:1085
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53 ../calendar/gui/dialogs/alarm-dialog.ui.h:15 
../mail/mail-config.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60 ../calendar/gui/dialogs/alarm-dialog.ui.h:15 
../mail/mail-config.ui.h:36
 msgid "Options"
 msgstr "Optionen"
 
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54 
../addressbook/gui/contact-editor/e-contact-editor.c:3683 
../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455 
../addressbook/gui/contact-editor/fullname.ui.h:14 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../addressbook/gui/widgets/eab-contact-merging.c:474 ../addressbook/gui/widgets/eab-contact-merging.c:718 
../addressbook/gui/widgets/eab-gui-util.c:318
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330 ../calendar/gui/dialogs/alarm-dialog.ui.h:8 
../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2 ../calendar/gui/dialogs/goto-dialog.ui.h:15 
../calendar/gui/dialogs/recurrence-page.c:2322 ../composer/e-composer-actions.c:267
-#: ../e-util/e-activity-bar.c:340 ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491 
../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:370
-#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208 
../e-util/e-charset-combo-box.c:101 ../e-util/e-color-chooser-widget.c:127
-#: ../e-util/e-filter-datespec.c:291 ../e-util/e-html-editor-actions.c:608 
../e-util/e-html-editor-actions.c:702 ../e-util/e-image-chooser-dialog.c:171
-#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470 ../e-util/e-rule-context.c:815 
../e-util/e-rule-editor.c:180 ../e-util/e-rule-editor.c:282
-#: ../e-util/e-rule-editor.c:776 ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379 
../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2 
../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3131 
../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196 ../mail/e-mail-tag-editor.c:242 
../mail/em-folder-selector.c:317 ../mail/mail-config.ui.h:2
-#: ../mail/mail-send-recv.c:738 ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148 
../mail/mail-vfolder-ui.c:270 ../modules/backup-restore/evolution-backup-tool.c:900
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:363 
../modules/cal-config-google/e-google-chooser-dialog.c:363 ../modules/calendar/e-cal-attachment-handler.c:285
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3 ../plugins/face/face.c:291 
../plugins/publish-calendar/publish-calendar.c:806
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61 
../addressbook/gui/contact-editor/e-contact-editor.c:3273 
../addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4321 
../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222 
../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17 
../addressbook/gui/widgets/eab-contact-merging.c:474
+#: ../addressbook/gui/widgets/eab-contact-merging.c:718 ../addressbook/gui/widgets/eab-gui-util.c:318 
../addressbook/gui/widgets/e-addressbook-view.c:1332
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8 ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2 
../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:15 ../calendar/gui/dialogs/recurrence-page.c:2326 
../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:340
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491 ../e-util/e-attachment-store.c:635 
../e-util/e-attachment-view.c:421 ../e-util/e-categories-dialog.c:82
+#: ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101 
../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-html-editor-actions.c:616 ../e-util/e-html-editor-actions.c:711 
../e-util/e-image-chooser-dialog.c:171 ../e-util/e-mail-signature-script-dialog.c:365
+#: ../e-util/e-passwords.c:470 ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180 
../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776 ../e-util/e-send-options.ui.h:42
+#: ../e-util/e-source-config-dialog.c:379 ../e-util/e-source-selector-dialog.c:372 
../e-util/e-table-config.c:548 ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3229 
../e-util/gal-view-instance-save-as-dialog.c:269 ../mail/e-mail-config-window.c:330
+#: ../mail/e-mail-label-dialog.c:196 ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317 
../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270 
../modules/backup-restore/evolution-backup-tool.c:899 ../modules/calendar/e-cal-attachment-handler.c:285
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3 ../plugins/face/face.c:297 
../plugins/publish-calendar/publish-calendar.c:790
 #: ../plugins/publish-calendar/url-editor-dialog.c:421 ../plugins/save-calendar/save-calendar.c:187 
../shell/e-shell-content.c:659 ../shell/e-shell-content.c:766
-#: ../shell/e-shell-utils.c:70 ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652 
../smime/gui/certificate-manager.c:729 ../smime/gui/certificate-manager.c:953
-#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237 ../smime/gui/smime-ui.ui.h:23
+#: ../shell/e-shell-utils.c:70 ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:654 
../smime/gui/certificate-manager.c:731 ../smime/gui/certificate-manager.c:955
+#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237 ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55 
../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18 
../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/dialogs/comp-editor.c:1277 
../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:408
-#: ../e-util/e-attachment-store.c:636 ../e-util/e-mail-signature-script-dialog.c:369 
../e-util/e-web-view.c:3132 ../e-util/gal-view-instance-save-as-dialog.c:270
-#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135 ../smime/gui/certificate-manager.c:653 
../smime/gui/certificate-manager.c:730
-msgid "_Save"
-msgstr "_Speichern"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
 msgid "Show Telephone"
 msgstr "Telefon anzeigen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
 msgid "Show SIP Address"
 msgstr "SIP-Adresse anzeigen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
 msgid "Show Instant Messaging"
 msgstr "Sofortnachrichten anzeigen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Show Web Addresses"
 msgstr "Web-Adressen anzeigen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
 msgid "Show Job section"
 msgstr "Arbeitsbereich anzeigen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
 msgid "Show Miscellaneous"
 msgstr "Sonstige Informationen anzeigen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
 msgid "Show Home Mailing Address"
 msgstr "Private Postadresse anzeigen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
 msgid "Show Work Mailing Address"
 msgstr "Geschäftliche Postadresse anzeigen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
 msgid "Show Other Mailing Address"
 msgstr "Andere Postadresse anzeigen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
 msgid "Show Notes"
 msgstr "Notizen anzeigen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257 ../calendar/gui/dialogs/comp-editor.c:1298 
../e-util/e-html-editor-actions.c:1123
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
+msgid "Show Certificates"
+msgstr "Zertifikate zeigen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:262 ../calendar/gui/dialogs/comp-editor.c:1326 
../e-util/e-html-editor-actions.c:1134
 msgid "_Undo"
 msgstr "_Rückgängig"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259 ../calendar/gui/dialogs/comp-editor.c:1300 
../e-util/e-focus-tracker.c:122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264 ../calendar/gui/dialogs/comp-editor.c:1328 
../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264 ../calendar/gui/dialogs/comp-editor.c:1305 
../e-util/e-html-editor-actions.c:1109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:269 ../calendar/gui/dialogs/comp-editor.c:1333 
../e-util/e-html-editor-actions.c:1120
 msgid "_Redo"
 msgstr "_Wiederholen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266 ../calendar/gui/dialogs/comp-editor.c:1307 
../e-util/e-focus-tracker.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271 ../calendar/gui/dialogs/comp-editor.c:1335 
../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298 ../addressbook/gui/widgets/eab-gui-util.c:503
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303 ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Fehler beim Hinzufügen eines Kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr "Fehler beim Ändern eines Kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:738 
../addressbook/gui/contact-editor/e-contact-editor.c:3081
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:743 
../addressbook/gui/contact-editor/e-contact-editor.c:3104
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
-msgid "Please select an image for this contact"
-msgstr "Bitte wählen Sie ein Bild für diesen Kontakt"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+#, fuzzy
+#| msgid "Certificates"
+msgid "X.509 certificates"
+msgstr "Zertifikate"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+msgid "PGP keys"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251 ../smime/gui/certificate-manager.c:678 
../smime/gui/certificate-manager.c:967
+msgid "All files"
+msgstr "Alle Dateien"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#, fuzzy
+#| msgid "OpenPGP _Key ID:"
+msgid "Open PGP key"
+msgstr "OpenPGP-_Schlüsselkennung:"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#, fuzzy
+#| msgid "Select certificate"
+msgid "Open X.509 certificate"
+msgstr "Zertifikat wählen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684 ../e-util/e-attachment-store.c:489 
../e-util/e-category-editor.c:146 ../e-util/e-html-editor-actions.c:609
-#: ../e-util/e-html-editor-actions.c:703 ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292 
../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3274 
../addressbook/gui/contact-editor/e-contact-editor.c:4322 ../e-util/e-attachment-store.c:489 
../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:617 ../e-util/e-html-editor-actions.c:712 
../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298 ../shell/e-shell-utils.c:71
+#: ../smime/gui/certificate-manager.c:956
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3291 
../addressbook/gui/contact-editor/e-contact-editor.c:3522
+#, fuzzy
+#| msgid "Choose an iCalendar file"
+msgid "Chosen file is not a local file."
+msgstr "Wählen Sie eine iCalendar-Datei"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
+#, fuzzy, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to load certificate: %s"
+msgstr "Zertifikat konnte nicht importiert werden"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr "X.509"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr "PGP"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save PGP key"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+#, fuzzy
+#| msgid "Select certificate"
+msgid "Save X.509 certificate"
+msgstr "Zertifikat wählen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#, fuzzy, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to save certificate: %s"
+msgstr "Zertifikat konnte nicht importiert werden"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+msgid "Please select an image for this contact"
+msgstr "Bitte wählen Sie ein Bild für diesen Kontakt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4672
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -582,39 +683,39 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4678
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4686
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "»%s« darf kein zukünftiges Datum sein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4694
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069 
../addressbook/gui/contact-editor/e-contact-editor.c:4083
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4707 
../addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s»%s« ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223 
../addressbook/gui/contact-editor/e-contact-quick-add.c:456 ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319 ../calendar/gui/dialogs/alarm-dialog.ui.h:9 
../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3 ../calendar/gui/dialogs/recurrence-page.c:2323 
../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
-#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102 
../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292 
../e-util/e-html-editor-link-dialog.c:381
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3 ../calendar/gui/dialogs/recurrence-page.c:2327 
../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
+#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102 
../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292 
../e-util/e-html-editor-link-dialog.c:436
 #: ../e-util/e-passwords.c:471 ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181 
../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777 ../e-util/e-send-options.ui.h:43
-#: ../e-util/e-source-config-dialog.c:380 ../e-util/e-source-selector-dialog.c:351 
../e-util/e-table-config.c:549 ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../e-util/e-source-config-dialog.c:380 ../e-util/e-source-selector-dialog.c:373 
../e-util/e-table-config.c:549 ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
 #: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243 ../mail/em-folder-selector.c:43 
../mail/mail-config.ui.h:3 ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
 #: ../mail/mail-vfolder-ui.c:271 ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4 
../plugins/publish-calendar/url-editor-dialog.c:422 ../shell/e-shell-content.c:661
-#: ../shell/e-shell-content.c:767 ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336 
../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
+#: ../shell/e-shell-content.c:767 ../shell/main.c:168 ../smime/gui/certificate-manager.c:1338 
../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_OK"
 
@@ -735,14 +836,6 @@ msgstr "Eine E-Mail zur Liste hinzufügen"
 msgid "Remove an email address from the List"
 msgstr "Eine E-Mail von der Liste entfernen"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10 
../calendar/gui/dialogs/alarm-list-dialog.ui.h:5 ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:21 ../calendar/gui/dialogs/task-page.ui.h:31 
../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:225
-#: ../e-util/e-mail-signature-manager.c:367 ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18 
../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
-#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:55 
../plugins/attachment-reminder/attachment-reminder.c:567 
../plugins/email-custom-header/email-custom-header.c:849
-#: ../plugins/publish-calendar/publish-calendar.c:807 ../plugins/publish-calendar/publish-calendar.ui.h:34 
../plugins/templates/templates.c:463
-msgid "_Remove"
-msgstr "_Entfernen"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "Eine E-Mail-Adresse aus dem Adressbuch einfügen"
@@ -809,19 +902,19 @@ msgstr "Evolution-Adressbuch"
 msgid "Copy _Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:151 ../e-util/e-web-view.c:307
+#: ../addressbook/gui/widgets/eab-contact-display.c:151 ../e-util/e-web-view.c:338
 msgid "Copy the email address to the clipboard"
 msgstr "E-Mail-Adresse in die Zwischenablage kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:156 ../e-util/e-web-view.c:312
+#: ../addressbook/gui/widgets/eab-contact-display.c:156 ../e-util/e-web-view.c:350
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an …"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:158 ../e-util/e-web-view.c:314
+#: ../addressbook/gui/widgets/eab-contact-display.c:158 ../e-util/e-web-view.c:352
 msgid "Send a mail message to this address"
 msgstr "Eine Nachricht an diese Adresse senden"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:290 ../e-util/e-web-view.c:999
+#: ../addressbook/gui/widgets/eab-contact-display.c:290 ../e-util/e-web-view.c:1064
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
@@ -910,7 +1003,7 @@ msgstr "Assistent"
 msgid "Video Chat"
 msgstr "Video-Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:827 ../e-util/e-send-options.c:546 
../modules/calendar/e-cal-shell-view-actions.c:181 ../modules/calendar/e-cal-shell-view.c:570
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827 ../e-util/e-send-options.c:546 
../modules/calendar/e-cal-shell-view-actions.c:181 ../modules/calendar/e-cal-shell-view.c:572
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Kalender"
@@ -1134,65 +1227,65 @@ msgstr "Fehler beim Abrufen der Buchansicht"
 msgid "Search Interrupted"
 msgstr "Suche wurde unterbrochen"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "Ausgewählte Kontakte in die Zwischenablage ausschneiden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "Ausgewählte Kontakte in die Zwischenablage kopieren"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "Kontakte aus der Zwischenablage einfügen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666 ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667 ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Die gewählten Kontakte löschen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "Alle sichtbaren Kontakte auswählen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktlisten löschen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktliste löschen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Sind Sie sicher, dass Sie diese Kontaktliste löschen wollen (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Sind Sie sicher, dass Sie diese Kontakte löschen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 msgid "Are you sure you want to delete this contact?"
 msgstr "Sind Sie sicher, dass Sie diesen Kontakt löschen wollen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sind Sie sicher, dass Sie diesen Kontakt löschen wollen (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1331 ../calendar/gui/dialogs/comp-editor.c:1242 
../e-util/e-focus-tracker.c:785 ../e-util/evolution-source-viewer.c:805
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333 ../calendar/gui/dialogs/comp-editor.c:1270 
../e-util/e-focus-tracker.c:785 ../e-util/evolution-source-viewer.c:805
 #: ../mail/e-mail-account-manager.c:736 ../modules/addressbook/e-book-shell-view-actions.c:1067 
../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-memo-shell-view-actions.c:635 ../modules/calendar/e-task-shell-view-actions.c:788 
../modules/mail/e-mail-shell-view-actions.c:1621
-#: ../shell/e-shell-window-actions.c:943 ../smime/gui/certificate-manager.c:1659 
../smime/gui/smime-ui.ui.h:10
+#: ../modules/calendar/e-memo-shell-view-actions.c:635 ../modules/calendar/e-task-shell-view-actions.c:788 
../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../shell/e-shell-window-actions.c:943 ../smime/gui/certificate-manager.c:1661 
../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Löschen"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1480
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1207,11 +1300,11 @@ msgstr[1] ""
 "Das Öffnen von %d Kontakten würde dazu führen, dass %d zusätzliche Fenster geöffnet werden.\n"
 "Wollen Sie wirklich alle Kontakte anzeigen?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 msgid "_Don't Display"
 msgstr "_Nicht anzeigen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
@@ -1322,7 +1415,7 @@ msgstr "Einheit"
 msgid "Title"
 msgstr "Anrede"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38 ../calendar/gui/e-meeting-list-view.c:666 
../calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38 ../calendar/gui/e-meeting-list-view.c:684 
../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Position"
 
@@ -1380,16 +1473,16 @@ msgid "Zoom _In"
 msgstr "Ver_größern"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:420 ../mail/e-mail-reader.c:2360
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420 ../mail/e-mail-reader.c:2293
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:450 ../e-util/e-html-editor-actions.c:2102 
../e-util/e-html-editor-find-dialog.c:195 ../shell/e-shell-window-actions.c:1020
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450 ../e-util/e-html-editor-actions.c:2113 
../e-util/e-html-editor-find-dialog.c:195 ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "_Suchen"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1399,7 +1492,7 @@ msgstr ""
 "\n"
 "Suche nach Kontakten …"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1413,7 +1506,7 @@ msgstr ""
 "\n"
 "Klicken Sie hier zwei mal, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1427,7 +1520,7 @@ msgstr ""
 "\n"
 "Klicken Sie hier zwei mal, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1437,7 +1530,7 @@ msgstr ""
 "\n"
 "Suche nach dem Kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1673,17 +1766,17 @@ msgstr[1] "Stunden"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:131 ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:131 ../calendar/gui/dialogs/recurrence-page.c:1253
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Tag"
 msgstr[1] "Tage"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
 msgid "Start time"
 msgstr "Anfangszeit"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../calendar/alarm-notify/alarm-notify.ui.h:1 ../calendar/alarm-notify/alarm-queue.c:1913
 msgid "Appointments"
 msgstr "Termine"
 
@@ -1695,10 +1788,10 @@ msgstr "_Alle verwerfen"
 msgid "_Snooze"
 msgstr "_Schlummer"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6 
../calendar/gui/dialogs/comp-editor.c:1321 ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../calendar/gui/dialogs/task-page.ui.h:32 
../e-util/e-html-editor-actions.c:1132 ../e-util/e-mail-signature-manager.c:357
-#: ../e-util/filter.ui.h:17 ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170 
../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:59
-#: ../plugins/attachment-reminder/attachment-reminder.c:562 
../plugins/email-custom-header/email-custom-header.c:844 ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6 
../calendar/gui/dialogs/comp-editor.c:1349 ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../calendar/gui/dialogs/task-page.ui.h:32 
../e-util/e-html-editor-actions.c:1143 ../e-util/e-mail-signature-manager.c:357
+#: ../e-util/filter.ui.h:17 ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171 
../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:60
+#: ../plugins/attachment-reminder/attachment-reminder.c:443 
../plugins/email-custom-header/email-custom-header.c:844 ../plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071 ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -1711,8 +1804,8 @@ msgstr "_Drucken"
 msgid "_Dismiss"
 msgstr "_Verwerfen"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7 ../calendar/alarm-notify/alarm-queue.c:1844 
../calendar/alarm-notify/alarm-queue.c:1854
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249 
../modules/itip-formatter/itip-view.c:1516 ../modules/itip-formatter/itip-view.c:1627
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7 ../calendar/alarm-notify/alarm-queue.c:1877 
../calendar/alarm-notify/alarm-queue.c:1887
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248 
../modules/itip-formatter/itip-view.c:1514 ../modules/itip-formatter/itip-view.c:1625
 msgid "Location:"
 msgstr "Ort:"
 
@@ -1741,42 +1834,42 @@ msgstr "Stunden"
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687 ../calendar/alarm-notify/alarm-queue.c:1824
+#: ../calendar/alarm-notify/alarm-queue.c:1703 ../calendar/alarm-notify/alarm-queue.c:1857
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1696 ../calendar/alarm-notify/alarm-queue.c:1698
+#: ../calendar/alarm-notify/alarm-queue.c:1712 ../calendar/alarm-notify/alarm-queue.c:1714
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1706
+#: ../calendar/alarm-notify/alarm-queue.c:1722
 msgid "No location information available."
 msgstr "Keine Ortsinformationen verfügbar."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1711 ../calendar/alarm-notify/alarm-queue.c:1815 
../calendar/alarm-notify/alarm-queue.c:2156
+#: ../calendar/alarm-notify/alarm-queue.c:1727 ../calendar/alarm-notify/alarm-queue.c:1848 
../calendar/alarm-notify/alarm-queue.c:2203
 msgid "Evolution Reminders"
 msgstr "Evolution-Erinnerungen"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1771
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Sie haben %d Erinnerung"
 msgstr[1] "Sie haben %d Erinnerungen"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1974
+#: ../calendar/alarm-notify/alarm-queue.c:2021
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21 ../mail/mail.error.xml.h:139 
../modules/mailto-handler/evolution-mailto-handler.c:114
+#: ../calendar/alarm-notify/alarm-queue.c:2022 ../mail/mail-dialogs.ui.h:21 
../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Nein"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138 
../modules/mailto-handler/evolution-mailto-handler.c:115
+#: ../calendar/alarm-notify/alarm-queue.c:2023 ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1980
+#: ../calendar/alarm-notify/alarm-queue.c:2027
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following 
program:\n"
@@ -1792,7 +1885,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1995
+#: ../calendar/alarm-notify/alarm-queue.c:2042
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -2365,20 +2458,20 @@ msgid "is not"
 msgstr "ist nicht"
 
 #. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2 
../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278 ../calendar/gui/e-cal-model.c:285
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2 
../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:306 ../calendar/gui/e-cal-model.c:313
 #: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Öffentlich"
 
 #. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4 
../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287 ../calendar/gui/e-task-table.c:499
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4 
../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:315 ../calendar/gui/e-task-table.c:499
 #: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Privat"
 
 #. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6 
../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289 ../calendar/gui/e-task-table.c:500
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:116 
../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6 
../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:317 ../calendar/gui/e-task-table.c:500
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:117 
../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Vertraulich"
 
@@ -2390,7 +2483,7 @@ msgstr "Organisator"
 msgid "Attendee"
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5 
../mail/message-list.etspec.h:14 ../plugins/publish-calendar/publish-calendar.c:903
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5 
../mail/message-list.etspec.h:14 ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22 ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
 msgstr "Ort"
@@ -2400,17 +2493,17 @@ msgid "Category"
 msgstr "Kategorie"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14 ../calendar/gui/tasktypes.xml.h:15 
../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:157 ../mail/filtertypes.xml.in.h:46 
../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
+#: ../em-format/e-mail-formatter-print-headers.c:157 ../mail/filtertypes.xml.in.h:45 
../mail/searchtypes.xml.in.h:47 ../mail/vfoldertypes.xml.in.h:48
 msgid "Attachments"
 msgstr "Anlagen"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15 ../calendar/gui/tasktypes.xml.h:16 
../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
-#: ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15 ../calendar/gui/tasktypes.xml.h:16 
../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 msgid "Exist"
 msgstr "Existieren"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16 ../calendar/gui/tasktypes.xml.h:17 
../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
-#: ../mail/vfoldertypes.xml.in.h:51
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16 ../calendar/gui/tasktypes.xml.h:17 
../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
+#: ../mail/vfoldertypes.xml.in.h:50
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
@@ -2595,255 +2688,255 @@ msgstr "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor ak
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:299
 msgid "Could not save attachments"
 msgstr "Die Anlagen konnten nicht gespeichert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:653
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:766
+#: ../calendar/gui/dialogs/comp-editor.c:794
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
+#: ../calendar/gui/dialogs/comp-editor.c:796
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
+#: ../calendar/gui/dialogs/comp-editor.c:804
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:781
+#: ../calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:797
+#: ../calendar/gui/dialogs/comp-editor.c:825
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:918
+#: ../calendar/gui/dialogs/comp-editor.c:946
 msgid "Keep original item?"
 msgstr "Originaleintrag behalten?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081 ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1109 ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Unable to synchronize with the server"
 msgstr "Abgleich mit dem Server nicht möglich."
 
 #. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1221 ../calendar/gui/dialogs/event-editor.c:116 
../calendar/gui/dialogs/event-editor.c:310 ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:387 ../e-util/e-html-editor-dialog.c:196 
../e-util/e-mail-signature-editor.c:295 ../e-util/e-name-selector-dialog.c:551
-#: ../e-util/e-preferences-window.c:388 ../e-util/e-table-field-chooser-dialog.c:207 
../mail/e-mail-browser.c:126 ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256 ../shell/e-shell-window-actions.c:342 
../shell/e-shell-window-actions.c:908 ../smime/gui/certificate-manager.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:1249 ../calendar/gui/dialogs/event-editor.c:116 
../calendar/gui/dialogs/event-editor.c:310 ../calendar/gui/dialogs/event-page.ui.h:29
+#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196 
../e-util/e-mail-signature-editor.c:295 ../e-util/e-name-selector-dialog.c:551
+#: ../e-util/e-preferences-window.c:388 ../e-util/e-table-field-chooser-dialog.c:207 
../mail/e-mail-browser.c:127 ../mail/em-folder-properties.c:688 ../mail/em-subscription-editor.c:1716
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256 ../shell/e-shell-window-actions.c:342 
../shell/e-shell-window-actions.c:908 ../smime/gui/certificate-manager.c:2066
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "Close the current window"
 msgstr "Das aktuelle Fenster schließen"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775 
../e-util/e-html-editor-actions.c:1088 ../e-util/e-text.c:2089 ../e-util/e-web-view.c:339
-#: ../mail/e-mail-browser.c:133 ../shell/e-shell-window-actions.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:775 
../e-util/e-html-editor-actions.c:1099 ../e-util/e-text.c:2109 ../e-util/e-web-view.c:377
+#: ../mail/e-mail-browser.c:134 ../mail/mail.error.xml.h:138 ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175 
../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284 ../e-util/e-focus-tracker.c:776
-#: ../e-util/e-web-view.c:341 ../e-util/e-web-view.c:1328 ../mail/e-mail-browser.c:135 
../shell/e-shell-window-actions.c:931
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:175 
../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284 ../e-util/e-focus-tracker.c:776
+#: ../e-util/e-web-view.c:379 ../e-util/e-web-view.c:1415 ../mail/e-mail-browser.c:136 
../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770 
../e-util/e-html-editor-actions.c:1095 ../e-util/e-text.c:2075 ../mail/e-mail-browser.c:140
+#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770 
../e-util/e-html-editor-actions.c:1106 ../e-util/e-text.c:2095 ../mail/e-mail-browser.c:141
 #: ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168 
../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278 ../e-util/e-focus-tracker.c:771
-#: ../e-util/e-web-view.c:1322 ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:1265 ../e-util/e-focus-tracker.c:168 
../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278 ../e-util/e-focus-tracker.c:771
+#: ../e-util/e-web-view.c:1409 ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189 
../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786 ../shell/e-shell-window-actions.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:1272 ../e-util/e-focus-tracker.c:189 
../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786 ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "Die Auswahl löschen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "View help"
 msgstr "Hilfe anzeigen"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780 
../e-util/e-html-editor-actions.c:1102 ../e-util/e-text.c:2101 ../mail/e-mail-browser.c:147
+#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780 
../e-util/e-html-editor-actions.c:1113 ../e-util/e-text.c:2121 ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182 
../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290 ../e-util/e-focus-tracker.c:781
-#: ../e-util/e-web-view.c:1334 ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
+#: ../calendar/gui/dialogs/comp-editor.c:1286 ../e-util/e-focus-tracker.c:182 
../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290 ../e-util/e-focus-tracker.c:781
+#: ../e-util/e-web-view.c:1421 ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263 ../composer/e-composer-actions.c:441 
../mail/e-mail-reader.c:2262 ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../calendar/gui/dialogs/comp-editor.c:1291 ../composer/e-composer-actions.c:388 
../mail/e-mail-reader.c:2195 ../modules/addressbook/e-book-shell-view-actions.c:1205
 #: ../modules/addressbook/e-book-shell-view-actions.c:1219
 msgid "_Print..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269 
../modules/addressbook/e-book-shell-view-actions.c:1212 ../modules/calendar/e-cal-shell-view-actions.c:1642
+#: ../calendar/gui/dialogs/comp-editor.c:1298 ../mail/e-mail-reader.c:2202 
../modules/addressbook/e-book-shell-view-actions.c:1212 ../modules/calendar/e-cal-shell-view-actions.c:1642
 #: ../modules/calendar/e-memo-shell-view-actions.c:764 ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Pre_view..."
 msgstr "_Vorschau …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1279
+#: ../calendar/gui/dialogs/comp-editor.c:1307
 msgid "Save current changes"
 msgstr "Aktuelle Änderungen speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-mail-signature-editor.c:304
+#: ../calendar/gui/dialogs/comp-editor.c:1312 ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Save current changes and close editor"
 msgstr "Aktuelle Änderungen speichern und den Editor schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790 
../e-util/e-html-editor-actions.c:1116 ../e-util/e-web-view.c:349 ../mail/e-mail-browser.c:154
+#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790 
../e-util/e-html-editor-actions.c:1127 ../e-util/e-web-view.c:387 ../mail/e-mail-browser.c:155
 #: ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "_Alle auswählen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196 
../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791 ../mail/e-mail-browser.c:156
+#: ../calendar/gui/dialogs/comp-editor.c:1321 ../e-util/e-focus-tracker.c:196 
../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791 ../mail/e-mail-browser.c:157
 #: ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1314
+#: ../calendar/gui/dialogs/comp-editor.c:1342
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-html-editor-actions.c:1139 
../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
+#: ../calendar/gui/dialogs/comp-editor.c:1356 ../e-util/e-html-editor-actions.c:1150 
../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
 #: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1342 ../e-util/e-html-editor-actions.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1370 ../e-util/e-html-editor-actions.c:1171
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349 ../composer/e-composer-actions.c:431
+#: ../calendar/gui/dialogs/comp-editor.c:1377 ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1356 ../e-util/e-html-editor-actions.c:1181 
../mail/e-mail-browser.c:177 ../shell/e-shell-window-actions.c:1121
-#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1384 ../e-util/e-html-editor-actions.c:1192 
../mail/e-mail-browser.c:178 ../shell/e-shell-window-actions.c:1121
+#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../composer/e-composer-actions.c:380
+#: ../calendar/gui/dialogs/comp-editor.c:1394 ../composer/e-composer-actions.c:327
 msgid "_Attachment..."
 msgstr "_Anlage …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368 ../composer/e-composer-actions.c:382 
../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1396 ../composer/e-composer-actions.c:329 
../e-util/e-attachment-view.c:463
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1423
 msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Classify as public"
 msgstr "Als öffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1402
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1411
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1449
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld für die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1435
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1443
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1473
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2232 ../composer/e-composer-actions.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:2596 ../composer/e-composer-actions.c:612
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2563 ../calendar/gui/dialogs/comp-editor.c:2773 
../calendar/gui/dialogs/comp-editor.c:3786
+#: ../calendar/gui/dialogs/comp-editor.c:2926 ../calendar/gui/dialogs/comp-editor.c:3512 
../calendar/gui/dialogs/comp-editor.c:4525
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald Aktualisierungen 
eintreffen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3748 ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:4487 ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3818
+#: ../calendar/gui/dialogs/comp-editor.c:4557
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -2852,7 +2945,7 @@ msgstr "Aktuelle Version konnte nicht verwendet werden!"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:129 ../calendar/gui/e-cal-ops.c:1940
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129 ../calendar/gui/e-cal-ops.c:1968
 msgid "Destination is read only"
 msgstr "Ziel ist nur lesbar"
 
@@ -2963,7 +3056,7 @@ msgstr "Das Ereignis kann nicht bearbeitet werden, weil der gewählte Kalender n
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Das Ereignis kann nicht vollständig bearbeitet werden, weil Sie nicht der Organisator sind"
 
-#: ../calendar/gui/dialogs/event-page.c:650 ../calendar/gui/dialogs/event-page.c:3178
+#: ../calendar/gui/dialogs/event-page.c:650 ../calendar/gui/dialogs/event-page.c:3180
 msgid "This event has reminders"
 msgstr "Dieses Ereignis enthält Erinnerungen"
 
@@ -3011,33 +3104,33 @@ msgstr "_Vertreter"
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:3458
+#: ../calendar/gui/dialogs/event-page.c:3460
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d Tag vor dem Termin"
 msgstr[1] "%d Tage vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3464
+#: ../calendar/gui/dialogs/event-page.c:3466
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d Stunde vor dem Termin"
 msgstr[1] "%d Stunden vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3470
+#: ../calendar/gui/dialogs/event-page.c:3472
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d Minute vor dem Termin"
 msgstr[1] "%d Minuten vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3493
 msgid "Custom"
 msgstr "Angepasst"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3498
+#: ../calendar/gui/dialogs/event-page.c:3500
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Keine"
@@ -3077,7 +3170,7 @@ msgid "_Location:"
 msgstr "O_rt:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12 ../calendar/gui/dialogs/memo-page.ui.h:2 
../calendar/gui/dialogs/task-page.ui.h:29 ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:558 ../e-util/e-html-editor-link-dialog.c:367
+#: ../e-util/e-html-editor-image-dialog.c:558 ../e-util/e-html-editor-link-dialog.c:422
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
@@ -3097,7 +3190,7 @@ msgstr "Zu_sammenfassung:"
 msgid "Event Description"
 msgstr "Ereignisbeschreibung"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../calendar/gui/dialogs/task-page.ui.h:33 
../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../calendar/gui/dialogs/task-page.ui.h:33 
../calendar/gui/e-meeting-time-sel.c:555
 msgid "Atte_ndees..."
 msgstr "Teil_nehmer …"
 
@@ -3181,7 +3274,7 @@ msgstr "Die Notiz kann nicht bearbeitet werden, weil die gewählte Notizliste nu
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Die Notiz kann nicht vollständig bearbeitet werden, weil Sie nicht der Organisator sind"
 
-#: ../calendar/gui/dialogs/memo-page.c:1166 ../em-format/e-mail-formatter-utils.c:202 
../em-format/e-mail-formatter-utils.c:219 ../em-format/e-mail-part-headers.c:48
+#: ../calendar/gui/dialogs/memo-page.c:1168 ../em-format/e-mail-formatter-utils.c:202 
../em-format/e-mail-formatter-utils.c:219 ../em-format/e-mail-part-headers.c:48
 #: ../mail/message-list.etspec.h:9 ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11 
../modules/mail/em-mailer-prefs.c:64
 msgid "To"
 msgstr "An"
@@ -3246,17 +3339,17 @@ msgstr "Alle Instanzen"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Dieser Termin enthält Wiederholungen, die Evolution nicht bearbeiten kann."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Recurrence date is invalid"
 msgstr "Das Wiederholungsdatum ist ungültig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "End time of the recurrence was before event's start"
 msgstr "Die Zeit der letzten Wiederholung lag vor dem Start des Termins"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1078
 msgid "on"
 msgstr "am"
 
@@ -3264,7 +3357,7 @@ msgstr "am"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1155
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "first"
 msgstr "erster"
 
@@ -3273,7 +3366,7 @@ msgstr "erster"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1161
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "second"
 msgstr "zweiter"
 
@@ -3281,7 +3374,7 @@ msgstr "zweiter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "third"
 msgstr "dritter"
 
@@ -3289,7 +3382,7 @@ msgstr "dritter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1171
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fourth"
 msgstr "vierter"
 
@@ -3297,7 +3390,7 @@ msgstr "vierter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "fifth"
 msgstr "fünfter"
 
@@ -3305,13 +3398,13 @@ msgstr "fünfter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../calendar/gui/dialogs/recurrence-page.c:1185
 msgid "last"
 msgstr "letzter"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
+#: ../calendar/gui/dialogs/recurrence-page.c:1209
 msgid "Other Date"
 msgstr "Anderes Datum"
 
@@ -3319,7 +3412,7 @@ msgstr "Anderes Datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
+#: ../calendar/gui/dialogs/recurrence-page.c:1215
 msgid "1st to 10th"
 msgstr "1. bis 10."
 
@@ -3327,7 +3420,7 @@ msgstr "1. bis 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1217
+#: ../calendar/gui/dialogs/recurrence-page.c:1221
 msgid "11th to 20th"
 msgstr "11. bis 20."
 
@@ -3335,67 +3428,67 @@ msgstr "11. bis 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1227
 msgid "21st to 31st"
 msgstr "21. bis 31."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250 ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../calendar/gui/dialogs/recurrence-page.c:1254 ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Montag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251 ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1255 ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252 ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../calendar/gui/dialogs/recurrence-page.c:1256 ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253 ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1257 ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254 ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1258 ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255 ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../calendar/gui/dialogs/recurrence-page.c:1259 ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1256 ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1260 ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Sonntag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1387
+#: ../calendar/gui/dialogs/recurrence-page.c:1391
 msgid "on the"
 msgstr "am"
 
 # oder im Falle von Terminen: Wiederholungen ??
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../calendar/gui/dialogs/recurrence-page.c:1576
 msgid "occurrences"
 msgstr "Wiederholungen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2346
 msgid "Add exception"
 msgstr "Ausnahme hinzufügen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
+#: ../calendar/gui/dialogs/recurrence-page.c:2388
 msgid "Could not get a selection to modify."
 msgstr "Keine zu verändernde Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
+#: ../calendar/gui/dialogs/recurrence-page.c:2394
 msgid "Modify exception"
 msgstr "Ausnahme verändern"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
+#: ../calendar/gui/dialogs/recurrence-page.c:2440
 msgid "Could not get a selection to delete."
 msgstr "Keine zu löschende Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
+#: ../calendar/gui/dialogs/recurrence-page.c:2581
 msgid "Date/Time"
 msgstr "Datum/Zeit"
 
@@ -3512,7 +3605,7 @@ msgid "High"
 msgstr "Hoch"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:10 ../calendar/gui/e-cal-component-preview.c:340 
../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
+#: ../calendar/gui/dialogs/task-page.ui.h:10 ../calendar/gui/e-cal-component-preview.c:340 
../calendar/gui/e-cal-model.c:1856 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5 ../mail/message-list.c:312
 msgid "Normal"
 msgstr "Normal"
@@ -3549,7 +3642,7 @@ msgstr "Abgeschlossen"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22 ../calendar/gui/e-cal-component-preview.c:319 
../calendar/gui/e-cal-model-tasks.c:316 ../calendar/gui/e-cal-model-tasks.c:558
-#: ../calendar/gui/e-task-table.c:213 ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610 
../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:958
+#: ../calendar/gui/e-task-table.c:213 ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610 
../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:963
 msgid "Canceled"
 msgstr "Abgebrochen"
 
@@ -3787,7 +3880,7 @@ msgstr "Enddatum:"
 msgid "Due Date:"
 msgstr "Fällig am:"
 
-#: ../calendar/gui/e-cal-component-preview.c:309 ../modules/itip-formatter/itip-view.c:1519 
../modules/itip-formatter/itip-view.c:1636
+#: ../calendar/gui/e-cal-component-preview.c:309 ../modules/itip-formatter/itip-view.c:1517 
../modules/itip-formatter/itip-view.c:1634
 msgid "Status:"
 msgstr "Status:"
 
@@ -3803,17 +3896,17 @@ msgstr "Beschreibung:"
 msgid "Web Page:"
 msgstr "Website:"
 
-#: ../calendar/gui/e-cal-data-model.c:1608
+#: ../calendar/gui/e-cal-data-model.c:1625
 #, c-format
 msgid "Creating view for calendar '%s'"
 msgstr "Ansicht für Kalender »%s« wird erstellt"
 
-#: ../calendar/gui/e-cal-data-model.c:1612
+#: ../calendar/gui/e-cal-data-model.c:1629
 #, c-format
 msgid "Creating view for task list '%s'"
 msgstr "Ansicht für Aufgabenliste »%s« wird erstellt"
 
-#: ../calendar/gui/e-cal-data-model.c:1616
+#: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
 msgid "Creating view for memo list '%s'"
 msgstr "Ansicht für Notizliste »%s« wird erstellt"
@@ -3826,7 +3919,7 @@ msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
 msgid "Start date"
 msgstr "Anfangsdatum"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:3 ../calendar/gui/e-meeting-list-view.c:652 
../calendar/gui/e-meeting-time-sel.etspec.h:4 ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:3 ../calendar/gui/e-meeting-list-view.c:670 
../calendar/gui/e-meeting-time-sel.etspec.h:4 ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:585 ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Art"
@@ -3835,7 +3928,7 @@ msgstr "Art"
 msgid "Completion date"
 msgstr "Abschlussdatum"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -3854,7 +3947,7 @@ msgstr "Priorität"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:11 ../calendar/gui/e-cal-model.c:3088 
../calendar/gui/e-meeting-list-view.c:695 ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11 ../calendar/gui/e-cal-model.c:3845 
../calendar/gui/e-meeting-list-view.c:713 ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34 ../mail/message-list.etspec.h:1 
../mail/searchtypes.xml.in.h:36 ../mail/vfoldertypes.xml.in.h:36
 msgid "Status"
 msgstr "Status"
@@ -3867,50 +3960,50 @@ msgstr "Angelegt"
 msgid "Last modified"
 msgstr "Zuletzt geändert"
 
-#: ../calendar/gui/e-calendar-view.c:411
+#: ../calendar/gui/e-calendar-view.c:459
 msgid "Cut selected events to the clipboard"
 msgstr "Die gewählten Ereignisse in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-calendar-view.c:417
+#: ../calendar/gui/e-calendar-view.c:465
 msgid "Copy selected events to the clipboard"
 msgstr "Die gewählten Ereignisse in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-calendar-view.c:423
+#: ../calendar/gui/e-calendar-view.c:471
 msgid "Paste events from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Ereignisse einfügen"
 
-#: ../calendar/gui/e-calendar-view.c:429
+#: ../calendar/gui/e-calendar-view.c:477
 msgid "Delete selected events"
 msgstr "Die gewählten Ereignisse löschen"
 
-#: ../calendar/gui/e-calendar-view.c:810
+#: ../calendar/gui/e-calendar-view.c:859
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "Eingefügter Text enthält keine gültigen iCalendar-Daten"
 
-#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+#: ../calendar/gui/e-calendar-view.c:870 ../calendar/gui/e-cal-ops.c:1567
 msgid "Default calendar not found"
 msgstr "Vorgegebener Benutzerkalender wurde nicht gefunden"
 
-#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+#: ../calendar/gui/e-calendar-view.c:875 ../calendar/gui/e-cal-ops.c:1570
 msgid "Default memo list not found"
 msgstr "Vorgabenotizliste wurde nicht gefunden"
 
-#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+#: ../calendar/gui/e-calendar-view.c:880 ../calendar/gui/e-cal-ops.c:1573
 msgid "Default task list not found"
 msgstr "Vorgabeaufgabenliste wurde nicht gefunden"
 
-#: ../calendar/gui/e-calendar-view.c:918
+#: ../calendar/gui/e-calendar-view.c:969
 msgid "No suitable component found"
 msgstr "Keine passende Komponente gefunden"
 
-#: ../calendar/gui/e-calendar-view.c:988
+#: ../calendar/gui/e-calendar-view.c:1039
 msgid "Pasting iCalendar data"
 msgstr "iCalendar-Daten einfügen"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495 
../calendar/gui/e-task-table.c:796
+#: ../calendar/gui/e-calendar-view.c:1842 ../calendar/gui/e-memo-table.c:493 
../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -3918,24 +4011,24 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500 
../calendar/gui/e-task-table.c:800
+#: ../calendar/gui/e-calendar-view.c:1846 ../calendar/gui/e-memo-table.c:498 
../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-meeting-time-sel.c:2663 
../calendar/gui/print.c:3527
+#: ../calendar/gui/e-calendar-view.c:1862 ../calendar/gui/e-meeting-time-sel.c:2725 
../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1851
+#: ../calendar/gui/e-calendar-view.c:1902
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/e-calendar-view.c:2235 
../calendar/gui/e-calendar-view.c:2242 ../calendar/gui/e-calendar-view.c:2245
+#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-calendar-view.c:2288 
../calendar/gui/e-calendar-view.c:2295 ../calendar/gui/e-calendar-view.c:2298
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -3944,11 +4037,11 @@ msgstr "%d. %B %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943 
../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-week-view-main-item.c:230
+#: ../calendar/gui/e-calendar-view.c:2286 ../calendar/gui/e-day-view.c:3052 
../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-calendar-view.c:2308
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -3958,11 +4051,11 @@ msgstr "%A, %d. %B %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927 
../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-week-view-main-item.c:216
+#: ../calendar/gui/e-calendar-view.c:2312 ../calendar/gui/e-day-view.c:3036 
../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: ../calendar/gui/e-calendar-view.c:2262 ../calendar/gui/e-calendar-view.c:2268 
../calendar/gui/e-calendar-view.c:2271
+#: ../calendar/gui/e-calendar-view.c:2315 ../calendar/gui/e-calendar-view.c:2321 
../calendar/gui/e-calendar-view.c:2324
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
@@ -3974,75 +4067,75 @@ msgstr "Anfangsdatum"
 msgid "End Date"
 msgstr "Enddatum"
 
-#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184 
../calendar/gui/e-meeting-list-view.c:198 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/e-cal-model.c:319 ../calendar/gui/e-meeting-list-view.c:184 
../calendar/gui/e-meeting-list-view.c:198 ../calendar/gui/e-meeting-store.c:134
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250 
../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3607 ../modules/itip-formatter/itip-view.c:6197 
../modules/plugin-manager/evolution-plugin-manager.c:99
+#: ../modules/itip-formatter/itip-view.c:3604 ../modules/itip-formatter/itip-view.c:6218 
../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586 ../calendar/gui/e-cal-ops.c:1209 
../modules/calendar/e-cal-base-shell-backend.c:361
+#: ../calendar/gui/e-cal-model.c:1394 ../calendar/gui/e-cal-ops.c:596 ../calendar/gui/e-cal-ops.c:1232 
../modules/calendar/e-cal-base-shell-backend.c:361
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr "Quelle mit UID »%s« wurde nicht gefunden"
 
-#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184 ../calendar/gui/e-cal-ops.c:1325
+#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185 ../calendar/gui/e-cal-ops.c:1349
 msgid "Creating an event"
 msgstr "Ereignis anlegen"
 
-#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188 ../calendar/gui/e-cal-ops.c:1329
+#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189 ../calendar/gui/e-cal-ops.c:1353
 msgid "Creating a memo"
 msgstr "Notiz anlegen"
 
-#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192 ../calendar/gui/e-cal-ops.c:1333
+#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193 ../calendar/gui/e-cal-ops.c:1357
 msgid "Creating a task"
 msgstr "Aufgabe anlegen"
 
-#: ../calendar/gui/e-cal-model.c:1645
+#: ../calendar/gui/e-cal-model.c:1858
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:1647
+#: ../calendar/gui/e-cal-model.c:1860
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139 
../calendar/gui/e-meeting-list-view.c:208 ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1139 
../calendar/gui/e-meeting-list-view.c:208 ../calendar/gui/e-meeting-store.c:176
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139 
../calendar/gui/e-meeting-list-view.c:209 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1139 
../calendar/gui/e-meeting-list-view.c:209 ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Nein"
 
-#: ../calendar/gui/e-cal-model.c:3029 ../calendar/gui/e-meeting-list-view.c:220 
../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6185
+#: ../calendar/gui/e-cal-model.c:3786 ../calendar/gui/e-meeting-list-view.c:220 
../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../modules/itip-formatter/itip-view.c:6206
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-cal-model.c:3030 ../calendar/gui/e-meeting-list-view.c:221 
../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6191
+#: ../calendar/gui/e-cal-model.c:3787 ../calendar/gui/e-meeting-list-view.c:221 
../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../modules/itip-formatter/itip-view.c:6212
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-cal-model.c:3031 ../calendar/gui/e-meeting-list-view.c:222 
../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-cal-model.c:3788 ../calendar/gui/e-meeting-list-view.c:222 
../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../calendar/gui/e-cal-model.c:3032 ../calendar/gui/e-meeting-list-view.c:223 
../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6194
+#: ../calendar/gui/e-cal-model.c:3789 ../calendar/gui/e-meeting-list-view.c:223 
../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../modules/itip-formatter/itip-view.c:6215
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-cal-model.c:3033
+#: ../calendar/gui/e-cal-model.c:3790
 msgid "Needs action"
 msgstr "Erfordert Maßnahme"
 
-#: ../calendar/gui/e-cal-model-calendar.c:123 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/e-cal-model-calendar.c:151 ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Frei"
 
-#: ../calendar/gui/e-cal-model-calendar.c:126 ../calendar/gui/e-meeting-time-sel.c:530 
../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/e-cal-model-calendar.c:154 ../calendar/gui/e-meeting-time-sel.c:536 
../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -4062,166 +4155,166 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-cal-ops.c:283
+#: ../calendar/gui/e-cal-ops.c:287
 msgid "Modifying an event"
 msgstr "Ein Ereignis verändern"
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:291
 msgid "Modifying a memo"
 msgstr "Eine Notiz verändern"
 
-#: ../calendar/gui/e-cal-ops.c:291
+#: ../calendar/gui/e-cal-ops.c:295
 msgid "Modifying a task"
 msgstr "Eine Aufgabe verändern"
 
-#: ../calendar/gui/e-cal-ops.c:387
+#: ../calendar/gui/e-cal-ops.c:394
 msgid "Removing an event"
 msgstr "Ein Ereignis entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:391
+#: ../calendar/gui/e-cal-ops.c:398
 msgid "Removing a memo"
 msgstr "Eine Notiz entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:395
+#: ../calendar/gui/e-cal-ops.c:402
 msgid "Removing a task"
 msgstr "Eine Aufgabe entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:484
+#: ../calendar/gui/e-cal-ops.c:493
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "Ein Ereignis löschen"
 msgstr[1] "%d Ereignisse löschen"
 
-#: ../calendar/gui/e-cal-ops.c:488
+#: ../calendar/gui/e-cal-ops.c:497
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "Eine Notiz löschen"
 msgstr[1] "%d Notizen löschen"
 
-#: ../calendar/gui/e-cal-ops.c:492
+#: ../calendar/gui/e-cal-ops.c:501
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Eine Aufgabe löschen"
 msgstr[1] "%d Aufgaben löschen"
 
-#: ../calendar/gui/e-cal-ops.c:692
+#: ../calendar/gui/e-cal-ops.c:704
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "Ein Ereignis einfügen"
 msgstr[1] "%d Ereignisse einfügen"
 
-#: ../calendar/gui/e-cal-ops.c:707
+#: ../calendar/gui/e-cal-ops.c:719
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "Eine Notiz einfügen"
 msgstr[1] "%d Notizen einfügen"
 
-#: ../calendar/gui/e-cal-ops.c:722
+#: ../calendar/gui/e-cal-ops.c:734
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "Eine Aufgabe einfügen"
 msgstr[1] "%d Aufgaben einfügen"
 
-#: ../calendar/gui/e-cal-ops.c:820
+#: ../calendar/gui/e-cal-ops.c:833
 msgid "Updating an event"
 msgstr "Ein Ereignis aktualisieren"
 
-#: ../calendar/gui/e-cal-ops.c:824
+#: ../calendar/gui/e-cal-ops.c:837
 msgid "Updating a memo"
 msgstr "Eine Notiz aktualisieren"
 
-#: ../calendar/gui/e-cal-ops.c:828
+#: ../calendar/gui/e-cal-ops.c:841
 msgid "Updating a task"
 msgstr "Eine Aufgabe aktualisieren"
 
-#: ../calendar/gui/e-cal-ops.c:933
+#: ../calendar/gui/e-cal-ops.c:949
 #, c-format
 msgid "Getting events to purge in the calendar '%s'"
 msgstr "Ereignisse sammeln, um sie in Kalender »%s« zu entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:937
+#: ../calendar/gui/e-cal-ops.c:953
 #, c-format
 msgid "Getting memos to purge in the memo list '%s'"
 msgstr "Notizen sammeln, um sie in Notizliste »%s« zu entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:941
+#: ../calendar/gui/e-cal-ops.c:957
 #, c-format
 msgid "Getting tasks to purge in the task list '%s'"
 msgstr "Aufgaben sammeln, um sie in Aufgabenliste »%s« zu entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:962
+#: ../calendar/gui/e-cal-ops.c:983
 #, c-format
 msgid "Purging events in the calendar '%s'"
 msgstr "Entfernen von Ereignissen in Kalender »%s«"
 
-#: ../calendar/gui/e-cal-ops.c:966
+#: ../calendar/gui/e-cal-ops.c:987
 #, c-format
 msgid "Purging memos in the memo list '%s'"
 msgstr "Entfernen von Notizen in Notizliste »%s«"
 
-#: ../calendar/gui/e-cal-ops.c:970
+#: ../calendar/gui/e-cal-ops.c:991
 #, c-format
 msgid "Purging tasks in the task list '%s'"
 msgstr "Entfernen von Aufgaben in Aufgabenliste »%s«"
 
-#: ../calendar/gui/e-cal-ops.c:1068
+#: ../calendar/gui/e-cal-ops.c:1091
 msgid "Purging events"
 msgstr "Ereignisse entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:1072
+#: ../calendar/gui/e-cal-ops.c:1095
 msgid "Purging memos"
 msgstr "Notizen entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:1076
+#: ../calendar/gui/e-cal-ops.c:1099
 msgid "Purging tasks"
 msgstr "Aufgaben entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:1178
+#: ../calendar/gui/e-cal-ops.c:1201
 msgid "Expunging completed tasks"
 msgstr "Erledigte Aufgaben entfernen"
 
-#: ../calendar/gui/e-cal-ops.c:2034
+#: ../calendar/gui/e-cal-ops.c:2062
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "Ein Ereignis bewegen"
 msgstr[1] "%d Ereignisse bewegen"
 
-#: ../calendar/gui/e-cal-ops.c:2035
+#: ../calendar/gui/e-cal-ops.c:2063
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Ein Ereignis kopieren"
 msgstr[1] "%d Ereignisse kopieren"
 
-#: ../calendar/gui/e-cal-ops.c:2041
+#: ../calendar/gui/e-cal-ops.c:2069
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Eine Notiz wird verschoben"
 msgstr[1] "%d Notizen werden verschoben"
 
-#: ../calendar/gui/e-cal-ops.c:2042
+#: ../calendar/gui/e-cal-ops.c:2070
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Eine Notiz wird kopiert"
 msgstr[1] "%d Notizen werden kopieren"
 
-#: ../calendar/gui/e-cal-ops.c:2048
+#: ../calendar/gui/e-cal-ops.c:2076
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Eine Aufgabe wird verschoben"
 msgstr[1] "%d Aufgaben werden verschoben"
 
-#: ../calendar/gui/e-cal-ops.c:2049
+#: ../calendar/gui/e-cal-ops.c:2077
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -4248,12 +4341,12 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692 ../calendar/gui/print.c:1073 
../calendar/gui/print.c:1092 ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
+#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1694 ../calendar/gui/print.c:1073 
../calendar/gui/print.c:1092 ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695 ../calendar/gui/print.c:1078 
../calendar/gui/print.c:1094 ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
+#: ../calendar/gui/e-day-view.c:2141 ../calendar/gui/e-week-view.c:1697 ../calendar/gui/print.c:1078 
../calendar/gui/print.c:1094 ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "PM"
 
@@ -4263,12 +4356,12 @@ msgstr "PM"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851 
../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:3019 ../calendar/gui/e-day-view-top-item.c:851 
../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3574
+#: ../calendar/gui/e-day-view.c:3744
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
@@ -4279,23 +4372,23 @@ msgstr "Woche %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:802
+#: ../calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
-#: ../calendar/gui/e-day-view-time-item.c:827
+#: ../calendar/gui/e-day-view-time-item.c:829
 msgid "Show the second time zone"
 msgstr "Zweite Zeitzone anzeigen"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:844 ../modules/calendar/e-calendar-preferences.c:305 
../modules/calendar/e-calendar-preferences.c:357
+#: ../calendar/gui/e-day-view-time-item.c:846 ../modules/calendar/e-calendar-preferences.c:308 
../modules/calendar/e-calendar-preferences.c:360
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-day-view-time-item.c:878 ../calendar/gui/e-timezone-entry.c:323 
../modules/calendar/e-calendar-preferences.c:388
+#: ../calendar/gui/e-day-view-time-item.c:880 ../calendar/gui/e-timezone-entry.c:324 
../modules/calendar/e-calendar-preferences.c:391
 msgid "Select..."
 msgstr "Auswählen …"
 
@@ -4353,11 +4446,11 @@ msgstr "Nicht-Teilnehmer"
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../calendar/gui/e-meeting-list-view.c:644
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:681 ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/e-meeting-list-view.c:699 ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "UAwg"
 
@@ -4365,81 +4458,81 @@ msgstr "UAwg"
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: ../calendar/gui/e-meeting-store.c:1909
+#: ../calendar/gui/e-meeting-store.c:1881
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Geben Sie das Passwort für Benutzer %2$s auf dem Server %1$s ein, um auf Verfügbarkeitsinformationen 
zuzugreifen"
 
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../calendar/gui/e-meeting-store.c:1891
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Fehlergrund: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1924 ../plugins/publish-calendar/publish-calendar.c:351 
../smime/gui/component.c:63
+#: ../calendar/gui/e-meeting-store.c:1896 ../plugins/publish-calendar/publish-calendar.c:351 
../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:537
 msgid "Out of Office"
 msgstr "Nicht im Büro"
 
-#: ../calendar/gui/e-meeting-time-sel.c:533
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid "No Information"
 msgstr "Keine Informationen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "_Einstellungen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:588
+#: ../calendar/gui/e-meeting-time-sel.c:594
 msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:601
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:625
 msgid "_Update free/busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:636
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr "_Auto-Auswählen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../calendar/gui/e-meeting-time-sel.c:679
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:694
+#: ../calendar/gui/e-meeting-time-sel.c:700
 msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:722
 msgid "_Required people"
 msgstr "_Benötigte Personen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:726
+#: ../calendar/gui/e-meeting-time-sel.c:732
 msgid "Required people and _one resource"
 msgstr "Benötigte Personen und _eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:765
+#: ../calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:794
+#: ../calendar/gui/e-meeting-time-sel.c:800
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2659
+#: ../calendar/gui/e-meeting-time-sel.c:2721
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4448,7 +4541,7 @@ msgstr ""
 "Zusammenfassung: %s\n"
 "Ort: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
@@ -4477,42 +4570,42 @@ msgstr "Allgemeiner Name"
 msgid "Language"
 msgstr "Sprache"
 
-#: ../calendar/gui/e-memo-table.c:371 ../modules/calendar/e-cal-shell-content.c:1602 
../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../calendar/gui/e-memo-table.c:371 ../modules/calendar/e-cal-shell-content.c:1599 
../modules/calendar/e-memo-shell-view-actions.c:180
 #: ../modules/calendar/e-memo-shell-view-actions.c:195 ../modules/calendar/e-memo-shell-view.c:308
 msgid "Memos"
 msgstr "Notizen"
 
-#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
+#: ../calendar/gui/e-memo-table.c:455 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* Keine Zusammenfassung *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-memo-table.c:540 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "Anfang:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
+#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Fälligkeit:"
 
-#: ../calendar/gui/e-memo-table.c:684
+#: ../calendar/gui/e-memo-table.c:683
 msgid "Cut selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-memo-table.c:690
+#: ../calendar/gui/e-memo-table.c:689
 msgid "Copy selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-memo-table.c:696
+#: ../calendar/gui/e-memo-table.c:695
 msgid "Paste memos from the clipboard"
 msgstr "Notiz aus der Zwischenablage einfügen"
 
-#: ../calendar/gui/e-memo-table.c:702 ../modules/calendar/e-memo-shell-view-actions.c:531
+#: ../calendar/gui/e-memo-table.c:701 ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "Die gewählten Notizen löschen"
 
-#: ../calendar/gui/e-memo-table.c:708
+#: ../calendar/gui/e-memo-table.c:707
 msgid "Select all visible memos"
 msgstr "Alle sichtbaren Notizen wählen"
 
@@ -4530,32 +4623,32 @@ msgid "%d%%"
 msgstr "%d%%"
 
 #: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404 
../calendar/importers/icalendar-importer.c:78 ../calendar/importers/icalendar-importer.c:1062
-#: ../modules/calendar/e-calendar-preferences.ui.h:62 ../modules/calendar/e-cal-shell-content.c:1560 
../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-calendar-preferences.ui.h:62 ../modules/calendar/e-cal-shell-content.c:1559 
../modules/calendar/e-task-shell-view-actions.c:203
 #: ../modules/calendar/e-task-shell-view-actions.c:218 ../modules/calendar/e-task-shell-view.c:466
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: ../calendar/gui/e-task-table.c:999
+#: ../calendar/gui/e-task-table.c:998
 msgid "Cut selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-task-table.c:1005
+#: ../calendar/gui/e-task-table.c:1004
 msgid "Copy selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-task-table.c:1011
+#: ../calendar/gui/e-task-table.c:1010
 msgid "Paste tasks from the clipboard"
 msgstr "Aufgaben aus der Zwischenablage einfügen"
 
-#: ../calendar/gui/e-task-table.c:1017 ../modules/calendar/e-task-shell-view-actions.c:656
+#: ../calendar/gui/e-task-table.c:1016 ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "Die gewählten Aufgaben löschen"
 
-#: ../calendar/gui/e-task-table.c:1023
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Select all visible tasks"
 msgstr "Alle sichtbaren Aufgaben wählen"
 
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Zeitzone auswählen"
 
@@ -4688,15 +4781,15 @@ msgstr "Eine Ressource kann nicht gebucht werden, Fehler:"
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/itip-utils.c:1917
+#: ../calendar/gui/itip-utils.c:1918
 msgid "Sending an event"
 msgstr "Eine Nachricht verschicken"
 
-#: ../calendar/gui/itip-utils.c:1921
+#: ../calendar/gui/itip-utils.c:1922
 msgid "Sending a memo"
 msgstr "Eine Notiz verschicken"
 
-#: ../calendar/gui/itip-utils.c:1925
+#: ../calendar/gui/itip-utils.c:1926
 msgid "Sending a task"
 msgstr "Eine Aufgabe verschicken"
 
@@ -6010,7 +6103,9 @@ msgid "Asia/Kashgar"
 msgstr "Asien/Kashgar"
 
 #: ../calendar/zones.h:242
-msgid "Asia/Katmandu"
+#, fuzzy
+#| msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
 msgstr "Asien/Katmandu"
 
 #: ../calendar/zones.h:243
@@ -6665,172 +6760,168 @@ msgstr "Pazifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
-#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131 
../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "Diese _Meldung nicht mehr anzeigen"
-
-#: ../composer/e-composer-actions.c:265
+#: ../composer/e-composer-actions.c:212
 msgid "Save as..."
 msgstr "Speichern unter …"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Die momentan geöffnete Datei schließen"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr "Neue _Nachricht"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
 msgstr "Neues Nachrichtenfenster öffnen"
 
-#: ../composer/e-composer-actions.c:401 ../shell/e-shell-window-actions.c:978
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../composer/e-composer-actions.c:403 ../shell/e-shell-window-actions.c:980
+#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Evolution konfigurieren"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr "Die momentan geöffnete Datei speichern"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "Speichern _unter …"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
 msgstr "Zeichen_kodierung"
 
-#: ../composer/e-composer-actions.c:448
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr "Als _Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:457
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr "A_bschicken"
 
-#: ../composer/e-composer-actions.c:464
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr "Diese Nachricht verschicken"
 
-#: ../composer/e-composer-actions.c:472
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
 msgstr "Mit P_GP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
 msgstr "Mit _PGP signieren"
 
-#: ../composer/e-composer-actions.c:482
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ../composer/e-composer-actions.c:488
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
 msgstr "_Bildersammlung"
 
-#: ../composer/e-composer-actions.c:490
+#: ../composer/e-composer-actions.c:437
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Eine Bildersammlung anzeigen, die in Ihrer Nachricht abgelegt werden kann"
 
-#: ../composer/e-composer-actions.c:496
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
 msgstr "Nachricht _priorisieren"
 
-#: ../composer/e-composer-actions.c:498
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
 msgstr "Die Priorität der Nachricht auf hoch setzen"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr "_Lesebestätigung anfordern"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:453
 msgid "Get delivery notification when your message is read"
 msgstr "Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr "Mit S/_MIME verschlüsseln"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr "Mit _S/MIME signieren"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ../composer/e-composer-actions.c:576 ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#: ../composer/e-composer-actions.c:523 ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
 msgid "Unicode smileys"
 msgstr "Grafische Emoticons in Unicode"
 
-#: ../composer/e-composer-actions.c:578 ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#: ../composer/e-composer-actions.c:525 ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
 msgid "Use Unicode characters for smileys."
 msgstr "Grafische Emoticons in Unicode verwenden."
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr "_Blindkopie-Feld"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Blindkopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr "_Kopie-Feld"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr "Kopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:547
 msgid "_From Override Field"
 msgstr "_Absender-Feld bearbeiten"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:549
 msgid "Toggles whether the From override field to change name or email address is displayed"
 msgstr "Umschalten des Absenderfeldes zur Anzeige des Names oder der E-Mail-Adresse"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr "An_twort-an-Feld"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Antwort-an-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:671
+#: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "Entwurf speichern"
 
-#: ../composer/e-composer-from-header.c:109 ../e-util/e-mail-signature-script-dialog.c:415 
../e-util/gal-view-instance-save-as-dialog.ui.h:2 ../mail/e-mail-config-identity-page.c:327
-#: ../mail/e-mail-config-summary-page.c:339
+#: ../composer/e-composer-from-header.c:109 ../e-util/e-mail-signature-script-dialog.c:415 
../e-util/gal-view-instance-save-as-dialog.ui.h:2 ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
 msgid "_Name:"
 msgstr "_Name:"
 
@@ -6874,7 +6965,7 @@ msgstr "_Veröffentlichen in:"
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-composer-header-table.c:870 ../mail/e-mail-config-identity-page.c:505
+#: ../composer/e-composer-header-table.c:870 ../mail/e-mail-config-identity-page.c:504
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -6886,21 +6977,21 @@ msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:876
 #, c-format
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat für dieses Konto 
festgelegt"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:885
 #, c-format
 msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein Verschlüsselungszertifikat für dieses 
Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2280
+#: ../composer/e-msg-composer.c:1599 ../composer/e-msg-composer.c:2367
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:4579
+#: ../composer/e-msg-composer.c:4710
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Der Editor enthält einen nicht-Text-Nachrichtenrumpf, der nicht bearbeitet werden kann."
 
@@ -7019,7 +7110,7 @@ msgstr "Der Fehler »{0}« wurde gemeldet. Die Nachricht ist höchstwahrscheinli
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Während des Verschickens ist ein Fehler aufgetreten. Wie möchten Sie fortfahren?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:167
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Die Fehlermeldung war »{0}«."
 
@@ -7056,6 +7147,26 @@ msgstr "Sind Sie sicher, dass Sie die Nachricht senden wollen?"
 msgid "A keyboard accelerator to send the message has been pressed. Either cancel sending the message, if it 
was done by an accident, or send the message."
 msgstr "Ein Tastenkürzel zum Versenden der Nachricht wurde gedrückt. Falls dies irrtümlich geschehen ist, 
brechen Sie den Sendevorgang ab, ansonsten senden Sie die Nachricht."
 
+#: ../composer/mail-composer.error.xml.h:39
+#, fuzzy
+#| msgid "Are you sure you want to send the message?"
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Sind Sie sicher, dass Sie die Nachricht senden wollen?"
+
+#: ../composer/mail-composer.error.xml.h:40
+msgid "Turning HTML mode off will cause the text to lose all formatting. Do you want to continue?"
+msgstr "Durch Ausschalten des HTML-Modus verliert der Text sämtliche Formatierungen. Möchten Sie fortsetzen?"
+
+#: ../composer/mail-composer.error.xml.h:41
+msgid "_Don't lose formatting"
+msgstr "Formatierung _nicht entfernen"
+
+#: ../composer/mail-composer.error.xml.h:42
+#, fuzzy
+#| msgid "_Lose formatting"
+msgid "Lose _formatting"
+msgstr "Formatierung _entfernen"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Alarm-Benachrichtigung"
@@ -7064,7 +7175,7 @@ msgstr "Evolution Alarm-Benachrichtigung"
 msgid "Calendar event notifications"
 msgstr "Benachrichtigungen über Kalenderereignisse"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032 
../modules/mailto-handler/evolution-mailto-handler.c:210 ../shell/e-shell-window-private.c:242
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1054 
../modules/mailto-handler/evolution-mailto-handler.c:210 ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7212,6 +7323,12 @@ msgstr "Legt fest, ob Sonstige Informationen angezeigt werden"
 msgid "Whether to show notes in the editor"
 msgstr "Legt fest, ob Notizen im Editor angezeigt werden"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+#, fuzzy
+#| msgid "Whether to show notes in the editor"
+msgid "Whether to show Certificates tab in the editor"
+msgstr "Legt fest, ob Notizen im Editor angezeigt werden"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "E-Mails nach Unicode konvertieren"
@@ -7319,170 +7436,282 @@ msgid "Minute the workday starts on, 0 to 59."
 msgstr "Die Minute von 0 bis 59, zu der der Arbeitstag beginnt."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Monday"
+msgstr "Stunde, zu der der Arbeitstag beginnt"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgid "Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, or -1 to use 
day-start-hour and day-start-minute"
+msgstr "Die Stunde im 24-Stunden-Format von 0 bis 23, an der ein Arbeitstag beginnt."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Monday"
+msgstr "Stunde, zu der der Arbeitstag endet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#, fuzzy
+#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgid "Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or -1 to use day-end-hour 
and day-end-minute"
+msgstr "Die Stunde im 24-Stunden-Format von 0 bis 23, an der ein Arbeitstag endet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#, fuzzy
+#| msgid "Workday start minute"
+msgid "Workday start time for Tuesday"
+msgstr "Minute, zu der der Arbeitstag beginnt"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#, fuzzy
+#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgid "Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or -1 to use day-start-hour 
and day-start-minute"
+msgstr "Die Stunde im 24-Stunden-Format von 0 bis 23, an der ein Arbeitstag endet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#, fuzzy
+#| msgid "Workday end minute"
+msgid "Workday end time for Tuesday"
+msgstr "Minute, zu der der Arbeitstag endet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#, fuzzy
+#| msgid "Workday start minute"
+msgid "Workday start time for Wednesday"
+msgstr "Minute, zu der der Arbeitstag beginnt"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#, fuzzy
+#| msgid "Workday end minute"
+msgid "Workday end time for Wednesday"
+msgstr "Minute, zu der der Arbeitstag endet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Thursday"
+msgstr "Stunde, zu der der Arbeitstag beginnt"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Thursday"
+msgstr "Stunde, zu der der Arbeitstag endet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Friday"
+msgstr "Stunde, zu der der Arbeitstag beginnt"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Friday"
+msgstr "Stunde, zu der der Arbeitstag endet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Saturday"
+msgstr "Stunde, zu der der Arbeitstag beginnt"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Saturday"
+msgstr "Stunde, zu der der Arbeitstag endet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Sunday"
+msgstr "Stunde, zu der der Arbeitstag beginnt"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Sunday"
+msgstr "Stunde, zu der der Arbeitstag endet"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 msgid "The second timezone for a Day View"
 msgstr "Die zweite Zeitzone für die Tagesansicht"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
 msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key"
 msgstr "Legt fest, ob die zweite Zeitzone in der Tagesansicht angezeigt wird, falls diese definiert ist. Der 
Schlüsselwert hat das gleiche Format wie der Schlüssel »timezone«"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
 msgid "Recently used second time zones in a Day View"
 msgstr "Zuletzt genutzte zweite Zeitzonen in der Tagesansicht"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
 msgid "List of recently used second time zones in a Day View"
 msgstr "Liste der zuletzt genutzten zweiten Zeitzonen in der Tagesansicht"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
 msgid "Maximum number of recently used timezones to remember"
 msgstr "Höchstzahl der zuletzt genutzten gespeicherten Zeitzonen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
 msgid "Maximum number of recently used timezones to remember in a 'day-second-zones' list"
 msgstr "Höchstzahl der zuletzt genutzten gespeicherten Zeitzonen in der Liste »day-second-zones«"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
 msgid "Default reminder value"
 msgstr "Wert der voreingestellten Erinnerung"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
 msgid "Number of units for determining a default reminder"
 msgstr "Anzahl der Einheiten zur Festlegung einer voreingestellten Erinnerung"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
 msgid "Default reminder units"
 msgstr "Einheit der voreingestellten Erinnerung"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "Einheit für eine voreingestellte Erinnerung (»minutes«, »hours« oder »days«)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#, fuzzy
+#| msgid "Default reminder value"
+msgid "Default reminder snooze interval, in minutes"
+msgstr "Wert der voreingestellten Erinnerung"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid "Default reminder snooze interval, in minutes, to be filled in the reminder notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Kategoriefeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Soll das Kategoriefeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Positionsfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Soll das Positionsfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Soll das Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Zeitzonenfeld im Ereignis-/Besprechungseditor anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Soll das Zeitzonenfeld im Ereignis-/Besprechungseditor angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide completed tasks"
 msgstr "Erledigte Aufgaben verbergen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 msgid "Hide task units"
 msgstr "Einheit für das Verbergen von Aufgaben"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr "Einheit zur Festlegung, wann Aufgaben verborgen werden sollen (»minutes«, »hours« oder »days«)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid "Hide task value"
 msgstr "Wert für das Verbergen von Aufgaben"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 msgid "Number of units for determining when to hide tasks"
 msgstr "Anzahl der Einheiten zur Festlegung, wann Aufgaben verborgen werden sollen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Horizontal pane position"
 msgstr "Position der horizontalen Schiebeleiste"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in 
the month view, in pixels"
 msgstr "Die Position der horizontalen Schiebeleiste zwischen dem Kalender zur Auswahl des Datums und der 
Aufgabenliste in Pixel, wenn keine Monatsansicht eingestellt ist"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Last reminder time"
 msgstr "Letzte Erinnerungszeit"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid "Time the last reminder ran, in time_t"
 msgstr "Zeit der letzten Erinnerungsauslösung im »time_t«-Format"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Farbe der Marcus-Bains-Linie - Tagesansicht"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Farbe der Marcus-Bains-Linie in der Tagesansicht"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Farbe der Marcus-Bains-Linie - Zeitleiste"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr "Farbe der Marcus-Bains-Linie in der Zeitleiste (Voreinstellung ist leer)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid "Marcus Bains Line"
 msgstr "Marcus-Bains-Linie"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "Soll eine Marcus-Bains-Linie (Linie auf der momentanen Zeit) im Kalender angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Memo preview pane position (horizontal)"
 msgstr "Position der horizontalen Notizvorschau"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "Position des Aufgaben-Vorschaufeldes in horizontaler Anordnung"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Memo layout style"
 msgstr "Stil der Notiz"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 msgid ""
 "The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic 
View) places the preview pane below the memo list. \"1\" (Vertical View) places "
 "the preview pane next to the memo list"
@@ -7490,167 +7719,167 @@ msgstr ""
 "Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die Notizliste angezeigt wird. »0« (klassische 
Ansicht) setzt die Vorschauleiste unter die Notizliste. »1« (vertikale "
 "Ansicht) setzt die Vorschauleiste neben die Notizliste"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo preview pane position (vertical)"
 msgstr "Position der vertikalen Notizvorschau"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "Position des Notiz-Vorschaufeldes in vertikaler Anordnung"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Month view horizontal pane position"
 msgstr "Position der horizontalen Schiebeleiste in der Monatsansicht"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in 
the month view, in pixels"
 msgstr "Die Position der horizontalen Schiebeleiste zwischen der Ansicht, dem Datumsnavigator-Kalender und 
der Aufgabenliste in Pixel, wenn die Monatsansicht eingestellt ist"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Scroll Month View by a week, not by a month"
 msgstr "Soll in der Monatsansicht wochenweise geblättert werden anstatt monatsweise?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Soll in der Monatsansicht wochenweise geblättert werden anstatt monatsweise?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Reminder programs"
 msgstr "Erinnerungsprogramme"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Programs that are allowed to be run by reminders"
 msgstr "Programme, die als Teil von Erinnerungen ausgeführt werden können"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show display reminders in notification tray"
 msgstr "Erinnerungen im Benachrichtigungsfeld anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "Whether or not to use the notification tray for display reminders"
 msgstr "Soll das Benachrichtigungsfeld für Erinnerungen verwendet werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Preferred New button item"
 msgstr "Bevorzugtes Objekt für neuen Knopf"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "Name of the preferred New toolbar button item"
 msgstr "Name des bevorzugten neuen Knopf-Objekts in der Werkzeugleiste"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr "Primärer Kalender"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "The UID of the selected (or \"primary\") calendar in the sidebar of the \"Calendar\" view"
 msgstr "Die UID des gewählten (oder »primären«) Kalenders in der Seitenleiste der »Kalender«-Ansicht"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
 msgstr "Primäre Notizliste"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "The UID of the selected (or \"primary\") memo list in the sidebar of the \"Memos\" view"
 msgstr "Die UID der gewählten (oder »primären«) Notizenliste in der Seitenleiste der »Notizen«-Ansicht"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
 msgstr "Primäre Aufgabenliste"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "The UID of the selected (or \"primary\") task list in the sidebar of the \"Tasks\" view"
 msgstr "Die UID der gewählten (oder »primären«) Aufgabenliste in der Seitenleiste der »Aufgaben«-Ansicht"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
 msgstr "Vorlage-Adresse für Verfügbarkeitsdaten"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 #, no-c-format
 msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail 
address and %d is replaced by the domain"
 msgstr "Die Adress-Vorlage zur Verwendung als Rückgriff auf Verfügbarkeitsdaten. »%u« wird durch den 
Benutzerteil der E-Mail-Adresse und »%d« durch die Domain ersetzt"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Recurrent Events in Italic"
 msgstr "Wiederkehrende Ereignisse kursiv"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr "Tage mit wiederkehrenden Ereignissen im Kalender unten links kursiv anzeigen"
 
 # laut Duden wird zeitbasiert zusammen geschrieben
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Search range for time-based searching in years"
 msgstr "Suchbereich für zeitbasierte Suche in Jahren"
 
 # laut Duden wird zeitbasiert zusammen geschrieben
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "How many years can the time-based search go forward or backward from currently selected day when 
searching for another occurrence; default is ten years"
 msgstr ""
 "Legt fest, wie viele Jahre die zeitbasierte Suche vor und nach dem derzeit ausgewählten Tag sucht, während 
nach einem anderen Wiederholung gesucht wird. Voreinstellung beträgt zehn Jahre"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show appointment end times in week and month views"
 msgstr "Endzeiten von Terminen in Wochen- und Monatsansichten anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "Sollen die Endzeiten von Ereignissen in den Wochen- und Monatsansichten angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show the memo preview pane"
 msgstr "Das Notiz-Vorschaufeld anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "Falls auf »wahr« gesetzt, wird die Notizvorschau im Hauptfenster angezeigt"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the task preview pane"
 msgstr "Das Aufgaben-Vorschaufeld anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "Falls auf »wahr« gesetzt, wird die Aufgabenvorschau im Hauptfenster angezeigt"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "Wochennummern in Tagesansicht, Arbeitswochenansicht und Datumsnavigator anzeigen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Sollen die Wochennummern im Kalender an verschiedenen Stellen angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Vertical position for the tag pane"
 msgstr "Vertikale Position der Markierungsleiste"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Highlight tasks due today"
 msgstr "Heute fällige Aufgaben hervorheben"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr "Legt fest, ob heute fällige Aufgaben mit einer bestimmten Farbe hervorgehoben werden sollen 
(task-due-today-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Tasks due today color"
 msgstr "Farbe heute fälliger Aufgaben"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format. Used together with 
task-due-today-highlight"
 msgstr "Hintergrundfarbe für heute fällige Aufgaben im Format »#rrggbb«. Gemeinsam verwendet mit 
task-due-today-highlight"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Task preview pane position (horizontal)"
 msgstr "Position der horizontalen Aufgabenvorschau"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Task layout style"
 msgstr "Anordnung für Aufgaben"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid ""
 "The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic 
View) places the preview pane below the task list. \"1\" (Vertical View) places "
 "the preview pane next to the task list"
@@ -7658,124 +7887,124 @@ msgstr ""
 "Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die Aufgabenliste angezeigt wird. »0« 
(klassische Ansicht) setzt die Vorschauleiste unter die Aufgabenliste. »1« (vertikale "
 "Ansicht) setzt die Vorschauleiste neben die Aufgabenliste"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task preview pane position (vertical)"
 msgstr "Position der vertikalen Aufgabenvorschau"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Position des Aufgaben-Vorschaufeldes in vertikaler Anordnung"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Highlight overdue tasks"
 msgstr "Überfällige Aufgaben hervorheben"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr "Legt fest, ob überfällige Aufgaben mit einer bestimmten Farbe hervorgehoben werden sollen 
(task-overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Overdue tasks color"
 msgstr "Farbe überfälliger Aufgaben"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format. Used together with 
task-overdue-highlight."
 msgstr "Hintergrundfarbe für überfällige Aufgaben im Format »#rrggbb«. Gemeinsam verwendet mit 
task-overdue-highlight."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Time divisions"
 msgstr "Zeiteinteilungen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "In der Tages- und Wochentagsansicht anzuzeigende Intervalle in Minuten"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olson timezone 
database location like \"America/New York\""
 msgstr "Die voreingestellte Zeitzone für Datum und Zeit im Kalender als nicht übersetzter Ort der 
Olsen-Zeitzonendatenbank, wie z.B. »Europe/Berlin«."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Twenty four hour time format"
 msgstr "24-Stunden-Zeitformat"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "Sollen Zeiten im 24-Stunden- und nicht im 12-Stunden-Format angezeigt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Birthday and anniversary reminder"
 msgstr "Erinnerung an Geburts- und Jahrestage"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Soll eine Erinnerung für Geburtstage und Jahrestage festgelegt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Default appointment reminder"
 msgstr "Voreingestellte Erinnerung für Termine"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to set a default reminder for appointments"
 msgstr "Soll eine voreingestellte Erinnerung für Termine festgelegt werden?"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Use system timezone"
 msgstr "Zeitzone des Systems verwenden"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Die Zeitzone des Systems anstatt der in Evolution gewählten Zeitzone verwenden"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "First day of the week"
 msgstr "Erster Tag der Woche"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Monday is a work day"
 msgstr "Montag ist ein Arbeitstag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Tuesday is a work day"
 msgstr "Dienstag ist ein Arbeitstag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Wednesday is a work day"
 msgstr "Mittwoch ist ein Arbeitstag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Thursday is a work day"
 msgstr "Donnerstag ist ein Arbeitstag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Friday is a work day"
 msgstr "Freitag ist ein Arbeitstag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Saturday is a work day"
 msgstr "Samstag ist ein Arbeitstag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Sunday is a work day"
 msgstr "Sonntag ist ein Arbeitstag"
 
 # »Samstag« wird auch in Österreich und in der Schweiz verstanden ;)
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(Veraltet) Wochentag von Sonntag (»0«) bis Samstag (»6«), mit dem die Woche beginnt"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"week-start-day-name\" 
instead."
 msgstr "Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr verwendet werden. Verwenden Sie 
stattdessen »week-start-day-name«."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "(Deprecated) Work days"
 msgstr "(Veraltet) Arbeitstage"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key was deprecated in version 3.10 
and should no longer be used. Use the \"work-day-monday\", \"work-day-tuesday"
 "\", etc. keys instead.)"
@@ -8089,102 +8318,112 @@ msgid "Will autowrap lines after given number of characters."
 msgstr "Automatischer Zeilenumbruch nach angegebener Anzahl von Zeichen"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#, fuzzy
+#| msgid "Whether to show SIP addresses in the editor"
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr "Legt fest, ob SIP-Adressen im Editor angezeigt werden"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid "If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME are always shown in the 
composer's toolbar. Otherwise they are shown only when being used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Save file format for drag-and-drop operation"
 msgstr "Dateiformat für den Vorgang des Ziehen-und-Ablegens speichern"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Kann entweder »mbox« oder »pdf« sein."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Show image animations"
 msgstr "Bildanimationen anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a 
static image instead."
 msgstr "Bewegte Bilder in HTML-Nachrichten einschalten. Viele Benutzer empfinden animierte Bilder als 
störend und bevorzugen, ein statisches Bild zu sehen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable or disable type ahead search feature"
 msgstr "Schnellsuche an- oder abschalten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable the side bar search feature to allow interactive searching of folder names."
 msgstr "Die Suchfunktion in der Seitenleiste einschalten für die interaktive Suche nach Ordnernamen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable or disable magic space bar"
 msgstr "Magische Leertaste ein-/ausschalten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
 msgstr "Legt fest, ob die Leertaste zum Blättern in der Nachrichtenvorschau, der Nachrichtenliste und den 
Ordnern benutzt werden soll."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "Ähnliche Ansichten der Nachrichtenliste für alle Ordner aktivieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Ähnliche Ansichten der Nachrichtenliste für alle Ordner aktivieren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Citation highlight color"
 msgstr "Hervorhebungsfarbe für Zitate"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Citation highlight color."
 msgstr "Hervorhebungsfarbe für Zitate."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor angezeigt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Bilder für HTML-Nachrichten per HTTP automatisch herunterladen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show all message headers"
 msgstr "Alle Nachrichtenköpfe anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Show all the headers when viewing a messages."
 msgstr "Beim Anzeigen von Nachrichten alle Nachrichtenköpfe anzeigen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "List of headers to show when viewing a message."
 msgstr "Anzuzeigende Nachrichtenköpfe beim Ansehen von Nachrichten."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean indicating whether the header is 
enabled. Disabled headers are not shown when viewing a message, but are still "
 "listed in Preferences."
@@ -8192,105 +8431,115 @@ msgstr ""
 "Jede Kopfzeile wird durch ein Paar dargestellt: Der Kopfzeilenname und ein Boolesch, welcher angibt, ob die 
Kopfzeile eingeschaltet ist. Ausgeschaltete Kopfzeilen werden beim Anschauen "
 "einer Nachricht nicht angezeigt, aber immer in den Einstellungen aufgeführt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show photo of the sender"
 msgstr "Foto des Absenders anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Fotos des Absenders in der Nachrichtenvorschau anzeigen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Auf gravatar.com nach dem Foto des Absenders suchen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr "Zulassen, dass auch auf gravatar.com nach dem Foto des Absenders gesucht werden soll."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#, fuzzy
+#| msgid "Mark as Seen after specified timeout"
+msgid "Mark as Seen always after specified timeout"
+msgstr "Nach angegebenem Intervall als gelesen markieren"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+msgid "If set to true, the selected message will be set as unread after the timeout also after the folder 
change."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Timeout for marking messages as seen"
 msgstr "Zeitintervall bis zum Markieren von Nachrichten als gelesen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Zeitintervall in Millisekunden zum Markieren von Nachrichten als gelesen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Sender email-address column in the message list"
 msgstr "Spalte mit der E-Mail-Adresse des Absenders in der Nachrichtenliste"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "Zeigt die E-Mail-Adresse des Absenders in einer eigenen Spalte in der Nachrichtenliste an."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" 
column in vertical view"
 msgstr "Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile in der 
»Nachrichten«-Spalte der vertikalen Ansicht verwendet werden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" 
column in vertical view."
 msgstr "Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile in der 
»Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Enable Unmatched search folder"
 msgstr "Trefferlosen Suchordner aktivieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Enable Unmatched search folder within Search Folders. It does nothing if Search Folders are disabled."
 msgstr "Trefferlosen Suchordner in den Suchordnern aktivieren. Hat keine Wirkung, wenn Suchordner 
ausgeschaltet sind."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and 
removes the preview for that folder."
 msgstr ""
 "Dieser Wert wird einmalig beim Aufruf von Evolution eingelesen und danach wieder auf den Vorgabewert 
»FALSCH« zurückgesetzt. Falls WAHR, so wird das Vorschaufenster für diesen Ordner "
 "nicht angezeigt und keine Auswahl in der Nachrichtenliste gesetzt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Ob Nachrichtenkopfzeilen in der Benutzeroberfläche angezeigt werden sollen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Width of the message-list pane"
 msgstr "Breite der Nachrichtenliste"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Layout style"
 msgstr "Anordnung"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid ""
 "The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic 
View) places the preview pane below the message list. \"1\" (Vertical View) "
 "places the preview pane next to the message list."
@@ -8298,78 +8547,90 @@ msgstr ""
 "Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die Nachrichtenliste angezeigt wird. »0« 
(klassische Ansicht) setzt die Vorschauleiste unter die Nachrichtenliste. "
 "»1« (vertikale Ansicht) setzt die Vorschauleiste neben die Nachrichtenliste. "
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "The variable width font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Use custom fonts for displaying mail."
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Kürzen der Adressanzeige in den Empfängerfeldern (An/Kopie/Blindkopie)"
 
 # CHECK
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
 msgstr "Die Anzeige der Adressen in den Empfängerfeldern (An/Kopie/Blindkopie) auf die im Schlüssel 
»address_count« angegebene Anzahl reduzieren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Anzahl der Adressen, die in den Empfängerfeldern (An/Kopie/Blindkopie) angezeigt werden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is 
shown."
 msgstr "Die Anzahl der Adressen, die in der Standardansicht angezeigt werden, bevor »…« angezeigt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert als Konversation anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or 
References headers."
 msgstr "Legt fest, ob die Konversationen auf Basis der Betreffe erstellt werden, falls die Kopfzeilen einer 
Nachricht auf keine Referenznachricht verweisen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Default value for thread expand state"
 msgstr "Vorgabewert, ob Konversationen ausgeklappt angezeigt werden sollen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. 
Evolution requires a restart."
 msgstr "Legt fest, ob Konversationen per Vorgabe ausgeklappt oder eingeklappt dargestellt werden sollen. 
Evolution muss zur Umsetzung der Änderung neu gestartet werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Legt fest, ob Konversationen nach der letzten Nachricht der jeweiligen Konversation sortiert werden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, 
rather than by message's date. Evolution requires a restart."
 msgstr ""
 "Legt fest, ob Konversationen nach der letzten Nachricht einer Konversation sortiert werden sollen anstatt 
nach dem Datum der Nachricht. Evolution muss nach Ändern des Wertes neu "
 "gestartet werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+msgid "Whether sort thread children always ascending"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#, fuzzy
+#| msgid "This setting specifies whether the threads should be sorted based on latest message in each 
thread, rather than by message's date. Evolution requires a restart."
+msgid "This setting specifies whether the thread children should be sorted always ascending, rather than 
using the same sort order as in the thread root level."
+msgstr ""
+"Legt fest, ob Konversationen nach der letzten Nachricht einer Konversation sortiert werden sollen anstatt 
nach dem Datum der Nachricht. Evolution muss nach Ändern des Wertes neu "
+"gestartet werden."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Konten alphabetisch in einem Ordnerbau sortieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to true accounts are sorted 
alphabetically, with an exception of On This Computer and Search folders, otherwise "
 "accounts are sorted based on an order given by a user"
@@ -8377,27 +8638,27 @@ msgstr ""
 "Legt fest, wie Konten in der Nachrichtenansicht in einem Ordnerbaum angezeigt werden. Wenn aktiviert, 
werden Konten alphabetisch sortiert, mit Ausnahme von »Auf diesem Rechner« und "
 "»Suchordner«, anderenfalls werden Konten nach einer vom Benutzer angegebenen Reihenfolge sortiert"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Flush Outbox after filtering"
 msgstr "Nachrichtenausgang nach dem Filtern leeren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen only when there was used any 
'Forward to' filter action and approximately one minute after the last action "
 "invocation."
@@ -8405,99 +8666,99 @@ msgstr ""
 "Legt fest. ob der Nachrichtenausgang nach dem Filtern geleert werden soll. Das geschieht nur, wenn ein 
»Weiterleiten an«-Filtervorgang angewendet wurde, etwa eine Minute nach der "
 "letzten Aktion."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Default reply style"
 msgstr "Standard-Antwortstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "Legt fest, ob eine Bestätigung eingeholt werden soll, falls eine Nachricht durch Tastenkürzel 
(Strg+Eingabe) verschickt wird"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt the user when he or she tries to send a message with a key accelerator."
 msgstr "Legt fest, ob eine Bestätigung eingeholt werden soll, falls ein Benutzer versucht, eine Nachricht 
durch Tastenkürzeln zu verschicken."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu verschicken."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when emptying the trash"
 msgstr "Beim Leeren des Papierkorbs nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Nachfragen, wenn Empfänger nicht als E-Mail-Adresse angegeben wurden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "It disables/enables the repeated prompts to warn that you are trying to send a message to recipients 
not entered as mail addresses"
 msgstr "Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine Nachricht an Empfänger 
versendet, deren Adresse nicht als E-Mail-Adresse angegeben wurde"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld nachfragen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu verschicken"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, nachfragen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Vor gleichzeitigem Öffnen von 10 oder mehr Nachrichten einen Hinweis anzeigen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 msgstr "Wenn ein Benutzer versucht, 10 oder mehr Nachrichten auf einmal zu öffnen, wird er gefragt, ob er es 
wirklich tun will."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Die Anzeige beim Markieren mehrerer Nachrichten ein-/ausschalten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim Löschen von Nachrichten in Suchordner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder 
permanently deletes the message, not simply removing it from the search results."
 msgstr "Legt fest, ob der Benutzer gewarnt werden soll, dass das Löschen einer Nachricht in einem Suchordner 
die Nachricht wirklich löscht und nicht nur aus den Suchergebnissen entfernt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "Anfragen, ob ein Ordner durch Ziehen und Ablegen in den Ordnerbaum kopiert werden soll"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of folders in folder tree, 'always' - 
allow copy with drag &amp; drop of folders in folder tree without asking, or "
 "'ask' - (or any other value) will ask user."
@@ -8505,11 +8766,11 @@ msgstr ""
 "Mögliche Werte sind: »never«, um das Kopieren per Ziehen-und-Ablegen von Ordnern in den Ordnerbaum zu 
verbieten, »always«, um ohne Nachfrage das Kopieren per Ziehen-und-Ablegen von "
 "Ordnern in den Ordnerbaum zu erlauben und »ask« (bzw. jeder andere Wert) führt dazu, dass der Benutzer 
stets gefragt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "Anfragen, ob ein Ordner durch Ziehen und Ablegen in den Ordnerbaum verschoben werden soll"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of folders in folder tree, 'always' - 
allow move with drag &amp; drop of folders in folder tree without asking, or "
 "'ask' - (or any other value) will ask user."
@@ -8517,19 +8778,19 @@ msgstr ""
 "Mögliche Werte sind: »never«, um das Verschieben per Ziehen-und-Ablegen von Ordnern in den Ordnerbaum zu 
verbieten, »always«, um ohne Nachfrage das Verschieben per Ziehen-und-Ablegen "
 "von Ordnern in den Ordnerbaum zu erlauben und »ask« (bzw. jeder andere Wert) führt dazu, dass der Benutzer 
stets gefragt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when replying privately to list messages"
 msgstr "Bei privater Antwort auf Listennachrichten nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "It disables/enables the repeated prompts to warn that you are sending a private reply to a message 
which arrived via a mailing list."
 msgstr "Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine private Antwort auf eine 
Nachricht versendet, die über eine Mailingliste eingegangen ist."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Nachfragen, wenn Mailinglisten versuchen private Antworten an die Liste umzuleiten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message 
which arrived via a mailing list, but the list sets a Reply-To: header which "
 "redirects your reply back to the list"
@@ -8537,119 +8798,129 @@ msgstr ""
 "Dadurch werden die wiederholten Warnhinweise aktiviert oder deaktiviert, welche erscheinen, wenn Sie auf 
eine über eine Mailingliste erhaltene Nachricht an den privaten Absender "
 "antworten wollen, aber die »Antwort an«-Kopfzeile die Antwort normalerweise an die Mailingliste leiten 
würde."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when replying to many recipients"
 msgstr "Beim Antworten an viele Empfänger nachfragen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "It disables/enables the repeated prompts to warn that you are sending a reply to many people."
 msgstr "Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine Antwort an viele Personen 
versendet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+msgid "Prompt when switching composer mode and the content needs to lose its formatting"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#, fuzzy
+#| msgid "It disables/enables the repeated prompts to warn that you are trying to send a message to 
recipients not entered as mail addresses"
+msgid "It disables/enables the repeated prompts to warn that you are switching composer mode and the content 
needs to lose its formatting."
+msgstr "Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine Nachricht an Empfänger 
versendet, deren Adresse nicht als E-Mail-Adresse angegeben wurde"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Policy for automatically closing the message browser window when forwarding or replying to the 
displayed message."
 msgstr "Richtlinie zum automatischen Schließen des Nachrichtenfensters beim Weiterleiten oder Antworten auf 
die dargestellte Nachricht."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Empty Trash folders on exit"
 msgstr "Papierkorb-Ordner beim Beenden leeren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Papierkorb-Ordner beim Beenden von Evolution leeren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Papierkorbs beim Beenden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Papierkorbs beim Beenden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Last time Empty Trash was run"
 msgstr "Letzte Papierkorbleerung"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Die Zeit seit der letzten Papierkorbleerung in Tagen seit dem 01.01.1970."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Anzahl der Sekunden, die eine Fehlermeldung in der Statusleiste angezeigt wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 msgstr "Hier sind drei verschiedene Werte möglich: »0« für Fehler, »1« für Warnungen, »2« für 
Diagnosemeldungen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Show original \"Date\" header value."
 msgstr "Den originalen Wert der Kopfzeile »Datum« anzeigen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always 
show \"Date\" header value in a user preferred format and local time zone."
 msgstr ""
 "Den originalen Wert der Kopfzeile »Datum« anzeigen, mit einer lokalen Zeit, falls sich die Zeitzonen 
unterscheiden. Anderenfalls wird der Wert der Kopfzeile »Datum« in einem "
 "benutzerdefinierten Format und der lokalen Zeitzone dargestellt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "List of labels known to the mail component of Evolution. The list contains strings containing 
name:color where color uses the HTML hex encoding."
 msgstr "Liste der Beschriftungen, die Evolutions E-Mail-Komponente bekannt sind. Die Liste enthält 
Zeichenketten der Form Name:Farbe, wobei die Farbe als HTML-Hextriplet anzugeben ist."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Check incoming mail being junk"
 msgstr "Eingehende E-Mails daraufhin überprüfen, ob sie unerwünscht sind"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Run junk test on incoming mail."
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Empty Junk folders on exit"
 msgstr "Unerwünscht-Ordner beim Beenden leeren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Alle Unerwünscht-Ordner beim Beenden von Evolution leeren."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim Beenden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim Beenden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Last time Empty Junk was run"
 msgstr "Letzte Leerung des Unerwünscht-Ordners"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Die Zeit seit der letzten Unerwünscht-Ordner-Leerung in Tagen seit dem 01.01.1970."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Erweiterung für die Unerwünscht-Erkennung"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default 
listed plugin is disabled, then it won't fall back to the other available plugins."
 msgstr ""
 "Dies ist die Vorgabe-Unerwünscht-Erweiterung, auch falls mehrere Erweiterungen aktiviert sind. Falls die 
als Vorgabe aufgelistete Erweiterung deaktiviert ist, wird nicht auf eine der "
 "anderen Erweiterungen zurückgegriffen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht wird"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks 
up in the books marked for autocompletion. It can be slow, if remote address "
 "books (like LDAP) are marked for autocompletion."
@@ -8657,11 +8928,11 @@ msgstr ""
 "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht wird. Falls die Adresse gefunden 
wird, so ist die E-Mail nicht unerwünscht. Es wird nur in Adressbüchern "
 "gesucht, die für Auto-Vervollständigung markiert sind. Diese Funktion kann langsam sein falls entfernte 
Adressbücher (wie LDAP) für die Auto-Vervollständigung aktiviert sind."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Determines whether to look up addresses for junk filtering in local address book only"
 msgstr "Legt fest, ob nur in lokalen Adressbüchern nach der E-Mail-Adresse des Absenders für das Filtern 
unerwünschter Nachrichten gesucht wird"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses 
in local address book only to exclude mail sent by known contacts from junk "
 "filtering."
@@ -8669,57 +8940,57 @@ msgstr ""
 "Diese Option bezieht sich auf den Schlüssel »lookup_addressbook« und legt fest, ob Adressen im lokalen 
Adressbuch gesucht werden um sicherzustellen, dass E-Mails von Bekannten nicht als "
 "unerwünscht markiert werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Legt fest, ob benutzerdefinierte Kopfzeilen für die Unerwünscht-Prüfung benutzt werden sollen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers 
are mentioned, it will be improve the junk checking speed."
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen für die Prüfung auf Unerwünschtheit benutzt werden sollen. Wenn 
diese Option aktiviert ist und eine angegebene Kopfzeile auftritt, so wird "
 "hierdurch die Prüfung auf Unerwünschtheit beschleunigt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Custom headers to use while checking for junk."
 msgstr "Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit genutzt werden."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Custom headers to use while checking for junk. The list elements are string in the format 
\"headername=value\"."
 msgstr "Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit genutzt werden.Das Format ist 
»Kopfzeilenname=Wert« im GConf-Schlüssel."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette für das Vorgabekonto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Composer load/attach directory"
 msgstr "Vorgabeordner für Anlagen im Nachrichteneditor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Directory for loading/attaching files to composer."
 msgstr "Vorgabeordner für Anlagen im Nachrichteneditor."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Check for new messages on start"
 msgstr "Beim Start nach neuen Nachrichten suchen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Whether to check for new messages when Evolution is started. This includes also sending messages from 
Outbox."
 msgstr "Legt fest, ob nach neuen E-Mails geschaut werden soll, sobald Evolution gestartet wurde. Dies 
schließt das Versenden von E-Mails aus dem Nachrichtenausgang mit ein."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Check for new messages in all active accounts"
 msgstr "Nach neuen Nachrichten in allen aktiven Konten schauen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the account \"Check for new messages 
every X minutes\" option when Evolution is started. This option is used only "
 "together with 'send_recv_on_start' option."
@@ -8727,19 +8998,19 @@ msgstr ""
 "Legt fest, ob beim Start von Evolution in allen aktiven Konten nach neuen E-Mails geschaut werden soll, 
unabhängig von der Einstellung »Automatisch nach neuen E-Mails sehen alle X "
 "Minuten«. Diese Option wird nur in Verbindung mit der Option »send_recv_on_start« verwendet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Server synchronization interval"
 msgstr "Intervall für Datenabgleich mit Servern"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must 
be at least 30 seconds."
 msgstr "Legt fest, wie oft lokale Änderungen mit dem entfernen Mail-Server abgeglichen werden. Der Intervall 
muss mindestens 30 Sekunden betragen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Allow expunge in virtual folders"
 msgstr "Löschen in virtuellen Ordnern erlauben"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge will be callable in virtual 
folders, while the expunge itself will be done in all folders for all deleted "
 "messages within the virtual folder, not only for deleted messages belonging to the virtual folder."
@@ -8747,51 +9018,59 @@ msgstr ""
 "Säubern in virtuellen Ordnern einschalten. Dies bedeutet, dass Ordner >Säubern unter virtuellen Ordnern 
möglich ist, wobei das Säubern selbst in allen unter dem virtuellen Ordner "
 "vertretenen Ordnern mit allen darin enthaltenen Nachrichten angewendet wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220 ../mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML mode"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+msgid "When enabled the theme colors for background, text and links are sent in resulting HTML formatted 
message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "An Archive folder for On This Computer folders."
 msgstr "Ein Archiv-Ordner für »Auf diesem Rechner«-Ordner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "An Archive folder to use for Messages|Archive... feature when in an On This Computer folder."
 msgstr "Ein Archiv-Ordner zur Benutzung für Nachrichten -&gt; Archivieren unter »Auf diesem 
Rechner«-Ordnern."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "(Deprecated) Default forward style"
 msgstr "(Veraltet) Standard-Weiterleitungsstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"forward-style-name\" 
instead."
 msgstr "Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr verwendet werden. Verwenden Sie 
stattdessen »forward-style-name«."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "(Deprecated) Default reply style"
 msgstr "(Veraltet) Standard-Antwortmethode"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"reply-style-name\" 
instead."
 msgstr "Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr verwendet werden. Verwenden Sie 
stattdessen »reply-style-name«."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Veraltet) Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"show-headers\" instead."
 msgstr "Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr verwendet werden. Verwenden Sie 
stattdessen »show-headers«."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Veraltet) Bilder für HTML-Nachrichten per HTTP laden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"image-loading-policy\" 
instead."
 msgstr "Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr verwendet werden. Verwenden Sie 
stattdessen »image-loading-policy«."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "(Deprecated) Asks whether to close the message window when the user forwards or replies to the 
message shown in the window"
 msgstr "(Veraltet)  Nachfragen, ob das Nachrichtenfenster geschlossen werden soll, wenn die Nachricht im 
Nachrichtenfenster weitergeleitet oder beantwortet wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "This key was deprecated in version 3.10 and should no longer be used. Use 
\"browser-close-on-reply-policy\" instead."
 msgstr "Dieser Schlüssel ist seit Version 3.10 veraltet und soll nicht mehr verwendet werden. Verwenden Sie 
stattdessen »browser-close-on-reply-policy«."
 
@@ -9145,14 +9424,14 @@ msgstr ""
 "Befehl mit vollem Pfad für sa-learn. Falls nicht festgelegt, so wird ein bei Übersetzung festgelegter Pfad 
verwendet, normalerweise /usr/bin/sa-learn. Der Befehl sollte keine Argumente "
 "enthalten."
 
-#: ../em-format/e-mail-formatter-attachment.c:405 ../e-util/e-attachment-bar.c:101 
../e-util/e-attachment-bar.c:106 ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
+#: ../em-format/e-mail-formatter-attachment.c:408 ../e-util/e-attachment-bar.c:101 
../e-util/e-attachment-bar.c:106 ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
-#: ../em-format/e-mail-formatter-attachment.c:406
+#: ../em-format/e-mail-formatter-attachment.c:409
 msgid "Display as attachment"
 msgstr "Als Anlage anzeigen"
 
@@ -9193,8 +9472,7 @@ msgstr "RFC822-Nachricht"
 msgid "Format part as an RFC822 message"
 msgstr "Teil als RFC822-Nachricht formatieren"
 
-#: ../em-format/e-mail-formatter-print.c:53 ../e-util/gal-view-instance-save-as-dialog.c:94 
../mail/e-mail-label-tree-view.c:98 ../modules/cal-config-caldav/e-caldav-chooser.c:1301
-#: ../modules/cal-config-google/e-google-chooser.c:1303 
../modules/plugin-manager/evolution-plugin-manager.c:66
+#: ../em-format/e-mail-formatter-print.c:53 ../e-util/gal-view-instance-save-as-dialog.c:94 
../mail/e-mail-label-tree-view.c:98 ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Name"
 
@@ -9202,13 +9480,13 @@ msgstr "Name"
 msgid "Size"
 msgstr "Größe"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:174 ../em-format/e-mail-part-headers.c:51 
../mail/e-mail-tag-editor.c:282 ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
-#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17 ../modules/mail/em-mailer-prefs.c:67 
../smime/gui/certificate-manager.c:1630
+#: ../em-format/e-mail-formatter-quote-headers.c:180 ../em-format/e-mail-part-headers.c:51 
../mail/e-mail-tag-editor.c:282 ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
+#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17 ../modules/mail/em-mailer-prefs.c:67 
../smime/gui/certificate-manager.c:1632
 msgid "Subject"
 msgstr "Betreff"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:193 ../em-format/e-mail-formatter-utils.c:343 
../modules/mail/em-mailer-prefs.c:1166
+#: ../em-format/e-mail-formatter-quote-headers.c:199 ../em-format/e-mail-formatter-utils.c:343 
../modules/mail/em-mailer-prefs.c:1484
 msgid "Mailer"
 msgstr "Mailer"
 
@@ -9228,7 +9506,7 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "Teil als HTML formatieren"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:123 ../em-format/e-mail-formatter-text-plain.c:198 
../e-util/e-html-editor-actions.c:1538
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123 ../em-format/e-mail-formatter-text-plain.c:198 
../e-util/e-html-editor-actions.c:1549
 msgid "Plain Text"
 msgstr "Einfacher Text"
 
@@ -9314,7 +9592,7 @@ msgid "This message is encrypted, with a strong encryption algorithm. It would b
 msgstr ""
 "Diese Nachricht ist mit einem starken Verschlüsselungsalgorithmus verschlüsselt. Daher können Dritte ihren 
Inhalt nur sehr schwerlich innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../em-format/e-mail-formatter-secure-button.c:187 ../shell/shell.error.xml.h:23 
../smime/gui/smime-ui.ui.h:22
+#: ../em-format/e-mail-formatter-secure-button.c:187 ../shell/shell.error.xml.h:28 
../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
@@ -9354,7 +9632,7 @@ msgstr "Mit S/MIME signiert"
 msgid "S/MIME encrypted"
 msgstr "Mit S/MIME verschlüsselt"
 
-#: ../em-format/e-mail-formatter-utils.c:591 ../mail/e-mail-config-security-page.c:736 
../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../em-format/e-mail-formatter-utils.c:591 ../mail/e-mail-config-security-page.c:748 
../modules/mail-config/e-mail-config-remote-accounts.c:194
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:144
 msgid "Security"
 msgstr "Sicherheit"
@@ -9429,7 +9707,7 @@ msgstr "Nicht unterstütztes Signaturformat"
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549 ../e-util/e-dateedit.c:572 
../mail/message-list.etspec.h:7 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:552 ../e-util/e-dateedit.c:575 
../mail/message-list.etspec.h:7 ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "Datum"
 
@@ -9495,12 +9773,12 @@ msgstr "%s"
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
-#: ../e-util/e-activity-proxy.c:352 ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../e-util/e-activity-proxy.c:352 ../modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:118
+#: ../e-util/e-alert-bar.c:124
 msgid "Close this message (Escape)"
 msgstr "Diese Nachricht schließen (Escape)"
 
@@ -9508,11 +9786,11 @@ msgstr "Diese Nachricht schließen (Escape)"
 msgid "Failed to create a thread: "
 msgstr "Konversation konnte nicht angelegt werden:"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
 msgid "Icon View"
 msgstr "Symbolansicht"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "Listenansicht"
 
@@ -9520,57 +9798,57 @@ msgstr "Listenansicht"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1197
+#: ../e-util/e-attachment.c:1223
 msgid "Attached message"
 msgstr "Beigelegte Nachricht"
 
-#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
 msgid "Operation was cancelled"
 msgstr "Vorgang wurde abgebrochen"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963 ../e-util/e-attachment.c:3334 
../e-util/e-attachment-store.c:691
+#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011 ../e-util/e-attachment.c:3382 
../e-util/e-attachment-store.c:691
 msgid "attachment.dat"
 msgstr "Anlage.dat"
 
-#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
 msgid "A load operation is already in progress"
 msgstr "Ein Ladevorgang läuft bereits"
 
-#: ../e-util/e-attachment.c:2353 ../e-util/e-attachment.c:3402
+#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
 msgid "A save operation is already in progress"
 msgstr "Ein Speichervorgang läuft bereits"
 
-#: ../e-util/e-attachment.c:2473
+#: ../e-util/e-attachment.c:2521
 #, c-format
 msgid "Could not load '%s'"
 msgstr "»%s« konnte nicht geladen werden"
 
-#: ../e-util/e-attachment.c:2476
+#: ../e-util/e-attachment.c:2524
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Die Anlage konnte nicht geladen werden"
 
-#: ../e-util/e-attachment.c:2761
+#: ../e-util/e-attachment.c:2809
 #, c-format
 msgid "Could not open '%s'"
 msgstr "»%s« konnte nicht geöffnet werden"
 
-#: ../e-util/e-attachment.c:2764
+#: ../e-util/e-attachment.c:2812
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Die Anlage konnte nicht geöffnet werden"
 
-#: ../e-util/e-attachment.c:3411
+#: ../e-util/e-attachment.c:3459
 msgid "Attachment contents not loaded"
 msgstr "Anlagen wurden nicht geladen"
 
-#: ../e-util/e-attachment.c:3502
+#: ../e-util/e-attachment.c:3550
 #, c-format
 msgid "Could not save '%s'"
 msgstr "»%s« konnte nicht gespeichert werden"
 
-#: ../e-util/e-attachment.c:3505
+#: ../e-util/e-attachment.c:3553
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Die Anlage konnte nicht gespeichert werden"
@@ -9611,7 +9889,7 @@ msgstr "Wird gespeichert"
 msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:751
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
@@ -9645,54 +9923,74 @@ msgstr "_Nur extrahierte Dateien speichern"
 msgid "Save extracted files and the original _archive"
 msgstr "Speichern der extrahierten Dateien und das Original-_Archiv"
 
-#: ../e-util/e-attachment-view.c:377
+#: ../e-util/e-attachment-view.c:428
 msgid "Open With Other Application..."
 msgstr "Mit anderer Anwendung öffnen …"
 
-#: ../e-util/e-attachment-view.c:384
+#: ../e-util/e-attachment-view.c:435
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../e-util/e-attachment-view.c:391
+#: ../e-util/e-attachment-view.c:442
 msgid "Sa_ve As"
 msgstr "Speichern _unter"
 
-#: ../e-util/e-attachment-view.c:400 ../plugins/save-calendar/save-calendar.c:349 
../plugins/save-calendar/save-calendar.c:380 ../plugins/save-calendar/save-calendar.c:411
+#: ../e-util/e-attachment-view.c:451 ../plugins/save-calendar/save-calendar.c:349 
../plugins/save-calendar/save-calendar.c:380 ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "Speichern _unter"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../e-util/e-attachment-view.c:461
 msgid "A_dd Attachment..."
 msgstr "Anlage _hinzufügen …"
 
-#: ../e-util/e-attachment-view.c:417 ../modules/addressbook/e-book-shell-view-actions.c:1071 
../modules/calendar/e-cal-shell-view-actions.c:1240
-#: ../modules/calendar/e-memo-shell-view-actions.c:571 ../modules/calendar/e-task-shell-view-actions.c:696 
../modules/mail/e-mail-shell-view-actions.c:1586
-#: ../modules/mail/e-mail-shell-view-actions.c:1657
+#: ../e-util/e-attachment-view.c:468 ../modules/addressbook/e-book-shell-view-actions.c:1071 
../modules/calendar/e-cal-shell-view-actions.c:1240
+#: ../modules/calendar/e-memo-shell-view-actions.c:571 ../modules/calendar/e-task-shell-view-actions.c:696 
../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#: ../e-util/e-attachment-view.c:434
+#: ../e-util/e-attachment-view.c:485
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:492
 msgid "Hid_e All"
 msgstr "_Alle verbergen"
 
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:499
 msgid "_View Inline"
 msgstr "_Eingebettet anzeigen"
 
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:506
 msgid "Vie_w All Inline"
 msgstr "_Alle eingebetteten anzeigen"
 
-#: ../e-util/e-attachment-view.c:785
+#: ../e-util/e-attachment-view.c:513
+msgid "_Zoom to 100%"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:515
+#, fuzzy
+#| msgid "Reset the text to its original size"
+msgid "Zoom the image to its natural size"
+msgstr "Den Text auf seine Originalgröße zurücksetzen"
+
+#: ../e-util/e-attachment-view.c:520
+#, fuzzy
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "Dieses Fenster schließen"
+
+#: ../e-util/e-attachment-view.c:522
+msgid "Zoom large images to not be wider than the window width"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:880
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Mit »%s« öffnen"
 
-#: ../e-util/e-attachment-view.c:788
+#: ../e-util/e-attachment-view.c:883
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Diese Anlage mit »%s« öffnen"
@@ -9710,7 +10008,7 @@ msgid "Copy book content locally for offline operation"
 msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus kopieren"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../e-util/e-buffer-tagger.c:407
+#: ../e-util/e-buffer-tagger.c:412
 msgid "Ctrl-click to open a link"
 msgstr "Drücken Sie die Taste Strg und klicken Sie mit der Maus, um einen Verweis zu öffnen"
 
@@ -9735,19 +10033,19 @@ msgid "Month Calendar"
 msgstr "Monatskalender"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+#: ../e-util/e-calendar-item.c:1322 ../e-util/e-calendar-item.c:2200
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1325
+#: ../e-util/e-calendar-item.c:1324
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1362
+#: ../e-util/e-calendar-item.c:1361
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -9768,15 +10066,15 @@ msgstr "Als Vorgabenotizliste markieren"
 msgid "Color:"
 msgstr "Farbe:"
 
-#: ../e-util/e-cal-source-config.c:405
+#: ../e-util/e-cal-source-config.c:428
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Den Kalenderinhalt lokal zur Arbeit im Offline-Modus kopieren"
 
-#: ../e-util/e-cal-source-config.c:409
+#: ../e-util/e-cal-source-config.c:432
 msgid "Copy task list contents locally for offline operation"
 msgstr "Den Inhalt der Aufgabenliste lokal zur Arbeit im Offline-Modus kopieren"
 
-#: ../e-util/e-cal-source-config.c:413
+#: ../e-util/e-cal-source-config.c:436
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus kopieren"
 
@@ -9841,31 +10139,31 @@ msgstr "Es gibt bereits eine Kategorie »%s« in dieser Konfiguration. Bitte ein
 msgid "popup list"
 msgstr "Popup-Liste"
 
-#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+#: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139 ../e-util/e-cell-date.c:159 
../mail/message-list.c:2033
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-date-edit.c:298
+#: ../e-util/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "Jetzt"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208 
../modules/calendar/e-cal-shell-view-actions.c:1740 ../modules/itip-formatter/itip-view.c:223
+#: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208 
../modules/calendar/e-cal-shell-view-actions.c:1740 ../modules/itip-formatter/itip-view.c:221
 msgid "Today"
 msgstr "Heute"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:316
+#: ../e-util/e-cell-date-edit.c:321
 msgctxt "table-date"
 msgid "None"
 msgstr "Keine"
 
-#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
+#: ../e-util/e-cell-date-edit.c:329 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "OK"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../e-util/e-cell-date-edit.c:878
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
@@ -9963,7 +10261,7 @@ msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 msgid "Other..."
 msgstr "Weitere …"
 
-#: ../e-util/e-client-cache.c:1266
+#: ../e-util/e-client-cache.c:1148 ../e-util/e-client-cache.c:1279
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Es kann kein Client-Objekt für den Erweiterungsnamen »%s« erstellt werden"
@@ -10132,62 +10430,62 @@ msgstr "hellpurpur"
 msgid "white"
 msgstr "weiß"
 
-#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134 
../mail/e-mail-config-security-page.c:426 ../mail/e-mail-config-security-page.c:566 
../mail/e-mail-reader.c:3863
-#: ../mail/mail-config.ui.h:69
+#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134 
../mail/e-mail-config-security-page.c:426 ../mail/e-mail-config-security-page.c:578 
../mail/e-mail-reader.c:3896
+#: ../mail/mail-config.ui.h:70
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:551
 msgid "Text entry to input date"
 msgstr "Eingabefeld für das Datum"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:574
 msgid "Click this button to show a calendar"
 msgstr "Diesen Knopf drücken, um den Kalender anzuzeigen"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:628
 msgid "Drop-down combination box to select time"
 msgstr "Auswahlliste für die Zeit"
 
-#: ../e-util/e-dateedit.c:626 ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:703
 msgid "No_w"
 msgstr "_Jetzt"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:710
 msgid "_Today"
 msgstr "_Heute"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:719
 msgid "_None"
 msgstr "_Keine"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
+#: ../e-util/e-dateedit.c:1841 ../e-util/e-dateedit.c:2089
 msgctxt "date"
 msgid "None"
 msgstr "Keine"
 
-#: ../e-util/e-dateedit.c:1978
+#: ../e-util/e-dateedit.c:1981
 msgid "Invalid Date Value"
 msgstr "Ungültiges Datum"
 
-#: ../e-util/e-dateedit.c:2023
+#: ../e-util/e-dateedit.c:2026
 msgid "Invalid Time Value"
 msgstr "Ungültige Zeitangabe"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
 msgid "Tomorrow"
 msgstr "Morgen"
 
@@ -10529,8 +10827,8 @@ msgstr "Objekte suchen, die folgenden Bedingungen entsprechen"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:62 
../e-util/e-mail-identity-combo-box.c:476 ../e-util/e-mail-signature-combo-box.c:367
-#: ../e-util/e-proxy-editor.c:560 ../libemail-engine/camel-null-store.c:27 
../mail/e-mail-config-summary-page.c:138 ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:63 
../e-util/e-mail-identity-combo-box.c:476 ../e-util/e-mail-signature-combo-box.c:367
+#: ../libemail-engine/camel-null-store.c:27 ../mail/e-mail-config-summary-page.c:138 
../modules/book-config-ldap/evolution-book-config-ldap.c:615
 msgid "None"
 msgstr "Keine"
 
@@ -10559,11 +10857,11 @@ msgstr "_Konversationen einschließen:"
 msgid "A_dd Condition"
 msgstr "Bedingung hin_zufügen"
 
-#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1 ../mail/em-utils.c:229
+#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1 ../mail/em-utils.c:165
 msgid "Incoming"
 msgstr "Eingang"
 
-#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -10575,618 +10873,618 @@ msgstr "Einfügen der HTML-Datei ist fehlgeschlagen."
 msgid "Failed to insert text file."
 msgstr "Einfügen der Textdatei ist fehlgeschlagen."
 
-#: ../e-util/e-html-editor-actions.c:606
+#: ../e-util/e-html-editor-actions.c:614
 msgid "Insert HTML File"
 msgstr "HTML-Datei einfügen"
 
-#: ../e-util/e-html-editor-actions.c:612
+#: ../e-util/e-html-editor-actions.c:620
 msgid "HTML file"
 msgstr "HTML-Datei"
 
-#: ../e-util/e-html-editor-actions.c:639
+#: ../e-util/e-html-editor-actions.c:647
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Bild einfügen"
 
-#: ../e-util/e-html-editor-actions.c:700
+#: ../e-util/e-html-editor-actions.c:709
 msgid "Insert text file"
 msgstr "Textdatei einfügen"
 
-#: ../e-util/e-html-editor-actions.c:706
+#: ../e-util/e-html-editor-actions.c:715
 msgid "Text file"
 msgstr "Textdatei"
 
-#: ../e-util/e-html-editor-actions.c:1090
+#: ../e-util/e-html-editor-actions.c:1101
 msgid "Copy selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage kopieren"
 
-#: ../e-util/e-html-editor-actions.c:1097
+#: ../e-util/e-html-editor-actions.c:1108
 msgid "Cut selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage verschieben"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1104
+#: ../e-util/e-html-editor-actions.c:1115
 msgid "Paste text from the clipboard"
 msgstr "Text aus der Zwischenablage einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1111
+#: ../e-util/e-html-editor-actions.c:1122
 msgid "Redo the last undone action"
 msgstr "Die letzte rückgängig gemachte Änderung wiederholen"
 
-#: ../e-util/e-html-editor-actions.c:1125
+#: ../e-util/e-html-editor-actions.c:1136
 msgid "Undo the last action"
 msgstr "Die letzte Aktion zurück nehmen"
 
-#: ../e-util/e-html-editor-actions.c:1146
+#: ../e-util/e-html-editor-actions.c:1157
 msgid "For_mat"
 msgstr "_Format"
 
-#: ../e-util/e-html-editor-actions.c:1153
+#: ../e-util/e-html-editor-actions.c:1164
 msgid "_Paragraph Style"
 msgstr "_Absatzstil"
 
-#: ../e-util/e-html-editor-actions.c:1167 ../e-util/e-html-editor-image-dialog.c:635
+#: ../e-util/e-html-editor-actions.c:1178 ../e-util/e-html-editor-image-dialog.c:635
 msgid "_Alignment"
 msgstr "Aus_richtung"
 
-#: ../e-util/e-html-editor-actions.c:1174
+#: ../e-util/e-html-editor-actions.c:1185
 msgid "Current _Languages"
 msgstr "Momentan verwendete _Sprachen"
 
-#: ../e-util/e-html-editor-actions.c:1191
+#: ../e-util/e-html-editor-actions.c:1202
 msgid "_Increase Indent"
 msgstr "Einzug _erhöhen"
 
-#: ../e-util/e-html-editor-actions.c:1193
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "Increase Indent"
 msgstr "Einzug erhöhen"
 
-#: ../e-util/e-html-editor-actions.c:1198
+#: ../e-util/e-html-editor-actions.c:1209
 msgid "_HTML File..."
 msgstr "_HTML-Datei …"
 
-#: ../e-util/e-html-editor-actions.c:1205
+#: ../e-util/e-html-editor-actions.c:1216
 msgid "Te_xt File..."
 msgstr "Te_xtdatei …"
 
-#: ../e-util/e-html-editor-actions.c:1212
+#: ../e-util/e-html-editor-actions.c:1223
 msgid "Paste _Quotation"
 msgstr "_Zitat einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1219
+#: ../e-util/e-html-editor-actions.c:1230
 msgid "_Find..."
 msgstr "_Suchen …"
 
-#: ../e-util/e-html-editor-actions.c:1221
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "Search for text"
 msgstr "Nach Text suchen"
 
-#: ../e-util/e-html-editor-actions.c:1226
+#: ../e-util/e-html-editor-actions.c:1237
 msgid "Find A_gain"
 msgstr "Wei_tersuchen"
 
-#: ../e-util/e-html-editor-actions.c:1233
+#: ../e-util/e-html-editor-actions.c:1244
 msgid "Re_place..."
 msgstr "_Ersetzen …"
 
-#: ../e-util/e-html-editor-actions.c:1235
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "Search for and replace text"
 msgstr "Nach Text suchen und diesen ersetzen"
 
-#: ../e-util/e-html-editor-actions.c:1240
+#: ../e-util/e-html-editor-actions.c:1251
 msgid "Check _Spelling..."
 msgstr "_Rechtschreibprüfung …"
 
-#: ../e-util/e-html-editor-actions.c:1247
+#: ../e-util/e-html-editor-actions.c:1258
 msgid "_Decrease Indent"
 msgstr "Einzug _vermindern"
 
-#: ../e-util/e-html-editor-actions.c:1249
+#: ../e-util/e-html-editor-actions.c:1260
 msgid "Decrease Indent"
 msgstr "Einzug vermindern"
 
-#: ../e-util/e-html-editor-actions.c:1254
+#: ../e-util/e-html-editor-actions.c:1265
 msgid "_Wrap Lines"
 msgstr "_Zeilenumbruch"
 
-#: ../e-util/e-html-editor-actions.c:1261
+#: ../e-util/e-html-editor-actions.c:1272
 msgid "Open Inspector"
 msgstr "_Inspekteur andocken"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1271 ../e-util/e-html-editor-paragraph-dialog.c:110
+#: ../e-util/e-html-editor-actions.c:1282 ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Zentrieren"
 
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1284
 msgid "Center Alignment"
 msgstr "Zentriert"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1278 ../e-util/e-html-editor-paragraph-dialog.c:101
+#: ../e-util/e-html-editor-actions.c:1289 ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Links"
 
-#: ../e-util/e-html-editor-actions.c:1280
+#: ../e-util/e-html-editor-actions.c:1291
 msgid "Left Alignment"
 msgstr "Linksbündig"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1285 ../e-util/e-html-editor-paragraph-dialog.c:119
+#: ../e-util/e-html-editor-actions.c:1296 ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "_Rechts"
 
-#: ../e-util/e-html-editor-actions.c:1287
+#: ../e-util/e-html-editor-actions.c:1298
 msgid "Right Alignment"
 msgstr "Rechtsbündig"
 
-#: ../e-util/e-html-editor-actions.c:1295 ../modules/text-highlight/languages.c:72
+#: ../e-util/e-html-editor-actions.c:1306 ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1297
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "HTML editing mode"
 msgstr "HTML-Bearbeitungsmodus"
 
-#: ../e-util/e-html-editor-actions.c:1302
+#: ../e-util/e-html-editor-actions.c:1313
 msgid "Plain _Text"
 msgstr "_Einfacher Text"
 
-#: ../e-util/e-html-editor-actions.c:1304
+#: ../e-util/e-html-editor-actions.c:1315
 msgid "Plain text editing mode"
 msgstr "Einfacher Textbearbeitungsmodus"
 
-#: ../e-util/e-html-editor-actions.c:1312
+#: ../e-util/e-html-editor-actions.c:1323
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1319
+#: ../e-util/e-html-editor-actions.c:1330
 msgid "Header _1"
 msgstr "Überschrift _1"
 
-#: ../e-util/e-html-editor-actions.c:1326
+#: ../e-util/e-html-editor-actions.c:1337
 msgid "Header _2"
 msgstr "Überschrift _2"
 
-#: ../e-util/e-html-editor-actions.c:1333
+#: ../e-util/e-html-editor-actions.c:1344
 msgid "Header _3"
 msgstr "Überschrift _3"
 
-#: ../e-util/e-html-editor-actions.c:1340
+#: ../e-util/e-html-editor-actions.c:1351
 msgid "Header _4"
 msgstr "Überschrift _4"
 
-#: ../e-util/e-html-editor-actions.c:1347
+#: ../e-util/e-html-editor-actions.c:1358
 msgid "Header _5"
 msgstr "Überschrift _5"
 
-#: ../e-util/e-html-editor-actions.c:1354
+#: ../e-util/e-html-editor-actions.c:1365
 msgid "Header _6"
 msgstr "Überschrift _6"
 
-#: ../e-util/e-html-editor-actions.c:1361
+#: ../e-util/e-html-editor-actions.c:1372
 msgid "_Preformatted"
 msgstr "_Vorformatiert"
 
-#: ../e-util/e-html-editor-actions.c:1368
+#: ../e-util/e-html-editor-actions.c:1379
 msgid "A_ddress"
 msgstr "A_dresse"
 
-#: ../e-util/e-html-editor-actions.c:1375
+#: ../e-util/e-html-editor-actions.c:1386
 msgid "_Blockquote"
 msgstr "_Zitat"
 
-#: ../e-util/e-html-editor-actions.c:1382
+#: ../e-util/e-html-editor-actions.c:1393
 msgid "_Bulleted List"
 msgstr "_Ungeordnete Liste"
 
-#: ../e-util/e-html-editor-actions.c:1389
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "_Roman Numeral List"
 msgstr "_Römisch nummerierte Liste"
 
-#: ../e-util/e-html-editor-actions.c:1396
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Numbered _List"
 msgstr "Nummerierte _Liste"
 
-#: ../e-util/e-html-editor-actions.c:1403
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "_Alphabetical List"
 msgstr "_Alphabetische Liste"
 
-#: ../e-util/e-html-editor-actions.c:1419 ../e-util/e-html-editor-actions.c:1457
+#: ../e-util/e-html-editor-actions.c:1430 ../e-util/e-html-editor-actions.c:1468
 msgid "_Image..."
 msgstr "_Bild …"
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1422
+#: ../e-util/e-html-editor-actions.c:1433
 msgid "Insert Image"
 msgstr "Bild einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1427 ../e-util/e-html-editor-actions.c:1464
+#: ../e-util/e-html-editor-actions.c:1438 ../e-util/e-html-editor-actions.c:1475
 msgid "_Link..."
 msgstr "_Verweis …"
 
-#: ../e-util/e-html-editor-actions.c:1429
+#: ../e-util/e-html-editor-actions.c:1440
 msgid "Insert Link"
 msgstr "Verweis einfügen"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1435 ../e-util/e-html-editor-actions.c:1479
+#: ../e-util/e-html-editor-actions.c:1446 ../e-util/e-html-editor-actions.c:1490
 msgid "_Rule..."
 msgstr "T_rennlinie …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1449
 msgid "Insert Rule"
 msgstr "Trennlinie einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1443 ../e-util/e-html-editor-actions.c:1486
+#: ../e-util/e-html-editor-actions.c:1454 ../e-util/e-html-editor-actions.c:1497
 msgid "_Table..."
 msgstr "_Tabelle …"
 
-#: ../e-util/e-html-editor-actions.c:1445
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "Insert Table"
 msgstr "Tabelle einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1450
+#: ../e-util/e-html-editor-actions.c:1461
 msgid "_Cell..."
 msgstr "_Zelle …"
 
-#: ../e-util/e-html-editor-actions.c:1471
+#: ../e-util/e-html-editor-actions.c:1482
 msgid "Pa_ge..."
 msgstr "_Seite …"
 
-#: ../e-util/e-html-editor-actions.c:1495
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Font _Size"
 msgstr "Schrift_größe"
 
-#: ../e-util/e-html-editor-actions.c:1502
+#: ../e-util/e-html-editor-actions.c:1513
 msgid "_Font Style"
 msgstr "Schrift_stil"
 
-#: ../e-util/e-html-editor-actions.c:1509
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "Paste As _Text"
 msgstr "Als normaler _Text einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1520 ../e-util/e-html-editor-text-dialog.c:214
+#: ../e-util/e-html-editor-actions.c:1531 ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "_Fett"
 
-#: ../e-util/e-html-editor-actions.c:1522
+#: ../e-util/e-html-editor-actions.c:1533
 msgid "Bold"
 msgstr "Fett"
 
-#: ../e-util/e-html-editor-actions.c:1528 ../e-util/e-html-editor-text-dialog.c:225
+#: ../e-util/e-html-editor-actions.c:1539 ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "_Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1530
+#: ../e-util/e-html-editor-actions.c:1541
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1536
+#: ../e-util/e-html-editor-actions.c:1547
 msgid "_Plain Text"
 msgstr "_Einfacher Text"
 
-#: ../e-util/e-html-editor-actions.c:1544 ../e-util/e-html-editor-text-dialog.c:246
+#: ../e-util/e-html-editor-actions.c:1555 ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "_Durchstreichen"
 
-#: ../e-util/e-html-editor-actions.c:1546
+#: ../e-util/e-html-editor-actions.c:1557
 msgid "Strikethrough"
 msgstr "Durchgestrichen"
 
-#: ../e-util/e-html-editor-actions.c:1552 ../e-util/e-html-editor-text-dialog.c:236
+#: ../e-util/e-html-editor-actions.c:1563 ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "_Unterstrichen"
 
-#: ../e-util/e-html-editor-actions.c:1554
+#: ../e-util/e-html-editor-actions.c:1565
 msgid "Underline"
 msgstr "Unterstrich"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1564
+#: ../e-util/e-html-editor-actions.c:1575
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1572
+#: ../e-util/e-html-editor-actions.c:1583
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1580
+#: ../e-util/e-html-editor-actions.c:1591
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1588
+#: ../e-util/e-html-editor-actions.c:1599
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1596
+#: ../e-util/e-html-editor-actions.c:1607
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1604
+#: ../e-util/e-html-editor-actions.c:1615
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1612
+#: ../e-util/e-html-editor-actions.c:1623
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1631
+#: ../e-util/e-html-editor-actions.c:1642
 msgid "Cell Contents"
 msgstr "Zelleninhalt"
 
-#: ../e-util/e-html-editor-actions.c:1638
+#: ../e-util/e-html-editor-actions.c:1649
 msgid "Column"
 msgstr "Spalte"
 
-#: ../e-util/e-html-editor-actions.c:1645
+#: ../e-util/e-html-editor-actions.c:1656
 msgid "Row"
 msgstr "Zeile"
 
-#: ../e-util/e-html-editor-actions.c:1652 ../e-util/e-html-editor-actions.c:1737
+#: ../e-util/e-html-editor-actions.c:1663 ../e-util/e-html-editor-actions.c:1748
 msgid "Table"
 msgstr "Tabelle"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1662
+#: ../e-util/e-html-editor-actions.c:1673
 msgid "Table Delete"
 msgstr "Tabelle löschen"
 
-#: ../e-util/e-html-editor-actions.c:1669 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1680 ../e-util/e-text.c:2147
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1677
+#: ../e-util/e-html-editor-actions.c:1688
 msgid "Table Insert"
 msgstr "Tabelle einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1684
+#: ../e-util/e-html-editor-actions.c:1695
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../e-util/e-html-editor-actions.c:1702
+#: ../e-util/e-html-editor-actions.c:1713
 msgid "Column After"
 msgstr "Spalte danach"
 
-#: ../e-util/e-html-editor-actions.c:1709
+#: ../e-util/e-html-editor-actions.c:1720
 msgid "Column Before"
 msgstr "Spalte davor"
 
-#: ../e-util/e-html-editor-actions.c:1716
+#: ../e-util/e-html-editor-actions.c:1727
 msgid "Insert _Link"
 msgstr "_Verweis einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1723
+#: ../e-util/e-html-editor-actions.c:1734
 msgid "Row Above"
 msgstr "Zeile darüber"
 
-#: ../e-util/e-html-editor-actions.c:1730
+#: ../e-util/e-html-editor-actions.c:1741
 msgid "Row Below"
 msgstr "Zeile darunter"
 
-#: ../e-util/e-html-editor-actions.c:1744
+#: ../e-util/e-html-editor-actions.c:1755
 msgid "Cell..."
 msgstr "Zelle …"
 
-#: ../e-util/e-html-editor-actions.c:1751
+#: ../e-util/e-html-editor-actions.c:1762
 msgid "Image..."
 msgstr "Bild …"
 
-#: ../e-util/e-html-editor-actions.c:1758
+#: ../e-util/e-html-editor-actions.c:1769
 msgid "Link..."
 msgstr "Verweis …"
 
-#: ../e-util/e-html-editor-actions.c:1765
+#: ../e-util/e-html-editor-actions.c:1776
 msgid "Page..."
 msgstr "Seite …"
 
-#: ../e-util/e-html-editor-actions.c:1772
+#: ../e-util/e-html-editor-actions.c:1783
 msgid "Paragraph..."
 msgstr "Absatz …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1780
+#: ../e-util/e-html-editor-actions.c:1791
 msgid "Rule..."
 msgstr "Trennlinie …"
 
-#: ../e-util/e-html-editor-actions.c:1787
+#: ../e-util/e-html-editor-actions.c:1798
 msgid "Table..."
 msgstr "Tabelle …"
 
-#: ../e-util/e-html-editor-actions.c:1794
+#: ../e-util/e-html-editor-actions.c:1805
 msgid "Text..."
 msgstr "Text …"
 
-#: ../e-util/e-html-editor-actions.c:1801
+#: ../e-util/e-html-editor-actions.c:1812
 msgid "Remove Link"
 msgstr "Verweis entfernen"
 
-#: ../e-util/e-html-editor-actions.c:1818
+#: ../e-util/e-html-editor-actions.c:1829
 msgid "Add Word to Dictionary"
 msgstr "Wort zu Wörterbuch hinzufügen"
 
-#: ../e-util/e-html-editor-actions.c:1825
+#: ../e-util/e-html-editor-actions.c:1836
 msgid "Ignore Misspelled Word"
 msgstr "Falsch geschriebenes Wort ignorieren"
 
-#: ../e-util/e-html-editor-actions.c:1832
+#: ../e-util/e-html-editor-actions.c:1843
 msgid "Add Word To"
 msgstr "Wort hinzufügen zu"
 
-#: ../e-util/e-html-editor-actions.c:1841
+#: ../e-util/e-html-editor-actions.c:1852
 msgid "More Suggestions"
 msgstr "Weitere Vorschläge"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1949
+#: ../e-util/e-html-editor-actions.c:1960
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s-Wörterbuch"
 
-#: ../e-util/e-html-editor-actions.c:2036
+#: ../e-util/e-html-editor-actions.c:2047
 msgid "_Emoticon"
 msgstr "_Emoticon"
 
-#: ../e-util/e-html-editor-actions.c:2037
+#: ../e-util/e-html-editor-actions.c:2048
 msgid "Insert Emoticon"
 msgstr "Emoticon einfügen"
 
-#: ../e-util/e-html-editor-actions.c:2105
+#: ../e-util/e-html-editor-actions.c:2116
 msgid "Re_place"
 msgstr "Erset_zen"
 
-#: ../e-util/e-html-editor-actions.c:2108
+#: ../e-util/e-html-editor-actions.c:2119
 msgid "_Image"
 msgstr "_Bild"
 
-#: ../e-util/e-html-editor-actions.c:2111
+#: ../e-util/e-html-editor-actions.c:2122
 msgid "_Link"
 msgstr "_Verweis"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2115
+#: ../e-util/e-html-editor-actions.c:2126
 msgid "_Rule"
 msgstr "T_rennlinie"
 
-#: ../e-util/e-html-editor-actions.c:2118 ../e-util/e-html-editor-cell-dialog.c:732
+#: ../e-util/e-html-editor-actions.c:2129 ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "_Tabelle"
 
-#: ../e-util/e-html-editor.c:672
+#: ../e-util/e-html-editor.c:681
 msgid "Paragraph Style"
 msgstr "Absatzstil"
 
-#: ../e-util/e-html-editor.c:686
+#: ../e-util/e-html-editor.c:695
 msgid "Editing Mode"
 msgstr "Bearbeitungsmodus"
 
-#: ../e-util/e-html-editor.c:698
+#: ../e-util/e-html-editor.c:707
 msgid "Font Color"
 msgstr "Schriftfarbe"
 
-#: ../e-util/e-html-editor.c:716
+#: ../e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "Schriftgröße"
 
-#: ../e-util/e-html-editor-cell-dialog.c:692
+#: ../e-util/e-html-editor-cell-dialog.c:698
 msgid "<b>Scope</b>"
 msgstr "<b>Geltungsbereich</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:706
+#: ../e-util/e-html-editor-cell-dialog.c:712
 msgid "C_ell"
 msgstr "_Zelle"
 
-#: ../e-util/e-html-editor-cell-dialog.c:719
+#: ../e-util/e-html-editor-cell-dialog.c:725
 msgid "_Row"
 msgstr "_Zeile"
 
-#: ../e-util/e-html-editor-cell-dialog.c:745
+#: ../e-util/e-html-editor-cell-dialog.c:751
 msgid "Col_umn"
 msgstr "_Spalte"
 
-#: ../e-util/e-html-editor-cell-dialog.c:755
+#: ../e-util/e-html-editor-cell-dialog.c:761
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>Ausrichtung und Verhalten</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:768 ../e-util/e-html-editor-hrule-dialog.c:407 
../e-util/e-html-editor-table-dialog.c:890
+#: ../e-util/e-html-editor-cell-dialog.c:774 ../e-util/e-html-editor-hrule-dialog.c:413 
../e-util/e-html-editor-table-dialog.c:900
 msgid "Left"
 msgstr "Links"
 
-#: ../e-util/e-html-editor-cell-dialog.c:769 ../e-util/e-html-editor-hrule-dialog.c:409 
../e-util/e-html-editor-table-dialog.c:891
+#: ../e-util/e-html-editor-cell-dialog.c:775 ../e-util/e-html-editor-hrule-dialog.c:415 
../e-util/e-html-editor-table-dialog.c:901
 msgid "Center"
 msgstr "Mitte"
 
-#: ../e-util/e-html-editor-cell-dialog.c:770 ../e-util/e-html-editor-hrule-dialog.c:411 
../e-util/e-html-editor-table-dialog.c:892
+#: ../e-util/e-html-editor-cell-dialog.c:776 ../e-util/e-html-editor-hrule-dialog.c:417 
../e-util/e-html-editor-table-dialog.c:902
 msgid "Right"
 msgstr "Rechts"
 
-#: ../e-util/e-html-editor-cell-dialog.c:778
+#: ../e-util/e-html-editor-cell-dialog.c:784
 msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:786 ../e-util/e-html-editor-image-dialog.c:625
+#: ../e-util/e-html-editor-cell-dialog.c:792 ../e-util/e-html-editor-image-dialog.c:625
 msgid "Top"
 msgstr "Oben"
 
-#: ../e-util/e-html-editor-cell-dialog.c:787 ../e-util/e-html-editor-image-dialog.c:626
+#: ../e-util/e-html-editor-cell-dialog.c:793 ../e-util/e-html-editor-image-dialog.c:626
 msgid "Middle"
 msgstr "Mitte"
 
-#: ../e-util/e-html-editor-cell-dialog.c:788 ../e-util/e-html-editor-image-dialog.c:627
+#: ../e-util/e-html-editor-cell-dialog.c:794 ../e-util/e-html-editor-image-dialog.c:627
 msgid "Bottom"
 msgstr "Unten"
 
 # CHECK - macht überhaupt keinen Sinn
-#: ../e-util/e-html-editor-cell-dialog.c:796
+#: ../e-util/e-html-editor-cell-dialog.c:802
 msgid "_Vertical:"
 msgstr "_Vertikal:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:802
+#: ../e-util/e-html-editor-cell-dialog.c:808
 msgid "_Wrap Text"
 msgstr "_Zeilenumbruch"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:810
+#: ../e-util/e-html-editor-cell-dialog.c:816
 msgid "_Header Style"
 msgstr "_Kopfstil"
 
-#: ../e-util/e-html-editor-cell-dialog.c:824 ../e-util/e-html-editor-image-dialog.c:565 
../e-util/e-html-editor-table-dialog.c:802
+#: ../e-util/e-html-editor-cell-dialog.c:830 ../e-util/e-html-editor-image-dialog.c:565 
../e-util/e-html-editor-table-dialog.c:812
 msgid "<b>Layout</b>"
 msgstr "<b>Aufbau</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:835
+#: ../e-util/e-html-editor-cell-dialog.c:841
 msgid "_Width"
 msgstr "_Breite"
 
-#: ../e-util/e-html-editor-cell-dialog.c:874
+#: ../e-util/e-html-editor-cell-dialog.c:880
 msgid "Row S_pan:"
 msgstr "Verbundene Zei_len:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:888
+#: ../e-util/e-html-editor-cell-dialog.c:894
 msgid "Co_lumn Span:"
 msgstr "Spa_ltenbreite:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:895 ../e-util/e-html-editor-table-dialog.c:906
+#: ../e-util/e-html-editor-cell-dialog.c:901 ../e-util/e-html-editor-table-dialog.c:916
 msgid "<b>Background</b>"
 msgstr "<b>Hintergrund</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:908 ../e-util/e-html-editor-table-dialog.c:919
+#: ../e-util/e-html-editor-cell-dialog.c:914 ../e-util/e-html-editor-table-dialog.c:929
 msgid "Transparent"
 msgstr "Transparent"
 
-#: ../e-util/e-html-editor-cell-dialog.c:916
+#: ../e-util/e-html-editor-cell-dialog.c:922
 msgid "C_olor:"
 msgstr "_Farbe:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:924 ../e-util/e-html-editor-image-dialog.c:527 
../e-util/e-html-editor-table-dialog.c:935
+#: ../e-util/e-html-editor-cell-dialog.c:930 ../e-util/e-html-editor-image-dialog.c:527 
../e-util/e-html-editor-table-dialog.c:945
 msgid "Choose Background Image"
 msgstr "Wählen Sie das Hintergrundbild"
 
-#: ../e-util/e-html-editor-cell-dialog.c:929 ../e-util/e-html-editor-image-dialog.c:533 
../e-util/e-html-editor-table-dialog.c:940
+#: ../e-util/e-html-editor-cell-dialog.c:935 ../e-util/e-html-editor-image-dialog.c:533 
../e-util/e-html-editor-table-dialog.c:950
 msgid "Images"
 msgstr "Bilder"
 
-#: ../e-util/e-html-editor-cell-dialog.c:942
+#: ../e-util/e-html-editor-cell-dialog.c:948
 msgid "_Image:"
 msgstr "_Bild:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:949 ../e-util/e-html-editor-page-dialog.c:579 
../e-util/e-html-editor-table-dialog.c:960
+#: ../e-util/e-html-editor-cell-dialog.c:955 ../e-util/e-html-editor-page-dialog.c:660 
../e-util/e-html-editor-table-dialog.c:970
 msgid "_Remove image"
 msgstr "Bild _entfernen"
 
-#: ../e-util/e-html-editor-cell-dialog.c:969
+#: ../e-util/e-html-editor-cell-dialog.c:975
 msgid "Cell Properties"
 msgstr "Zelleneigenschaften"
 
@@ -11210,37 +11508,37 @@ msgstr "Suche am Anfang fortsetzen"
 msgid "Find"
 msgstr "Suchen"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:342
+#: ../e-util/e-html-editor-hrule-dialog.c:348
 msgid "<b>Size</b>"
 msgstr "<b>Größe</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:362 ../e-util/e-html-editor-image-dialog.c:583 
../e-util/e-html-editor-table-dialog.c:813
+#: ../e-util/e-html-editor-hrule-dialog.c:368 ../e-util/e-html-editor-image-dialog.c:583 
../e-util/e-html-editor-table-dialog.c:823
 msgid "_Width:"
 msgstr "_Breite:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:387
+#: ../e-util/e-html-editor-hrule-dialog.c:393
 msgid "_Size:"
 msgstr "_Größe:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:394
+#: ../e-util/e-html-editor-hrule-dialog.c:400
 msgid "<b>Style</b>"
 msgstr "<b>Stil</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:419 ../e-util/e-html-editor-table-dialog.c:899
+#: ../e-util/e-html-editor-hrule-dialog.c:425 ../e-util/e-html-editor-table-dialog.c:909
 msgid "_Alignment:"
 msgstr "_Ausrichtung:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../e-util/e-html-editor-hrule-dialog.c:431
 msgid "S_haded"
 msgstr "_Schattiert"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:442
+#: ../e-util/e-html-editor-hrule-dialog.c:448
 msgid "Rule properties"
 msgstr "Trennlinien-Eigenschaften"
 
-#: ../e-util/e-html-editor-image-dialog.c:515 ../e-util/e-html-editor-paragraph-dialog.c:66 
../e-util/e-html-editor-table-dialog.c:756
+#: ../e-util/e-html-editor-image-dialog.c:515 ../e-util/e-html-editor-paragraph-dialog.c:66 
../e-util/e-html-editor-table-dialog.c:766
 msgid "<b>General</b>"
 msgstr "<b>Allgemein</b>"
 
@@ -11260,7 +11558,7 @@ msgstr "_X-Polster:"
 msgid "_Y-Padding:"
 msgstr "_Y-Polster:"
 
-#: ../e-util/e-html-editor-image-dialog.c:680 ../e-util/e-html-editor-table-dialog.c:880
+#: ../e-util/e-html-editor-image-dialog.c:680 ../e-util/e-html-editor-table-dialog.c:890
 msgid "_Border:"
 msgstr "_Rand:"
 
@@ -11268,11 +11566,11 @@ msgstr "_Rand:"
 msgid "<b>Link</b>"
 msgstr "<b>Verweis</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:708 ../e-util/e-html-editor-link-dialog.c:345
+#: ../e-util/e-html-editor-image-dialog.c:708 ../e-util/e-html-editor-link-dialog.c:400
 msgid "_URL:"
 msgstr "_Adresse:"
 
-#: ../e-util/e-html-editor-image-dialog.c:713 ../e-util/e-html-editor-link-dialog.c:350
+#: ../e-util/e-html-editor-image-dialog.c:713 ../e-util/e-html-editor-link-dialog.c:405
 msgid "_Test URL..."
 msgstr "Adresse über_prüfen …"
 
@@ -11280,75 +11578,81 @@ msgstr "Adresse über_prüfen …"
 msgid "Image Properties"
 msgstr "Bildeigenschaften"
 
-#: ../e-util/e-html-editor-link-dialog.c:374
+#: ../e-util/e-html-editor-link-dialog.c:429
 msgid "_Remove Link"
 msgstr "Verknüpfung en_tfernen"
 
-#: ../e-util/e-html-editor-link-dialog.c:399
+#: ../e-util/e-html-editor-link-dialog.c:454
 msgid "Link Properties"
 msgstr "Verweis-Eigenschaften"
 
-#: ../e-util/e-html-editor-page-dialog.c:71
+#: ../e-util/e-html-editor-page-dialog.c:72
 msgid "Perforated Paper"
 msgstr "Perforiertes Papier"
 
-#: ../e-util/e-html-editor-page-dialog.c:80
+#: ../e-util/e-html-editor-page-dialog.c:81
 msgid "Blue Ink"
 msgstr "Blaue Tinte"
 
-#: ../e-util/e-html-editor-page-dialog.c:89
+#: ../e-util/e-html-editor-page-dialog.c:90
 msgid "Paper"
 msgstr "Papier"
 
-#: ../e-util/e-html-editor-page-dialog.c:98
+#: ../e-util/e-html-editor-page-dialog.c:99
 msgid "Ribbon"
 msgstr "Band"
 
-#: ../e-util/e-html-editor-page-dialog.c:107
+#: ../e-util/e-html-editor-page-dialog.c:108
 msgid "Midnight"
 msgstr "Mitternacht"
 
-#: ../e-util/e-html-editor-page-dialog.c:125 ../mail/filtertypes.xml.in.h:36 ../mail/searchtypes.xml.in.h:39 
../mail/vfoldertypes.xml.in.h:39
+#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:36 ../mail/searchtypes.xml.in.h:39 
../mail/vfoldertypes.xml.in.h:39
 msgid "Draft"
 msgstr "Entwurf"
 
-#: ../e-util/e-html-editor-page-dialog.c:134
+#: ../e-util/e-html-editor-page-dialog.c:135
 msgid "Graph Paper"
 msgstr "Millimeterpapier"
 
-#: ../e-util/e-html-editor-page-dialog.c:478
+#: ../e-util/e-html-editor-page-dialog.c:544
 msgid "<b>Colors</b>"
 msgstr "<b>Farben</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:497
+#: ../e-util/e-html-editor-page-dialog.c:563
 msgid "_Text:"
 msgstr "_Text:"
 
-#: ../e-util/e-html-editor-page-dialog.c:512
+#: ../e-util/e-html-editor-page-dialog.c:578
 msgid "_Link:"
 msgstr "_Verweis:"
 
-#: ../e-util/e-html-editor-page-dialog.c:527
+#: ../e-util/e-html-editor-page-dialog.c:593
+#, fuzzy
+#| msgid "_Link:"
+msgid "_Visited Link:"
+msgstr "_Verweis:"
+
+#: ../e-util/e-html-editor-page-dialog.c:608
 msgid "_Background:"
 msgstr "_Hintergrund:"
 
-#: ../e-util/e-html-editor-page-dialog.c:535
+#: ../e-util/e-html-editor-page-dialog.c:616
 msgid "<b>Background Image</b>"
 msgstr "<b>Hintergrundbild</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:557
+#: ../e-util/e-html-editor-page-dialog.c:638 ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "_Template:"
 msgstr "_Vorlage:"
 
-#: ../e-util/e-html-editor-page-dialog.c:565 ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: ../e-util/e-html-editor-page-dialog.c:572
+#: ../e-util/e-html-editor-page-dialog.c:653
 msgid "_Custom:"
 msgstr "_Angepasst:"
 
-#: ../e-util/e-html-editor-page-dialog.c:599
+#: ../e-util/e-html-editor-page-dialog.c:680
 msgid "Page Properties"
 msgstr "Seiteneigenschaften"
 
@@ -11365,9 +11669,11 @@ msgid "Paragraph Properties"
 msgstr "Absatzeigenschaften"
 
 #: ../e-util/e-html-editor-replace-dialog.c:163
-#, c-format
-msgid "%d occurence replaced"
-msgid_plural "%d occurences replaced"
+#, fuzzy, c-format
+#| msgid "%d occurence replaced"
+#| msgid_plural "%d occurences replaced"
+msgid "%d occurrence replaced"
+msgid_plural "%d occurrences replaced"
 msgstr[0] "%d Vorkommnis wurden ersetzt"
 msgstr[1] "%d Vorkommnisse wurden ersetzt"
 
@@ -11404,78 +11710,78 @@ msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#: ../e-util/e-html-editor-spell-check-dialog.c:88
 #, c-format
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>Vorschläge für »%s«</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:501
+#: ../e-util/e-html-editor-spell-check-dialog.c:520
 msgid "<b>Suggestions</b>"
 msgstr "<b>Vorschläge</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:536
+#: ../e-util/e-html-editor-spell-check-dialog.c:555
 msgid "Replace"
 msgstr "Ersetzen"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:545
+#: ../e-util/e-html-editor-spell-check-dialog.c:564
 msgid "Replace All"
 msgstr "Alle Ersetzen"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:554 ../mail/mail.error.xml.h:109
+#: ../e-util/e-html-editor-spell-check-dialog.c:573 ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:563
+#: ../e-util/e-html-editor-spell-check-dialog.c:582
 msgid "Skip"
 msgstr "Überspringen"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:572
+#: ../e-util/e-html-editor-spell-check-dialog.c:591
 msgid "Back"
 msgstr "Zurück"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:581
+#: ../e-util/e-html-editor-spell-check-dialog.c:600
 msgid "<b>Dictionary</b>"
 msgstr "<b>Wörterbuch</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:601
+#: ../e-util/e-html-editor-spell-check-dialog.c:620
 msgid "Add word"
 msgstr "Wort hin_zufügen"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:618 ../mail/mail-config.ui.h:37
+#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:38
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../e-util/e-html-editor-table-dialog.c:778
+#: ../e-util/e-html-editor-table-dialog.c:788
 msgid "_Rows:"
 msgstr "_Zeilen:"
 
-#: ../e-util/e-html-editor-table-dialog.c:795
+#: ../e-util/e-html-editor-table-dialog.c:805
 msgid "C_olumns:"
 msgstr "_Spalten:"
 
-#: ../e-util/e-html-editor-table-dialog.c:846
+#: ../e-util/e-html-editor-table-dialog.c:856
 msgid "_Spacing:"
 msgstr "A_bstand:"
 
-#: ../e-util/e-html-editor-table-dialog.c:863
+#: ../e-util/e-html-editor-table-dialog.c:873
 msgid "_Padding:"
 msgstr "_Füllung:"
 
-#: ../e-util/e-html-editor-table-dialog.c:927 ../e-util/e-html-editor-text-dialog.c:261
+#: ../e-util/e-html-editor-table-dialog.c:937 ../e-util/e-html-editor-text-dialog.c:261
 msgid "_Color:"
 msgstr "_Farbe:"
 
-#: ../e-util/e-html-editor-table-dialog.c:953
+#: ../e-util/e-html-editor-table-dialog.c:963
 msgid "Image:"
 msgstr "Bild:"
 
-#: ../e-util/e-html-editor-table-dialog.c:980
+#: ../e-util/e-html-editor-table-dialog.c:990
 msgid "Table Properties"
 msgstr "Tabelleneigenschaften"
 
@@ -11487,26 +11793,14 @@ msgstr "_Größe:"
 msgid "Text Properties"
 msgstr "Texteigenschaften"
 
-#: ../e-util/e-html-editor-view.c:4673
+#: ../e-util/e-html-editor-view.c:5338
 msgid "Changed property"
 msgstr "Geänderte Eigenschaft"
 
-#: ../e-util/e-html-editor-view.c:4674
+#: ../e-util/e-html-editor-view.c:5339
 msgid "Whether editor changed"
 msgstr "Ob eine Änderung des Editors vorliegt"
 
-#: ../e-util/e-html-editor-view.c:8509
-msgid "Turning HTML mode off will cause the text to lose all formatting. Do you want to continue?"
-msgstr "Durch Ausschalten des HTML-Modus verliert der Text sämtliche Formatierungen. Möchten Sie fortsetzen?"
-
-#: ../e-util/e-html-editor-view.c:8513
-msgid "_Don't lose formatting"
-msgstr "Formatierung _nicht entfernen"
-
-#: ../e-util/e-html-editor-view.c:8514
-msgid "_Lose formatting"
-msgstr "Formatierung _entfernen"
-
 #: ../e-util/e-import-assistant.c:256
 msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the 
list."
 msgstr "Wählen Sie die Datei, die Sie in Evolution importieren wollen und legen Sie den Dateitypenanhand der 
Auswahlliste fest."
@@ -11609,15 +11903,15 @@ msgstr "Schließen"
 msgid "_Save and Close"
 msgstr "_Speichern und schließen"
 
-#: ../e-util/e-mail-signature-editor.c:531
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr "Signatur bearbeiten"
 
-#: ../e-util/e-mail-signature-editor.c:564
+#: ../e-util/e-mail-signature-editor.c:562
 msgid "_Signature Name:"
 msgstr "_Signaturname:"
 
-#: ../e-util/e-mail-signature-editor.c:600
+#: ../e-util/e-mail-signature-editor.c:598
 msgid "Unnamed"
 msgstr "Namenlose"
 
@@ -11659,34 +11953,38 @@ msgstr "Weltkarte"
 msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the 
timezone from the drop-down combination box below."
 msgstr "Mausbasiertes interaktives Kartenobjekt zur Auswahl der Zeitzone. Tastaturbenutzer sollten die 
Zeitzone stattdessen mit der Auswahlliste im unteren Bereich festlegen."
 
-#: ../e-util/e-misc-utils.c:248
+#: ../e-util/e-misc-utils.c:251
 msgid "Could not open the link."
 msgstr "Verknüpfung konnte nicht geöffnet werden."
 
-#: ../e-util/e-misc-utils.c:330
+#: ../e-util/e-misc-utils.c:334
 msgid "Could not display help for Evolution."
 msgstr "Hilfe für Evolution konnte nicht angezeigt werden."
 
-#: ../e-util/e-misc-utils.c:2383
+#: ../e-util/e-misc-utils.c:2387
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Kalender »%s« wird geöffnet"
 
-#: ../e-util/e-misc-utils.c:2386
+#: ../e-util/e-misc-utils.c:2390
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Notizliste »%s« wird geöffnet"
 
-#: ../e-util/e-misc-utils.c:2389
+#: ../e-util/e-misc-utils.c:2393
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Aufgabenliste »%s« wird geöffnet"
 
-#: ../e-util/e-misc-utils.c:2392
+#: ../e-util/e-misc-utils.c:2396
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "Adressbuch »%s« wird geöffnet"
 
+#: ../e-util/e-misc-utils.c:3138 ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "Diese _Meldung nicht mehr anzeigen"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Kontakte anzeigen"
@@ -11716,7 +12014,7 @@ msgstr "Ko_ntakte"
 msgid "Search"
 msgstr "Suchen"
 
-#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:427
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "Adressbuch"
 
@@ -11729,30 +12027,30 @@ msgid "Select Contacts from Address Book"
 msgstr "Kontakte aus dem Adressbuch wählen"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3183
+#: ../e-util/e-name-selector-entry.c:3186
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s aus_klappen"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3199
+#: ../e-util/e-name-selector-entry.c:3202
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s _kopieren"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3210
+#: ../e-util/e-name-selector-entry.c:3213
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ausschnei_den"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3228
+#: ../e-util/e-name-selector-entry.c:3231
 #, c-format
 msgid "_Edit %s"
 msgstr "%s _bearbeiten"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../e-util/e-name-selector-list.c:584
 #, c-format
 msgid "_Delete %s"
 msgstr "%s _löschen"
@@ -11849,6 +12147,10 @@ msgstr "Automatisch"
 msgid "Configuration _URL:"
 msgstr "_Konfigurationsadresse:"
 
+#: ../e-util/e-proxy-editor.c:560
+msgid "No proxy"
+msgstr "Kein Proxy"
+
 #: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "Eine direkte Verbindung verwenden. Kein Proxy erforderlich."
@@ -11894,48 +12196,48 @@ msgstr "Regel bearbeiten"
 msgid "Matches: %u"
 msgstr "Stimmt überein mit: %u"
 
-#: ../e-util/e-search-bar.c:567
+#: ../e-util/e-search-bar.c:569
 msgid "Close the find bar"
 msgstr "Die Suchleiste schließen"
 
-#: ../e-util/e-search-bar.c:575
+#: ../e-util/e-search-bar.c:577
 msgid "Fin_d:"
 msgstr "_Suchen:"
 
-#: ../e-util/e-search-bar.c:587
+#: ../e-util/e-search-bar.c:589
 msgid "Clear the search"
 msgstr "Das Suchfeld leeren"
 
-#: ../e-util/e-search-bar.c:611
+#: ../e-util/e-search-bar.c:613
 msgid "_Previous"
 msgstr "_Rückwärts suchen"
 
-#: ../e-util/e-search-bar.c:614
+#: ../e-util/e-search-bar.c:616
 msgid "Find the previous occurrence of the phrase"
 msgstr "Den letzten Suchtreffer finden"
 
-#: ../e-util/e-search-bar.c:623
+#: ../e-util/e-search-bar.c:625
 msgid "_Next"
 msgstr "_Weitersuchen"
 
-#: ../e-util/e-search-bar.c:626
+#: ../e-util/e-search-bar.c:628
 msgid "Find the next occurrence of the phrase"
 msgstr "Den nächsten Suchtreffer finden"
 
-#: ../e-util/e-search-bar.c:635
+#: ../e-util/e-search-bar.c:637
 msgid "Mat_ch case"
 msgstr "_Groß-/Kleinschreibung berücksichtigen"
 
-#: ../e-util/e-search-bar.c:663
+#: ../e-util/e-search-bar.c:665
 msgid "Reached bottom of page, continued from top"
 msgstr "Seitenende erreicht, ab Anfang wird fortgesetzt"
 
-#: ../e-util/e-search-bar.c:685
+#: ../e-util/e-search-bar.c:687
 msgid "Reached top of page, continued from bottom"
 msgstr "Seitenanfang erreicht, ab Ende wird fortgesetzt"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327 
../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1163 ../smime/gui/certificate-manager.c:1669
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329 
../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1172 ../smime/gui/certificate-manager.c:1671
 msgid "Mail"
 msgstr "E-Mail"
 
@@ -12104,11 +12406,11 @@ msgstr "_Vertrauenswürdigkeit des SSL-Zertifikats zurücknehmen"
 msgid "User"
 msgstr "Benutzer"
 
-#: ../e-util/e-source-selector-dialog.c:229
+#: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "Zielor_dner:"
 
-#: ../e-util/e-source-selector-dialog.c:342
+#: ../e-util/e-source-selector-dialog.c:364
 msgid "Select destination"
 msgstr "Wählen Sie das Ziel"
 
@@ -12128,26 +12430,26 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:379
+#: ../e-util/e-spell-entry.c:408
 msgid "(no suggestions)"
 msgstr "(Keine Vorschläge)"
 
-#: ../e-util/e-spell-entry.c:403
+#: ../e-util/e-spell-entry.c:432
 msgid "More..."
 msgstr "Mehr …"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:517
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "»%s« zum Wörterbuch hinzufügen"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:537
+#: ../e-util/e-spell-entry.c:566
 msgid "Ignore All"
 msgstr "Alle ignorieren"
 
-#: ../e-util/e-spell-entry.c:569
+#: ../e-util/e-spell-entry.c:598
 msgid "Spelling Suggestions"
 msgstr "Rechtschreibvorschläge"
 
@@ -12235,7 +12537,7 @@ msgstr "Ein Fehler trat im Notizlisten-Backend für &quot;{0}&quot; auf."
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "Ein Fehler trat im Aufgabenlisten-Backend für &quot;{0}&quot; auf."
 
-#: ../e-util/e-table-click-to-add.c:684 ../e-util/gal-a11y-e-table-click-to-add.c:61 
../e-util/gal-a11y-e-table-click-to-add.c:142
+#: ../e-util/e-table-click-to-add.c:689 ../e-util/gal-a11y-e-table-click-to-add.c:61 
../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "Klicken zum Hinzufügen"
 
@@ -12283,7 +12585,7 @@ msgstr "Felder anzeigen"
 msgid "Choose the order of information to appear in the message list."
 msgstr "Wählen Sie die Reihenfolge der Informationen, die in der Nachrichtenliste erscheinen sollen."
 
-#: ../e-util/e-table-config.ui.h:2 ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:367 
../modules/cal-config-google/e-google-chooser-dialog.c:367
+#: ../e-util/e-table-config.ui.h:2
 msgid "_Apply"
 msgstr "An_wenden"
 
@@ -12430,7 +12732,7 @@ msgstr "_Sortieren nach"
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
-#: ../e-util/e-text.c:2114
+#: ../e-util/e-text.c:2134
 msgid "Select All"
 msgstr "Alle auswählen"
 
@@ -12484,99 +12786,111 @@ msgstr "Angezeigter Name"
 msgid "Flags"
 msgstr "Markierungen"
 
-#: ../e-util/evolution-source-viewer.c:728 ../mail/e-mail-config-identity-page.c:722
+#: ../e-util/evolution-source-viewer.c:728 ../mail/e-mail-config-identity-page.c:721
 msgid "Identity"
 msgstr "Identität"
 
-#: ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view.c:316
 msgid "_Copy Link Location"
 msgstr "Verweis-Ziel _kopieren"
 
-#: ../e-util/e-web-view.c:287
+#: ../e-util/e-web-view.c:318
 msgid "Copy the link to the clipboard"
 msgstr "Den Verweis in die Zwischenablage kopieren"
 
-#: ../e-util/e-web-view.c:295
+#: ../e-util/e-web-view.c:326
 msgid "_Open Link in Browser"
 msgstr "Verweis im Browser ö_ffnen"
 
-#: ../e-util/e-web-view.c:297
+#: ../e-util/e-web-view.c:328
 msgid "Open the link in a web browser"
 msgstr "Verweis im Browser ö_ffnen"
 
-#: ../e-util/e-web-view.c:305
+#: ../e-util/e-web-view.c:336
 msgid "_Copy Email Address"
 msgstr "_E-Mail-Adresse kopieren"
 
-#: ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view.c:343
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "Copy _Raw Email Address"
+msgstr "_E-Mail-Adresse kopieren"
+
+#: ../e-util/e-web-view.c:345
+#, fuzzy
+#| msgid "Copy the email address to the clipboard"
+msgid "Copy the raw email address to the clipboard"
+msgstr "E-Mail-Adresse in die Zwischenablage kopieren"
+
+#: ../e-util/e-web-view.c:360
 msgid "_Copy Image"
 msgstr "Bild _kopieren"
 
-#: ../e-util/e-web-view.c:324
+#: ../e-util/e-web-view.c:362
 msgid "Copy the image to the clipboard"
 msgstr "Das Bild in die Zwischenablage kopieren"
 
-#: ../e-util/e-web-view.c:329
+#: ../e-util/e-web-view.c:367
 msgid "Save _Image..."
 msgstr "Bild spe_ichern …"
 
-#: ../e-util/e-web-view.c:331
+#: ../e-util/e-web-view.c:369
 msgid "Save the image to a file"
 msgstr "Das Bild in einer Datei speichern"
 
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1340
+#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
 msgid "Select all text and images"
 msgstr "Den gesamten Text und Bilder in einer Nachricht markieren"
 
-#: ../e-util/e-web-view.c:1004
+#: ../e-util/e-web-view.c:1069
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../e-util/e-web-view.c:1006
+#: ../e-util/e-web-view.c:1071
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
-#: ../e-util/e-web-view.c:1017
+#: ../e-util/e-web-view.c:1082
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Zu Abschnitt »%s« in der Nachricht springen"
 
-#: ../e-util/e-web-view.c:1019
+#: ../e-util/e-web-view.c:1084
 msgid "Go to the beginning of the message"
 msgstr "Zum Anfang der aktuellen Zeile springen"
 
-#: ../e-util/e-web-view.c:1023
+#: ../e-util/e-web-view.c:1088
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
 
-#: ../e-util/e-web-view.c:2941
+#: ../e-util/e-web-view.c:3039
 msgid "Copying image to clipboard"
 msgstr "Das Bild wird in die Zwischenablage kopiert"
 
-#: ../e-util/e-web-view.c:3129
+#: ../e-util/e-web-view.c:3227
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: ../e-util/e-web-view.c:3165
+#: ../e-util/e-web-view.c:3263
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Bild wird als »%s« gespeichert"
 
-#: ../e-util/e-widget-undo.c:429
+#: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "»Text einfügen« rückgängig machen"
 
-#: ../e-util/e-widget-undo.c:431
+#: ../e-util/e-widget-undo.c:432
 msgid "Redo 'Insert text'"
 msgstr "»Text einfügen« wiederholen"
 
-#: ../e-util/e-widget-undo.c:445
+#: ../e-util/e-widget-undo.c:446
 msgid "Undo 'Delete text'"
 msgstr "»Text löschen« rückgängig machen"
 
-#: ../e-util/e-widget-undo.c:447
+#: ../e-util/e-widget-undo.c:448
 msgid "Redo 'Delete text'"
 msgstr "»Text löschen« wiederholen"
 
@@ -12652,7 +12966,7 @@ msgstr "die von Ihnen angegebene Zeit"
 msgid "a time relative to the current time"
 msgstr "Eine zur aktuellen Zeit relative Zeit"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:86
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:87
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -12714,7 +13028,7 @@ msgstr ""
 "relativ zu der verglichen, an der der Filter\n"
 "angewandt wird."
 
-#: ../e-util/gal-a11y-e-cell.c:122
+#: ../e-util/gal-a11y-e-cell.c:130
 msgid "Table Cell"
 msgstr "Zelle"
 
@@ -12724,7 +13038,7 @@ msgid "popup a child"
 msgstr "Kind aufklappen"
 
 #. Translators: description of an "edit" action
-#: ../e-util/gal-a11y-e-cell-text.c:617
+#: ../e-util/gal-a11y-e-cell-text.c:631
 msgid "begin editing this cell"
 msgstr "beginnen Sie die Bearbeitung dieser Zelle"
 
@@ -12870,28 +13184,28 @@ msgid "Invalid folder URI '%s'"
 msgstr "Ungültiger Ordneradresse »%s«"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410 
../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1074 ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:680 
../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1081 ../modules/mail/e-mail-shell-view-private.c:1092
 msgid "Inbox"
 msgstr "Eingang"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167 
../mail/importers/kmail-libs.c:147 ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1222 
../mail/importers/kmail-libs.c:147 ../modules/mail/e-mail-shell-view-private.c:1079
 msgid "Drafts"
 msgstr "Entwürfe"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178 
../mail/importers/kmail-libs.c:143 ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1233 
../mail/importers/kmail-libs.c:143 ../modules/mail/e-mail-shell-view-private.c:1083
 msgid "Outbox"
 msgstr "Ausgang"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182 
../mail/importers/kmail-libs.c:145 ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1237 
../mail/importers/kmail-libs.c:145 ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Sent"
 msgstr "Verschickt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170 
../mail/importers/kmail-libs.c:149 ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1225 
../mail/importers/kmail-libs.c:149 ../modules/mail/e-mail-shell-view-private.c:1087
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1 ../plugins/templates/templates.c:1176 
../plugins/templates/templates.c:1478 ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "Vorlagen"
@@ -12916,26 +13230,26 @@ msgstr "Das Weiterleiten der Nachricht wurde abgebrochen, da keine nutzbare Iden
 msgid "Waiting for '%s'"
 msgstr "Warten auf »%s«"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
+#: ../libemail-engine/e-mail-session-utils.c:540
 msgid "No mail transport service available"
 msgstr "Keine Email-Dienste verfügbar."
 
-#: ../libemail-engine/e-mail-session-utils.c:629 ../libemail-engine/mail-ops.c:718
+#: ../libemail-engine/e-mail-session-utils.c:630 ../libemail-engine/mail-ops.c:719
 #, c-format
 msgid "Posting message to '%s'"
 msgstr "Nachricht an »%s« verschicken"
 
-#: ../libemail-engine/e-mail-session-utils.c:666 ../libemail-engine/mail-ops.c:754
+#: ../libemail-engine/e-mail-session-utils.c:667 ../libemail-engine/mail-ops.c:755
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:696 ../libemail-engine/e-mail-session-utils.c:731 
../libemail-engine/mail-ops.c:778 ../libemail-engine/mail-ops.c:813
+#: ../libemail-engine/e-mail-session-utils.c:697 ../libemail-engine/e-mail-session-utils.c:732 
../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
 #, c-format
 msgid "Storing sent message to '%s'"
 msgstr "Verschickte Nachricht unter »%s« ablegen"
 
-#: ../libemail-engine/e-mail-session-utils.c:720 ../libemail-engine/mail-ops.c:802
+#: ../libemail-engine/e-mail-session-utils.c:721 ../libemail-engine/mail-ops.c:803
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -12944,12 +13258,12 @@ msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschickt«-Ordner anzuhängen."
 
-#: ../libemail-engine/e-mail-session-utils.c:750 ../libemail-engine/mail-ops.c:830
+#: ../libemail-engine/e-mail-session-utils.c:751 ../libemail-engine/mail-ops.c:831
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:952 ../libemail-engine/mail-ops.c:978 
../libemail-engine/mail-ops.c:1080
+#: ../libemail-engine/e-mail-session-utils.c:953 ../libemail-engine/mail-ops.c:979 
../libemail-engine/mail-ops.c:1081
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
@@ -12987,7 +13301,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "E-Mail wird von »%s« abgerufen"
 
-#: ../libemail-engine/mail-ops.c:748
+#: ../libemail-engine/mail-ops.c:749
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set in one or more filters is 
invalid. Please check your filters in Edit->Message Filters.\n"
@@ -12997,57 +13311,57 @@ msgstr ""
 "Bearbeiten->Nachrichtenfilter.\n"
 "Ursprüngliche Fehlermeldung ist: %s"
 
-#: ../libemail-engine/mail-ops.c:989
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../libemail-engine/mail-ops.c:1041
+#: ../libemail-engine/mail-ops.c:1042
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Eine Nachricht konnte nicht verschickt werden"
 msgstr[1] "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../libemail-engine/mail-ops.c:1047
+#: ../libemail-engine/mail-ops.c:1048
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../libemail-engine/mail-ops.c:1049
+#: ../libemail-engine/mail-ops.c:1050
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../libemail-engine/mail-ops.c:1163
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Nachrichten werden nach »%s« verschoben"
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1165
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Nachrichten werden nach »%s« kopiert"
 
-#: ../libemail-engine/mail-ops.c:1283
+#: ../libemail-engine/mail-ops.c:1284
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../libemail-engine/mail-ops.c:1411
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../libemail-engine/mail-ops.c:1487
+#: ../libemail-engine/mail-ops.c:1488
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Papierkorb in »%s« wird geleert"
 
-#: ../libemail-engine/mail-ops.c:1579
+#: ../libemail-engine/mail-ops.c:1580
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr "Veränderungen an Ordner »%s« werden verarbeitet"
@@ -13122,8 +13436,8 @@ msgstr "Sie können Kontonamen durch Ziehen-und-Ablegen neu anordnen."
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: ../mail/e-mail-account-tree-view.c:83 ../modules/mail/em-composer-prefs.c:1263 
../modules/plugin-manager/evolution-plugin-manager.c:358
-#: ../plugins/publish-calendar/publish-calendar.c:896
+#: ../mail/e-mail-account-tree-view.c:83 ../modules/mail/em-composer-prefs.c:1270 
../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
 msgstr "Aktiv"
 
@@ -13139,11 +13453,11 @@ msgstr "Keine E-Mail-Adresse angegeben"
 msgid "Missing domain in email address"
 msgstr "Domain in E-Mail-Adresse fehlt"
 
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903 ../shell/e-shell-window-actions.c:910 
../shell/e-shell-window-actions.c:917
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:903 ../shell/e-shell-window-actions.c:910 
../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: ../mail/e-mail-browser.c:285
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -13165,7 +13479,7 @@ msgstr "Evolution-Kontoassistent"
 msgid "_Revise Details"
 msgstr "Details ü_berarbeiten"
 
-#: ../mail/e-mail-config-auth-check.c:349
+#: ../mail/e-mail-config-auth-check.c:339
 msgid "Check for Supported Types"
 msgstr "Prüfen, welche Arten unterstützt werden"
 
@@ -13218,7 +13532,7 @@ msgstr "Antworten im Ordner der beantworteten Nachricht _speichern"
 msgid "Archi_ve Folder:"
 msgstr "Archi_vierungsordner:"
 
-#: ../mail/e-mail-config-defaults-page.c:638 ../modules/mail/em-mailer-prefs.c:1079
+#: ../mail/e-mail-config-defaults-page.c:638 ../modules/mail/em-mailer-prefs.c:1397
 msgid "Choose a folder to archive messages to."
 msgstr "Wählen Sie einen Ordner, in denen Nachrichten archiviert werden sollen."
 
@@ -13288,43 +13602,47 @@ msgstr ""
 msgid "Account Information"
 msgstr "Konteninformation"
 
-#: ../mail/e-mail-config-identity-page.c:319 ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:346 ../mail/e-mail-config-summary-page.c:352
+#, fuzzy
+#| msgid ""
+#| "Type the name by which you would like to refer to this account.\n"
+#| "For example, \"Work\" or \"Personal\"."
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, \"Work\" or \"Personal\"."
 msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel »Geschäftlich« oder »Persönlich«."
 
-#: ../mail/e-mail-config-identity-page.c:364
+#: ../mail/e-mail-config-identity-page.c:363
 msgid "Required Information"
 msgstr "Benötigte Informationen"
 
-#: ../mail/e-mail-config-identity-page.c:373
+#: ../mail/e-mail-config-identity-page.c:372
 msgid "Full Nam_e:"
 msgstr "_Voller Name:"
 
-#: ../mail/e-mail-config-identity-page.c:400
+#: ../mail/e-mail-config-identity-page.c:399
 msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: ../mail/e-mail-config-identity-page.c:447 ../plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../mail/e-mail-config-identity-page.c:446 ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Zusätzliche Informationen"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:455
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../mail/e-mail-config-identity-page.c:483
+#: ../mail/e-mail-config-identity-page.c:482
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../mail/e-mail-config-identity-page.c:538
+#: ../mail/e-mail-config-identity-page.c:537
 msgid "Add Ne_w Signature..."
 msgstr "N_eue Signatur …"
 
-#: ../mail/e-mail-config-identity-page.c:556
+#: ../mail/e-mail-config-identity-page.c:555
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "Details des E-Mail-Servers"
 
@@ -13356,8 +13674,8 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:29 
../modules/addressbook/autocompletion-config.c:114
-#: ../modules/calendar/e-calendar-preferences.ui.h:46 ../modules/itip-formatter/plugin/config-ui.c:90 
../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603 ../mail/mail-config.ui.h:30 
../modules/addressbook/autocompletion-config.c:113
+#: ../modules/calendar/e-calendar-preferences.c:625 ../modules/calendar/e-calendar-preferences.ui.h:46 
../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Allgemein"
 
@@ -13377,19 +13695,19 @@ msgstr "OpenPGP-_Schlüsselkennung:"
 msgid "Si_gning algorithm:"
 msgstr "Si_gnaturalgorithmus:"
 
-#: ../mail/e-mail-config-security-page.c:429 ../mail/e-mail-config-security-page.c:569 
../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:429 ../mail/e-mail-config-security-page.c:581 
../mail/mail-config.ui.h:71
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:432 ../mail/e-mail-config-security-page.c:572 
../mail/mail-config.ui.h:71
+#: ../mail/e-mail-config-security-page.c:432 ../mail/e-mail-config-security-page.c:584 
../mail/mail-config.ui.h:72
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:435 ../mail/e-mail-config-security-page.c:575 
../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:435 ../mail/e-mail-config-security-page.c:587 
../mail/mail-config.ui.h:73
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:438 ../mail/e-mail-config-security-page.c:578 
../mail/mail-config.ui.h:73
+#: ../mail/e-mail-config-security-page.c:438 ../mail/e-mail-config-security-page.c:590 
../mail/mail-config.ui.h:74
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -13398,46 +13716,52 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten _immer signieren"
 
 #: ../mail/e-mail-config-security-page.c:466
+#, fuzzy
+#| msgid "Always encrypt outgoing messages when using this account"
+msgid "Always enc_rypt outgoing messages when using this account"
+msgstr "Aus diesem Konto ausgehende Nachrichten immer verschlüsseln"
+
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Beim Verschicken verschlüsselter E-Mails _immer für mich selbst verschlüsseln"
 
-#: ../mail/e-mail-config-security-page.c:478
+#: ../mail/e-mail-config-security-page.c:490
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Schlüssel am Schlüsselbund beim Verschlüsseln _immer vertrauen"
 
-#: ../mail/e-mail-config-security-page.c:502
+#: ../mail/e-mail-config-security-page.c:514
 msgid "Secure MIME (S/MIME)"
 msgstr "Sicheres MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:511
+#: ../mail/e-mail-config-security-page.c:523
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../mail/e-mail-config-security-page.c:535 ../mail/e-mail-config-security-page.c:641
+#: ../mail/e-mail-config-security-page.c:547 ../mail/e-mail-config-security-page.c:653
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../mail/e-mail-config-security-page.c:544 ../mail/e-mail-config-security-page.c:650 
../mail/mail-dialogs.ui.h:5 ../shell/e-shell-window-actions.c:1006
+#: ../mail/e-mail-config-security-page.c:556 ../mail/e-mail-config-security-page.c:662 
../mail/mail-dialogs.ui.h:5 ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "_Leeren"
 
-#: ../mail/e-mail-config-security-page.c:553
+#: ../mail/e-mail-config-security-page.c:565
 msgid "Signing _algorithm:"
 msgstr "Signatur_algorithmus:"
 
-#: ../mail/e-mail-config-security-page.c:594
+#: ../mail/e-mail-config-security-page.c:606
 msgid "Always sign outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten immer signieren"
 
-#: ../mail/e-mail-config-security-page.c:617
+#: ../mail/e-mail-config-security-page.c:629
 msgid "Encryption certificate:"
 msgstr "Verschlüsselungszertifikat:"
 
-#: ../mail/e-mail-config-security-page.c:659
+#: ../mail/e-mail-config-security-page.c:671
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Aus diesem Konto ausgehende Nachrichten immer verschlüsseln"
 
-#: ../mail/e-mail-config-security-page.c:679
+#: ../mail/e-mail-config-security-page.c:691
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Beim Verschicken verschlüsselter E-Mails immer für mich selbst verschlüsseln"
 
@@ -13461,43 +13785,43 @@ msgstr "TLS"
 msgid "This is a summary of the settings which will be used to access your mail."
 msgstr "Dies ist eine Zusammenfassung der Einstellungen, die zum Zugriff auf Ihre Nachrichten verwendet 
werden."
 
-#: ../mail/e-mail-config-summary-page.c:370
+#: ../mail/e-mail-config-summary-page.c:369
 msgid "Personal Details"
 msgstr "Persönliche Angaben"
 
-#: ../mail/e-mail-config-summary-page.c:379
+#: ../mail/e-mail-config-summary-page.c:378
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: ../mail/e-mail-config-summary-page.c:393
+#: ../mail/e-mail-config-summary-page.c:392
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../mail/e-mail-config-summary-page.c:406
 msgid "Receiving"
 msgstr "Abrufen läuft"
 
-#: ../mail/e-mail-config-summary-page.c:419
+#: ../mail/e-mail-config-summary-page.c:418
 msgid "Sending"
 msgstr "Verschicken läuft"
 
-#: ../mail/e-mail-config-summary-page.c:431
+#: ../mail/e-mail-config-summary-page.c:430
 msgid "Server Type:"
 msgstr "Server-Art:"
 
-#: ../mail/e-mail-config-summary-page.c:452 ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../mail/e-mail-config-summary-page.c:451 ../modules/book-config-ldap/evolution-book-config-ldap.c:601
 msgid "Server:"
 msgstr "Server:"
 
-#: ../mail/e-mail-config-summary-page.c:473 ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../mail/e-mail-config-summary-page.c:472 ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../mail/e-mail-config-summary-page.c:494
+#: ../mail/e-mail-config-summary-page.c:493
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: ../mail/e-mail-config-summary-page.c:785
+#: ../mail/e-mail-config-summary-page.c:784
 msgid "Account Summary"
 msgstr "Konto-Zusammenfassung"
 
@@ -13519,27 +13843,27 @@ msgstr "Willkommen"
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: ../mail/e-mail-display.c:97
+#: ../mail/e-mail-display.c:103
 msgid "_Add to Address Book..."
 msgstr "Zum Adressbuch _hinzufügen …"
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:110
 msgid "_To This Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:117
 msgid "_From This Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:124
 msgid "Send _Reply To..."
 msgstr "Anwo_rt senden an …"
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:126
 msgid "Send a reply message to this address"
 msgstr "Eine Antwort an diese Adresse senden"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:133
 msgid "Create Search _Folder"
 msgstr "_Suchordner anlegen"
 
@@ -13561,42 +13885,42 @@ msgstr "Ordner_name:"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../mail/e-mail-free-form-exp.c:226
+#: ../mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/e-mail-free-form-exp.c:227
+#: ../mail/e-mail-free-form-exp.c:237
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: ../mail/e-mail-free-form-exp.c:228
+#: ../mail/e-mail-free-form-exp.c:238
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Entwurf"
 
-#: ../mail/e-mail-free-form-exp.c:229
+#: ../mail/e-mail-free-form-exp.c:239
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Markiert"
 
-#: ../mail/e-mail-free-form-exp.c:230
+#: ../mail/e-mail-free-form-exp.c:240
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/e-mail-free-form-exp.c:231
+#: ../mail/e-mail-free-form-exp.c:241
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Anlage"
 
-#: ../mail/e-mail-free-form-exp.c:479
+#: ../mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr "nein"
 
-#: ../mail/e-mail-free-form-exp.c:480
+#: ../mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "falsch"
@@ -13633,7 +13957,7 @@ msgstr "Zu er_ledigen"
 msgid "_Later"
 msgstr "S_päter"
 
-#: ../mail/e-mail-label-manager.c:171 ../modules/mail/e-mail-shell-view-actions.c:1084
+#: ../mail/e-mail-label-manager.c:171 ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
@@ -13681,664 +14005,691 @@ msgstr "Name der Kopfzeile"
 msgid "Header Value"
 msgstr "Kopfzeilenwert"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:114
+#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:119
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: ../mail/e-mail-printer.c:166
+#: ../mail/e-mail-printer.c:168
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487 ../mail/mail.error.xml.h:144
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "K_opieren"
 
-#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480 ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412 ../mail/e-mail-reader.c:1452
 msgid "_Do not ask me again."
 msgstr "_Nicht mehr nachfragen."
 
-#: ../mail/e-mail-reader.c:1526
+#: ../mail/e-mail-reader.c:1458
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "»_Antwort an« bei Mailinglisten immer ignorieren"
 
-#: ../mail/e-mail-reader.c:1728
+#: ../mail/e-mail-reader.c:1661
 msgid "Failed to retrieve message:"
 msgstr "Abrufen der Nachricht schlug fehl:"
 
-#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3014
+#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3038
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Nachricht »%s« wird abgerufen"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1894
 msgid "A_dd Sender to Address Book"
 msgstr "A_bsender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1896
 msgid "Add sender to address book"
 msgstr "Absender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1901
 msgid "_Archive..."
 msgstr "_Archivieren …"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1903
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Gewählten Nachrichten in den Archivordner verschieben"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1908
 msgid "Check for _Junk"
 msgstr "Auf unerwünschte Nachrichten über_prüfen"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1910
 msgid "Filter the selected messages for junk status"
 msgstr "Die gewählten Nachrichten auf den Status »Unerwünscht« filtern"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1915
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren …"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1917
 msgid "Copy selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1922
 msgid "_Delete Message"
 msgstr "Nachricht _löschen"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewählten Nachrichten zum Löschen markieren"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1929
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Filterregel über Mailing_liste erstellen …"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1931
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1936
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Filterregel über _Empfänger erstellen …"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1938
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1943
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Filterregel über _Absender erstellen …"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1945
 msgid "Create a rule to filter messages from this sender"
 msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1950
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Filterregel über _Betreff erstellen …"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1952
 msgid "Create a rule to filter messages with this subject"
 msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1957
 msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1959
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewählten Nachrichten anwenden"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1964
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen …"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1966
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach Text suchen"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1971
 msgid "_Clear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1973
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Die Folgemarkierung aus den gewählten Nachrichten entfernen"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1978
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1980
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Für die gewählten Nachrichten die Folgenachricht-Markierung auf »vollständig« setzen"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1985
 msgid "Follow _Up..."
 msgstr "_Folgenachricht …"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1987
 msgid "Flag the selected messages for follow-up"
 msgstr "Die gewählten Nachrichten zur Nachverfolgung markieren"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1992
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die gewählte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1999
 msgid "Forward As _Attached"
 msgstr "Als _Anhang weiterleiten"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2006
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die gewählte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2013
 msgid "Forward As _Inline"
 msgstr "_Eingebettet weiterleiten"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2020
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die gewählte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2027
 msgid "Forward As _Quoted"
 msgstr "_Zitiert weiterleiten"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2034
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2036
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-E-Mails erzwingen"
 
-#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
 msgid "_Ignore Subthread"
 msgstr "Unterkonversation _ignorieren"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2043
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Neue E-Mails in Unterkonversationen automatisch als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
 msgid "_Ignore Thread"
 msgstr "Konversation _ignorieren"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2050
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Neue E-Mails in dieser Konversation automatisch als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2055
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2057
 msgid "Mark the selected messages as important"
 msgstr "Die gewählten Nachrichten als wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2062
 msgid "_Junk"
 msgstr "Unerwü_nscht"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2064
 msgid "Mark the selected messages as junk"
 msgstr "Die gewählten Nachrichten als unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2069
 msgid "_Not Junk"
 msgstr "E_rwünscht"
 
 # doppelte Verneinung?
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2071
 msgid "Mark the selected messages as not being junk"
 msgstr "Die gewählten Nachrichten als nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2076
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2078
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewählten Nachrichten als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
 msgid "Do not _Ignore Subthread"
 msgstr "Unterkonversation nicht _ignorieren"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2085
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Neue E-Mails in Unterkonversationen nicht automatisch als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
 msgid "Do not _Ignore Thread"
 msgstr "Konversation nicht _ignorieren"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2092
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Neue E-Mails in dieser Konversation nicht automatisch als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2097
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2099
 msgid "Mark the selected messages as unimportant"
 msgstr "Die gewählten Nachrichten als unwichtig markieren"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2104
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2106
 msgid "Mark the selected messages as not having been read"
 msgstr "Die gewählten Nachrichten als ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2111
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten …"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2113
 msgid "Open the selected messages in the composer for editing"
 msgstr "Die gewählten Nachrichten zum Bearbeiten im Editor öffnen"
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2118
 msgid "Compose _New Message"
 msgstr "_Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2120
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht öffnen"
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2125
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2127
 msgid "Open the selected messages in a new window"
 msgstr "Die gewählten Nachrichten in einem neuen Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2132
 msgid "_Move to Folder..."
 msgstr "In Ordner _verschieben …"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2134
 msgid "Move selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2139
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2141
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2146
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2148
 msgid "Display the next important message"
 msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2153
 msgid "Next _Thread"
 msgstr "Nächste _Konversation"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2155
 msgid "Display the next thread"
 msgstr "Nächste Konversation anzeigen"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2160
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2162
 msgid "Display the next unread message"
 msgstr "Die nächste ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2167
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2169
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2174
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2176
 msgid "Display the previous important message"
 msgstr "Die vorhergehende wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2181
 msgid "Previous T_hread"
 msgstr "Vo_rherige Konversation"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2183
 msgid "Display the previous thread"
 msgstr "Die vorhergehende Konversation anzeigen"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2188
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2190
 msgid "Display the previous unread message"
 msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2197
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2204
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2209
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2211
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden umleiten"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2216
 msgid "Remo_ve Attachments"
 msgstr "Anlagen _löschen"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2218
 msgid "Remove attachments"
 msgstr "Anlagen löschen"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2223
 msgid "Remove Du_plicate Messages"
 msgstr "Do_ppelte Nachrichten löschen"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2225
 msgid "Checks selected messages for duplicates"
 msgstr "Die gewählten Nachrichten auf Duplikate überprüfen"
 
-#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27 
../modules/calendar/e-cal-shell-view-actions.c:1387 ../modules/mail/e-mail-attachment-handler.c:213
+#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:27 
../modules/calendar/e-cal-shell-view-actions.c:1387 ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2232
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Eine Antwort an alle Empfänger der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2239
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Eine Antwort an die Mailingliste der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2311 ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2246
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Eine Antwort an den Absender der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2251
 msgid "_Save as mbox..."
 msgstr "_Speichern als mbox …"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2253
 msgid "Save selected messages as an mbox file"
 msgstr "Die gewählten Nachrichten als mbox-Datei speichern"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2258
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2260
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2339
+#: ../mail/e-mail-reader.c:2272
 msgid "_Undelete Message"
 msgstr "Löschen der Nachricht _rückgängig"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2274
 msgid "Undelete the selected messages"
 msgstr "Löschen der gewählten Nachrichten rückgängig machen"
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2279
 msgid "_Normal Size"
 msgstr "_Normale Größe"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2281
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2286
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2288
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2295
 msgid "Decrease the text size"
 msgstr "Die Textgröße heruntersetzen"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2302
 msgid "Cre_ate"
 msgstr "_Erstellen"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2309
 msgid "Ch_aracter Encoding"
 msgstr "Zeichenko_dierung"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2316
 msgid "F_orward As"
 msgstr "_Weiterleiten als …"
 
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2323
 msgid "_Group Reply"
 msgstr "Antwort an _Gruppe"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2330
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2337
 msgid "Mar_k As"
 msgstr "Mar_kieren als"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2344
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2351
 msgid "_Zoom"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2361
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Einen Suchordner für diese Mailing_liste anlegen …"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2363
 msgid "Create a search folder for this mailing list"
 msgstr "Einen Suchordner für diese Mailingliste anlegen"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2368
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Einen Suchordner über _Empfänger anlegen …"
 
-#: ../mail/e-mail-reader.c:2437
+#: ../mail/e-mail-reader.c:2370
 msgid "Create a search folder for these recipients"
 msgstr "Einen Suchordner für diese Empfänger anlegen"
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2375
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Einen Suchordner über _Absender anlegen …"
 
-#: ../mail/e-mail-reader.c:2444
+#: ../mail/e-mail-reader.c:2377
 msgid "Create a search folder for this sender"
 msgstr "Einen Suchordner für diesen Absender anlegen"
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2382
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Einen Suchordner über _Betreff anlegen …"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2384
 msgid "Create a search folder for this subject"
 msgstr "Einen Suchordner für diesen Betreff anlegen"
 
-#: ../mail/e-mail-reader.c:2478
+#: ../mail/e-mail-reader.c:2411
 msgid "Mark for Follo_w Up..."
 msgstr "Als _Folgenachricht markieren …"
 
-#: ../mail/e-mail-reader.c:2494
+#: ../mail/e-mail-reader.c:2427
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/e-mail-reader.c:2498
+#: ../mail/e-mail-reader.c:2431
 msgid "Mark as _Junk"
 msgstr "Als un_erwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2502
+#: ../mail/e-mail-reader.c:2435
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2506
+#: ../mail/e-mail-reader.c:2439
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2518
+#: ../mail/e-mail-reader.c:2451
 msgid "Mark as Uni_mportant"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2522
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2566
+#: ../mail/e-mail-reader.c:2499
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../mail/e-mail-reader.c:2568
+#: ../mail/e-mail-reader.c:2501
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ../mail/e-mail-reader.c:2574
+#: ../mail/e-mail-reader.c:2507
 msgid "All Message _Headers"
 msgstr "Alle Nachrichtenk_öpfe"
 
-#: ../mail/e-mail-reader.c:2576
+#: ../mail/e-mail-reader.c:2509
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../mail/e-mail-reader.c:3020
+#: ../mail/e-mail-reader.c:3044
 msgid "Retrieving message"
 msgstr "Nachricht wird abgerufen"
 
-#: ../mail/e-mail-reader.c:4033 ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4075 ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../mail/e-mail-reader.c:4034
+#: ../mail/e-mail-reader.c:4076
 msgid "Forward the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden weiterleiten"
 
-#: ../mail/e-mail-reader.c:4053
+#: ../mail/e-mail-reader.c:4095
 msgid "Group Reply"
 msgstr "Antwort an Gruppe"
 
-#: ../mail/e-mail-reader.c:4054
+#: ../mail/e-mail-reader.c:4096
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Eine Antwort an die Mailingliste oder an alle Empfänger der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:4120 ../mail/filtertypes.xml.in.h:65
+#: ../mail/e-mail-reader.c:4162 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../mail/e-mail-reader.c:4132 ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../mail/e-mail-reader.c:4174 ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Weiter"
 
-#: ../mail/e-mail-reader.c:4136 ../modules/calendar/e-cal-shell-view-actions.c:1205
+#: ../mail/e-mail-reader.c:4178 ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../mail/e-mail-reader.c:4145 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4187 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Antworten"
 
+#: ../mail/e-mail-reader.c:5246
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5248
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5265
+#, c-format
+msgid "Allow remote content from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5322
+#, fuzzy
+#| msgid "Header content"
+msgid "Load remote content"
+msgstr "Inhalt der Kopfzeile"
+
 #: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Nicht mehr nachfragen"
 
-#: ../mail/e-mail-reader-utils.c:556 ../modules/cal-config-caldav/e-caldav-chooser.c:1806 
../modules/cal-config-google/e-google-chooser.c:1843 ../plugins/face/face.c:170
-#: ../shell/e-shell.c:867 ../shell/e-shell.c:888 ../smime/gui/certificate-manager.c:346
+#: ../mail/e-mail-reader-utils.c:552
+#, fuzzy, c-format
+#| msgid "Removing folder '%s'"
+msgid "Refreshing folder '%s'"
+msgstr "Ordner »%s« wird entfernt"
+
+#: ../mail/e-mail-reader-utils.c:620 ../mail/mail-send-recv.c:486 ../mail/mail-send-recv.c:1285 
../plugins/face/face.c:176 ../shell/e-shell.c:972 ../shell/e-shell.c:994
+#: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../mail/e-mail-reader-utils.c:1043
+#: ../mail/e-mail-reader-utils.c:1121
 msgid "Marking thread to be ignored"
 msgstr "Die Konversation zum Ignorieren markieren"
 
-#: ../mail/e-mail-reader-utils.c:1047
+#: ../mail/e-mail-reader-utils.c:1125
 msgid "Unmarking thread from being ignored"
 msgstr "Markierung zum Ignorieren der Konversation entfernen"
 
-#: ../mail/e-mail-reader-utils.c:1051
+#: ../mail/e-mail-reader-utils.c:1129
 msgid "Marking subthread to be ignored"
 msgstr "Unterkonversation als »zu ignorieren« markieren"
 
-#: ../mail/e-mail-reader-utils.c:1055
+#: ../mail/e-mail-reader-utils.c:1133
 msgid "Unmarking subthread from being ignored"
 msgstr "Markierung zum Ignorieren der Unterkonversation entfernen"
 
-#: ../mail/e-mail-reader-utils.c:1290
+#: ../mail/e-mail-reader-utils.c:1373
 msgid "Printing"
 msgstr "Drucken"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1525
+#: ../mail/e-mail-reader-utils.c:1608
 #, c-format
 msgid "Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
 msgid_plural "Folder '%s' contains %u duplicate messages. Are you sure you want to delete them?"
 msgstr[0] "Der Ordner »%s« enthält %u doppelte Nachricht. Soll diese wirklich gelöscht werden?"
 msgstr[1] "Der Ordner »%s« enthält %u doppelte Nachrichten. Sollen diese wirklich gelöscht werden?"
 
-#: ../mail/e-mail-reader-utils.c:2355
+#: ../mail/e-mail-reader-utils.c:2438
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Nachricht speichern"
@@ -14349,17 +14700,17 @@ msgstr[1] "Nachrichten speichern"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2376
+#: ../mail/e-mail-reader-utils.c:2459
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Nachricht"
 msgstr[1] "Nachrichten"
 
-#: ../mail/e-mail-reader-utils.c:2749
+#: ../mail/e-mail-reader-utils.c:2832
 msgid "Parsing message"
 msgstr "Nachricht wird verarbeitet"
 
-#: ../mail/e-mail-request.c:199
+#: ../mail/e-mail-request.c:204
 msgid "The message has no text content."
 msgstr "Diese Nachrichten hat keinen inhaltlichen Text."
 
@@ -14381,28 +14732,28 @@ msgstr "Keine Datenquelle gefunden für UID »%s«"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1534
+#: ../mail/em-composer-utils.c:1542
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} ${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1540
+#: ../mail/em-composer-utils.c:1548
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:1545
+#: ../mail/em-composer-utils.c:1553
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:2698
+#: ../mail/em-composer-utils.c:2766
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3137
+#: ../mail/em-composer-utils.c:3204
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../mail/em-composer-utils.c:3142
+#: ../mail/em-composer-utils.c:3209
 msgid "Choose folders to post the message to."
 msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
@@ -14419,35 +14770,101 @@ msgstr "Dann"
 msgid "Add Ac_tion"
 msgstr "Aktion hin_zufügen"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ungelesene Nachrichten:"
 msgstr[1] "Ungelesene Nachrichten:"
 
-#: ../mail/em-folder-properties.c:188
+#: ../mail/em-folder-properties.c:189
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Nachrichten insgesamt:"
 msgstr[1] "Nachrichten insgesamt:"
 
-#: ../mail/em-folder-properties.c:209
+#: ../mail/em-folder-properties.c:210
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Speicherverbrauch (%s):"
 
-#: ../mail/em-folder-properties.c:211
+#: ../mail/em-folder-properties.c:212
 #, c-format
 msgid "Quota usage"
 msgstr "Speicherverbrauch:"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../mail/em-folder-properties.c:286
+#: ../mail/em-folder-properties.c:287
 msgid "_Send Account Override:"
 msgstr "_Sendekonto überschreiben:"
 
-#: ../mail/em-folder-properties.c:415
+#: ../mail/em-folder-properties.c:491
+msgid "_Archive this folder using these settings:"
+msgstr ""
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:500
+#, fuzzy
+#| msgid "Sent _Messages Folder:"
+msgctxt "autoarchive"
+msgid "_Cleanup messages older than"
+msgstr "Ordner für _verschickte Nachrichten:"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:516
+msgctxt "autoarchive"
+msgid "days"
+msgstr "Tage"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:518
+msgctxt "autoarchive"
+msgid "weeks"
+msgstr "Wochen"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:520
+msgctxt "autoarchive"
+msgid "months"
+msgstr "Monate"
+
+#: ../mail/em-folder-properties.c:526
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move old messages to the default archive _folder"
+msgstr "Die gewählten Nachrichten in einen anderen Ordner verschieben"
+
+#: ../mail/em-folder-properties.c:537
+#, fuzzy
+#| msgid "Moving messages to '%s'"
+msgid "_Move old messages to:"
+msgstr "Nachrichten werden nach »%s« verschoben"
+
+#: ../mail/em-folder-properties.c:541
+#, fuzzy
+#| msgid "Archi_ve Folder:"
+msgid "AutoArchive folder"
+msgstr "Archi_vierungsordner:"
+
+#: ../mail/em-folder-properties.c:541
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select folder to use for AutoArchive"
+msgstr "Wählen Sie den Ordner, in den importiert werden soll"
+
+#: ../mail/em-folder-properties.c:547
+#, fuzzy
+#| msgid "_Delete junk messages"
+msgid "_Delete old messages"
+msgstr "Unerwünscht-Ordner beim Beenden _leeren"
+
+#: ../mail/em-folder-properties.c:606
+#, fuzzy
+#| msgid "_Archive..."
+msgid "AutoArchive"
+msgstr "_Archivieren …"
+
+#: ../mail/em-folder-properties.c:685
 msgid "Folder Properties"
 msgstr "Ordnereigenschaften"
 
@@ -14463,48 +14880,48 @@ msgstr "Einen neuen Ordner anlegen"
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 
-#: ../mail/em-folder-tree.c:819
+#: ../mail/em-folder-tree.c:845
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1668
+#: ../mail/em-folder-tree.c:1703
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
+#: ../mail/em-folder-tree.c:2251 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
+#: ../mail/em-folder-tree.c:2254 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2477
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2479
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:2249
+#: ../mail/em-folder-tree.c:2284
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
 
 # CHECK
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
+#: ../mail/em-folder-tree-model.c:444 ../mail/em-folder-tree-model.c:446
 msgid "UNMATCHED"
 msgstr "OHNE TREFFER"
 
-#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
+#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
 msgid "Loading..."
 msgstr "Ladevorgang …"
 
@@ -14528,75 +14945,75 @@ msgstr "_Gezeigte abonnieren"
 msgid "Subscribe To _All"
 msgstr "_Alle abonnieren"
 
-#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867 
../modules/mail/e-mail-shell-view-actions.c:1692
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1869 
../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: ../mail/em-subscription-editor.c:978
+#: ../mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr "_Versteckte abbestellen"
 
-#: ../mail/em-subscription-editor.c:986
+#: ../mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "_Alle abbestellen"
 
-#: ../mail/em-subscription-editor.c:1704
+#: ../mail/em-subscription-editor.c:1706
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/em-subscription-editor.c:1743
+#: ../mail/em-subscription-editor.c:1745
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../mail/em-subscription-editor.c:1756
+#: ../mail/em-subscription-editor.c:1758
 msgid "Clear Search"
 msgstr "Suchfeld leeren"
 
-#: ../mail/em-subscription-editor.c:1773
+#: ../mail/em-subscription-editor.c:1775
 msgid "Sho_w items that contain:"
 msgstr "Nur Einträge anzeigen, die Folgendes ent_halten:"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../mail/em-subscription-editor.c:1822
 msgid "Subscribe to the selected folder"
 msgstr "Den gewählten Ordner abonnieren"
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../mail/em-subscription-editor.c:1823
 msgid "Su_bscribe"
 msgstr "A_bonnieren"
 
-#: ../mail/em-subscription-editor.c:1866 ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../mail/em-subscription-editor.c:1868 ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Den gewählten Ordner abbestellen"
 
-#: ../mail/em-subscription-editor.c:1906
+#: ../mail/em-subscription-editor.c:1908
 msgid "Collapse all folders"
 msgstr "Alle Ordner einklappen"
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../mail/em-subscription-editor.c:1909
 msgid "C_ollapse All"
 msgstr "Alle _einklappen"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1919
 msgid "Expand all folders"
 msgstr "Alle Ordner aufklappen"
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../mail/em-subscription-editor.c:1920
 msgid "E_xpand All"
 msgstr "Alle _aufklappen"
 
-#: ../mail/em-subscription-editor.c:1928
+#: ../mail/em-subscription-editor.c:1930
 msgid "Refresh the folder list"
 msgstr "Die Ordnerliste auffrischen"
 
-#: ../mail/em-subscription-editor.c:1929 ../modules/mail/e-mail-shell-view-actions.c:1593 
../modules/mail/e-mail-shell-view-actions.c:1664
+#: ../mail/em-subscription-editor.c:1931 ../modules/mail/e-mail-shell-view-actions.c:1652 
../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "_Aktualisieren"
 
-#: ../mail/em-subscription-editor.c:1940
+#: ../mail/em-subscription-editor.c:1942
 msgid "Stop the current operation"
 msgstr "Den momentan ausgeführten Vorgang abbrechen"
 
-#: ../mail/em-subscription-editor.c:1941 ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../mail/em-subscription-editor.c:1943 ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "_Anhalten"
 
@@ -14605,22 +15022,28 @@ msgstr "_Anhalten"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:75
+#: ../mail/em-utils.c:76
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Sind Sie sicher, dass Sie %d Nachricht auf einmal öffnen wollen?"
 msgstr[1] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal öffnen wollen?"
 
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:177
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:983
+#: ../mail/em-utils.c:923
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
 
+#: ../mail/em-utils.c:1680
+#, fuzzy
+#| msgid "_Delete junk messages"
+msgid "Deleting old messages"
+msgstr "Unerwünscht-Ordner beim Beenden _leeren"
+
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Such_ordner"
@@ -14774,7 +15197,7 @@ msgstr "Wichtig"
 msgid "Read"
 msgstr "Gelesen"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:121 ../mail/vfoldertypes.xml.in.h:42
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:126 ../mail/vfoldertypes.xml.in.h:42
 msgid "Junk"
 msgstr "Unerwünscht"
 
@@ -14791,122 +15214,122 @@ msgid "is not Flagged"
 msgstr "ist nicht markiert"
 
 #: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45 ../mail/vfoldertypes.xml.in.h:46
-msgid "Completed On"
-msgstr "Abgeschlossen am"
+#, fuzzy
+#| msgid "% Completed"
+msgid "is Completed"
+msgstr "% abgeschlossen"
 
 #: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46 ../mail/vfoldertypes.xml.in.h:47
-msgid "is set"
-msgstr "ist gesetzt"
-
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47 ../mail/vfoldertypes.xml.in.h:48
-msgid "is not set"
-msgstr "ist nicht gesetzt"
+#, fuzzy
+#| msgid "% Completed"
+msgid "is not Completed"
+msgstr "% abgeschlossen"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52 ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53 ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52 ../mail/vfoldertypes.xml.in.h:53
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:51
 msgid "Source Account"
 msgstr "Quellkonto"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:52
 msgid "Pipe to Program"
 msgstr "An Programm weiterleiten"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:53
 msgid "returns"
 msgstr "liefert"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:54
 msgid "does not return"
 msgstr "liefert nicht"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:55
 msgid "returns greater than"
 msgstr "liefert größer als"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns less than"
 msgstr "liefert kleiner als"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:57
 msgid "Junk Test"
 msgstr "Unerwünscht-Test"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:58
 msgid "Message is Junk"
 msgstr "Nachricht ist unerwünscht"
 
-#: ../mail/filtertypes.xml.in.h:60
+#: ../mail/filtertypes.xml.in.h:59
 msgid "Message is not Junk"
 msgstr "Nachricht ist nicht unerwünscht"
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
 msgid "Message Location"
 msgstr "Nachrichtenort"
 
-#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54 ../mail/vfoldertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53 ../mail/vfoldertypes.xml.in.h:55
 msgid "Match All"
 msgstr "Auf alles zutreffen"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:65
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:66
 msgid "Set Label"
 msgstr "Beschriftung setzen"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:67
 msgid "Assign Color"
 msgstr "Farbe zuweisen"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Unset Color"
 msgstr "Farbe zurücksetzen"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Adjust Score"
 msgstr "Bewertung anpassen"
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Set Status"
 msgstr "Status setzen"
 
-#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Unset Status"
 msgstr "Status nicht setzen"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Beep"
 msgstr "Signalton"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:75
 msgid "Play Sound"
 msgstr "Klang abspielen"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Run Program"
 msgstr "Programm ausführen"
 
-#: ../mail/filtertypes.xml.in.h:78
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Forward to"
 msgstr "Weiterleiten an"
 
@@ -14914,11 +15337,11 @@ msgstr "Weiterleiten an"
 msgid "Importing Elm data"
 msgstr "Elm-Daten werden importiert"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:376
 msgid "Evolution Elm importer"
 msgstr "Evolution-Elm-Importeur"
 
-#: ../mail/importers/elm-importer.c:375
+#: ../mail/importers/elm-importer.c:377
 msgid "Import mail from Elm."
 msgstr "E-Mail von Elm importieren."
 
@@ -14967,25 +15390,25 @@ msgstr "Evolution KMail-Importeur"
 msgid "Import mail and contacts from KMail."
 msgstr "E-Mail und Kontakte aus KMail importieren."
 
-#: ../mail/importers/kmail-libs.c:152 ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../mail/importers/kmail-libs.c:152 ../modules/mail/e-mail-shell-view-private.c:1089
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: ../mail/importers/mail-importer.c:55
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "E-Mail-Postfach wird importiert"
 
-#: ../mail/importers/mail-importer.c:61
+#: ../mail/importers/mail-importer.c:60
 msgid "Importing mail and contacts from KMail"
 msgstr "E-Mail und Kontakte werden aus KMail importiert."
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314 
../plugins/dbx-import/dbx-importer.c:609 ../plugins/pst-import/pst-importer.c:760
+#: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311 
../plugins/dbx-import/dbx-importer.c:609 ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "»%s« wird importiert"
 
-#: ../mail/importers/mail-importer.c:570
+#: ../mail/importers/mail-importer.c:555
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
@@ -14994,11 +15417,11 @@ msgstr "%s wird eingelesen"
 msgid "Importing Pine data"
 msgstr "Pine-Daten werden importiert"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr "Evolution-Pine-Importeur"
 
-#: ../mail/importers/pine-importer.c:476
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr "E-Mail von Pine importieren."
 
@@ -15071,186 +15494,186 @@ msgstr "Vorgabeverhalten"
 msgid "For_mat messages in HTML"
 msgstr "Nachrichten als HTML f_ormatieren"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Automatically insert _emoticons"
 msgstr "Grafische _Emoticons automatisch einfügen"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Use Unicode characters for smile_ys"
 msgstr "Unicode-Zeichen für grafische _Emoticons verwenden"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "_Lesebestätigung immer anfordern"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Dateinamen wie _Outlook/GMail kodieren"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:14
 msgid "Send messages through Outbo_x folder"
 msgstr "Nachrichten über den Nachrichten_ausgang verschicken"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
 msgstr "Anzahl der Zeichen für Zeilenumbruch:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
 msgstr "Zeichenko_dierung:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr "Antworten und Weiterleitungen"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Start _typing at the bottom on replying"
 msgstr "Beim Antworten auf Mails _unten mit dem Schreiben beginnen"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr "Signat_ur beim Antworten über der Original-Nachricht behalten"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "»Antwort an« bei Mailinglisten immer _ignorieren"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "_Gruppenantwort nur an Mailingliste, wenn möglich"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "Nachrichten digital _signieren, wenn die Originalnachricht signiert ist (PGP oder S/MIME)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Anlage"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Eingebettet (Im Stil von Outlook)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Nicht zitieren"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Eingebettet"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Sig_natures"
 msgstr "Sig_naturen"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "_Languages"
 msgstr "_Sprachen"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Languages Table"
 msgstr "Sprachtabelle"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "Diese Sprachliste enthält ausschließlich die Sprachen, für die ein Wörterbuch installiert sind."
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:37
 msgid "Check spelling while I _type"
 msgstr "Rechtschreibprüfung während der Ein_gabe durchführen"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "To help avoid email accidents and embarrassments, ask for confirmation before taking the following 
checkmarked actions:"
 msgstr "Um Ärgernisse und ungewollte Ergebnisse zu vermeiden, bei folgenden markierten Aktionen um 
Bestätigung nachfragen:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a message with an _empty subject line"
 msgstr "Nachrichten mit _leerem Betreff senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Nachricht mit ausschließlich _Blindkopie-Empfängern senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Sending a _private reply to a mailing list message"
 msgstr "_Private Antwort auf eine Listennachricht senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Antwort an zahlreiche Empfänger se_nden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "_Mailinglisten erlauben, private Antworten an die Liste zu leiten"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Nachricht mit Empfängern senden, die nicht als E-Mail-Ad_resse angegeben wurden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Nachrichten mit Tastenkürzel (Strg+Eingabe) senden"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "Confirmations"
 msgstr "Bestätigungen"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Use for Folders"
 msgstr "Als Ordner verwenden"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:59
 msgid "A_dd"
 msgstr "_Hinzufügen"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Re_move"
 msgstr "_Entfernen"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "Use for Recipients"
 msgstr "Als Empfänger verwenden"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:64 ../modules/mail/em-composer-prefs.c:863
+#: ../mail/mail-config.ui.h:65 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "Konto"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Send account overrides"
 msgstr "Sendekonto überschreiben"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid ""
 "Assign which account should be used as a send account for respective folders or recipients, an override for 
usual send account detection. List of recipients can contain partial "
 "addresses or names. The name and the address parts are compared separately."
@@ -15258,201 +15681,224 @@ msgstr ""
 "Weisen Sie das Konto zu, welches als Sendekonto für die entsprechenden Ordner oder Empfänger dienen soll. 
Damit wird die Erkennung für das übliche Konto zum Versenden überschrieben. Die "
 "Liste der Empfänger kann Teiladressen oder Namen enthalten. Die Teile der Namen und Adressen werden 
getrennt verglichen."
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "_Folder override has precedence over Recipient override"
 msgstr "_Ordner hat Vorrang vor Empfänger"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Send Account"
-msgstr "Konto senden"
+msgstr "Sendekonto"
 
-#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:76 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:77
 msgid "Start up"
 msgstr "Startvorgang"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Check for new _messages on start"
 msgstr "Beim Start nach neuen _Nachrichten suchen"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Nach neuen Nachrichten in allen a_ktiven Konten suchen"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wählen"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Select HTML variable width font"
 msgstr "HTML-Proportionalschrift wählen"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "Fix_ed Width Font:"
 msgstr "_Dicktengleiche Schrift:"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "_Mark messages as read after"
 msgstr "Nachrichten als gelesen markieren nach"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: ../mail/mail-config.ui.h:88 ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../mail/mail-config.ui.h:89 ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "color"
 msgstr "Farbe"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Default character e_ncoding:"
 msgstr "Voreingestellte _Zeichenkodierung:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Apply the same _view settings to all folders"
 msgstr "Ansichts_einstellungen auf alle Ordner anwenden"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "F_all back to threading messages by subject"
 msgstr "Zurückfallen auf be_treffsbezogene Konversationen der Nachrichten"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Delete Mail"
 msgstr "Nachricht löschen"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Empty _trash folders"
 msgstr "_Papierkorbordner beim Beenden leeren"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "Confirm _when expunging a folder"
 msgstr "Beim _Säubern eines Ordners nachfragen"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "Archive Mail"
 msgstr "E-Mail archivieren"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "On This Computer A_rchive folder:"
 msgstr "Archiv-Ordner unter »Auf diesem Rechner«:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "Archive folder to use for On This Computer messages"
 msgstr "Archiv-Ordner zur Benutzung für Nachrichten unter »Auf diesem Rechner«"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "_Show animated images"
 msgstr "_Animierte Bilder anzeigen"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht wünschen"
 
-# Im Konfig-Dialog. Hier keine Passivform verwenden! -ck
-#: ../mail/mail-config.ui.h:102
-msgid "Loading Images"
-msgstr "Bilder laden"
-
 #: ../mail/mail-config.ui.h:103
-msgid "_Never load images from the Internet"
-msgstr "Bilder _nie aus dem Internet laden"
+msgid "Loading Remote Content"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:104
-msgid "_Load images only in messages from contacts"
-msgstr "Bilder nur in Nachrichten von Kontakten _laden"
+#, fuzzy
+#| msgid "_Never load images from the Internet"
+msgid "_Never load remote content from the Internet"
+msgstr "Bilder _nie aus dem Internet laden"
 
 #: ../mail/mail-config.ui.h:105
-msgid "_Always load images from the Internet"
-msgstr "Bilder _immer aus dem Internet laden"
+#, fuzzy
+#| msgid "_Load images only in messages from contacts"
+msgid "_Load remote content only in messages from contacts"
+msgstr "Bilder nur in Nachrichten von Kontakten _laden"
 
 #: ../mail/mail-config.ui.h:106
+#, fuzzy
+#| msgid "_Always load images from the Internet"
+msgid "_Always load remote content from the Internet"
+msgstr "Bilder _immer aus dem Internet laden"
+
+#: ../mail/mail-config.ui.h:107
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../mail/mail-config.ui.h:108
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../mail/mail-config.ui.h:109
+msgid "Allow for sites:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:110
+#, fuzzy
+#| msgid "All local folders"
+msgid "Allow for senders:"
+msgstr "Alle lokalen Ordner"
+
+#: ../mail/mail-config.ui.h:111
 msgid "HTML Messages"
 msgstr "HTML-Nachrichten"
 
-#: ../mail/mail-config.ui.h:107 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:112 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Beschriftungen"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:113
 msgid "Sender Photograph"
 msgstr "Foto des Absenders"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:114
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Foto des Absenders in der Nachrichtenvorschau anzeigen"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:115
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "gra_vatar.com nach einem Bild des Absenders durchsuchen"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:116
 msgid "Displayed Message Headers"
 msgstr "Angezeigte Nachrichtenköpfe"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:117
 msgid "Mail Headers Table"
 msgstr "E-Mail-Kopf-Tabelle"
 
-#: ../mail/mail-config.ui.h:113 ../modules/addressbook/autocompletion-config.c:117 
../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../mail/mail-config.ui.h:118 ../modules/addressbook/autocompletion-config.c:116 
../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Format von Datum/Zeit"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:120
 msgid "Check incoming _messages for junk"
 msgstr "_Eingehende E-Mail auf Unerwünschtheit prüfen"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:121
 msgid "_Delete junk messages"
 msgstr "Unerwünscht-Ordner beim Beenden _leeren"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:122
 msgid "Junk Test Options"
 msgstr "Optionen für Unerwünscht-Test"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:123
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "_Nachrichten nicht als Unerwünscht markieren, wenn Absender im Adressbuch"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:124
 msgid "_Lookup in local address book only"
 msgstr "Nur in _lokalen Adressbüchern suchen"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:125
 msgid "Check cu_stom headers for junk"
 msgstr "_Benutzerdefinierte Kopfzeilen auf Unerwünschtheit prüfen"
 
-#: ../mail/mail-config.ui.h:122 ../modules/mail-config/e-mail-config-remote-accounts.c:224 
../modules/mail-config/e-mail-config-smtp-backend.c:174
+#: ../mail/mail-config.ui.h:127 ../modules/mail-config/e-mail-config-remote-accounts.c:224 
../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Keine Verschlüsselung"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:128
 msgid "TLS encryption"
 msgstr "TLS-Verschlüsselung"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:129
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
@@ -15682,7 +16128,7 @@ msgstr "_Säubern"
 msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
 msgstr "Sind Sie sicher, dass Sie endgültig alle gelöschten Nachrichten aus allen Ordnern entfernen wollen?"
 
-#: ../mail/mail.error.xml.h:39 ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../mail/mail.error.xml.h:39 ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "_Papierkorb leeren"
 
@@ -15873,7 +16319,7 @@ msgstr "Falls Sie fortfahren, werden alle Vertretungskonten dauerhaft gelöscht.
 msgid "Do _Not Disable"
 msgstr "_Nicht deaktivieren"
 
-#: ../mail/mail.error.xml.h:90 ../plugins/publish-calendar/publish-calendar.c:655
+#: ../mail/mail.error.xml.h:90
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
@@ -16056,12 +16502,22 @@ msgstr "Ordner in den Ordnerbaum kopieren."
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Sind Sie sicher, dass Sie den Ordner »{0}« nach »{1}« kopieren wollen?"
 
+#: ../mail/mail.error.xml.h:139
+#, fuzzy
+#| msgid "Do _not Send"
+msgid "Do _not copy"
+msgstr "_Nicht verschicken"
+
 #: ../mail/mail.error.xml.h:140
-msgid "_Always"
+#, fuzzy
+#| msgid "_Always"
+msgid "_Always copy"
 msgstr "_Immer"
 
 #: ../mail/mail.error.xml.h:141
-msgid "N_ever"
+#, fuzzy
+#| msgid "N_ever"
+msgid "N_ever copy"
 msgstr "Ni_e"
 
 #: ../mail/mail.error.xml.h:142
@@ -16072,72 +16528,90 @@ msgstr "Ordner in Ordnerbaum verschieben."
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "Sind Sie sicher, dass Sie den Ordner »{0}« nach »{1}« verschieben wollen?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
+#, fuzzy
+#| msgid "Do _not Send"
+msgid "Do _not move"
+msgstr "_Nicht verschicken"
+
+#: ../mail/mail.error.xml.h:146
+#, fuzzy
+#| msgid "_Always"
+msgid "_Always move"
+msgstr "_Immer"
+
+#: ../mail/mail.error.xml.h:147
+#, fuzzy
+#| msgid "N_ever"
+msgid "N_ever move"
+msgstr "Ni_e"
+
+#: ../mail/mail.error.xml.h:148
 msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "Diese Nachricht konnte nicht verschickt werden, da das zum Verschicken gewählte Konto nicht 
aktiviert ist"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid "Please enable the account or send using another account."
 msgstr "Aktivieren Sie bitte das Konto oder verwenden Sie ein anderes Konto zum Senden."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "Mail Deletion Failed"
 msgstr "Löschen der E-Mail gescheitert"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sie haben keine ausreichenden Rechte, um diese E-Mail zu löschen."
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "\"Check Junk\" Failed"
 msgstr "Überprüfung auf Unerwünschtheit gescheitert"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:153
 msgid "\"Report Junk\" Failed"
 msgstr "Bericht über Unerwünschtheit gescheitert"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "\"Report Not Junk\" Failed"
 msgstr "Bericht über Erwünschtheit gescheitert"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 msgid "Remove duplicate messages?"
 msgstr "Sollen die doppelten Nachrichten entfernt werden?"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:156
 msgid "No duplicate messages found."
 msgstr "Keine doppelten Nachrichten gefunden."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:158
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Der Ordner »{0}« enthält keine doppelten Nachrichten."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Verbindung zu Konto »{0}« konnte nicht hergestellt werden."
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Verbindung zu Konto »{0}« konnte nicht getrennt werden."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Abbestellen des Ordners »{0}« schlug fehl."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Unable to retrieve message."
 msgstr "Nachricht konnte nicht abgerufen werden."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:164
 msgid "Message is not available in offline mode."
 msgstr "Nachricht ist nicht im Offline-Modus verfügbar."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:165
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the account, can be marked for 
offline synchronization. Then, once the account is online again, use File-&gt;"
 "Download Messages for Offline Usage, when this folder is selected, to make sure that all the messages in 
the folder will be available in offline mode."
@@ -16146,114 +16620,139 @@ msgstr ""
 "Internet verbunden ist, verwenden Sie bei ausgewähltem Ordner Datei-&gt;Nachrichten für Offline-Benutzung 
herunterladen. So stellen Sie sicher, dass die Nachrichten nun auch im Offline-"
 "Modus zur Verfügung gestellt werden."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to open folder."
 msgstr "Ordner konnte nicht geöffnet werden."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to find duplicate messages."
 msgstr "Doppelte Nachrichten konnten nicht gefunden werden."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to retrieve messages."
 msgstr "Nachrichten konnten nicht abgerufen werden."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:170
 msgid "Failed to mark messages as read."
 msgstr "Nachrichten konnten nicht als gelesen markiert werden."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to remove attachments from messages."
 msgstr "Anhänge konnten nicht von Nachrichten entfernt werden."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to download messages for offline viewing."
 msgstr "Nachrichten konnten nicht für Offline-Benutzung heruntergeladen werden."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to save messages to disk."
 msgstr "Nachrichten konnten nicht auf Festplatte gespeichert werden."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:174
 msgid "Hidden file is attached."
 msgstr "Eine verborgene Datei wurde beigelegt."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:175
 msgid "The attachment named {0} is a hidden file and may contain sensitive data. Please review it before 
sending."
 msgstr "Die Anlage namens {0} ist eine verborgene Datei und könnte sensible Daten enthalten. Bitte 
überprüfen Sie sie vor dem Abschicken."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:176
 msgid "Printing failed."
 msgstr "Drucken ist fehlgeschlagen."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:177
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Die Meldung des Druckers war »{0}«."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:178
 msgid "Could not perform this operation on {0}."
 msgstr "Dieser Vorgang konnte auf {0} nicht ausgeführt werden."
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:179
 msgid "You must be working online to complete this operation."
 msgstr "Sie müssen online sein, damit dieser Vorgang abgeschlossen wird."
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:180
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Nachricht von Konto &quot;{0}&quot; :"
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:181
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "Die Konversation in Ordner »{0}« konnte nicht zum Ignorieren markiert werden"
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:182
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "Das Entfernen der Markierung zum Ignorieren der Konversation im Ordner »{0}« ist fehlgeschlagen"
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:183
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr "Markieren der Unterkonversation als »zu ignorieren« im Ordner »{0}« ist fehlgeschlagen"
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr "Entfernen der Markierung zum Ignorieren der Unterkonversation im Ordner »{0}« ist fehlgeschlagen"
 
+#: ../mail/mail.error.xml.h:185
+msgid "Remote content download had been blocked for this message."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:186
+msgid "You can download remote content manually, or set to remember to download remote content for this 
sender or used sites."
+msgstr ""
+
+#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:188
+#, fuzzy
+#| msgid " (Completed "
+msgid "{0}, Completed on {1}"
+msgstr " (Abgeschlossen "
+
+#. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:190
+msgid "{0} by {1}"
+msgstr ""
+
+#. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:192
+msgid "Overdue: {0} by {1}"
+msgstr ""
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Absagevorgang …"
 
-#: ../mail/mail-send-recv.c:631
+#: ../mail/mail-send-recv.c:636
 msgid "Send & Receive Mail"
 msgstr "E-Mails verschicken und abrufen"
 
-#: ../mail/mail-send-recv.c:645
+#: ../mail/mail-send-recv.c:650
 msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
 msgid "Updating..."
 msgstr "Aktualisieren …"
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
 msgid "Waiting..."
 msgstr "Warten …"
 
-#: ../mail/mail-send-recv.c:1220
+#: ../mail/mail-send-recv.c:1225
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Nach neuen E-Mails auf »%s« sehen"
 
-#: ../mail/mail-send-recv.c:1434
+#: ../mail/mail-send-recv.c:1452
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "Löschen unerwünschter Nachrichten und Leeren des Papierkorbs unter »%s«"
 
-#: ../mail/mail-send-recv.c:1436
+#: ../mail/mail-send-recv.c:1454
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "Löschen von Unerwünscht unter »%s«"
 
-#: ../mail/mail-send-recv.c:1438
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "Papierkorb in »%s« wird geleert"
@@ -16310,13 +16809,13 @@ msgstr "Höher"
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6043
+#: ../mail/message-list.c:459 ../mail/message-list.c:6044
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
@@ -16340,16 +16839,16 @@ msgstr "%b %d %Y"
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wählen"
 
-#: ../mail/message-list.c:3629 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3632 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Nachrichten"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4985
+#: ../mail/message-list.c:4988
 msgid "Follow-up"
 msgstr "Folgenachricht"
 
-#: ../mail/message-list.c:5980
+#: ../mail/message-list.c:5981
 msgid ""
 "No message satisfies your search criteria. Change search criteria by selecting a new Show message filter 
from the drop down list above or by running a new search either by clearing it "
 "with Search->Clear menu item or by changing the query above."
@@ -16357,7 +16856,7 @@ msgstr ""
 "Keine Nachricht entspricht Ihren Suchkriterien. Ändern Sie die Suchkriterien, indem Sie einen neuen 
Nachrichtenfilter in der Auswahlliste oben wählen, oder indem Sie eine neue Suche "
 "ausführen, entweder durch Löschen mit dem Menüeintrag Suche->Löschen oder durch Ändern der Anfrage oben."
 
-#: ../mail/message-list.c:5988
+#: ../mail/message-list.c:5989
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
@@ -16393,52 +16892,52 @@ msgstr "Betreff - Gekürzt"
 msgid "Any header"
 msgstr "Beliebige Kopfzeile"
 
-#: ../mail/searchtypes.xml.in.h:55
+#: ../mail/searchtypes.xml.in.h:54
 msgid "Subject or Addresses contains"
 msgstr "Betreff oder Adresse enthält"
 
-#: ../mail/searchtypes.xml.in.h:56 ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../mail/searchtypes.xml.in.h:55 ../modules/mail/e-mail-shell-view-actions.c:2136
 msgid "Recipients contain"
 msgstr "Empfänger enthalten"
 
-#: ../mail/searchtypes.xml.in.h:57 ../modules/mail/e-mail-shell-view-actions.c:2063
+#: ../mail/searchtypes.xml.in.h:56 ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Message contains"
 msgstr "Nachricht enthält"
 
-#: ../mail/searchtypes.xml.in.h:58 ../modules/mail/e-mail-shell-view-actions.c:2084
+#: ../mail/searchtypes.xml.in.h:57 ../modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Subject contains"
 msgstr "Betreff enthält"
 
-#: ../mail/searchtypes.xml.in.h:59 ../modules/mail/e-mail-shell-view-actions.c:2077
+#: ../mail/searchtypes.xml.in.h:58 ../modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Sender contains"
 msgstr "Absender enthält"
 
-#: ../mail/searchtypes.xml.in.h:60 ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../mail/searchtypes.xml.in.h:59 ../modules/mail/e-mail-shell-view-actions.c:2115
 msgid "Body contains"
 msgstr "Rumpf enthält"
 
-#: ../mail/searchtypes.xml.in.h:61 ../modules/mail/e-mail-shell-view-actions.c:2056
+#: ../mail/searchtypes.xml.in.h:60 ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "Free form expression"
 msgstr "Freies Eingabefeld"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:123 ../modules/mail/em-mailer-prefs.c:1234
+#: ../modules/addressbook/autocompletion-config.c:122 ../modules/mail/em-mailer-prefs.c:1552
 msgid "_Table column:"
 msgstr "_Tabellenspalte:"
 
-#: ../modules/addressbook/autocompletion-config.c:126
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr "Adressformatierung"
 
-#: ../modules/addressbook/autocompletion-config.c:129
+#: ../modules/addressbook/autocompletion-config.c:128
 msgid "_Format address according to standard of its destination country"
 msgstr "Adresse anhand der Vorgaben des Ziellandes _formatieren"
 
-#: ../modules/addressbook/autocompletion-config.c:137
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr "Auto-Vervollständigung"
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr "Immer Adresse des automatisch vervollständigten Kontakts an_zeigen"
 
@@ -16492,10 +16991,6 @@ msgstr "Adressb_uch"
 msgid "Create a new address book"
 msgstr "Ein neues Adressbuch anlegen"
 
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "Zertifikate"
-
 #: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
@@ -16559,7 +17054,7 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Karte mit allen Kontakten des gewählten Adressbuchs anzeigen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:972 
../modules/calendar/e-cal-shell-view-actions.c:1261 ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:710 ../modules/mail/e-mail-shell-view-actions.c:1671
+#: ../modules/calendar/e-task-shell-view-actions.c:710 ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
@@ -16636,7 +17131,7 @@ msgid "_Actions"
 msgstr "A_ktionen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1058 
../modules/calendar/e-memo-shell-view-actions.c:622 ../modules/calendar/e-task-shell-view-actions.c:775
-#: ../modules/mail/e-mail-shell-view-actions.c:1836
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "_Vorschau"
 
@@ -16662,7 +17157,7 @@ msgstr "Karten im Kontakt-Vorschaufenster anzeigen"
 
 # CHECK
 #: ../modules/addressbook/e-book-shell-view-actions.c:1140 
../modules/calendar/e-memo-shell-view-actions.c:692 ../modules/calendar/e-task-shell-view-actions.c:857
-#: ../modules/mail/e-mail-shell-view-actions.c:1966
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_Classic View"
 msgstr "_Klassische Ansicht"
 
@@ -16672,7 +17167,7 @@ msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
 
 # CHECK - macht überhaupt keinen Sinn
 #: ../modules/addressbook/e-book-shell-view-actions.c:1147 
../modules/calendar/e-memo-shell-view-actions.c:699 ../modules/calendar/e-task-shell-view-actions.c:864
-#: ../modules/mail/e-mail-shell-view-actions.c:1973
+#: ../modules/mail/e-mail-shell-view-actions.c:2039
 msgid "_Vertical View"
 msgstr "_Vertikale Ansicht"
 
@@ -16686,7 +17181,7 @@ msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1174 
../modules/calendar/e-cal-shell-view-actions.c:1604 ../modules/calendar/e-memo-shell-view-actions.c:726
-#: ../modules/calendar/e-task-shell-view-actions.c:926 ../modules/mail/e-mail-shell-view-actions.c:2042 
../shell/e-shell-content.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:926 ../modules/mail/e-mail-shell-view-actions.c:2108 
../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -16764,35 +17259,40 @@ msgstr "Eine Datei zum Wiederherstellen wählen"
 msgid "Restore from Backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:216
+#: ../modules/backup-restore/evolution-backup-restore.c:217
 msgid "Select name of the Evolution backup file"
 msgstr "Name des Evolution-Sicherungsarchivs auswählen"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../modules/backup-restore/evolution-backup-restore.c:250
 msgid "_Restart Evolution after backup"
 msgstr "Evolution nach Sicherung neu sta_rten"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:276
+#: ../modules/backup-restore/evolution-backup-restore.c:285
+msgid "Re_start Evolution after restore"
+msgstr "Evolution nach Wiederherstellung neu _starten"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:327
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Name des Evolution-Sicherungsarchivs zur Wiederherstellung wählen"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "Re_start Evolution after restore"
-msgstr "Evolution nach Wiederherstellung neu _starten"
+#: ../modules/backup-restore/evolution-backup-restore.c:336
+#, c-format
+msgid "Checking content of backup file '%s', please wait..."
+msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:307
+#: ../modules/backup-restore/evolution-backup-restore.c:357
 msgid "_Back up Evolution Data..."
 msgstr "Evolution-Daten _sichern …"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:309
+#: ../modules/backup-restore/evolution-backup-restore.c:359
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen in einer Archivdatei"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:314
+#: ../modules/backup-restore/evolution-backup-restore.c:364
 msgid "R_estore Evolution Data..."
 msgstr "Evolution-Daten wi_ederherstellen …"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:316
+#: ../modules/backup-restore/evolution-backup-restore.c:366
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen aus einer Archivdatei"
 
@@ -16857,41 +17357,41 @@ msgstr "Temporäre Sicherungsdateien werden entfernt"
 msgid "Reloading registry service"
 msgstr "Registrierungsdienst wird neu geladen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr "Evolution-Datensicherung"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:868
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:873
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:942
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Backing up Evolution Data"
 msgstr "Sichern der Evolution-Daten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:943
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten sichert."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:945
+#: ../modules/backup-restore/evolution-backup-tool.c:944
 msgid "Restoring Evolution Data"
 msgstr "Wiederherstellen der Evolution-Daten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:946
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten wiederherstellt."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:968
+#: ../modules/backup-restore/evolution-backup-tool.c:967
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dies kann abhängig von den Daten in Ihrem Konto einige Zeit dauern."
 
@@ -16900,8 +17400,10 @@ msgid "Invalid Evolution backup file"
 msgstr "Ungültiges Evolution-Sicherungsarchiv"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "Bitte wählen Sie ein gültiges Evolution-Archiv zur Wiederherstellung."
+#, fuzzy
+#| msgid "Invalid Evolution backup file"
+msgid "File '{0}' is not a valid Evolution backup file."
+msgstr "Ungültiges Evolution-Sicherungsarchiv"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
@@ -16939,28 +17441,28 @@ msgstr "Unzureichende Berechtigungen"
 msgid "The selected folder is not writable."
 msgstr "Der gewählte Ordner ist schreibgeschützt."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:161
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Weiterleitung an Bogofilter gescheitert (%s):"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:179
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Nachrichteninhalt konnte nicht an Bogofilter weitergeleitet werden:"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:228
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter ist entweder abgestürzt oder kann eine Nachricht nicht verarbeiten"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:373
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr "Bogofilter-Optionen"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:382
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr "Nachrichtentext nach _Unicode konvertieren"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:540 
../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+#: ../modules/bogofilter/evolution-bogofilter.c:539 
../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
@@ -16968,99 +17470,99 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr "Filter für unerwünschte Nachrichten, der den Bogofilter verwendet"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
 msgid "Standard LDAP Port"
 msgstr "Standard-LDAP-Port"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447 
../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446 
../modules/book-config-ldap/evolution-book-config-ldap.c:618
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP über SSL (veraltet)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalog"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Microsoft Global Catalog über SSL"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
 msgid "Connecting to LDAP"
 msgstr "Verbindung mit LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
 msgid "Server Information"
 msgstr "Server-Informationen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Port:"
 msgstr "Port:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (empfohlen)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
 msgid "Encryption:"
 msgstr "Verschlüsselung:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648 
../modules/mail-config/e-mail-config-remote-accounts.c:245 
../modules/mail-config/e-mail-config-smtp-backend.c:195
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647 
../modules/mail-config/e-mail-config-remote-accounts.c:245 
../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutiger Name (DN) wird verwendet"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
 msgid "Method:"
 msgstr "Methode:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Using email 
address\" requires anonymous access to your LDAP server."
 msgstr ""
 "Dies ist die von Evolution verwendete Methode, um Sie zu legitimieren. Beachten Sie, dass ein anonymer 
Zugriff auf den LDAP-Server erforderlich ist, wenn Sie dies auf »E-Mail-Adresse "
 "verwenden« einstellen."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
 msgid "Using LDAP"
 msgstr "LDAP wird verwendet"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716 ../modules/mail/e-mail-shell-view.c:120
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715 ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Suchen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
 msgid "Search Base:"
 msgstr "Suchbasis:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
 msgid "Find Possible Search Bases"
 msgstr "Mögliche Suchbasen suchen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "One Level"
 msgstr "Eine Ebene"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
 msgid "Subtree"
 msgstr "Unterbaum"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
 msgid "Search Scope:"
 msgstr "Suchbereich:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid ""
 "The search scope defines how deep you would like the search to extend down the directory tree.  A search 
scope of \"Subtree\" will include all entries below your search base.  A search "
 "scope of \"One Level\" will only include the entries one level beneath your search base."
@@ -17068,28 +17570,28 @@ msgstr ""
 "Der Suchbereich legt fest, wie tief Sie bei der Suche im Ordnerbaum absteigen wollen. Der Suchbereich 
»Unterbaum« schließt alle Einträge unterhalb des Suchbereichs ein. Der Suchbereich "
 "»Eine Ebene« hingegen schließt lediglich die Ebene unterhalb des Ausgangspunktes der Suche ein."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Filter:"
 msgstr "Suchfilter:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
 msgid "Limit:"
 msgstr "Begrenzung:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "contacts"
 msgstr "Kontakte"
 
 # server until either set time limit or amount of contacts limit reached
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Browse until limit is reached"
 msgstr "Durchsuchen, bis Begrenzung erreicht ist"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135 
../modules/cal-config-caldav/evolution-cal-config-caldav.c:220
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135 
../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "Adresse:"
@@ -17098,61 +17600,35 @@ msgstr "Adresse:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch vermeiden (benötigt von Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:422 ../modules/cal-config-caldav/e-caldav-chooser.c:431 
../modules/cal-config-google/e-google-chooser.c:424
-#: ../modules/cal-config-google/e-google-chooser.c:433
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP-Fehler: %s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:460 ../modules/cal-config-google/e-google-chooser.c:462
-msgid "Could not parse response"
-msgstr "Antwort konnte nicht analysiert werden"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469 ../modules/cal-config-google/e-google-chooser.c:471
-msgid "Empty response"
-msgstr "Leere Antwort"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:477 ../modules/cal-config-google/e-google-chooser.c:479
-msgid "Unexpected reply from server"
-msgstr "Unerwartete Antwort vom Server"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1099 ../modules/cal-config-google/e-google-chooser.c:1101
-msgid "Could not locate user's calendars"
-msgstr "Benutzerkalender konnten nicht gefunden werden"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1321
-msgid "Path"
-msgstr "Pfad"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:348 
../modules/cal-config-google/e-google-chooser-dialog.c:348
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112 
../modules/cal-config-google/e-google-chooser-button.c:213
 msgid "Choose a Calendar"
 msgstr "Wählen Sie einen Kalender"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:351 
../modules/cal-config-google/e-google-chooser-dialog.c:351
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116 
../modules/cal-config-google/e-google-chooser-button.c:217
 msgid "Choose a Memo List"
 msgstr "Wählen Sie eine Notizliste"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:354 
../modules/cal-config-google/e-google-chooser-dialog.c:354
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120 
../modules/cal-config-google/e-google-chooser-button.c:221
 msgid "Choose a Task List"
 msgstr "Wählen Sie eine Aufgabenliste"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:234
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
 msgstr "Kalender suchen"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Memo Lists"
 msgstr "Notizlisten suchen"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:240
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
 msgid "Find Task Lists"
 msgstr "Aufgabenlisten suchen"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:258
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:263
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
 msgid "Server handles meeting invitations"
 msgstr "Server unterstützt Einladungen zu Besprechungen"
 
@@ -17164,27 +17640,27 @@ msgstr "Wählen Sie die zu verwendenden Adressbücher."
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Im Geburts- und Jahrestagskalender verwenden"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:143
+#: ../modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
 msgstr "Vorgegebener Benutzerkalender"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../modules/cal-config-local/evolution-cal-config-local.c:158
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Eine vorhandene iCalendar-Datei (*.ics) verwenden"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
 msgid "iCalendar File"
 msgstr "iCalendar-Datei"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
 msgid "Choose an iCalendar file"
 msgstr "Wählen Sie eine iCalendar-Datei"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
 msgid "File:"
 msgstr "Datei:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../modules/cal-config-local/evolution-cal-config-local.c:213
 msgid "Allow Evolution to update the file"
 msgstr "Evolution erlauben, die Datei zu aktualisieren"
 
@@ -17194,29 +17670,29 @@ msgstr "Evolution erlauben, die Datei zu aktualisieren"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
 msgid "Fahrenheit (°F)"
 msgstr "Fahrenheit (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
 msgid "Centigrade (°C)"
 msgstr "Celsius (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
 msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
 msgid "Units:"
 msgstr "Einheiten:"
 
@@ -17272,57 +17748,74 @@ msgstr "Neue Notizliste"
 msgid "New Task List"
 msgstr "Neue Aufgabenliste"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
 #, c-format
 msgid "Copying an event into the calendar '%s'"
 msgstr "Einen Termin in den Kalender »%s« kopieren"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
 #, c-format
 msgid "Moving an event into the calendar '%s'"
 msgstr "Einen Termin in den Kalender »%s« verschieben"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
 #, c-format
 msgid "Copying a memo into the memo list '%s'"
 msgstr "Eine Notiz in die Notizliste »%s« kopieren"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
 #, c-format
 msgid "Moving a memo into the memo list '%s'"
 msgstr "Eine Notiz in die Notizliste »%s« verschieben"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
 #, c-format
 msgid "Copying a task into the task list '%s'"
 msgstr "Eine Aufgabe in die Aufgabenliste »%s« kopieren"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
 #, c-format
 msgid "Moving a task into the task list '%s'"
 msgstr "Eine Aufgabe in die Aufgabenliste »%s« verschieben"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
 msgid "Calendar Selector"
 msgstr "Kalenderquellenauswahl"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
 msgid "Memo List Selector"
 msgstr "Notizquellenauswahl"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
 msgid "Task List Selector"
 msgstr "Aufgabenlistenauswahl"
 
-#: ../modules/calendar/e-calendar-preferences.c:516
+#: ../modules/calendar/e-calendar-preferences.c:520
 msgid "Selected Calendars for Alarms"
 msgstr "Ausgewählte Kalender für die Erinnerungen"
 
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../modules/calendar/e-calendar-preferences.c:616
+msgid "Meeting Invitations"
+msgstr "Besprechungseinladungen"
+
+#: ../modules/calendar/e-calendar-preferences.c:642
+msgid "_Delete message after acting"
+msgstr "_Löschen der Nachricht nach Abarbeitung"
+
+#: ../modules/calendar/e-calendar-preferences.c:656 ../modules/calendar/e-calendar-preferences.c:687
+msgid "Conflict Search"
+msgstr "Konfliktsuche"
+
+#. Source selector
+#: ../modules/calendar/e-calendar-preferences.c:671
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
+
+#: ../modules/calendar/e-calendar-preferences.c:1051
 msgid "Ti_me and date:"
 msgstr "_Zeit und Datum:"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:1052
 msgid "_Date only:"
 msgstr "Nur das _Datum:"
 
@@ -17519,23 +18012,23 @@ msgid "before every anniversary/birthday"
 msgstr "vor jedem Jahrestag/Geburtstag"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Default _snooze time (in minutes)"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Select the calendars for reminder notification"
 msgstr "Kalender für Erinnerungsmeldungen auswählen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Default Free/Busy Server"
 msgstr "Vorgegebener Verfügbarkeits-Server"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
-msgid "Template:"
-msgstr "Vorlage:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u und %d werden durch Benutzername und Domain der E-Mail-Adresse ersetzt."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:78
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Publishing Information"
 msgstr "Information zur Veröffentlichung"
 
@@ -18242,630 +18735,630 @@ msgstr "Teil als Einladung anzeigen"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../modules/itip-formatter/itip-view.c:226
 msgid "Today %H:%M"
 msgstr "Heute %k:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:232
+#: ../modules/itip-formatter/itip-view.c:230
 msgid "Today %H:%M:%S"
 msgstr "Heute %k:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:241
+#: ../modules/itip-formatter/itip-view.c:239
 msgid "Today %l:%M:%S %p"
 msgstr "Heute %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:256
+#: ../modules/itip-formatter/itip-view.c:254
 msgid "Tomorrow %H:%M"
 msgstr "Morgen %k:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:260
+#: ../modules/itip-formatter/itip-view.c:258
 msgid "Tomorrow %H:%M:%S"
 msgstr "Morgen %k:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:265
+#: ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow %l:%M %p"
 msgstr "Morgen %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:269
+#: ../modules/itip-formatter/itip-view.c:267
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgen %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:288
+#: ../modules/itip-formatter/itip-view.c:286
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:293
+#: ../modules/itip-formatter/itip-view.c:291
 msgid "%A %H:%M"
 msgstr "%A %k:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:297
+#: ../modules/itip-formatter/itip-view.c:295
 msgid "%A %H:%M:%S"
 msgstr "%A %k:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:302
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:306
+#: ../modules/itip-formatter/itip-view.c:304
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:315
+#: ../modules/itip-formatter/itip-view.c:313
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:321
+#: ../modules/itip-formatter/itip-view.c:319
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:325
+#: ../modules/itip-formatter/itip-view.c:323
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:330
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:334
+#: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:340
+#: ../modules/itip-formatter/itip-view.c:338
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:345
+#: ../modules/itip-formatter/itip-view.c:343
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:349
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:354
+#: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:358
+#: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:396 ../modules/itip-formatter/itip-view.c:397 
../modules/itip-formatter/itip-view.c:486 ../modules/itip-formatter/itip-view.c:487
-#: ../modules/itip-formatter/itip-view.c:576
+#: ../modules/itip-formatter/itip-view.c:394 ../modules/itip-formatter/itip-view.c:395 
../modules/itip-formatter/itip-view.c:484 ../modules/itip-formatter/itip-view.c:485
+#: ../modules/itip-formatter/itip-view.c:574
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
-#: ../modules/itip-formatter/itip-view.c:401 ../modules/itip-formatter/itip-view.c:491 
../modules/itip-formatter/itip-view.c:580
+#: ../modules/itip-formatter/itip-view.c:399 ../modules/itip-formatter/itip-view.c:489 
../modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Bitte antworten Sie im Namen von %s"
 
-#: ../modules/itip-formatter/itip-view.c:403 ../modules/itip-formatter/itip-view.c:493 
../modules/itip-formatter/itip-view.c:582
+#: ../modules/itip-formatter/itip-view.c:401 ../modules/itip-formatter/itip-view.c:491 
../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Erhalten im Namen von %s"
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:406
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s hat durch %s folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s hat folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:413
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s hat folgende Besprechung an Sie delegiert:"
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:416
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s wünscht durch %s Ihre Teilnahme an folgender Besprechung:"
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s wünscht Ihre Teilnahme an folgender Besprechung:"
 
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../modules/itip-formatter/itip-view.c:424
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s wünscht durch %s zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../modules/itip-formatter/itip-view.c:428
+#: ../modules/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s wünscht zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:430
 #, c-format
 msgid "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr "%s durch %s wünscht, aktuelle Informationen zu folgender Besprechung zu erhalten:"
 
-#: ../modules/itip-formatter/itip-view.c:434
+#: ../modules/itip-formatter/itip-view.c:432
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s wünscht, aktuelle Informationen zu folgender Besprechung zu erhalten:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:436
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s durch %s hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s hat durch %s folgende Besprechung abgesagt:"
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s hat folgende Besprechung abgesagt:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:448
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s durch %s hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:454
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s hat durch %s folgende Besprechungsänderungen abgelehnt:"
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s hat folgende Besprechungsänderungen abgelehnt:"
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:496
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s hat durch %s folgende Aufgabe veröffentlicht:"
 
-#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:498
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s hat folgende Aufgabe veröffentlicht:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:503
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s wünscht die Zuweisung folgender Aufgabe an %s:"
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../modules/itip-formatter/itip-view.c:506
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s hat Ihnen durch %s eine Aufgabe zugewiesen:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s hat Ihnen eine Aufgabe zugewiesen:"
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../modules/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s wünscht durch %s zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../modules/itip-formatter/itip-view.c:518
+#: ../modules/itip-formatter/itip-view.c:516
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s wünscht zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:520
 #, c-format
 msgid "%s through %s wishes to receive the latest information for the following assigned task:"
 msgstr "%s durch %s wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe zu erhalten:"
 
-#: ../modules/itip-formatter/itip-view.c:524
+#: ../modules/itip-formatter/itip-view.c:522
 #, c-format
 msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe zu erhalten:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:526
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s durch %s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:534
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s hat folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:538
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s durch %s hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:544
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s hat durch %s folgende zugewiesene Aufgabe abgelehnt:"
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s hat die folgende zugewiesene Aufgabe abgelehnt:"
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:585
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s hat durch %s folgende Notiz veröffentlicht:"
 
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s hat folgende Notiz veröffentlicht:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:592
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s wünscht durch %s zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s wünscht zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../modules/itip-formatter/itip-view.c:600
+#: ../modules/itip-formatter/itip-view.c:598
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s hat durch %s folgende gemeinsame Notiz gelöscht:"
 
-#: ../modules/itip-formatter/itip-view.c:602
+#: ../modules/itip-formatter/itip-view.c:600
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s hat folgende gemeinsame Notiz gelöscht:"
 
-#: ../modules/itip-formatter/itip-view.c:676
+#: ../modules/itip-formatter/itip-view.c:674
 msgid "All day:"
 msgstr "Ganztägig:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:680
 msgid "Start day:"
 msgstr "Anfangsdatum:"
 
-#: ../modules/itip-formatter/itip-view.c:682 ../modules/itip-formatter/itip-view.c:1517
+#: ../modules/itip-formatter/itip-view.c:680 ../modules/itip-formatter/itip-view.c:1515
 msgid "Start time:"
 msgstr "Anfangszeit:"
 
-#: ../modules/itip-formatter/itip-view.c:691
+#: ../modules/itip-formatter/itip-view.c:689
 msgid "End day:"
 msgstr "Enddatum:"
 
-#: ../modules/itip-formatter/itip-view.c:691 ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:689 ../modules/itip-formatter/itip-view.c:1516
 msgid "End time:"
 msgstr "Endzeit:"
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "Ope_n Calendar"
 msgstr "Kalender ö_ffnen"
 
-#: ../modules/itip-formatter/itip-view.c:1044
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Decline all"
 msgstr "Alles a_blehnen"
 
-#: ../modules/itip-formatter/itip-view.c:1047
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "_Decline"
 msgstr "Ab_lehnen"
 
-#: ../modules/itip-formatter/itip-view.c:1050
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "_Tentative all"
 msgstr "Alles vorläu_fig"
 
-#: ../modules/itip-formatter/itip-view.c:1053
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "_Tentative"
 msgstr "_Vorläufig"
 
-#: ../modules/itip-formatter/itip-view.c:1056
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "Acce_pt all"
 msgstr "Alles anneh_men"
 
-#: ../modules/itip-formatter/itip-view.c:1059
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "Acce_pt"
 msgstr "Annehmen"
 
-#: ../modules/itip-formatter/itip-view.c:1062
+#: ../modules/itip-formatter/itip-view.c:1060
 msgid "Send _Information"
 msgstr "Informationen über_mitteln"
 
-#: ../modules/itip-formatter/itip-view.c:1065
+#: ../modules/itip-formatter/itip-view.c:1063
 msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
-#: ../modules/itip-formatter/itip-view.c:1068 ../smime/gui/certificate-manager.c:1664
+#: ../modules/itip-formatter/itip-view.c:1066 ../smime/gui/certificate-manager.c:1666
 msgid "_Update"
 msgstr "A_ktualisieren"
 
-#: ../modules/itip-formatter/itip-view.c:1520 ../modules/itip-formatter/itip-view.c:1568 
../modules/itip-formatter/itip-view.c:1639
+#: ../modules/itip-formatter/itip-view.c:1518 ../modules/itip-formatter/itip-view.c:1566 
../modules/itip-formatter/itip-view.c:1637
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1556
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "Send reply to sender"
 msgstr "Antwort an Absender verschicken"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1571
+#: ../modules/itip-formatter/itip-view.c:1569
 msgid "Send _updates to attendees"
 msgstr "Akt_ualisierungen an die Teilnehmer verschicken"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1574
+#: ../modules/itip-formatter/itip-view.c:1572
 msgid "_Apply to all instances"
 msgstr "Auf alle _Instanzen anwenden"
 
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1573
 msgid "Show time as _free"
 msgstr "Zeit als _frei anzeigen"
 
-#: ../modules/itip-formatter/itip-view.c:1576
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Preserve my reminder"
 msgstr "_Erinnerung aufbewahren"
 
-#: ../modules/itip-formatter/itip-view.c:1577
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "_Inherit reminder"
 msgstr "Erinnerung ü_bernehmen"
 
-#: ../modules/itip-formatter/itip-view.c:1911
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Tasks:"
 msgstr "Auf_gaben:"
 
-#: ../modules/itip-formatter/itip-view.c:1914
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Memos:"
 msgstr "_Notizen:"
 
-#: ../modules/itip-formatter/itip-view.c:3220
+#: ../modules/itip-formatter/itip-view.c:3217
 msgid "Sa_ve"
 msgstr "_Speichern"
 
-#: ../modules/itip-formatter/itip-view.c:3682 ../modules/itip-formatter/itip-view.c:5131
+#: ../modules/itip-formatter/itip-view.c:3679 ../modules/itip-formatter/itip-view.c:5151
 msgid "Attendee status updated"
 msgstr "Teilnehmerstatus aktualisiert"
 
-#: ../modules/itip-formatter/itip-view.c:3862
+#: ../modules/itip-formatter/itip-view.c:3859
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ein Termin im Kalender »%s« überschneidet sich mit dieser Besprechung"
 
-#: ../modules/itip-formatter/itip-view.c:3891
+#: ../modules/itip-formatter/itip-view.c:3889
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Der Termin wurde im Kalender »%s« gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:4004
+#: ../modules/itip-formatter/itip-view.c:4024
 msgid "Unable to find any calendars"
 msgstr "Es wurden keine Kalender gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:4012
+#: ../modules/itip-formatter/itip-view.c:4032
 msgid "Unable to find this meeting in any calendar"
 msgstr "Diese Besprechung wurde in keinem Kalender gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:4017
+#: ../modules/itip-formatter/itip-view.c:4037
 msgid "Unable to find this task in any task list"
 msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:4022
+#: ../modules/itip-formatter/itip-view.c:4042
 msgid "Unable to find this memo in any memo list"
 msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
 
-#: ../modules/itip-formatter/itip-view.c:4367
+#: ../modules/itip-formatter/itip-view.c:4387
 msgid "Opening the calendar. Please wait..."
 msgstr "Kalender wird geöffnet. Bitte warten …"
 
-#: ../modules/itip-formatter/itip-view.c:4372
+#: ../modules/itip-formatter/itip-view.c:4392
 msgid "Searching for an existing version of this appointment"
 msgstr "Eine bestehende Version dieses Termins wird gesucht"
 
-#: ../modules/itip-formatter/itip-view.c:4767
+#: ../modules/itip-formatter/itip-view.c:4787
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Element kann nicht zu Kalender »%s« gesendet werden. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4782
+#: ../modules/itip-formatter/itip-view.c:4802
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "In Kalender »%s« als »Angenommen« eingetragen"
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4807
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "In Kalender »%s« als »Vorläufig angenommen« eingetragen"
 
-#: ../modules/itip-formatter/itip-view.c:4793
+#: ../modules/itip-formatter/itip-view.c:4813
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
 
-#: ../modules/itip-formatter/itip-view.c:4799
+#: ../modules/itip-formatter/itip-view.c:4819
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
 
-#: ../modules/itip-formatter/itip-view.c:4820 ../modules/itip-formatter/itip-view.c:5278 
../modules/itip-formatter/itip-view.c:5384
+#: ../modules/itip-formatter/itip-view.c:4840 ../modules/itip-formatter/itip-view.c:5298 
../modules/itip-formatter/itip-view.c:5404
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Änderungen im Kalender werden gespeichert. Bitte warten …"
 
-#: ../modules/itip-formatter/itip-view.c:4861
+#: ../modules/itip-formatter/itip-view.c:4881
 msgid "Unable to parse item"
 msgstr "Element kann nicht analysiert werden"
 
-#: ../modules/itip-formatter/itip-view.c:5054
+#: ../modules/itip-formatter/itip-view.c:5074
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Der Organisator hat den Vertreter %s entfernt "
 
-#: ../modules/itip-formatter/itip-view.c:5071
+#: ../modules/itip-formatter/itip-view.c:5091
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Dem Vertreter wurde eine Absagenachricht zugestellt"
 
-#: ../modules/itip-formatter/itip-view.c:5075
+#: ../modules/itip-formatter/itip-view.c:5095
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Die Absagenachricht konnte dem Vertreter nicht zugestellt werden"
 
-#: ../modules/itip-formatter/itip-view.c:5123
+#: ../modules/itip-formatter/itip-view.c:5143
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5167
+#: ../modules/itip-formatter/itip-view.c:5187
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Die Besprechung ist ungültig und kann nicht aktualisiert werden"
 
-#: ../modules/itip-formatter/itip-view.c:5243
+#: ../modules/itip-formatter/itip-view.c:5263
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Teilnehmerstatus konnte auf Grund eines ungültigen Zustands nicht aktualisiert werden"
 
-#: ../modules/itip-formatter/itip-view.c:5315 ../modules/itip-formatter/itip-view.c:5354
+#: ../modules/itip-formatter/itip-view.c:5335 ../modules/itip-formatter/itip-view.c:5374
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Teilnahmestatus konnte nicht aktualisiert werden, weil der Eintrag nicht mehr existiert"
 
-#: ../modules/itip-formatter/itip-view.c:5417
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Meeting information sent"
 msgstr "Besprechungsinformationen wurden verschickt"
 
-#: ../modules/itip-formatter/itip-view.c:5422
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Task information sent"
 msgstr "Aufgabeninformationen wurden verschickt"
 
-#: ../modules/itip-formatter/itip-view.c:5427
+#: ../modules/itip-formatter/itip-view.c:5447
 msgid "Memo information sent"
 msgstr "Notizinformationen wurden verschickt"
 
-#: ../modules/itip-formatter/itip-view.c:5438
+#: ../modules/itip-formatter/itip-view.c:5458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Verschicken der Besprechungsinformationen nicht möglich, die Besprechung existiert nicht"
 
-#: ../modules/itip-formatter/itip-view.c:5443
+#: ../modules/itip-formatter/itip-view.c:5463
 msgid "Unable to send task information, the task does not exist"
 msgstr "Verschicken der Aufgabeninformationen nicht möglich, die Aufgabe existiert nicht"
 
-#: ../modules/itip-formatter/itip-view.c:5448
+#: ../modules/itip-formatter/itip-view.c:5468
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Verschicken der Notizinformationen nicht möglich, die Notiz existiert nicht"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5513
+#: ../modules/itip-formatter/itip-view.c:5533
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5518
+#: ../modules/itip-formatter/itip-view.c:5538
 msgid "Save Calendar"
 msgstr "Kalender speichern"
 
-#: ../modules/itip-formatter/itip-view.c:5567 ../modules/itip-formatter/itip-view.c:5580
+#: ../modules/itip-formatter/itip-view.c:5587 ../modules/itip-formatter/itip-view.c:5600
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../modules/itip-formatter/itip-view.c:5568 ../modules/itip-formatter/itip-view.c:5581
+#: ../modules/itip-formatter/itip-view.c:5588 ../modules/itip-formatter/itip-view.c:5601
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist jedoch kein gültiger 
iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5623 ../modules/itip-formatter/itip-view.c:5653 
../modules/itip-formatter/itip-view.c:5754
+#: ../modules/itip-formatter/itip-view.c:5643 ../modules/itip-formatter/itip-view.c:5673 
../modules/itip-formatter/itip-view.c:5774
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../modules/itip-formatter/itip-view.c:5624 ../modules/itip-formatter/itip-view.c:5654 
../modules/itip-formatter/itip-view.c:5755
+#: ../modules/itip-formatter/itip-view.c:5644 ../modules/itip-formatter/itip-view.c:5674 
../modules/itip-formatter/itip-view.c:5775
 msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy 
information"
 msgstr "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine Ereignisse, Aufgaben oder 
Verfügbarkeitsinformationen."
 
-#: ../modules/itip-formatter/itip-view.c:5669
+#: ../modules/itip-formatter/itip-view.c:5689
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente."
 
-#: ../modules/itip-formatter/itip-view.c:5670
+#: ../modules/itip-formatter/itip-view.c:5690
 msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und der Kalender importiert 
werden."
 
-#: ../modules/itip-formatter/itip-view.c:6172
+#: ../modules/itip-formatter/itip-view.c:6193
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Keine"
 
-#: ../modules/itip-formatter/itip-view.c:6188
+#: ../modules/itip-formatter/itip-view.c:6209
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: ../modules/itip-formatter/itip-view.c:6348
+#: ../modules/itip-formatter/itip-view.c:6369
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../modules/itip-formatter/itip-view.c:6351
+#: ../modules/itip-formatter/itip-view.c:6372
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../modules/itip-formatter/itip-view.c:6354
+#: ../modules/itip-formatter/itip-view.c:6375
 msgid "This memo recurs"
 msgstr "Diese Notiz wird wiederholt"
 
@@ -18881,44 +19374,19 @@ msgstr "Die Besprechung wurde delegiert"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "»{0}« hat die Besprechung delegiert. Möchten Sie den Vertreter »{1}« hinzufügen?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:81
-msgid "Meeting Invitations"
-msgstr "Besprechungseinladungen"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:107
-msgid "_Delete message after acting"
-msgstr "_Löschen der Nachricht nach Abarbeitung"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:121 ../modules/itip-formatter/plugin/config-ui.c:152
-msgid "Conflict Search"
-msgstr "Konfliktsuche"
-
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:136
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip-Formatierung"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Text- und Kalenderteile in Nachrichten anzeigen."
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:250
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Google Features"
 msgstr "Google-Funktionen"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:259
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
 msgid "Add Google Ca_lendar to this account"
 msgstr "Google-K_alender zu diesem Konto hinzufügen"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:267
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
 msgid "Add Google Con_tacts to this account"
 msgstr "Google-Kon_takte zu diesem Konto hinzufügen"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:275
+#: ../modules/mail-config/e-mail-config-google-summary.c:286
 msgid "You may need to enable IMAP access"
 msgstr "Es wird nötig sein, den IMAP-Zugriff zu aktivieren"
 
@@ -19033,361 +19501,383 @@ msgstr "Yahoo!-Funktionen"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Ka_lender und Aufgabenlisten aus Yahoo! zu diesem Konto hinzufügen"
 
-#: ../modules/mail/e-mail-attachment-handler.c:424
+#: ../modules/mail/e-mail-attachment-handler.c:440
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d beigelegte Nachricht"
 msgstr[1] "%d beigelegte Nachrichten"
 
-#: ../modules/mail/e-mail-shell-backend.c:349
+#: ../modules/mail/e-mail-shell-backend.c:353
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../modules/mail/e-mail-shell-backend.c:351
+#: ../modules/mail/e-mail-shell-backend.c:355
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../modules/mail/e-mail-shell-backend.c:359
+#: ../modules/mail/e-mail-shell-backend.c:363
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "E-Mail-Konto"
 
-#: ../modules/mail/e-mail-shell-backend.c:361
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgid "Create a new mail account"
 msgstr "Ein neues E-Mail-Konto erstellen"
 
-#: ../modules/mail/e-mail-shell-backend.c:366
+#: ../modules/mail/e-mail-shell-backend.c:370
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../modules/mail/e-mail-shell-backend.c:368
+#: ../modules/mail/e-mail-shell-backend.c:372
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../modules/mail/e-mail-shell-backend.c:683
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
-#: ../modules/mail/e-mail-shell-backend.c:692
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:701
+#: ../modules/mail/e-mail-shell-backend.c:705
 msgid "Composer Preferences"
 msgstr "Editoreinstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:711
+#: ../modules/mail/e-mail-shell-backend.c:715
 msgid "Network Preferences"
 msgstr "Netzwerkeinstellungen"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1003
+#: ../modules/mail/e-mail-shell-backend.c:1007
 msgctxt "label"
 msgid "None"
 msgstr "Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:712
+#: ../modules/mail/e-mail-shell-view-actions.c:713
 msgid "Marking messages as read..."
 msgstr "Nachrichten werden als gelesen markiert …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#, fuzzy
+#| msgid "Move to Folder"
+msgid "Go to Folder"
+msgstr "In Ordner verschieben"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+msgid "_Select"
+msgstr "A_uswählen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1574
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Disable this account"
 msgstr "Dieses Konto deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1588
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Edit properties of this account"
 msgstr "Die Eigenschaften dieses Kontos bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1595
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
 msgstr "Die Ordnerliste dieses Kontos neu einlesen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nachrichten für Offline-Benutzung herunterladen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1602
+#: ../modules/mail/e-mail-shell-view-actions.c:1661
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Nachrichten von Konten/Ordnern herunterladen, die für den Offline-Modus markiert sind"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr "Ordner _kopieren nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner kopieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Diesen Ordner dauerhaft entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr "_Säubern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635 ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../modules/mail/e-mail-shell-view-actions.c:1694 ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr "Alle Nachrichten als gelesen _markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637 ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1696 ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Mark all messages in the folder as read"
 msgstr "Alle Nachrichten im Ordner als gelesen markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1642
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr "Ordner verschie_ben nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Move the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner verschieben"
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 msgid "_New..."
 msgstr "_Neu …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Create a new folder for storing mail"
 msgstr "Einen neuen Ordner zum Ablegen von Nachrichten anlegen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Den Ordner auffrischen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr "Nachrichten-_Konversation auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Alle Nachrichten in der selben Konversation markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr "Nachrichten-_Unterkonversation auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Select all replies to the currently selected message"
 msgstr "Alle Antworten auf die momentan ausgewählten Nachricht auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "_Papierkorb leeren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1701
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Konten entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1706
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
+#, fuzzy
+#| msgid "Move to Folder"
+msgid "Go to _Folder"
+msgstr "In Ordner verschieben"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#, fuzzy
+#| msgid "Click here to select folders to post to"
+msgid "Opens a dialog to select a folder to go to"
+msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1715
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "_Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1729
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr "Abonnements _verwalten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731 ../modules/mail/e-mail-shell-view-actions.c:1815
+#: ../modules/mail/e-mail-shell-view-actions.c:1797 ../modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf fernen Servern abonnieren oder abbestellen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1743 ../modules/mail/e-mail-shell-view-actions.c:1764
+#: ../modules/mail/e-mail-shell-view-actions.c:1809 ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send / _Receive"
 msgstr "Verschicken/Ab_rufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1750
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "Alle _abrufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr "Neue Objekte in von allen Konten empfangen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1757
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "Alle _verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1759
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr "Objekte in den Warteschlangen aller Konten verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1787
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgeführten E-Mail-Vorgang abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr "Alle _Konversationen einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr "Alle Nachrichtenkonversationen einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1799
+#: ../modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr "Alle Konversationen a_usklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1801
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr "Alle Nachrichtenkonversationen ausklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1806
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1808
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Create or edit rules for filtering new mail"
 msgstr "Regeln zum Filtern neuer E-Mails anlegen/bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1813
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr "A_bonnements …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1822
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "_Ordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1829
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "Bes_chriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1846
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
 msgstr "Sucho_rdner aus Suche anlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1853
+#: ../modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "S_uchordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1855
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1894
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show Message _Preview"
 msgstr "Nachrichten_vorschau anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1924
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show message preview pane"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1930
+#: ../modules/mail/e-mail-shell-view-actions.c:1996
 msgid "Show _Deleted Messages"
 msgstr "Gel_öschte Nachrichten anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1932
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Show deleted messages with a line through them"
 msgstr "Gelöschte Nachrichten (durchgestrichen) anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1938
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "_Group By Threads"
 msgstr "Nach Konversationen _gruppieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1940
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Threaded message list"
 msgstr "Nachrichtenliste nach Konversationen sortieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1946
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Unmatched Folder Enabled"
 msgstr "Trefferlosen Suchordner _aktiviert"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1948
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Legt fest, ob trefferlose Suchordner aktiviert sind"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1968
+#: ../modules/mail/e-mail-shell-view-actions.c:2034
 msgid "Show message preview below the message list"
 msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1975
+#: ../modules/mail/e-mail-shell-view-actions.c:2041
 msgid "Show message preview alongside the message list"
 msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1983
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1990
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1997
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fünf Tage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2004
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2011
+#: ../modules/mail/e-mail-shell-view-actions.c:2077
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2018
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2025
+#: ../modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2091
+#: ../modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Subject or Addresses contain"
 msgstr "Betreff oder Adresse enthält"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2101
+#: ../modules/mail/e-mail-shell-view-actions.c:2167
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2108
+#: ../modules/mail/e-mail-shell-view-actions.c:2174
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2115
+#: ../modules/mail/e-mail-shell-view-actions.c:2181
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
@@ -19448,42 +19938,49 @@ msgid_plural "%d unread, "
 msgstr[0] "%d ungelesen, "
 msgstr[1] "%d ungelesen, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1061
+#: ../modules/mail/e-mail-shell-view-private.c:1063
+#, c-format
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d ungelesen"
+msgstr[1] "%d ungelesene"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1569
+#: ../modules/mail/e-mail-shell-view-private.c:1581
 msgid "Send / Receive"
 msgstr "Verschicken/Abrufen"
 
-#: ../modules/mail/em-composer-prefs.c:413
+#: ../modules/mail/em-composer-prefs.c:414
 msgid "Select Folder to Add"
 msgstr "Wählen Sie einen Ordner zum Hinzufügen"
 
-#: ../modules/mail/em-composer-prefs.c:883
+#: ../modules/mail/em-composer-prefs.c:884
 msgid "Folder"
 msgstr "Ordner"
 
-#: ../modules/mail/em-composer-prefs.c:919
+#: ../modules/mail/em-composer-prefs.c:920
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: ../modules/mail/em-composer-prefs.c:1192
+#: ../modules/mail/em-composer-prefs.c:1199
 msgid "Keep in Outbox"
 msgstr "Im Nachrichtenausgang behalten"
 
-#: ../modules/mail/em-composer-prefs.c:1193
+#: ../modules/mail/em-composer-prefs.c:1200
 msgid "Send immediately"
 msgstr "Sofort versenden"
 
-#: ../modules/mail/em-composer-prefs.c:1194
+#: ../modules/mail/em-composer-prefs.c:1201
 msgid "Send after 5 minutes"
 msgstr "Nach 5 Minuten verschicken"
 
-#: ../modules/mail/em-composer-prefs.c:1267
+#: ../modules/mail/em-composer-prefs.c:1274
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
@@ -19507,20 +20004,20 @@ msgstr "Einmal pro Monat"
 msgid "Immediately, on folder leave"
 msgstr "Sofort beim Verlassen des Ordners"
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:420
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:424
 msgid "Contains Value"
 msgstr "Enthält Wert"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1236
+#: ../modules/mail/em-mailer-prefs.c:1554
 msgid "_Date header:"
 msgstr "_Datum in der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:1237
+#: ../modules/mail/em-mailer-prefs.c:1555
 msgid "Show _original header value"
 msgstr "_Originalwert der Kopfzeile anzeigen"
 
@@ -19587,19 +20084,19 @@ msgstr "Erweiterungs-Verwaltung"
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Hinweis: Einige Änderungen werden erst nach einem Neustart wirksam."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
 msgid "Overview"
 msgstr "Überblick"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:366 
../modules/plugin-manager/evolution-plugin-manager.c:449
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365 
../modules/plugin-manager/evolution-plugin-manager.c:448
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "_Plugins"
 msgstr "_Erweiterungen"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "Enable and disable plugins"
 msgstr "Erweiterungen aktivieren und deaktivieren"
 
@@ -19993,11 +20490,11 @@ msgstr "Teil als Adressbuchkontakt anzeigen"
 msgid "Evolution Web Inspector"
 msgstr "Evolution Web-Inspektor"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:123
+#: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "Diese _Meldung nicht mehr anzeigen."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:584 ../plugins/templates/templates.c:478
+#: ../plugins/attachment-reminder/attachment-reminder.c:465 ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
@@ -20178,7 +20675,7 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Automatisch beim Bearbeiten einer neuen E-Mail starten"
 
-#: ../plugins/external-editor/external-editor.c:469 ../plugins/external-editor/external-editor.c:471
+#: ../plugins/external-editor/external-editor.c:484 ../plugins/external-editor/external-editor.c:486
 msgid "Compose in External Editor"
 msgstr "Im externen Editor verfassen"
 
@@ -20214,23 +20711,29 @@ msgstr "Der externe Editor läuft immer noch"
 msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor 
is active."
 msgstr "Der externe Editor läuft immer noch. Das Fenster zum Verfassen einer Nachricht kann nicht 
geschlossen werden, solange der Editor läuft."
 
-#: ../plugins/face/face.c:288
+#: ../plugins/face/face.c:294
 msgid "Select a Face Picture"
 msgstr "Wählen Sie ein Porträtfoto"
 
-#: ../plugins/face/face.c:298
+#: ../plugins/face/face.c:304
 msgid "Image files"
 msgstr "Bilddateien"
 
-#: ../plugins/face/face.c:357
+#: ../plugins/face/face.c:392
 msgid "_Insert Face picture by default"
 msgstr "Porträtfoto standardmäßig e_infügen"
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:405
 msgid "Load new _Face picture"
 msgstr "Neues _Porträtfoto laden"
 
-#: ../plugins/face/face.c:431
+#: ../plugins/face/face.c:449
+#, fuzzy
+#| msgid "Choose Background Image"
+msgid "Change Face Image"
+msgstr "Wählen Sie das Hintergrundbild"
+
+#: ../plugins/face/face.c:537
 msgid "Include _Face"
 msgstr "_Porträtfoto einschließen"
 
@@ -20251,15 +20754,25 @@ msgid "Invalid Image Size"
 msgstr "Ungültige Bildgröße"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "Bitte wählen Sie ein Bild der Größe 48x48"
+msgid "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't exceed 723 bytes."
+msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "Incorrect Face Image Byte Size"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The Face image size is {0} bytes, while it should not be more than 723 bytes. Please select a PNG 
image of size 48 * 48 pixels, whose file size doesn't exceed 723 bytes."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:7
 msgid "Not an image"
 msgstr "Kein Bild"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
+#: ../plugins/face/org-gnome-face.error.xml.h:8
+#, fuzzy
+#| msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "Die von Ihnen ausgewählte Datei scheint keine gültige *.png-Datei zu sein. Fehler: {0}"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:364
@@ -20390,7 +20903,7 @@ msgstr ""
 "\n"
 "Kopfzeile: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:382 ../plugins/mail-notification/mail-notification.c:418
+#: ../plugins/mail-notification/mail-notification.c:400 ../plugins/mail-notification/mail-notification.c:436
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -20399,54 +20912,54 @@ msgstr[1] "Sie haben %d neue Nachrichten."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:393
+#: ../plugins/mail-notification/mail-notification.c:411
 #, c-format
 msgid "From: %s"
 msgstr "Von: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:407
+#: ../plugins/mail-notification/mail-notification.c:425
 #, c-format
 msgid "Subject: %s"
 msgstr "Betreff: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../plugins/mail-notification/mail-notification.c:442
 msgid "New email in Evolution"
 msgstr "Neue E-Mail in Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:459
+#: ../plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "%s anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:685
 msgid "_Play sound when a new message arrives"
 msgstr "Beim Eintreffen neuer E-Mails _Klang abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "_Beep"
 msgstr "_Signalton ausgeben"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "Use sound _theme"
 msgstr "Klang_thema verwenden"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Play _file:"
 msgstr "Klang_datei abspielen:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Select sound file"
 msgstr "Klangdatei auswählen"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:835
 msgid "Notify new messages for _Inbox only"
 msgstr "Nur über neue Nachrichten im _Eingangsordner benachrichtigen."
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Show _notification when a new message arrives"
 msgstr "Symbol im Be_nachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen"
 
@@ -20660,22 +21173,18 @@ msgstr "Die Veröffentlichung nach »%s« ist erfolgreich abgeschlossen worden"
 msgid "Mount of %s failed:"
 msgstr "Einhängen von »%s« ist fehlgeschlagen:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:655 ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr "_Aktivieren"
-
-#: ../plugins/publish-calendar/publish-calendar.c:805
+#: ../plugins/publish-calendar/publish-calendar.c:789
 msgid "Are you sure you want to remove this location?"
 msgstr "Sind Sie sicher, dass Sie diesen Ort entfernen wollen?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1144
+#: ../plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "Konversation zum Veröffentlichen der Nachricht konnte nicht erstellt werden."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1154
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "Kalenderinformationen verö_ffentlichen"
 
@@ -20755,7 +21264,7 @@ msgstr "_Port:"
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29 ../smime/gui/certificate-manager.c:772
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29 ../smime/gui/certificate-manager.c:774
 msgid "_Password:"
 msgstr "_Passwort:"
 
@@ -20767,7 +21276,7 @@ msgstr "Passwort _merken"
 msgid "Publishing Location"
 msgstr "Ort der Veröffentlichung"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:101 ../plugins/publish-calendar/publish-format-ical.c:104
+#: ../plugins/publish-calendar/publish-format-fb.c:84 ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Ungültige Quellen-Benutzerkennung »%s«"
@@ -20942,7 +21451,7 @@ msgstr "Beenden wird vorbereitet"
 msgid "Preparing to quit..."
 msgstr "Beenden wird vorbereitet …"
 
-#: ../shell/e-shell.c:915
+#: ../shell/e-shell.c:1024
 msgid "Credentials are required to connect to the destination host."
 msgstr "Anmeldedaten sind für eine Verbindung mit dem Zielrechner erforderlich."
 
@@ -20958,19 +21467,19 @@ msgstr "Suche speichern"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:930
+#: ../shell/e-shell-searchbar.c:926
 msgid "Sho_w:"
 msgstr "An_zeigen: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:955
+#: ../shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr "S_uchen: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1023
+#: ../shell/e-shell-searchbar.c:1019
 msgid "i_n"
 msgstr " _in "
 
@@ -21285,13 +21794,13 @@ msgstr "Diese Suchparameter ausführen"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../shell/e-shell-window.c:505
+#: ../shell/e-shell-window.c:555
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Neu"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:579
+#: ../shell/e-shell-window-private.c:632
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -21469,7 +21978,9 @@ msgid "Failed to invoke authenticate for '{0}'"
 msgstr "Starten der Legitimation für »{0}« ist fehlgeschlagen"
 
 #: ../shell/shell.error.xml.h:17
-msgid "Failed to connect to '{0}'"
+#, fuzzy
+#| msgid "Failed to connect to '{0}'"
+msgid "Failed to connect '{0}'"
 msgstr "Verbindung zu »{0}« fehlgeschlagen"
 
 #: ../shell/shell.error.xml.h:18
@@ -21477,21 +21988,81 @@ msgid "_Reconnect"
 msgstr "_Erneut verbinden"
 
 #: ../shell/shell.error.xml.h:19
+#, fuzzy
+#| msgid "Failed to refresh address book '{0}'"
+msgid "Failed to connect address book '{0}'"
+msgstr "Adressbuch »{0}« kann nicht aktualisiert werden"
+
+#: ../shell/shell.error.xml.h:20
+#, fuzzy
+#| msgid "Failed to open calendar '{0}'"
+msgid "Failed to connect calendar '{0}'"
+msgstr "Der Kalender »{0}« konnte nicht geöffnet werden"
+
+#: ../shell/shell.error.xml.h:21
+#, fuzzy
+#| msgid "Failed to connect to '{0}'"
+msgid "Failed to connect mail account '{0}'"
+msgstr "Verbindung zu »{0}« fehlgeschlagen"
+
+#: ../shell/shell.error.xml.h:22
+#, fuzzy
+#| msgid "Failed to open memo list '{0}'"
+msgid "Failed to connect memo list '{0}'"
+msgstr "Notizliste »{0}« konnte nicht geöffnet werden"
+
+#: ../shell/shell.error.xml.h:23
+#, fuzzy
+#| msgid "Failed to open task list '{0}'"
+msgid "Failed to connect task list '{0}'"
+msgstr "Aufgabenliste »{0}« konnte nicht geöffnet werden"
+
+#: ../shell/shell.error.xml.h:24
 msgid "Failed to prompt for credentials for '{0}'"
 msgstr "Abfragen der Anmeldedaten für »{0}« schlug fehl"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:25
 msgid "Failed to finish trust prompt for '{0}'"
 msgstr "Eingabe der Vertrauenswürdigkeit für »{0}« fehlgeschlagen"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:26
 msgid "SSL certificate for '{0}' is not trusted."
 msgstr "Das Zertifikat für »{0}« ist nicht vertrauenswürdig."
 
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:27
 msgid "Reason: {1}"
 msgstr "Grund: {1}"
 
+#: ../shell/shell.error.xml.h:29
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for address book '{0}' is not trusted."
+msgstr "Das Zertifikat für »{0}« ist nicht vertrauenswürdig."
+
+#: ../shell/shell.error.xml.h:30
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for calendar '{0}' is not trusted."
+msgstr "Das Zertifikat für »{0}« ist nicht vertrauenswürdig."
+
+#: ../shell/shell.error.xml.h:31
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for mail account '{0}' is not trusted."
+msgstr "Das Zertifikat für »{0}« ist nicht vertrauenswürdig."
+
+#: ../shell/shell.error.xml.h:32
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for memo list '{0}' is not trusted."
+msgstr "Das Zertifikat für »{0}« ist nicht vertrauenswürdig."
+
+#: ../shell/shell.error.xml.h:33
+#, fuzzy
+#| msgid "SSL certificate for '{0}' is not trusted."
+msgid "SSL certificate for task list '{0}' is not trusted."
+msgstr "Das Zertifikat für »{0}« ist nicht vertrauenswürdig."
+
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
@@ -21555,7 +22126,7 @@ msgstr "MD5-Fingerabdruck"
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: ../smime/gui/certificate-manager.c:650
+#: ../smime/gui/certificate-manager.c:652
 msgid "Select a file to backup your key and certificate..."
 msgstr "Wählen Sie eine Datei zum Sichern ihres Schlüssels und Zertifikats …"
 
@@ -21564,35 +22135,31 @@ msgstr "Wählen Sie eine Datei zum Sichern ihres Schlüssels und Zertifikats …
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:662
+#: ../smime/gui/certificate-manager.c:664
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-backup.p12"
 
-#: ../smime/gui/certificate-manager.c:676 ../smime/gui/certificate-manager.c:965
-msgid "All files"
-msgstr "Alle Dateien"
-
-#: ../smime/gui/certificate-manager.c:728
+#: ../smime/gui/certificate-manager.c:730
 msgid "Backup Certificate"
 msgstr "Zertifikat sichern"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:742
+#: ../smime/gui/certificate-manager.c:744
 msgid "_File name:"
 msgstr "_Dateiname:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:747
+#: ../smime/gui/certificate-manager.c:749
 msgid "Please select a file..."
 msgstr "Bitte eine Datei wählen …"
 
-#: ../smime/gui/certificate-manager.c:761
+#: ../smime/gui/certificate-manager.c:763
 msgid "_Include certificate chain in the backup"
 msgstr "Die Zertifikatskette in der Sicherung mit _einschließen"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:767
+#: ../smime/gui/certificate-manager.c:769
 msgid ""
 "The certificate backup password you set here protects the backup file that you are about to create.\n"
 "You must set this password to proceed with the backup."
@@ -21600,16 +22167,16 @@ msgstr ""
 "Das Passwort schützt die Sicherheitskopie ihres Zertifikats, das sie gerade erstellen.\n"
 "Sie müssen ein Passwort angeben, um mit der Sicherheitskopie fortsetzen zu können."
 
-#: ../smime/gui/certificate-manager.c:786
+#: ../smime/gui/certificate-manager.c:788
 msgid "_Repeat Password:"
 msgstr "Passwort _wiederholen:"
 
-#: ../smime/gui/certificate-manager.c:805
+#: ../smime/gui/certificate-manager.c:807
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:813
+#: ../smime/gui/certificate-manager.c:815
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to restore this backup later.\n"
@@ -21619,133 +22186,146 @@ msgstr ""
 "Falls Sie das Passwort Ihrer Zertifikatssicherheitskopie vergessen, können sie die Sicherheitskopie später 
nicht wiederherstellen.\n"
 "Bewahren Sie das Passwort an einem sicheren Ort auf. "
 
-#: ../smime/gui/certificate-manager.c:858
+#: ../smime/gui/certificate-manager.c:860
 msgid "No file name provided"
 msgstr "Kein Dateiname angegeben"
 
-#: ../smime/gui/certificate-manager.c:862
+#: ../smime/gui/certificate-manager.c:864
 msgid "Failed to backup key and certificate"
 msgstr "Zertifikat und Notfallschlüssel konnten nicht gesichert werden"
 
-#: ../smime/gui/certificate-manager.c:951
+#: ../smime/gui/certificate-manager.c:953
 msgid "Select a certificate to import..."
 msgstr "Wählen Sie ein zu importierendes Zertifikat …"
 
-#: ../smime/gui/certificate-manager.c:1001
+#: ../smime/gui/certificate-manager.c:1003
 msgid "Failed to import certificate"
 msgstr "Zertifikat konnte nicht importiert werden"
 
-#: ../smime/gui/certificate-manager.c:1117
+#: ../smime/gui/certificate-manager.c:1119
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Beim Verwenden nachfragen"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1121
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Nie"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1123
 msgctxt "CamelTrust"
-msgid "Marginal"
+msgid "Marginally"
 msgstr "Geringfügig"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1125
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Vollkommen"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1127
 msgctxt "CamelTrust"
-msgid "Ultimate"
+msgid "Ultimately"
 msgstr "Uneingeschränkt"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1129
 msgctxt "CamelTrust"
-msgid "Temporary"
+msgid "Temporarily"
 msgstr "Vorübergehend"
 
-#: ../smime/gui/certificate-manager.c:1333
+#: ../smime/gui/certificate-manager.c:1335
 msgid "Change certificate trust"
 msgstr "Vertrauenswürdigkeit eines Zertifikats ändern"
 
-#: ../smime/gui/certificate-manager.c:1345
+#: ../smime/gui/certificate-manager.c:1347
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr "Vertrauenswürdigkeit für Rechner »%s« ändern:"
 
-#: ../smime/gui/certificate-manager.c:1369
+#: ../smime/gui/certificate-manager.c:1371
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "Beim _Verwenden nachfragen"
 
-#: ../smime/gui/certificate-manager.c:1370
+#: ../smime/gui/certificate-manager.c:1372
+#, fuzzy
+#| msgid "Unset _trust for SSL certificate"
 msgctxt "CamelTrust"
-msgid "_Temporary (this session only)"
-msgstr "_Vorübergehend (nur für diese Sitzung)"
+msgid "_Never trust this certificate"
+msgstr "_Vertrauenswürdigkeit des SSL-Zertifikats zurücknehmen"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1373
+#, fuzzy
+#| msgctxt "CamelTrust"
+#| msgid "_Temporary (this session only)"
 msgctxt "CamelTrust"
-msgid "_Never"
-msgstr "_Nie"
+msgid "_Temporarily trusted (this session only)"
+msgstr "_Vorübergehend (nur für diese Sitzung)"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1374
+#, fuzzy
+#| msgctxt "CamelTrust"
+#| msgid "_Marginal"
 msgctxt "CamelTrust"
-msgid "_Marginal"
+msgid "_Marginally trusted"
 msgstr "_Geringfügig"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1375
+#, fuzzy
+#| msgid "R_eply requested"
 msgctxt "CamelTrust"
-msgid "_Fully"
-msgstr "_Vollkommen"
+msgid "_Fully trusted"
+msgstr "Rüc_kmeldung gewünscht"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1376
+#, fuzzy
+#| msgctxt "CamelTrust"
+#| msgid "_Ultimate"
 msgctxt "CamelTrust"
-msgid "_Ultimate"
+msgid "_Ultimately trusted"
 msgstr "_Uneingeschränkt"
 
 # CHECK
-#: ../smime/gui/certificate-manager.c:1378
+#: ../smime/gui/certificate-manager.c:1380
 msgid "Before trusting this site, you should examine its certificate and its policy and procedures (if 
available)."
 msgstr "Bevor Sie dieser Zertifizierungsstelle vertrauen, sollten Sie deren Zertifikat und seine 
Verfahrensweisen genau kontrollieren (falls möglich)."
 
-#: ../smime/gui/certificate-manager.c:1393
+#: ../smime/gui/certificate-manager.c:1395
 msgid "_Display certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../smime/gui/certificate-manager.c:1598
+#: ../smime/gui/certificate-manager.c:1600
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Sie besitzen Zertifikate, die folgende E-Mail-Server identifizieren:"
 
-#: ../smime/gui/certificate-manager.c:1629
+#: ../smime/gui/certificate-manager.c:1631
 msgid "Host name"
 msgstr "Rechnername"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1633
 msgid "Issuer"
 msgstr "Aussteller"
 
-#: ../smime/gui/certificate-manager.c:1632
+#: ../smime/gui/certificate-manager.c:1634
 msgid "Fingerprint"
 msgstr "Fingerabdruck"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1635
 msgid "Trust"
 msgstr "Vertrauenswürdigkeit"
 
-#: ../smime/gui/certificate-manager.c:1654
+#: ../smime/gui/certificate-manager.c:1656
 msgid "_Edit Trust"
 msgstr "Vertrauenswürdigkeit _bearbeiten"
 
-#: ../smime/gui/certificate-manager.c:1973
+#: ../smime/gui/certificate-manager.c:1975
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-Dateien"
 
-#: ../smime/gui/certificate-manager.c:1990
+#: ../smime/gui/certificate-manager.c:1992
 msgid "All email certificate files"
 msgstr "Alle E-Mail-Zertifikatdateien"
 
-#: ../smime/gui/certificate-manager.c:2007
+#: ../smime/gui/certificate-manager.c:2009
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
@@ -21842,7 +22422,9 @@ msgid "Before trusting this CA for any purpose, you should examine its certifica
 msgstr "Bevor Sie dieser Zertifizierungsstelle uneingeschränkt vertrauen, sollten Sie sein Zertifikat und 
seine Verfahrensweisen unter die Lupe nehmen (falls möglich)."
 
 #: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
+#, fuzzy
+#| msgid "Certificate"
+msgid "C_ertificate:"
 msgstr "Zertifikat"
 
 #: ../smime/gui/smime-ui.ui.h:26
@@ -21989,6 +22571,63 @@ msgstr "Mit _Fälligkeitsdatum"
 msgid "With _Status"
 msgstr "Mit _Status"
 
+#~ msgid "Completed On"
+#~ msgstr "Abgeschlossen am"
+
+#~ msgid "is set"
+#~ msgstr "ist gesetzt"
+
+#~ msgid "is not set"
+#~ msgstr "ist nicht gesetzt"
+
+# Im Konfig-Dialog. Hier keine Passivform verwenden! -ck
+#~ msgid "Loading Images"
+#~ msgstr "Bilder laden"
+
+#~ msgid "Please select a valid backup file to restore."
+#~ msgstr "Bitte wählen Sie ein gültiges Evolution-Archiv zur Wiederherstellung."
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP-Fehler: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Antwort konnte nicht analysiert werden"
+
+#~ msgid "Empty response"
+#~ msgstr "Leere Antwort"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Unerwartete Antwort vom Server"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Benutzerkalender konnten nicht gefunden werden"
+
+#~ msgid "Path"
+#~ msgstr "Pfad"
+
+#~ msgid "Template:"
+#~ msgstr "Vorlage:"
+
+#~ msgid "Itip Formatter"
+#~ msgstr "Itip-Formatierung"
+
+#~ msgid "Display \"text/calendar\" MIME parts in mail messages."
+#~ msgstr "Text- und Kalenderteile in Nachrichten anzeigen."
+
+#~ msgid "Please select an image of size 48 * 48"
+#~ msgstr "Bitte wählen Sie ein Bild der Größe 48x48"
+
+#~ msgid "E_nable"
+#~ msgstr "_Aktivieren"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Never"
+#~ msgstr "_Nie"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Fully"
+#~ msgstr "_Vollkommen"
+
 #~ msgid "Invalid authentication result code (%d)"
 #~ msgstr "Rückgabecode der Legitimation ist ungültig (%d)"
 
@@ -22108,9 +22747,6 @@ msgstr "Mit _Status"
 #~ msgid "Pinging %s"
 #~ msgstr "Ping zu %s wird ermittelt"
 
-#~ msgid "Add"
-#~ msgstr "Hinzufügen"
-
 #~ msgid "Edit"
 #~ msgstr "Bearbeiten"
 
@@ -22141,9 +22777,6 @@ msgstr "Mit _Status"
 #~ msgid "_Secure HTTP Proxy:"
 #~ msgstr "_Sicherer HTTP-Proxy:"
 
-#~ msgid "No _Proxy for:"
-#~ msgstr "Kein _Proxy für:"
-
 #~ msgid "Use Authe_ntication"
 #~ msgstr "_Legitimation benutzen"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]