[evolution/wip/webkit2] Updated German translation



commit 14f133fb6af827d4b385bbc75cd082e6cf603a07
Author: Christian Kirbach <Christian Kirbach gmail com>
Date:   Thu Dec 18 23:46:46 2014 +0000

    Updated German translation

 po/de.po | 6992 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 3984 insertions(+), 3008 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 89c5604..c5586bc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,22 +24,23 @@
 # Tobias Endrigkeit <tobiasendrigkeit googlemail com>, 2012.
 # Christian Kirbach <christian kirbach gmail com>, 2009, 2010, 2011, 2012, 2013.
 # Benjamin Steinwender <b stbe at>, 2014.
+# Bernd Homuth <dev hmt im>, 2014.
 #
 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: 2014-08-17 07:05+0000\n"
-"PO-Revision-Date: 2014-08-21 22:22+0100\n"
-"Last-Translator: Benjamin Steinwender <b stbe at>\n"
-"Language-Team: Deutsch <gnome-de gnome org>\n"
+"POT-Creation-Date: 2014-12-15 10:29+0000\n"
+"PO-Revision-Date: 2014-12-19 00:13+0100\n"
+"Last-Translator: Christian Kirbach <christian kirbach gmail com>\n"
+"Language-Team: German <>\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.6.7\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -142,10 +143,8 @@ msgid "Unable to perform search."
 msgstr "Suche konnte nicht durchgeführt werden."
 
 #: ../addressbook/addressbook.error.xml.h:20
-#, fuzzy
-#| msgid "Unable to open address book '{0}'"
 msgid "Failed to refresh address book '{0}'"
-msgstr "Adressbuch »{0}« kann nicht geöffnet werden"
+msgstr "Adressbuch »{0}« kann nicht aktualisiert werden"
 
 #: ../addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
@@ -221,12 +220,12 @@ msgstr ""
 #: ../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/filter.ui.h:16
-#: ../e-util/e-mail-signature-manager.c:326
-#: ../e-util/e-name-selector-dialog.c:995 ../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:53
-#: ../modules/mail/em-composer-prefs.c:397
+#: ../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:53 ../modules/mail/em-composer-prefs.c:397
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -307,9 +306,9 @@ msgstr ""
 "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:706
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:728
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2896
+#: ../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
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -342,16 +341,16 @@ msgid "Full _Name..."
 msgstr "_Voller Name …"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "Wünscht _HTML-E-Mails"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:749
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "E-Mail"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "Wünscht _HTML-E-Mails"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "Telefon"
@@ -419,57 +418,53 @@ msgid "Web Addresses"
 msgstr "Web-Adressen"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-msgid "Web addresses"
-msgstr "Web-Adressen"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Profession:"
 msgstr "Ber_uf:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgctxt "Job"
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Department:"
 msgstr "A_bteilung:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Office:"
 msgstr "Bü_ro:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Manager:"
 msgstr "V_orgesetzter:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Job"
 msgstr "Beruf"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Spouse:"
 msgstr "E_hepartner:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Birthday:"
 msgstr "_Geburtstag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Anniversary:"
 msgstr "_Jahrestag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
-#: ../calendar/gui/e-calendar-view.c:2311
+#: ../calendar/gui/e-calendar-view.c:1996
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -478,135 +473,142 @@ 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:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
-#: ../calendar/gui/e-calendar-view.c:2310 ../shell/main.c:132
+#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "Miscellaneous"
-msgstr "Verschiedenes"
+msgstr "Sonstige Informationen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_City:"
 msgstr "S_tadt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Zip/Postal Code:"
 msgstr "Postleit_zahl:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "_Bundesstaat/Provinz:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_PO Box:"
 msgstr "_Postfach:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/widgets/e-contact-map.c:371
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "Privat"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/widgets/e-contact-map.c:384
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:382
 msgid "Work"
 msgstr "Geschäftlich"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../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:3951
+#: ../calendar/gui/e-cal-model.c:3034
 msgid "Other"
 msgstr "Weitere"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "Notes"
 msgstr "Notizen"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../calendar/gui/dialogs/comp-editor.c:1250
-#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
-#: ../e-util/e-preferences-window.c:379
+#: ../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 ../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:1086
+#: ../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:34
+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:3472
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
 #: ../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/e-addressbook-view.c:1330
 #: ../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-send-options.ui.h:42
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/e-activity-bar.c:340 ../e-util/e-attachment-dialog.c:311
-#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
-#: ../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:472
-#: ../e-util/e-html-editor-actions.c:565
+#: ../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:480 ../e-util/e-html-editor-actions.c:573
 #: ../e-util/e-image-chooser-dialog.c:171
-#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:468
+#: ../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-source-config-dialog.c:379
+#: ../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-web-view.c:3043 ../e-util/evolution-source-viewer.c:833
+#: ../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:3043
 #: ../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:917
+#: ../modules/backup-restore/evolution-backup-tool.c:886
 #: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:277
 #: ../modules/cal-config-google/e-google-chooser-dialog.c:187
-#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../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/mail-to-task/mail-to-task.c:593
 #: ../plugins/publish-calendar/publish-calendar.c:806
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../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:623
-#: ../smime/gui/e-cert-selector.c:237 ../smime/gui/smime-ui.ui.h:23
+#: ../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
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
@@ -614,73 +616,115 @@ msgstr "A_bbrechen"
 #: ../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:1278
-#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:381
-#: ../e-util/e-attachment-store.c:546
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:395
+#: ../e-util/e-attachment-store.c:636
 #: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3044
 #: ../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/e-contact-editor.c:241
-#: ../calendar/gui/dialogs/comp-editor.c:1299
-#: ../e-util/e-html-editor-actions.c:1027
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "Show Telephone"
+msgstr "Telefon anzeigen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+msgid "Show SIP Address"
+msgstr "SIP-Adresse anzeigen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+msgid "Show Instant Messaging"
+msgstr "Sofortnachrichten anzeigen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+msgid "Show Web Addresses"
+msgstr "Web-Adressen anzeigen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+msgid "Show Job section"
+msgstr "Arbeitsbereich anzeigen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+msgid "Show Miscellaneous"
+msgstr "Sonstige Informationen anzeigen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+msgid "Show Home Mailing Address"
+msgstr "Private Postadresse anzeigen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+msgid "Show Work Mailing Address"
+msgstr "Geschäftliche Postadresse anzeigen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+msgid "Show Other Mailing Address"
+msgstr "Andere Postadresse anzeigen"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+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:994
 msgid "_Undo"
 msgstr "_Rückgängig"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:243
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:248
-#: ../calendar/gui/dialogs/comp-editor.c:1306
-#: ../e-util/e-html-editor-actions.c:985
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../e-util/e-html-editor-actions.c:980
 msgid "_Redo"
 msgstr "_Wiederholen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
-#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 #: ../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:302
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Error modifying contact"
 msgstr "Fehler beim Ändern eines Kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3469
+#: ../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:3473
-#: ../e-util/e-category-editor.c:146 ../e-util/e-html-editor-actions.c:473
-#: ../e-util/e-html-editor-actions.c:566
+#: ../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:481 ../e-util/e-html-editor-actions.c:574
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3474
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3823
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -688,28 +732,28 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3829
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3837
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
 #, 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:3845
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
 #, 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:3858
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3872
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s»%s« ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3887
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
@@ -721,15 +765,15 @@ msgstr "Kontakt ungültig."
 #: ../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-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
-#: ../e-util/e-timezone-dialog.ui.h:3 ../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:370
-#: ../e-util/e-passwords.c:469 ../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-source-config-dialog.c:380
+#: ../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:370 ../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
 #: ../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
@@ -737,8 +781,8 @@ msgstr "Kontakt ungültig."
 #: ../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:173 ../smime/gui/e-cert-selector.c:238
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_OK"
 
@@ -867,12 +911,11 @@ msgstr "Eine E-Mail von der Liste entfernen"
 #: ../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/filter.ui.h:18
-#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:225
-#: ../e-util/e-mail-signature-manager.c:366
-#: ../e-util/e-name-selector-dialog.c:999 ../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:54
+#: ../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:54
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:807
@@ -929,6 +972,219 @@ msgstr "Fehler beim Ändern einer Liste"
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1253
+msgid "Name contains"
+msgstr "Name enthält"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+msgid "Email begins with"
+msgstr "E-Mail-Adresse beginnt mit"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Any field contains"
+msgstr "Ein beliebiges Feld enthält"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+msgid "evolution address book"
+msgstr "Evolution-Adressbuch"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "_E-Mail-Adresse kopieren"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:307
+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
+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
+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:996
+#, c-format
+msgid "Click to mail %s"
+msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "Karte öffnen"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "Listenmitglieder:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Firma"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "Abteilung"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Büro"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "Beruf"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "Position"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "Vorgesetzter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "Assistent"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+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
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Verfügbarkeit"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "Adresse"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "Homepage"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Weblog"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "Ehepartner"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "Persönlich"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Notiz"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "Listenmitglieder"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "Tätigkeit"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "Homepage"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "Blog"
+
 #: ../addressbook/gui/widgets/eab-contact-merging.c:261
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
@@ -979,25 +1235,124 @@ msgstr "Kontakt in Konflikt:"
 msgid "Old Contact:"
 msgstr "Alter Kontakt: "
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1253
-msgid "Name contains"
-msgstr "Name enthält"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
+"dieses Adressbuch nicht für die Offline-Benutzung markiert wurde oder bis "
+"jetzt noch nicht für die Offline-Benutzung heruntergeladen wurde. Bitte "
+"laden Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte "
+"herunterzuladen."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
-msgid "Email begins with"
-msgstr "E-Mail-Adresse beginnt mit"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
+"Pfad %s existiert und Sie darauf zugreifen dürfen."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1239
-#: ../modules/calendar/e-cal-shell-view-actions.c:1762
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
-msgid "Any field contains"
-msgstr "Ein beliebiges Feld enthält"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"In diese Evolution-Version wurde keine LDAP-Unterstützung einkompiliert. "
+"Falls Sie LDAP in Evolution verwenden wollen, müssen Sie eine LDAP-mächtige "
+"Evolution-Version installieren."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
+"Sie eine falsche Adresse eingegeben haben, oder dass der Server nicht "
+"erreichbar ist."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "Ausführliche Fehlernachricht:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Ihre Abfrage führte zu mehr Treffern als dieser Server übertragen\n"
+"oder Evolution anzeigen soll. Bitte präzisieren Sie Ihre Suche\n"
+"oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
+"Verzeichnis-Servers für dieses Adressbuch."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"Die für das Ausführen der Abfrage erforderliche Zeit hat das Zeitlimit des\n"
+"Servers oder das von Ihnen für dieses Adressbuch festgelegte überschritten.\n"
+"Bitte präzisieren Sie Ihre Suche oder erhöhen Sie das Zeitlimit in den\n"
+"Einstellungen des Verzeichnis-Servers für dieses Adressbuch."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr ""
+"Die Hintergrundkomponente für dieses Adressbuch konnte die Syntax dieser "
+"Abfrage nicht analysieren. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr ""
+"Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
+"ausführen. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Adressbuch auswählen"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "Liste"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Kontakt verschieben nach"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Kontakt kopieren nach"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Kontakt verschieben nach"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Kontakte kopieren nach"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
@@ -1070,16 +1425,17 @@ 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:1243
+#: ../calendar/gui/dialogs/comp-editor.c:1242
 #: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:804
+#: ../e-util/evolution-source-viewer.c:805
 #: ../mail/e-mail-account-manager.c:736
 #: ../modules/addressbook/e-book-shell-view-actions.c:1125
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
-#: ../modules/calendar/e-memo-shell-view-actions.c:684
-#: ../modules/calendar/e-task-shell-view-actions.c:836
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
-#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+#: ../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:1661
+#: ../shell/e-shell-window-actions.c:943
+#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Löschen"
 
@@ -1121,11 +1477,6 @@ msgstr "Vorname"
 msgid "Family Name"
 msgstr "Familienname"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
-msgid "Nickname"
-msgstr "Spitzname"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "E-Mail 2"
@@ -1178,11 +1529,6 @@ msgstr "Fax, privat"
 msgid "ISDN Phone"
 msgstr "ISDN-Telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Weiteres Telefon"
@@ -1218,20 +1564,10 @@ msgstr "Telex"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
-msgid "Company"
-msgstr "Firma"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Einheit"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
-msgid "Office"
-msgstr "Büro"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Anrede"
@@ -1242,16 +1578,6 @@ msgstr "Anrede"
 msgid "Role"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
-msgid "Manager"
-msgstr "Vorgesetzter"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
-msgid "Assistant"
-msgstr "Assistent"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Website"
@@ -1268,15 +1594,36 @@ msgstr "Journal"
 msgid "Categories"
 msgstr "Kategorien"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
-msgid "Spouse"
-msgstr "Ehepartner"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "Öffnen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
-msgid "Note"
-msgstr "Notiz"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "Kontaktliste: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "Kontakt: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "Evolution-Minicard"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "Neuer Kontakt"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "Neue Kontaktliste"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "Angezeigter Adressbuchordner %s enthält %d Karte"
+msgstr[1] "Angezeigter Adressbuchordner %s enthält %d Karten"
 
 #: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
@@ -1289,15 +1636,15 @@ msgstr "Ver_größern"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2230
+#: ../mail/e-mail-reader.c:2360
 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:1939
+#: ../e-util/e-html-editor-actions.c:1972
 #: ../e-util/e-html-editor-find-dialog.c:195
-#: ../shell/e-shell-window-actions.c:1021
+#: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "_Suchen"
 
@@ -1359,310 +1706,6 @@ msgstr ""
 "\n"
 "In dieser Ansicht existieren keine anzuzeigenden Einträge."
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
-msgid "evolution address book"
-msgstr "Evolution-Adressbuch"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "Neuer Kontakt"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "Neue Kontaktliste"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "Angezeigter Adressbuchordner %s enthält %d Karte"
-msgstr[1] "Angezeigter Adressbuchordner %s enthält %d Karten"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "Öffnen"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "Kontaktliste: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "Kontakt: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "Evolution-Minicard"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "_E-Mail-Adresse kopieren"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:307
-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
-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
-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:996
-#, c-format
-msgid "Click to mail %s"
-msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
-msgid "Open map"
-msgstr "Karte öffnen"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
-msgid "SIP"
-msgstr "SIP"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
-msgid "List Members:"
-msgstr "Listenmitglieder:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
-msgid "AIM"
-msgstr "AIM"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
-msgid "ICQ"
-msgstr "ICQ"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
-msgid "Jabber"
-msgstr "Jabber"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
-msgid "Skype"
-msgstr "Skype"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
-msgid "Twitter"
-msgstr "Twitter"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
-msgid "Department"
-msgstr "Abteilung"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
-msgid "Profession"
-msgstr "Beruf"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
-msgid "Position"
-msgstr "Position"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
-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:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:591
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Kalender"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Verfügbarkeit"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
-msgid "Phone"
-msgstr "Telefon"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
-msgid "Fax"
-msgstr "Fax"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
-msgid "Address"
-msgstr "Adresse"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
-msgid "Home Page"
-msgstr "Homepage"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
-msgid "Web Log"
-msgstr "Weblog"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
-msgid "Personal"
-msgstr "Persönlich"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
-msgid "List Members"
-msgstr "Listenmitglieder"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
-msgid "Job Title"
-msgstr "Tätigkeit"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
-msgid "Home page"
-msgstr "Homepage"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
-msgid "Blog"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
-"dieses Adressbuch nicht für die Offline-Benutzung markiert wurde oder bis "
-"jetzt noch nicht für die Offline-Benutzung heruntergeladen wurde. Bitte "
-"laden Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte "
-"herunterzuladen."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
-"Pfad %s existiert und Sie darauf zugreifen dürfen."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"In diese Evolution-Version wurde keine LDAP-Unterstützung einkompiliert. "
-"Falls Sie LDAP in Evolution verwenden wollen, müssen Sie eine LDAP-mächtige "
-"Evolution-Version installieren."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
-"Sie eine falsche Adresse eingegeben haben, oder dass der Server nicht "
-"erreichbar ist."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "Ausführliche Fehlernachricht:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Ihre Abfrage führte zu mehr Treffern als dieser Server übertragen\n"
-"oder Evolution anzeigen soll. Bitte präzisieren Sie Ihre Suche\n"
-"oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
-"Verzeichnis-Servers für dieses Adressbuch."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"Die für das Ausführen der Abfrage erforderliche Zeit hat das Zeitlimit des\n"
-"Servers oder das von Ihnen für dieses Adressbuch festgelegte überschritten.\n"
-"Bitte präzisieren Sie Ihre Suche oder erhöhen Sie das Zeitlimit in den\n"
-"Einstellungen des Verzeichnis-Servers für dieses Adressbuch."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr ""
-"Die Hintergrundkomponente für dieses Adressbuch konnte die Syntax dieser "
-"Abfrage nicht analysieren. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr ""
-"Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
-"ausführen. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "Adressbuch auswählen"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "Liste"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "Kontakt verschieben nach"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "Kontakt kopieren nach"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "Kontakt verschieben nach"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "Kontakte kopieren nach"
-
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
@@ -1719,38 +1762,38 @@ msgstr "Evolution-VCard-Importeur"
 msgid "Page %d"
 msgstr "Seite %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "Die angegebene Ausgabedatei statt der Standardausgabe verwenden"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "AUSGABEDATEI"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "Lokale Adressbuchordner auflisten"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "Karten als vcard- oder csv-Datei anzeigen"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:111
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Argumentfehler in Befehlszeile, bitte übergeben Sie den »--help«-Parameter, "
 "um Hinweise zum Aufruf zu erhalten."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:147
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "Es werden ausschließlich die Formate »csv« oder »vcard« unterstützt."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:178
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "Unbehandelter Fehler"
 
@@ -1780,19 +1823,16 @@ msgid "Other Email"
 msgstr "Weitere E-Mail-Adresse"
 
 #: ../addressbook/util/eab-book-util.c:44
-#| msgid "Work"
 msgctxt "addressbook-label"
 msgid "Work SIP"
 msgstr "SIP-Telefon (geschäftlich)"
 
 #: ../addressbook/util/eab-book-util.c:45
-#| msgid "Home Page"
 msgctxt "addressbook-label"
 msgid "Home SIP"
 msgstr "SIP-Telefon (privat)"
 
 #: ../addressbook/util/eab-book-util.c:46
-#| msgid "Other"
 msgctxt "addressbook-label"
 msgid "Other SIP"
 msgstr "Weiteres SIP-Telefon"
@@ -1880,7 +1920,7 @@ msgstr "Sofortnachricht"
 #. * if a phone number type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../addressbook/util/eab-book-util.c:269
+#: ../addressbook/util/eab-book-util.c:271
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Telefon"
@@ -1925,19 +1965,19 @@ 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:1322
+#: ../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/filter.ui.h:17
-#: ../e-util/e-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1057
-#: ../e-util/e-mail-signature-manager.c:356
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../e-util/e-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1003
+#: ../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:58
 #: ../plugins/attachment-reminder/attachment-reminder.c:562
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/mail-to-task/mail-to-task.c:594
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -1951,8 +1991,8 @@ msgid "_Dismiss"
 msgstr "_Verwerfen"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
+#: ../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:1493
 #: ../modules/itip-formatter/itip-view.c:1604
@@ -1970,71 +2010,71 @@ msgstr "Schlummer_zeit:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:143
-#: ../modules/calendar/e-cal-shell-view-actions.c:352
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:326
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "Tage"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:141
+#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "Stunden"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:139
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1696
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "Keine Ortsinformationen verfügbar."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1711
+#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:2156
 msgid "Evolution Reminders"
 msgstr "Evolution-Erinnerungen"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, 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:1965
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../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
 msgid "_No"
 msgstr "_Nein"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2051,7 +2091,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -2514,83 +2554,189 @@ msgstr "Die Notizliste ist nicht für eine Offline-Benutzung markiert."
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:87
+msgid "Failed to open calendar '{0}'"
+msgstr "Der Kalender »{0}« konnte nicht geöffnet werden"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+msgid "Failed to open memo list '{0}'"
+msgstr "Notizliste »{0}« konnte nicht geöffnet werden"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to open task list '{0}'"
+msgstr "Aufgabenliste »{0}« konnte nicht geöffnet werden"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+msgid "Failed to create an event in a calendar '{0}'"
+msgstr "Erstellen eines Ereignisses im Kalender »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:95
+msgid "Failed to create a memo in a memo list '{0}'"
+msgstr "Erstellen einer Notiz in Notizliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:97
+msgid "Failed to create a task in a task list '{0}'"
+msgstr "Erstellen einer Aufgabe in Aufgabenliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+msgid "Failed to modify an event in a calendar '{0}'"
+msgstr "Verändern eines Ereignisses im Kalender »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:101
+msgid "Failed to modify a memo in a memo list '{0}'"
+msgstr "Verändern einer Notiz in Notizliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:103
+msgid "Failed to modify a task in a task list '{0}'"
+msgstr "Verändern einer Aufgabe in Aufgabenliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+msgid "Failed to delete an event in a calendar '{0}'"
+msgstr "Löschen eines Ereignisses im Kalender »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:107
+msgid "Failed to delete a memo in a memo list '{0}'"
+msgstr "Löschen einer Notiz in Notizliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:109
+msgid "Failed to delete a task in a task list '{0}'"
+msgstr "Löschen einer Aufgabe in Aufgabenliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:111
+msgid "Failed to update an event in a calendar '{0}'"
+msgstr "Aktualisieren eines Ereignisses im Kalender »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:113
+msgid "Failed to update a memo in a memo list '{0}'"
+msgstr "Aktualisieren einer Notiz in Notizliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:115
+msgid "Failed to update a task in a task list '{0}'"
+msgstr "Aktualisieren einer Aufgabe in Aufgabenliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:117
+msgid "Failed to send an event to a calendar '{0}'"
+msgstr "Versenden eines Ereignisses an Kalender »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:119
+msgid "Failed to send a memo to a memo list '{0}'"
+msgstr "Versenden einer Notiz in die Notizliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:121
+msgid "Failed to send a task to a task list '{0}'"
+msgstr "Versenden einer Aufgabe in die Aufgabenliste »{0}« ist fehlgeschlagen"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:123
+msgid "Error creating view for a calendar '{0}'"
+msgstr "Fehler beim Erstellen einer Ansicht von Kalender »{0}«"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:125
+msgid "Error creating view for a task list '{0}'"
+msgstr "Fehler beim Erstellen einer Ansicht von Aufgabenliste »{0}«"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+msgid "Error creating view for a memo list '{0}'"
+msgstr "Fehler beim Erstellen einer Ansicht der Notizliste »{0}«"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "Kopieren eines Ereignisses in den Kalender »{0}« ist fehlgeschlagen"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "Kopieren einer Aufgabe in die Aufgabenliste »{0}« ist fehlgeschlagen"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
 msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr "Kopieren einer Notiz in die Notizliste »{0}« ist fehlgeschlagen"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:135
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "Verschieben eines Ereignisses in den Kalender »{0}« ist fehlgeschlagen"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to move a task into the task list '{0}'"
 msgstr ""
 "Verschieben einer Aufgabe in die Aufgabenliste »{0}« ist fehlgeschlagen"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr "Verschieben einer Notiz in die Notizliste »{0}« ist fehlgeschlagen"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:141
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Ein Ereignis wird in den Kalender »{0}« kopiert"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:143
 msgid "Copying a task into the task list '{0}'"
 msgstr "Eine Aufgabe wird in die Aufgabenliste »{0}« kopiert"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:145
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Eine Notiz wird in die Notizliste »{0}« kopiert"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:147
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Ein Ereignis wird in den Kalender »{0}« verschoben"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:149
 msgid "Moving a task into the task list '{0}'"
 msgstr "Eine Aufgabe wird in die Aufgabenliste »{0}« verschoben"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:151
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Eine Notiz wird in die Notizliste »{0}« verschoben"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:111
-#| msgid "Delete remote calendar '{0}'?"
+#: ../calendar/calendar.error.xml.h:153
 msgid "Failed to refresh calendar '{0}'"
 msgstr "Der Kalender »{0}« konnte nicht geladen werden"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:113
-#| msgid "Failed to move a task into the task list '{0}'"
+#: ../calendar/calendar.error.xml.h:155
 msgid "Failed to refresh task list '{0}'"
 msgstr "Aufgabenliste »{0}« konnte nicht geladen werden"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:115
-#| msgid "Failed to move a memo into the memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:157
 msgid "Failed to refresh memo list '{0}'"
 msgstr "Notizliste »{0}« konnte nicht geladen werden"
 
+#: ../calendar/calendar.error.xml.h:158
+msgid "Failed to make an occurrence movable"
+msgstr "Wiederholung verschiebbar machen ist fehlgeschlagen"
+
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
@@ -2613,7 +2759,7 @@ msgstr "enthält nicht"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Beschreibung"
@@ -2641,24 +2787,24 @@ 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:247 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:556
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
+#: ../calendar/gui/e-cal-model.c:285 ../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:248 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:557 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
+#: ../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:249 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7 ../e-util/e-html-editor-page-dialog.c:111
+#: ../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:114 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Vertraulich"
 
@@ -2689,20 +2835,20 @@ 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:203
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 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:46
-#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 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:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
@@ -2813,10 +2959,6 @@ msgstr "Die Erinnerung _wiederholen"
 msgid "extra times every"
 msgstr "weitere Male alle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:34
-msgid "Options"
-msgstr "Optionen"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "_Benutzerdefinierte Nachricht"
@@ -2855,7 +2997,7 @@ msgstr "Aktion/Auslöser"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 #: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "Erinnerungen"
 
@@ -2911,294 +3053,295 @@ msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 msgid "Could not save attachments"
 msgstr "Die Anlagen konnten nicht gespeichert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:759
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:781
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
+#: ../calendar/gui/dialogs/comp-editor.c:797
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
+#: ../calendar/gui/dialogs/comp-editor.c:918
 msgid "Keep original item?"
 msgstr "Originaleintrag behalten?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Unable to synchronize with the server"
 msgstr "Abgleich mit dem Server nicht möglich."
 
 #. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../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:360 ../e-util/e-html-editor-dialog.c:196
+#: ../composer/e-composer-actions.c:374 ../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:343 ../shell/e-shell-window-actions.c:909
-#: ../smime/gui/certificate-manager.c:1182
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
+#: ../smime/gui/certificate-manager.c:2064
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "Close the current window"
 msgstr "Das aktuelle Fenster schließen"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:936 ../e-util/e-text.c:2089
+#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:959 ../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:930
+#: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:175
+#: ../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:1325 ../mail/e-mail-browser.c:135
-#: ../shell/e-shell-window-actions.c:932
+#: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:943 ../e-util/e-text.c:2075
-#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:966 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:168
+#: ../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:1319
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:189
+#: ../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:946
+#: ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "Die Auswahl löschen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
 msgstr "Hilfe anzeigen"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:971 ../e-util/e-text.c:2101
-#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:973 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:182
+#: ../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:1331
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
-#: ../composer/e-composer-actions.c:414 ../mail/e-mail-reader.c:2132
+#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../composer/e-composer-actions.c:428 ../mail/e-mail-reader.c:2262
 #: ../modules/addressbook/e-book-shell-view-actions.c:1263
 #: ../modules/addressbook/e-book-shell-view-actions.c:1277
 msgid "_Print..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2139
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
 #: ../modules/addressbook/e-book-shell-view-actions.c:1270
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../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:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
 msgstr "Aktuelle Änderungen speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 #: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Save current changes and close editor"
 msgstr "Aktuelle Änderungen speichern und den Editor schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:992 ../e-util/e-web-view.c:349
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:987 ../e-util/e-web-view.c:349
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "_Alle auswählen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:196
+#: ../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 ../shell/e-shell-window-actions.c:1044
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
-#: ../e-util/e-html-editor-actions.c:1064
+#: ../calendar/gui/dialogs/comp-editor.c:1328
+#: ../e-util/e-html-editor-actions.c:1010
 #: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1079
+#: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
-#: ../e-util/e-html-editor-actions.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1342
+#: ../e-util/e-html-editor-actions.c:1031
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:404
+#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../composer/e-composer-actions.c:418
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
-#: ../e-util/e-html-editor-actions.c:1106 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1052 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1120
+#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
-#: ../composer/e-composer-actions.c:353
+#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../composer/e-composer-actions.c:367
 msgid "_Attachment..."
 msgstr "_Anlage …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
-#: ../composer/e-composer-actions.c:355 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../composer/e-composer-actions.c:369 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1376
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1378
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1386
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1398
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Classify as public"
 msgstr "Als öffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1421
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld für die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1435
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1443
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../composer/e-composer-actions.c:636
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2564
-#: ../calendar/gui/dialogs/comp-editor.c:2774
-#: ../calendar/gui/dialogs/comp-editor.c:3787
+#: ../calendar/gui/dialogs/comp-editor.c:2563
+#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:3786
 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:3749
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
+#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3819
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -3207,21 +3350,25 @@ msgstr "Aktuelle Version konnte nicht verwendet werden!"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "Ziel konnte nicht geöffnet werden"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129
+#: ../calendar/gui/e-cal-ops.c:1940
 msgid "Destination is read only"
 msgstr "Ziel ist nur lesbar"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:174
-msgid "Cannot create object"
-msgstr "Objekt kann nicht angelegt werden"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "Ereignisse werden in den Kalender »%s« kopiert"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "Notizen werden in die Notizliste »%s« kopiert"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:205
-msgid "Could not open source"
-msgstr "Quelle konnte nicht geöffnet werden"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "Aufgaben werden in die Aufgabenliste »%s« kopiert"
 
 #: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
@@ -3233,78 +3380,6 @@ msgstr ""
 msgid "_Retract comment"
 msgstr "Kommentar zur_ückziehen"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr ""
-"Das Ereignis konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr ""
-"Die Aufgabe konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr ""
-"Die Notiz konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr ""
-"Das Objekt konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
-
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr ""
-"Das Ereignis konnte nicht gelöscht werden, weil der Zugriff verweigert wurde"
-
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr ""
-"Die Aufgabe konnte nicht gelöscht werden, weil der Zugriff verweigert wurde"
-
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr ""
-"Diese Notiz konnte nicht gelöscht werden, weil der Zugriff verweigert wurde"
-
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr ""
-"Das Objekt konnte nicht gelöscht werden, weil der Zugriff verweigert wurde"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "Das Ereignis konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "Die Aufgabe konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "Die Notiz konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
-
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Enter Delegate"
 msgstr "Vertreter eingeben"
@@ -3366,7 +3441,7 @@ msgstr "_Verfügbarkeit"
 msgid "Query free / busy information for the attendees"
 msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3499
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "Termin"
 
@@ -3416,7 +3491,7 @@ msgstr "Ereignis ohne Enddatum"
 
 #: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
+#: ../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
@@ -3434,12 +3509,12 @@ msgstr "Die Endzeit ist falsch"
 
 #: ../calendar/gui/dialogs/event-page.c:1697
 #: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
+#: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
 #: ../calendar/gui/dialogs/event-page.c:1732
-#: ../calendar/gui/dialogs/task-page.c:1119
+#: ../calendar/gui/dialogs/task-page.c:1121
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
@@ -3520,7 +3595,7 @@ msgstr "O_rt:"
 #: ../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:511
+#: ../e-util/e-html-editor-image-dialog.c:514
 #: ../e-util/e-html-editor-link-dialog.c:356
 msgid "_Description:"
 msgstr "_Beschreibung:"
@@ -3605,11 +3680,11 @@ msgid "Select Date"
 msgstr "Datum wählen"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3503
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "Notiz"
 
@@ -3948,7 +4023,7 @@ msgstr "_Nur neue Teilnehmer benachrichtigen"
 msgid "_Send Options"
 msgstr "_Versandoptionen"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3501
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
 #: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Aufgabe"
@@ -3985,43 +4060,43 @@ msgstr ""
 "Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste "
 "zugewiesene Aufgaben nicht unterstützt"
 
-#: ../calendar/gui/dialogs/task-page.c:1011
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
+#: ../calendar/gui/dialogs/task-page.c:1181
+#: ../calendar/gui/dialogs/task-page.c:1206
 msgid "Completed date is wrong"
 msgstr "Das Fertigstellungsdatum ist falsch"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
 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:1659 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/e-cal-model.c:1643 ../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:308
+#: ../mail/message-list.c:312
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
 #: ../calendar/gui/e-cal-component-preview.c:342
-#: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
 msgid "Low"
 msgstr "Niedrig"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:585 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Nicht festgelegt"
@@ -4030,9 +4105,9 @@ msgstr "Nicht festgelegt"
 #: ../calendar/gui/dialogs/task-page.ui.h:16
 #: ../calendar/gui/e-cal-component-preview.c:323
 #: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:218
-#: ../calendar/gui/e-task-table.c:233 ../calendar/gui/e-task-table.c:665
-#: ../calendar/gui/print.c:3585 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -4041,9 +4116,9 @@ msgstr "Nicht begonnen"
 #: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-cal-model-tasks.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:666
-#: ../calendar/gui/print.c:3588
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
@@ -4053,8 +4128,8 @@ msgstr "In Bearbeitung"
 #: ../calendar/gui/e-cal-model-tasks.c:314
 #: ../calendar/gui/e-cal-model-tasks.c:556
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:237
-#: ../calendar/gui/e-task-table.c:667 ../calendar/gui/print.c:3591
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
@@ -4064,9 +4139,9 @@ msgstr "Abgeschlossen"
 #: ../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:224
-#: ../calendar/gui/e-task-table.c:239 ../calendar/gui/e-task-table.c:668
-#: ../calendar/gui/print.c:3594 ../mail/mail-send-recv.c:958
+#: ../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
 msgid "Canceled"
 msgstr "Abgebrochen"
 
@@ -4102,56 +4177,56 @@ msgstr "E_instufung:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: ../calendar/gui/ea-cal-view.c:281
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/ea-cal-view.c:282
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "Neues ganztägiges Ereignis"
 
-#: ../calendar/gui/ea-cal-view.c:283
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "Zum heutigen Tag"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "Gehe zu Datum"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "Es enthält Erinnerungen."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "Es enthält Wiederholungen."
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "Es ist eine Besprechung."
 
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalender-Ereignis: Die Zusammenfassung lautet %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "Kalender-Ereignis: Keine Zusammenfassung verfügbar."
 
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "Kalenderansicht Ereignis"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Erhält Fokus"
 
-#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4160,89 +4235,33 @@ msgstr[1] "Sie enthält %d Ereignisse."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "Sie enthält keine Ereignisse."
 
-#: ../calendar/gui/ea-day-view.c:126
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Arbeitswochenansicht: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:133
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Tagesansicht: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:167
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "Kalenderansicht für eine Arbeitswoche"
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "Kalenderansicht für einen oder mehrere Tage"
 
 #: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:293
+#: ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "Eine Tabelle zur Ansicht und Auswahl der momentanen Zeitspanne"
 
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1108
-msgid "Gnome Calendar"
-msgstr "GNOME Calendar"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../modules/calendar/e-cal-shell-view-private.c:1190
-msgid "%A %d %b %Y"
-msgstr "%A, %d. %B %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2812
-#: ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:216
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-msgid "%a %d %b"
-msgstr "%a, %d. %b"
-
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../calendar/gui/ea-gnome-calendar.c:222
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-#: ../modules/calendar/e-cal-shell-view-private.c:1203
-#: ../modules/calendar/e-cal-shell-view-private.c:1206
-msgid "%a %d %b %Y"
-msgstr "%a, %d. %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:249
-#: ../calendar/gui/ea-gnome-calendar.c:256
-#: ../calendar/gui/ea-gnome-calendar.c:259
-#: ../modules/calendar/e-cal-shell-view-private.c:1223
-#: ../modules/calendar/e-cal-shell-view-private.c:1234
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
-#: ../modules/calendar/e-cal-shell-view-private.c:1244
-msgid "%d %b %Y"
-msgstr "%d. %B %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. 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/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2828
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1230
-msgid "%d %b"
-msgstr "%d. %b"
-
 #: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Sprungknopf"
@@ -4319,21 +4338,21 @@ msgstr "%s um %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: ../calendar/gui/ea-week-view.c:119
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Monatsansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:124
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Wochenansicht: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "Kalenderansicht für einen Monat"
 
-#: ../calendar/gui/ea-week-view.c:160
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "Kalenderansicht für eine oder mehrere Wochen"
 
@@ -4381,17 +4400,20 @@ msgstr "Beschreibung:"
 msgid "Web Page:"
 msgstr "Website:"
 
-#: ../calendar/gui/e-calendar-selector.c:355
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-cal-data-model.c:1608
+#, c-format
+msgid "Creating view for calendar '%s'"
+msgstr "Ansicht für Kalender »%s« wird erstellt"
+
+#: ../calendar/gui/e-cal-data-model.c:1612
 #, c-format
-msgid "Copying an event into the calendar %s"
-msgstr "Ein Ereignis wird in den Kalender %s kopiert"
+msgid "Creating view for task list '%s'"
+msgstr "Ansicht für Aufgabenliste »%s« wird erstellt"
 
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../calendar/gui/e-cal-data-model.c:1616
 #, c-format
-msgid "Moving an event into the calendar %s"
-msgstr "Ein Ereignis wird in den Kalender »%s« verschoben"
+msgid "Creating view for memo list '%s'"
+msgstr "Ansicht für Notizliste »%s« wird erstellt"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
@@ -4436,12 +4458,12 @@ 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:4005
+#: ../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/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:33
-#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:35
-#: ../mail/vfoldertypes.xml.in.h:35
+#: ../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"
 
@@ -4458,37 +4480,51 @@ msgstr "Angelegt"
 msgid "Last modified"
 msgstr "Zuletzt geändert"
 
-#: ../calendar/gui/e-calendar-view.c:448
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "Die gewählten Ereignisse in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-calendar-view.c:454
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "Die gewählten Ereignisse in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-calendar-view.c:460
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Ereignisse einfügen"
 
-#: ../calendar/gui/e-calendar-view.c:466
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "Die gewählten Ereignisse löschen"
 
-#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:274
-msgid "Deleting selected objects"
-msgstr "Gewählte Objekte werden gelöscht"
+#: ../calendar/gui/e-calendar-view.c:810
+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
+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
+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
+msgid "Default task list not found"
+msgstr "Vorgabeaufgabenliste wurde nicht gefunden"
+
+#: ../calendar/gui/e-calendar-view.c:918
+msgid "No suitable component found"
+msgstr "Keine passende Komponente gefunden"
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1190
-msgid "Updating objects"
-msgstr "Objekte werden aktualisiert"
+#: ../calendar/gui/e-calendar-view.c:988
+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:2112 ../calendar/gui/e-memo-table.c:553
-#: ../calendar/gui/e-task-table.c:854
+#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495
+#: ../calendar/gui/e-task-table.c:796
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -4496,25 +4532,65 @@ 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:2116 ../calendar/gui/e-memo-table.c:558
-#: ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:800
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2132
-#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3539
+#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-meeting-time-sel.c:2663 ../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:2167
+#: ../calendar/gui/e-calendar-view.c:1851
 #, 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
+msgid "%d %b %Y"
+msgstr "%d. %B %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. 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:2939
+#: ../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
+msgid "%A %d %b %Y"
+msgstr "%A, %d. %B %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %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:2923
+#: ../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
+msgid "%a %d %b %Y"
+msgstr "%a, %d. %Y"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
@@ -4524,77 +4600,99 @@ msgstr "Anfangsdatum"
 msgid "End Date"
 msgstr "Enddatum"
 
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../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-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1253
-#: ../calendar/gui/print.c:1270 ../e-util/e-charset.c:51
+#: ../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:3500
 #: ../modules/itip-formatter/itip-view.c:6087
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:1661
+#: ../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
+#, 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
+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
+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
+msgid "Creating a task"
+msgstr "Aufgabe anlegen"
+
+#: ../calendar/gui/e-cal-model.c:1645
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:1663
+#: ../calendar/gui/e-cal-model.c:1647
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../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-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../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
 msgid "No"
 msgstr "Nein"
 
-#: ../calendar/gui/e-cal-model.c:3946
+#: ../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:6075
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-cal-model.c:3947
+#: ../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:6081
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-cal-model.c:3948
+#: ../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
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../calendar/gui/e-cal-model.c:3949
+#: ../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:6084
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: ../calendar/gui/e-cal-model.c:3950
+#: ../calendar/gui/e-cal-model.c:3033
 msgid "Needs action"
 msgstr "Erfordert Maßnahme"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:640
+#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Frei"
 
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:641
+#: ../calendar/gui/e-cal-model-calendar.c:126
+#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -4614,17 +4712,183 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Keine"
 
+#: ../calendar/gui/e-cal-ops.c:283
+msgid "Modifying an event"
+msgstr "Ein Ereignis verändern"
+
+#: ../calendar/gui/e-cal-ops.c:287
+msgid "Modifying a memo"
+msgstr "Eine Notiz verändern"
+
+#: ../calendar/gui/e-cal-ops.c:291
+msgid "Modifying a task"
+msgstr "Eine Aufgabe verändern"
+
+#: ../calendar/gui/e-cal-ops.c:387
+msgid "Removing an event"
+msgstr "Ein Ereignis entfernen"
+
+#: ../calendar/gui/e-cal-ops.c:391
+msgid "Removing a memo"
+msgstr "Eine Notiz entfernen"
+
+#: ../calendar/gui/e-cal-ops.c:395
+msgid "Removing a task"
+msgstr "Eine Aufgabe entfernen"
+
+#: ../calendar/gui/e-cal-ops.c:484
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "Updating an event"
+msgstr "Ein Ereignis aktualisieren"
+
+#: ../calendar/gui/e-cal-ops.c:824
+msgid "Updating a memo"
+msgstr "Eine Notiz aktualisieren"
+
+#: ../calendar/gui/e-cal-ops.c:828
+msgid "Updating a task"
+msgstr "Eine Aufgabe aktualisieren"
+
+#: ../calendar/gui/e-cal-ops.c:933
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "Purging events in the calendar '%s'"
+msgstr "Entfernen von Ereignissen in Kalender »%s«"
+
+#: ../calendar/gui/e-cal-ops.c:966
+#, c-format
+msgid "Purging memos in the memo list '%s'"
+msgstr "Entfernen von Notizen in Notizliste »%s«"
+
+#: ../calendar/gui/e-cal-ops.c:970
+#, c-format
+msgid "Purging tasks in the task list '%s'"
+msgstr "Entfernen von Aufgaben in Aufgabenliste »%s«"
+
+#: ../calendar/gui/e-cal-ops.c:1068
+msgid "Purging events"
+msgstr "Ereignisse entfernen"
+
+#: ../calendar/gui/e-cal-ops.c:1072
+msgid "Purging memos"
+msgstr "Notizen entfernen"
+
+#: ../calendar/gui/e-cal-ops.c:1076
+msgid "Purging tasks"
+msgstr "Aufgaben entfernen"
+
+#: ../calendar/gui/e-cal-ops.c:1178
+msgid "Expunging completed tasks"
+msgstr "Erledigte Aufgaben entfernen"
+
+#: ../calendar/gui/e-cal-ops.c:2034
+#, 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
+#, 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
+#, c-format
+msgid "Moving an memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Eine Notiz verschieben"
+msgstr[1] "%d Notizen verschieben"
+
+#: ../calendar/gui/e-cal-ops.c:2042
+#, c-format
+msgid "Copying an memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Eine Notiz kopieren"
+msgstr[1] "%d Notizen kopieren"
+
+#: ../calendar/gui/e-cal-ops.c:2048
+#, c-format
+msgid "Moving an task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Eine Aufgabe verschieben"
+msgstr[1] "%d Aufgaben verschieben"
+
+#: ../calendar/gui/e-cal-ops.c:2049
+#, c-format
+msgid "Copying an task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Eine Aufgabe kopieren"
+msgstr[1] "%d Aufgaben kopieren "
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d. %m %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:168
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4634,16 +4898,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1992 ../calendar/gui/e-week-view.c:1591
-#: ../calendar/gui/print.c:1076 ../calendar/gui/print.c:1095
-#: ../calendar/gui/print.c:2636 ../calendar/gui/print.c:2656
+#: ../calendar/gui/e-day-view.c:2057 ../calendar/gui/e-week-view.c:1690
+#: ../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:1995 ../calendar/gui/e-week-view.c:1594
-#: ../calendar/gui/print.c:1081 ../calendar/gui/print.c:1097
-#: ../calendar/gui/print.c:2641 ../calendar/gui/print.c:2658
+#: ../calendar/gui/e-day-view.c:2060 ../calendar/gui/e-week-view.c:1693
+#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "PM"
 
@@ -4653,13 +4917,13 @@ 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:2795 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2092
+#: ../calendar/gui/e-day-view.c:2906 ../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:3459
+#: ../calendar/gui/e-day-view.c:3570
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
@@ -4712,49 +4976,49 @@ msgstr "Ressourcen"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1250 ../e-util/e-table-config.ui.h:8
+#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1251
+#: ../calendar/gui/print.c:1248
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1252
+#: ../calendar/gui/print.c:1249
 msgid "Room"
 msgstr "Raum"
 
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/print.c:1263
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1267
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1268
+#: ../calendar/gui/print.c:1265
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1269
+#: ../calendar/gui/print.c:1266
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
@@ -4864,7 +5128,7 @@ msgstr ""
 "Zusammenfassung: %s\n"
 "Ort: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3528
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
@@ -4893,46 +5157,46 @@ msgstr "Allgemeiner Name"
 msgid "Language"
 msgstr "Sprache"
 
-#: ../calendar/gui/e-memo-table.c:429
-#: ../modules/calendar/e-cal-shell-content.c:481
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:371
+#: ../modules/calendar/e-cal-shell-content.c:1573
+#: ../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:515 ../calendar/gui/e-task-table.c:817
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
 msgid "* No Summary *"
 msgstr "* Keine Zusammenfassung *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:901
+#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
 msgid "Start: "
 msgstr "Anfang:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:919
+#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
 msgid "Due: "
 msgstr "Fälligkeit:"
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:684
 msgid "Cut selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:690
 msgid "Copy selected memos to the clipboard"
 msgstr "Die gewählten Notizen in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:696
 msgid "Paste memos from the clipboard"
 msgstr "Notiz aus der Zwischenablage einfügen"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../calendar/gui/e-memo-table.c:702
+#: ../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:766
+#: ../calendar/gui/e-memo-table.c:708
 msgid "Select all visible memos"
 msgstr "Alle sichtbaren Notizen wählen"
 
@@ -4944,40 +5208,40 @@ msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:613
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:730 ../calendar/gui/print.c:2417
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../calendar/importers/icalendar-importer.c:78
 #: ../calendar/importers/icalendar-importer.c:1072
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:438
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-cal-shell-content.c:1531
+#: ../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:1054
+#: ../calendar/gui/e-task-table.c:999
 msgid "Cut selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-task-table.c:1060
+#: ../calendar/gui/e-task-table.c:1005
 msgid "Copy selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-task-table.c:1066
+#: ../calendar/gui/e-task-table.c:1011
 msgid "Paste tasks from the clipboard"
 msgstr "Aufgaben aus der Zwischenablage einfügen"
 
-#: ../calendar/gui/e-task-table.c:1072
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../calendar/gui/e-task-table.c:1017
+#: ../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:1078
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Select all visible tasks"
 msgstr "Alle sichtbaren Aufgaben wählen"
 
@@ -4988,14 +5252,10 @@ msgstr "Zeitzone auswählen"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2071
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:2374
-msgid "Purging"
-msgstr "Säuberungsvorgang"
-
 #: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
 #: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
@@ -5106,142 +5366,154 @@ msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: ../calendar/gui/itip-utils.c:1147
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Eine Ressource kann nicht belegt werden, das neue Ereignis überschneidet "
 "sich mit anderen."
 
-#: ../calendar/gui/itip-utils.c:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
-msgstr "Eine Ressource kann nicht belegt werden, Fehler: %s"
+#: ../calendar/gui/itip-utils.c:1153
+msgid "Unable to book a resource, error: "
+msgstr "Eine Ressource kann nicht gebucht werden, Fehler:"
 
-#: ../calendar/gui/itip-utils.c:1327
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/itip-utils.c:1917
+msgid "Sending an event"
+msgstr "Eine Nachricht verschicken"
+
+#: ../calendar/gui/itip-utils.c:1921
+msgid "Sending a memo"
+msgstr "Eine Notiz verschicken"
+
+#: ../calendar/gui/itip-utils.c:1925
+msgid "Sending a task"
+msgstr "Eine Aufgabe verschicken"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31."
 
@@ -5249,102 +5521,102 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Mo"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Di"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "Mi"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "Do"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Fr"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:734
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "Sa"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:736
 msgid "Su"
 msgstr "So"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3322
+#: ../calendar/gui/print.c:3309
 msgid " to "
 msgstr " bis "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3332
+#: ../calendar/gui/print.c:3319
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3338
+#: ../calendar/gui/print.c:3325
 msgid "Completed "
 msgstr "Abgeschlossen "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3348
+#: ../calendar/gui/print.c:3335
 msgid " (Due "
 msgstr " (Fällig am "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3355
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "Fällig am "
 
-#: ../calendar/gui/print.c:3558
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:3602
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3618
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../calendar/gui/print.c:3636
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:3650
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:3664
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:3675
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "Kontakte: "
 
@@ -5357,13 +5629,13 @@ msgstr "In Bearbeitung"
 msgid "% Completed"
 msgstr "% abgeschlossen"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:30
-#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "ist größer als"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:31
-#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "ist kleiner als"
 
@@ -5400,6 +5672,10 @@ msgstr "Evolution-vCalendar-Importeur"
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
+#: ../calendar/importers/icalendar-importer.c:1108
+msgid "Gnome Calendar"
+msgstr "GNOME Calendar"
+
 #: ../calendar/importers/icalendar-importer.c:1109
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
@@ -7102,146 +7378,146 @@ msgstr "Diese _Meldung nicht mehr anzeigen"
 msgid "Save as..."
 msgstr "Speichern unter …"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:376
 msgid "Close the current file"
 msgstr "Die momentan geöffnete Datei schließen"
 
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:381
 msgid "New _Message"
 msgstr "Neue _Nachricht"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:383
 msgid "Open New Message window"
 msgstr "Neues Nachrichtenfenster öffnen"
 
-#: ../composer/e-composer-actions.c:374 ../shell/e-shell-window-actions.c:979
+#: ../composer/e-composer-actions.c:388 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../composer/e-composer-actions.c:376 ../shell/e-shell-window-actions.c:981
+#: ../composer/e-composer-actions.c:390 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Evolution konfigurieren"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:397
 msgid "Save the current file"
 msgstr "Die momentan geöffnete Datei speichern"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:402
 msgid "Save _As..."
 msgstr "Speichern _unter …"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:404
 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:397
+#: ../composer/e-composer-actions.c:411
 msgid "Character _Encoding"
 msgstr "Zeichen_kodierung"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:435
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:442
 msgid "Save as _Draft"
 msgstr "Als _Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:444
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:449
 msgid "S_end"
 msgstr "A_bschicken"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:451
 msgid "Send this message"
 msgstr "Diese Nachricht verschicken"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:459
 msgid "PGP _Encrypt"
 msgstr "Mit P_GP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:467
 msgid "PGP _Sign"
 msgstr "Mit _PGP signieren"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:475
 msgid "_Picture Gallery"
 msgstr "_Bildersammlung"
 
-#: ../composer/e-composer-actions.c:463
+#: ../composer/e-composer-actions.c:477
 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:469
+#: ../composer/e-composer-actions.c:483
 msgid "_Prioritize Message"
 msgstr "Nachricht _priorisieren"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:485
 msgid "Set the message priority to high"
 msgstr "Die Priorität der Nachricht auf hoch setzen"
 
-#: ../composer/e-composer-actions.c:477
+#: ../composer/e-composer-actions.c:491
 msgid "Re_quest Read Receipt"
 msgstr "_Lesebestätigung anfordern"
 
-#: ../composer/e-composer-actions.c:479
+#: ../composer/e-composer-actions.c:493
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
-#: ../composer/e-composer-actions.c:485
+#: ../composer/e-composer-actions.c:499
 msgid "S/MIME En_crypt"
 msgstr "Mit S/_MIME verschlüsseln"
 
-#: ../composer/e-composer-actions.c:487
+#: ../composer/e-composer-actions.c:501
 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:493
+#: ../composer/e-composer-actions.c:507
 msgid "S/MIME Sig_n"
 msgstr "Mit _S/MIME signieren"
 
-#: ../composer/e-composer-actions.c:495
+#: ../composer/e-composer-actions.c:509
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:563
 msgid "_Bcc Field"
 msgstr "_Blindkopie-Feld"
 
-#: ../composer/e-composer-actions.c:503
+#: ../composer/e-composer-actions.c:565
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Blindkopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:571
 msgid "_Cc Field"
 msgstr "_Kopie-Feld"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:573
 msgid "Toggles whether the CC field is displayed"
 msgstr "Kopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:517
+#: ../composer/e-composer-actions.c:579
 msgid "_Reply-To Field"
 msgstr "An_twort-an-Feld"
 
-#: ../composer/e-composer-actions.c:519
+#: ../composer/e-composer-actions.c:581
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Antwort-an-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:642
 msgid "Save Draft"
 msgstr "Entwurf speichern"
 
@@ -7291,7 +7567,7 @@ msgid "S_ubject:"
 msgstr "Be_treff:"
 
 #: ../composer/e-composer-header-table.c:811
-#: ../mail/e-mail-config-identity-page.c:487
+#: ../mail/e-mail-config-identity-page.c:505
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -7320,11 +7596,11 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1632 ../composer/e-msg-composer.c:2190
+#: ../composer/e-msg-composer.c:1581 ../composer/e-msg-composer.c:2147
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:4406
+#: ../composer/e-msg-composer.c:4390
 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 "
@@ -7475,7 +7751,7 @@ 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:161
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Die Fehlermeldung war »{0}«."
 
@@ -7508,16 +7784,17 @@ msgstr ""
 "»Verschicken/Abrufen« in der Werkzeugleiste verschicken."
 
 #: ../composer/mail-composer.error.xml.h:37
-#| 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?"
 msgid "Are you sure you want to send the message?"
 msgstr "Sind Sie sicher, dass Sie die Nachricht senden wollen?"
 
+# Wenn man ein Kürzel verwendet, will man doch eigentlcih nicht gefragt werden, ob man wirklich die 
Abkürzung nehmen will. So ein Blödsinn.
 #: ../composer/mail-composer.error.xml.h:38
 msgid ""
 "A keyboard accelerator to send the message had been pressed. Either cancel "
 "message send, 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 ab, oder senden Sie die Nachricht."
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -7527,34 +7804,13 @@ msgstr "Evolution Alarm-Benachrichtigung"
 msgid "Calendar event notifications"
 msgstr "Benachrichtigungen über Kalenderereignisse"
 
-#: ../data/evolution.appdata.xml.in.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution ist eine Anwendung zur Verwaltung persönlicher Informationen, die "
-"ein E-Mail-Programm, einen Kalender und ein Adressbuch enthält."
-
-#: ../data/evolution.appdata.xml.in.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolution unterstützt eine Vielzahl von industriellen Standard-Formaten und "
-"Netzwerk-Protokollen zum Informationsaustausch, mit einem Schwerpunkt auf "
-"Standard-Konformität und Sicherheit. Evolution arbeitet außerdem problemlos "
-"mit Microsoft Exchange mittels der Erweiterung »Exchange Web Services« (EWS) "
-"zusammen."
-
 #: ../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
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "Groupware-Suite"
 
@@ -7677,6 +7933,51 @@ msgstr "Vorschaufeld anzeigen"
 msgid "Whether to show the preview pane."
 msgstr "Soll das Vorschaufeld angezeigt werden?"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "wahr"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr "Legt fest, ob Telefonnummern im Editor angezeigt werden"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr "Legt fest, ob SIP-Adressen im Editor angezeigt werden"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr ""
+"Legt fest, Adressen von Sofortnachrichtendiensten im Editor angezeigt werden"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "Legt fest, ob Privatadressen im Editor angezeigt werden"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "Legt fest, ob Geschäftsadressen im Editor angezeigt werden"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "Legt fest, ob andere Adressen im Editor angezeigt werden"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr "Legt fest, ob Internetadressen im Editor angezeigt werden"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr "Legt fest, ob Berufsinformationen im Editor angezeigt werden"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "Legt fest, ob Sonstige Informationen angezeigt werden"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes 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"
@@ -8382,11 +8683,11 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
 msgid "List of disabled plugins"
-msgstr "Liste der deaktivierten Plugins"
+msgstr "Liste der deaktivierten Erweiterungen"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:4
 msgid "The list of disabled plugins in Evolution"
-msgstr "Liste der in Evolution deaktivierten Plugins"
+msgstr "Liste der in Evolution deaktivierten Erweiterungen"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "The window's X coordinate"
@@ -8671,16 +8972,16 @@ msgstr ""
 "inkorrekten Standard RFC 2047."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#, fuzzy
-#| msgid "Saving message to Outbox."
 msgid "Send messages through Outbox folder"
-msgstr "Nachricht wird im Nachrichtenausgang gespeichert"
+msgstr "Nachrichten durch den Nachrichtenausgang verschicken"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
 msgstr ""
+"Nachrichten beim Versand immer im Nachrichtenausgang speichern, damit der "
+"Nutzer entscheiden kann, wann die Nachrichten verschickt werden sollen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Put personalized signatures at the top of replies"
@@ -8753,14 +9054,16 @@ msgstr "Entwicklermodus aktivieren"
 msgid ""
 "Enables some hidden actions and tools aimed for development and debugging."
 msgstr ""
+"Legt fest, ob versteckte Aktionen und Werkzeuge aktiviert werden, die für "
+"die Entwicklung und Fehlersuche gebraucht werden."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Number of characters for wrapping"
-msgstr ""
+msgstr "Anzahl von Zeichen bis zum Zeilenumbruch"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid "Will autowrap lines after given number of characters."
-msgstr ""
+msgstr "Automatischer Zeilenumbruch nach angegebener Anzahl von Zeichen"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Save file format for drag-and-drop operation"
@@ -8892,7 +9195,6 @@ 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:84
-#| msgid "Show photo of the sender"
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Auf gravatar.com nach dem Foto des Absenders suchen"
 
@@ -9059,45 +9361,47 @@ msgstr ""
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
-"Anzahl der Adressen, die in den Empfängerfeldern (An/Kopie/"
-"Blindkopie( angezeigt werden"
+"Anzahl der Adressen, die in den Empfängerfeldern (An/Kopie/Blindkopie) "
+"angezeigt werden"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
-"Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
-"werden, bevor »…« angezeigt wird."
+"Die Anzahl der Adressen, die in der Standardansicht angezeigt werden, bevor "
+"»…« angezeigt wird."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Thread the message-list based on Subject"
-msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
+msgstr "Die Nachrichtenliste themenbasiert als Konversation anzeigen"
 
-# CHECK - etwas schluderig, kommt aber hoffentlich hin.
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
-"einer Nachricht auf keine Referenznachricht verweisen."
+"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:119
 msgid "Default value for thread expand state"
-msgstr "Vorgabewert, ob Threads ausgeklappt angezeigt werden sollen"
+msgstr "Vorgabewert, ob Konversationen ausgeklappt angezeigt werden sollen"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
-"Legt fest, ob Threads standardmäßig ausgeklappt oder eingeklappt dargestellt "
-"werden sollen. Evolution muss zur Umsetzung der Änderung neu gestartet werden"
+"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:121
 msgid "Whether sort threads based on latest message in that thread"
-msgstr "Threads nach der letzten Nachricht im jeweiligen Thread sortieren"
+msgstr ""
+"Legt fest, ob Konversationen nach der letzten Nachricht der jeweiligen "
+"Konversation sortiert werden"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
@@ -9105,9 +9409,9 @@ msgid ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"Legt fest, ob Threads nach der letzten Nachricht in einem Thread sortiert "
-"werden sollen anstatt nach dem Datum der Nachricht. Evolution muss nach "
-"Ändern dieses Wertes hierfür neu gestartet werden."
+"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:123
 msgid "Sort accounts alphabetically in a folder tree"
@@ -9164,15 +9468,12 @@ msgid "Default reply style"
 msgstr "Standard-Antwortstil"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-#, fuzzy
 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ürzeln (Strg+Eingabe) verschickt werden soll."
+"durch Tastenkürzel (Strg+Eingabe) verschickt wird"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#| msgid ""
-#| "Prompt the user when he or she tries to send a message without a Subject."
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
@@ -9480,7 +9781,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "The default plugin for Junk hook"
-msgstr "Vorgabe-Plugin für die Unerwünscht-Erkennung"
+msgstr "Vorgabe-Erweiterung für die Unerwünscht-Erkennung"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
@@ -9488,9 +9789,10 @@ msgid ""
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
-"Dies ist das Vorgabe-Unerwünscht-Plugin, auch falls mehrere Plugins "
-"aktiviert sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, "
-"so wird nicht auf eines der anderen Plugins zurückgegriffen."
+"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:187
 msgid "Determines whether to lookup in address book for sender email"
@@ -9621,10 +9923,38 @@ msgstr ""
 "abgeglichen werden. Der Intervall muss mindestens 30 Sekunden betragen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid "Allow expunge in virtual folders"
+msgstr "Löschen in virtuellen Ordnern erlauben"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+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."
+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:208
+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:209
+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:210
 msgid "(Deprecated) Default forward style"
 msgstr "(Veraltet) Standard-Weiterleitungsstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9632,11 +9962,11 @@ 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:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "(Deprecated) Default reply style"
 msgstr "(Veraltet) Standard-Antwortmethode"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9644,13 +9974,13 @@ 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:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 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:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9658,11 +9988,11 @@ 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:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9670,7 +10000,7 @@ 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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9679,7 +10009,7 @@ msgstr ""
 "wenn die Nachricht im Nachrichtenfenster weitergeleitet oder beantwortet "
 "wird."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9961,7 +10291,7 @@ msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 msgstr ""
-"Liste der Schlüsselwort/Wert-Paare, die das Vorlagen-Plugin im "
+"Liste der Schlüsselwort/Wert-Paare, die die Vorlagen-Erweiterung im "
 "Nachrichtentext ersetzen soll."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
@@ -9994,7 +10324,7 @@ msgstr "Ausgangsordner des Dateiwählers"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Ausgangsordner des GtkFileChooser-Dialogs."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:313
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
@@ -10092,7 +10422,7 @@ msgstr "Ausschließlich lokale Spam-Tests verwenden (kein DNS)."
 
 #: ../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:176 ../e-util/e-attachment-paned.c:181
+#: ../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"
@@ -10179,18 +10509,19 @@ msgstr "Mit S/MIME verschlüsselt"
 msgid "Security"
 msgstr "Sicherheit"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:167
+#: ../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
 msgid "Subject"
 msgstr "Betreff"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
+#: ../em-format/e-mail-formatter-quote-headers.c:193
 #: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1166
 msgid "Mailer"
 msgstr "Mailer"
 
@@ -10216,7 +10547,7 @@ msgstr "Teil als HTML formatieren"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:197
-#: ../e-util/e-html-editor-actions.c:1382
+#: ../e-util/e-html-editor-actions.c:1408
 msgid "Plain Text"
 msgstr "Einfacher Text"
 
@@ -10461,336 +10792,18 @@ msgstr "Gesicht"
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Standard"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Proprietär"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Geheim"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Streng geheim"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Streng geheim"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Keine"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Empfangsbestätigung"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "Rüc_kmeldung gewünscht"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "B_innen"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "Tage"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "_Wenn passend"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:848
-msgid "Replies"
-msgstr "Antworten"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "Nachrichtenzustellung ver_zögern"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "D_anach"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "Tage"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "_Verfallsdatum angeben"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Bis"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Zustellungsoptionen"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "_Priorität:"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "E_instufung:"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Allge_meine Optionen"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "Ein gesendetes _Element erstellen, um Informationen zu verfolgen"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "Zuge_stellt"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "_Zugestellt und geöffnet"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Alle Informationen"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "Gesendetes Element a_utomatisch löschen"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Statusverfolgung"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "_Wenn geöffnet:"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Wenn abge_lehnt:"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Wenn a_bgeschlossen:"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "Wenn a_ngenommen:"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Rücksendemitteilung"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Sta_tusverfolgung"
-
-#: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:281
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:191
-msgid "_Apply"
-msgstr "An_wenden"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Sortieren …"
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "_Gruppieren nach …"
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "An_gezeigte Felder …"
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "Alles _entfernen"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "Fel_d in Ansicht anzeigen"
-
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
-msgid "Ascending"
-msgstr "Aufsteigend"
-
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
-msgid "Descending"
-msgstr "Absteigend"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "Objekte gruppieren nach"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "_Feld in Ansicht anzeigen"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "Dann nach"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "Feld in A_nsicht anzeigen"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "Feld in Ansicht an_zeigen"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Sortieren"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "Alles entfernen"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "Objekte sortieren nach"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Eine Zeitzone wählen"
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Benutzen Sie die linke Maustaste, um einen Kartenausschnitt zu vergrößern "
-"und wählen Sie eine Zeitzone.\n"
-"Mit der rechten Maustaste können Sie die Ansicht verkleinern."
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "Zeitzonen"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "Au_swahl"
-
-#: ../e-util/e-timezone-dialog.ui.h:8
-msgid "Timezone drop-down combination box"
-msgstr "Auswahlliste für die Zeitzone"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1244
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "Eingang"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "Die aktuelle Zeit"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "die von Ihnen angegebene Zeit"
-
-#: ../e-util/filter.ui.h:4
-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:85
-msgid "seconds"
-msgstr "Sekunden"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "Wochen"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "Monaten"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "Jahren"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "vor"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "in der Zukunft"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Anzeigen der Filter für E-Mail:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "_Filterregeln"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "Vergleichen mit"
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Das Datum der Nachricht wird mit dem Datum\n"
-"verglichen, an dem der Filter angewandt wird."
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Das Datum der Nachricht wird mit 12:00 am\n"
-"des angegebenen Datums verglichen"
-
-# CHECK - time <=> date?!?!
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Die Datum der Nachricht wird mit einer Zeit\n"
-"relativ zu der verglichen, an der der Filter\n"
-"angewandt wird."
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "Neue Ansicht er_stellen"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:415
-#: ../mail/e-mail-config-identity-page.c:309
-#: ../mail/e-mail-config-summary-page.c:339
-msgid "_Name:"
-msgstr "_Name:"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr " %d. %B %Y"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "Vorhandene Ansicht erset_zen"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalender: von %s bis %s"
 
-#: ../e-util/e-activity-proxy.c:313
-#: ../modules/mail/e-mail-shell-view-actions.c:1817
-msgid "Cancel"
-msgstr "Abbrechen"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "Evolution Kalenderelement"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:258
@@ -10822,24 +10835,95 @@ msgstr "%s (wird abgebrochen)"
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose percent complete is known.
 #: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1824
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #. Translators: Escape is a keyboard binding.
 #: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "Diese Nachricht schließen (Escape)"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+#: ../e-util/e-alert-sink.c:246
+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
 msgid "Icon View"
 msgstr "Symbolansicht"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
 msgid "List View"
 msgstr "Listenansicht"
 
+#. To Translators: This text is set as a description of an attached
+#. * 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
+msgid "Attached message"
+msgstr "Beigelegte Nachricht"
+
+#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+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
+msgid "attachment.dat"
+msgstr "Anlage.dat"
+
+#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+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
+msgid "A save operation is already in progress"
+msgstr "Ein Speichervorgang läuft bereits"
+
+#: ../e-util/e-attachment.c:2473
+#, c-format
+msgid "Could not load '%s'"
+msgstr "»%s« konnte nicht geladen werden"
+
+#: ../e-util/e-attachment.c:2476
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Die Anlage konnte nicht geladen werden"
+
+#: ../e-util/e-attachment.c:2761
+#, c-format
+msgid "Could not open '%s'"
+msgstr "»%s« konnte nicht geöffnet werden"
+
+#: ../e-util/e-attachment.c:2764
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Die Anlage konnte nicht geöffnet werden"
+
+#: ../e-util/e-attachment.c:3411
+msgid "Attachment contents not loaded"
+msgstr "Anlagen wurden nicht geladen"
+
+#: ../e-util/e-attachment.c:3502
+#, c-format
+msgid "Could not save '%s'"
+msgstr "»%s« konnte nicht gespeichert werden"
+
+#: ../e-util/e-attachment.c:3505
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Die Anlage konnte nicht gespeichert werden"
+
 #: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Eigenschaften der Anlage"
@@ -10852,15 +10936,15 @@ msgstr "Datei_name:"
 msgid "MIME Type:"
 msgstr "MIME-Typ:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "Konnte nicht als Hintergrund gesetzt werden"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
@@ -10874,33 +10958,43 @@ msgstr "Wird geladen"
 msgid "Saving"
 msgstr "Wird gespeichert"
 
-#: ../e-util/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:486
 msgid "Add Attachment"
 msgstr "Anlage hinzufügen"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
 msgstr "Bei_legen"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:533
+msgid "Archive selected directories using this format:"
+msgstr "Archivieren der ausgewählten Ordner mit diesem Format:"
+
+#: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Anlage speichern"
 msgstr[1] "Anlagen speichern"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2059
-#: ../e-util/e-attachment.c:2722
-msgid "attachment.dat"
-msgstr "Anlage.dat"
+#: ../e-util/e-attachment-store.c:653
+msgid "Do _not extract files from the attachment"
+msgstr "Dateien _nicht aus der Anlage auslesen"
+
+#: ../e-util/e-attachment-store.c:658
+msgid "Save extracted files _only"
+msgstr "_Nur extrahierte Dateien speichern"
+
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files and the original _archive"
+msgstr "Speichern der extrahierten Dateien und das Original-_Archiv"
 
 #: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
@@ -10927,11 +11021,11 @@ msgstr "Anlage _hinzufügen …"
 
 #: ../e-util/e-attachment-view.c:417
 #: ../modules/addressbook/e-book-shell-view-actions.c:1129
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../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:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
@@ -10961,56 +11055,6 @@ msgstr "Mit »%s« öffnen"
 msgid "Open this attachment in %s"
 msgstr "Diese Anlage mit »%s« öffnen"
 
-#. To Translators: This text is set as a description of an attached
-#. * 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:1109
-msgid "Attached message"
-msgstr "Beigelegte Nachricht"
-
-#: ../e-util/e-attachment.c:2140 ../e-util/e-attachment.c:3028
-msgid "A load operation is already in progress"
-msgstr "Ein Ladevorgang läuft bereits"
-
-#: ../e-util/e-attachment.c:2148 ../e-util/e-attachment.c:3036
-msgid "A save operation is already in progress"
-msgstr "Ein Speichervorgang läuft bereits"
-
-#: ../e-util/e-attachment.c:2268
-#, c-format
-msgid "Could not load '%s'"
-msgstr "»%s« konnte nicht geladen werden"
-
-#: ../e-util/e-attachment.c:2271
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Die Anlage konnte nicht geladen werden"
-
-#: ../e-util/e-attachment.c:2575
-#, c-format
-msgid "Could not open '%s'"
-msgstr "»%s« konnte nicht geöffnet werden"
-
-#: ../e-util/e-attachment.c:2578
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Die Anlage konnte nicht geöffnet werden"
-
-#: ../e-util/e-attachment.c:3045
-msgid "Attachment contents not loaded"
-msgstr "Anlagen wurden nicht geladen"
-
-#: ../e-util/e-attachment.c:3125
-#, c-format
-msgid "Could not save '%s'"
-msgstr "»%s« konnte nicht gespeichert werden"
-
-#: ../e-util/e-attachment.c:3128
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Die Anlage konnte nicht gespeichert werden"
-
 #: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "Als Vorgabeadressbuch markieren"
@@ -11030,6 +11074,44 @@ msgstr ""
 "Drücken Sie die Taste Strg und klicken Sie mit der Maus, um einen Verweis zu "
 "öffnen"
 
+#: ../e-util/e-calendar.c:195
+msgid "Previous month"
+msgstr "Vorheriger Monat"
+
+#: ../e-util/e-calendar.c:220
+msgid "Next month"
+msgstr "Nächster Monat"
+
+#: ../e-util/e-calendar.c:246
+msgid "Previous year"
+msgstr "Vorheriges Jahr"
+
+#: ../e-util/e-calendar.c:271
+msgid "Next year"
+msgstr "Nächstes Jahr"
+
+#: ../e-util/e-calendar.c:295
+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
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1325
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1362
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B %Y"
+
 #: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Als Vorgabekalender markieren"
@@ -11059,44 +11141,6 @@ msgstr ""
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus kopieren"
 
-#. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2205
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%B"
-
-#. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1329
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1366
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../e-util/e-calendar.c:195
-msgid "Previous month"
-msgstr "Vorheriger Monat"
-
-#: ../e-util/e-calendar.c:220
-msgid "Next month"
-msgstr "Nächster Monat"
-
-#: ../e-util/e-calendar.c:246
-msgid "Previous year"
-msgstr "Vorheriges Jahr"
-
-#: ../e-util/e-calendar.c:271
-msgid "Next year"
-msgstr "Nächstes Jahr"
-
-#: ../e-util/e-calendar.c:295
-msgid "Month Calendar"
-msgstr "Monatskalender"
-
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "Gegenwärtig gen_utzte Kategorien:"
@@ -11107,7 +11151,7 @@ msgstr "Verfügbare Kate_gorien"
 
 #: ../e-util/e-categories-editor.c:274
 #: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1100
+#: ../shell/e-shell-window-actions.c:1099
 msgid "_New"
 msgstr "_Neu"
 
@@ -11153,13 +11197,17 @@ msgstr ""
 msgid "popup list"
 msgstr "Popup-Liste"
 
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+msgid "?"
+msgstr "?"
+
 #: ../e-util/e-cell-date-edit.c:298
 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:1891
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 #: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "Heute"
@@ -11180,26 +11228,10 @@ msgstr "OK"
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
 
-#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:1877
-msgid "?"
-msgstr "?"
-
 #: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "Zeichenkodierung"
-
-#: ../e-util/e-charset-combo-box.c:119
-msgid "Enter the character set to use"
-msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
-
-#: ../e-util/e-charset-combo-box.c:365
-msgid "Other..."
-msgstr "Weitere …"
-
 #: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Arabisch"
@@ -11278,6 +11310,18 @@ msgstr "Ukrainisch"
 msgid "Visual"
 msgstr "Visuell"
 
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "Zeichenkodierung"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Weitere …"
+
 #: ../e-util/e-client-cache.c:1209
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
@@ -11448,9 +11492,9 @@ msgstr "hellpurpur"
 msgid "white"
 msgstr "weiß"
 
-#: ../e-util/e-color-combo.c:596 ../mail/e-mail-account-tree-view.c:134
+#: ../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:3656
+#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3857
 #: ../mail/mail-config.ui.h:68
 msgid "Default"
 msgstr "Vorgabe"
@@ -11850,9 +11894,9 @@ 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:57
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:60
 #: ../e-util/e-mail-identity-combo-box.c:472
-#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:549
+#: ../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
@@ -11863,6 +11907,10 @@ msgstr "Keine"
 msgid "All related"
 msgstr "Alle mit Bezug"
 
+#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Antworten"
+
 # CHECK
 #: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
@@ -11874,640 +11922,670 @@ msgstr "Ohne Antwort oder Vorgänger"
 
 #: ../e-util/e-filter-rule.c:853
 msgid "I_nclude threads:"
-msgstr "_Threads einschließen:"
+msgstr "_Konversationen einschließen:"
 
 #: ../e-util/e-filter-rule.c:930
 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
+msgid "Incoming"
+msgstr "Eingang"
+
 #: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "Ausgehend"
 
-#: ../e-util/e-html-editor-actions.c:56
+#: ../e-util/e-html-editor-actions.c:57
 msgid "Failed to insert HTML file."
 msgstr "Einfügen der HTML-Datei ist fehlgeschlagen."
 
-#: ../e-util/e-html-editor-actions.c:93
+#: ../e-util/e-html-editor-actions.c:94
 msgid "Failed to insert text file."
 msgstr "Einfügen der Textdatei ist fehlgeschlagen."
 
-#: ../e-util/e-html-editor-actions.c:470
+#: ../e-util/e-html-editor-actions.c:478
 msgid "Insert HTML File"
 msgstr "HTML-Datei einfügen"
 
-#: ../e-util/e-html-editor-actions.c:476
+#: ../e-util/e-html-editor-actions.c:484
 msgid "HTML file"
 msgstr "HTML-Datei"
 
-#: ../e-util/e-html-editor-actions.c:503
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:511
+#: ../e-util/e-html-editor-actions.c:1292
 msgid "Insert Image"
 msgstr "Bild einfügen"
 
-#: ../e-util/e-html-editor-actions.c:563
-#| msgid "Increase the text size"
+#: ../e-util/e-html-editor-actions.c:571
 msgid "Insert text file"
 msgstr "Textdatei einfügen"
 
-#: ../e-util/e-html-editor-actions.c:569
+#: ../e-util/e-html-editor-actions.c:577
 msgid "Text file"
 msgstr "Textdatei"
 
-#: ../e-util/e-html-editor-actions.c:938
+#: ../e-util/e-html-editor-actions.c:961
 msgid "Copy selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage kopieren"
 
-#: ../e-util/e-html-editor-actions.c:945
+#: ../e-util/e-html-editor-actions.c:968
 msgid "Cut selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage verschieben"
 
-#: ../e-util/e-html-editor-actions.c:950
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:975
+msgid "Paste text from the clipboard"
+msgstr "Text aus der Zwischenablage einfügen"
+
+#: ../e-util/e-html-editor-actions.c:982
+msgid "Redo the last undone action"
+msgstr "Die letzte rückgängig gemachte Änderung wiederholen"
+
+#: ../e-util/e-html-editor-actions.c:996
+msgid "Undo the last action"
+msgstr "Die letzte Aktion zurück nehmen"
+
+#: ../e-util/e-html-editor-actions.c:1017
+msgid "For_mat"
+msgstr "_Format"
+
+#: ../e-util/e-html-editor-actions.c:1024
+msgid "_Paragraph Style"
+msgstr "_Absatzstil"
+
+#: ../e-util/e-html-editor-actions.c:1038
+#: ../e-util/e-html-editor-image-dialog.c:591
+msgid "_Alignment"
+msgstr "Aus_richtung"
+
+#: ../e-util/e-html-editor-actions.c:1045
+msgid "Current _Languages"
+msgstr "Momentan verwendete _Sprachen"
+
+#: ../e-util/e-html-editor-actions.c:1062
 msgid "_Increase Indent"
 msgstr "Einzug _erhöhen"
 
-#: ../e-util/e-html-editor-actions.c:952
+#: ../e-util/e-html-editor-actions.c:1064
 msgid "Increase Indent"
 msgstr "Einzug erhöhen"
 
-#: ../e-util/e-html-editor-actions.c:957
+#: ../e-util/e-html-editor-actions.c:1069
 msgid "_HTML File..."
 msgstr "_HTML-Datei …"
 
-#: ../e-util/e-html-editor-actions.c:964
+#: ../e-util/e-html-editor-actions.c:1076
 msgid "Te_xt File..."
 msgstr "Te_xtdatei …"
 
-#. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:973
-msgid "Paste text from the clipboard"
-msgstr "Text aus der Zwischenablage einfügen"
-
-#: ../e-util/e-html-editor-actions.c:978
+#: ../e-util/e-html-editor-actions.c:1083
 msgid "Paste _Quotation"
 msgstr "_Zitat einfügen"
 
-#: ../e-util/e-html-editor-actions.c:987
-msgid "Redo the last undone action"
-msgstr "Die letzte rückgängig gemachte Änderung wiederholen"
-
-#: ../e-util/e-html-editor-actions.c:999
+#: ../e-util/e-html-editor-actions.c:1090
 msgid "_Find..."
 msgstr "_Suchen …"
 
-#: ../e-util/e-html-editor-actions.c:1001
+#: ../e-util/e-html-editor-actions.c:1092
 msgid "Search for text"
 msgstr "Nach Text suchen"
 
-#: ../e-util/e-html-editor-actions.c:1006
+#: ../e-util/e-html-editor-actions.c:1097
 msgid "Find A_gain"
 msgstr "Wei_tersuchen"
 
-#: ../e-util/e-html-editor-actions.c:1013
+#: ../e-util/e-html-editor-actions.c:1104
 msgid "Re_place..."
 msgstr "_Ersetzen …"
 
-#: ../e-util/e-html-editor-actions.c:1015
+#: ../e-util/e-html-editor-actions.c:1106
 msgid "Search for and replace text"
 msgstr "Nach Text suchen und diesen ersetzen"
 
-#: ../e-util/e-html-editor-actions.c:1020
+#: ../e-util/e-html-editor-actions.c:1111
 msgid "Check _Spelling..."
 msgstr "_Rechtschreibprüfung …"
 
-#: ../e-util/e-html-editor-actions.c:1029
-msgid "Undo the last action"
-msgstr "Die letzte Aktion zurück nehmen"
-
-#: ../e-util/e-html-editor-actions.c:1034
+#: ../e-util/e-html-editor-actions.c:1118
 msgid "_Decrease Indent"
 msgstr "Einzug _vermindern"
 
-#: ../e-util/e-html-editor-actions.c:1036
+#: ../e-util/e-html-editor-actions.c:1120
 msgid "Decrease Indent"
 msgstr "Einzug vermindern"
 
-#: ../e-util/e-html-editor-actions.c:1041
+#: ../e-util/e-html-editor-actions.c:1125
 msgid "_Wrap Lines"
 msgstr "_Zeilenumbruch"
 
-#: ../e-util/e-html-editor-actions.c:1048
+#: ../e-util/e-html-editor-actions.c:1132
 msgid "Open Inspector"
 msgstr "_Inspekteur andocken"
 
-#: ../e-util/e-html-editor-actions.c:1071
-msgid "For_mat"
-msgstr "_Format"
-
-#: ../e-util/e-html-editor-actions.c:1078
-msgid "_Paragraph Style"
-msgstr "_Absatzstil"
-
-#: ../e-util/e-html-editor-actions.c:1092
-#: ../e-util/e-html-editor-image-dialog.c:588
-msgid "_Alignment"
-msgstr "Aus_richtung"
-
-#: ../e-util/e-html-editor-actions.c:1099
-msgid "Current _Languages"
-msgstr "Momentan verwendete _Sprachen"
-
 #. Center
-#: ../e-util/e-html-editor-actions.c:1116
+#: ../e-util/e-html-editor-actions.c:1142
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Zentrieren"
 
-#: ../e-util/e-html-editor-actions.c:1118
+#: ../e-util/e-html-editor-actions.c:1144
 msgid "Center Alignment"
 msgstr "Zentriert"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1123
+#: ../e-util/e-html-editor-actions.c:1149
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Links"
 
-#: ../e-util/e-html-editor-actions.c:1125
+#: ../e-util/e-html-editor-actions.c:1151
 msgid "Left Alignment"
 msgstr "Linksbündig"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1130
+#: ../e-util/e-html-editor-actions.c:1156
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "_Rechts"
 
-#: ../e-util/e-html-editor-actions.c:1132
+#: ../e-util/e-html-editor-actions.c:1158
 msgid "Right Alignment"
 msgstr "Rechtsbündig"
 
-#: ../e-util/e-html-editor-actions.c:1140
+#: ../e-util/e-html-editor-actions.c:1166
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1142
+#: ../e-util/e-html-editor-actions.c:1168
 msgid "HTML editing mode"
 msgstr "HTML-Bearbeitungsmodus"
 
-#: ../e-util/e-html-editor-actions.c:1147
+#: ../e-util/e-html-editor-actions.c:1173
 msgid "Plain _Text"
 msgstr "_Einfacher Text"
 
-#: ../e-util/e-html-editor-actions.c:1149
-#| msgid "Plain Text Mode"
+#: ../e-util/e-html-editor-actions.c:1175
 msgid "Plain text editing mode"
 msgstr "Einfacher Textbearbeitungsmodus"
 
-#: ../e-util/e-html-editor-actions.c:1157
+#: ../e-util/e-html-editor-actions.c:1183
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1164
+#: ../e-util/e-html-editor-actions.c:1190
 msgid "Header _1"
 msgstr "Überschrift _1"
 
-#: ../e-util/e-html-editor-actions.c:1171
+#: ../e-util/e-html-editor-actions.c:1197
 msgid "Header _2"
 msgstr "Überschrift _2"
 
-#: ../e-util/e-html-editor-actions.c:1178
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "Header _3"
 msgstr "Überschrift _3"
 
-#: ../e-util/e-html-editor-actions.c:1185
+#: ../e-util/e-html-editor-actions.c:1211
 msgid "Header _4"
 msgstr "Überschrift _4"
 
-#: ../e-util/e-html-editor-actions.c:1192
+#: ../e-util/e-html-editor-actions.c:1218
 msgid "Header _5"
 msgstr "Überschrift _5"
 
-#: ../e-util/e-html-editor-actions.c:1199
+#: ../e-util/e-html-editor-actions.c:1225
 msgid "Header _6"
 msgstr "Überschrift _6"
 
-#: ../e-util/e-html-editor-actions.c:1206
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "_Preformatted"
 msgstr "_Vorformatiert"
 
-#: ../e-util/e-html-editor-actions.c:1213
+#: ../e-util/e-html-editor-actions.c:1239
 msgid "A_ddress"
 msgstr "A_dresse"
 
-#: ../e-util/e-html-editor-actions.c:1220
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "_Blockquote"
 msgstr "_Zitat"
 
-#: ../e-util/e-html-editor-actions.c:1227
+#: ../e-util/e-html-editor-actions.c:1253
 msgid "_Bulleted List"
 msgstr "_Ungeordnete Liste"
 
-#: ../e-util/e-html-editor-actions.c:1234
+#: ../e-util/e-html-editor-actions.c:1260
 msgid "_Roman Numeral List"
 msgstr "_Römisch nummerierte Liste"
 
-#: ../e-util/e-html-editor-actions.c:1241
+#: ../e-util/e-html-editor-actions.c:1267
 msgid "Numbered _List"
 msgstr "Nummerierte _Liste"
 
-#: ../e-util/e-html-editor-actions.c:1248
+#: ../e-util/e-html-editor-actions.c:1274
 msgid "_Alphabetical List"
 msgstr "_Alphabetische Liste"
 
-#: ../e-util/e-html-editor-actions.c:1264
-#: ../e-util/e-html-editor-actions.c:1301
+#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1327
 msgid "_Image..."
 msgstr "_Bild …"
 
-#: ../e-util/e-html-editor-actions.c:1271
-#: ../e-util/e-html-editor-actions.c:1308
+#: ../e-util/e-html-editor-actions.c:1297
+#: ../e-util/e-html-editor-actions.c:1334
 msgid "_Link..."
 msgstr "_Verweis …"
 
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1299
 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:1279
-#: ../e-util/e-html-editor-actions.c:1323
+#: ../e-util/e-html-editor-actions.c:1305
+#: ../e-util/e-html-editor-actions.c:1349
 msgid "_Rule..."
 msgstr "T_rennlinie …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1282
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "Insert Rule"
 msgstr "Trennlinie einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1287
-#: ../e-util/e-html-editor-actions.c:1330
+#: ../e-util/e-html-editor-actions.c:1313
+#: ../e-util/e-html-editor-actions.c:1356
 msgid "_Table..."
 msgstr "_Tabelle …"
 
-#: ../e-util/e-html-editor-actions.c:1289
+#: ../e-util/e-html-editor-actions.c:1315
 msgid "Insert Table"
 msgstr "Tabelle einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1294
+#: ../e-util/e-html-editor-actions.c:1320
 msgid "_Cell..."
 msgstr "_Zelle …"
 
-#: ../e-util/e-html-editor-actions.c:1315
+#: ../e-util/e-html-editor-actions.c:1341
 msgid "Pa_ge..."
 msgstr "_Seite …"
 
-#: ../e-util/e-html-editor-actions.c:1339
+#: ../e-util/e-html-editor-actions.c:1365
 msgid "Font _Size"
 msgstr "Schrift_größe"
 
-#: ../e-util/e-html-editor-actions.c:1346
+#: ../e-util/e-html-editor-actions.c:1372
 msgid "_Font Style"
 msgstr "Schrift_stil"
 
-#: ../e-util/e-html-editor-actions.c:1353
+#: ../e-util/e-html-editor-actions.c:1379
 msgid "Paste As _Text"
 msgstr "Als normaler _Text einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1364
+#: ../e-util/e-html-editor-actions.c:1390
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "_Fett"
 
-#: ../e-util/e-html-editor-actions.c:1366
+#: ../e-util/e-html-editor-actions.c:1392
 msgid "Bold"
 msgstr "Fett"
 
-#: ../e-util/e-html-editor-actions.c:1372
+#: ../e-util/e-html-editor-actions.c:1398
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "_Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1374
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../e-util/e-html-editor-actions.c:1380
+#: ../e-util/e-html-editor-actions.c:1406
 msgid "_Plain Text"
 msgstr "_Einfacher Text"
 
-#: ../e-util/e-html-editor-actions.c:1388
+#: ../e-util/e-html-editor-actions.c:1414
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "_Durchstreichen"
 
-#: ../e-util/e-html-editor-actions.c:1390
+#: ../e-util/e-html-editor-actions.c:1416
 msgid "Strikethrough"
 msgstr "Durchgestrichen"
 
-#: ../e-util/e-html-editor-actions.c:1396
+#: ../e-util/e-html-editor-actions.c:1422
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "_Unterstrichen"
 
-#: ../e-util/e-html-editor-actions.c:1398
+#: ../e-util/e-html-editor-actions.c:1424
 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:1408
+#: ../e-util/e-html-editor-actions.c:1434
 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:1416
+#: ../e-util/e-html-editor-actions.c:1442
 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:1424
+#: ../e-util/e-html-editor-actions.c:1450
 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:1432
+#: ../e-util/e-html-editor-actions.c:1458
 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:1440
+#: ../e-util/e-html-editor-actions.c:1466
 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:1448
+#: ../e-util/e-html-editor-actions.c:1474
 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:1456
+#: ../e-util/e-html-editor-actions.c:1482
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1475
+#: ../e-util/e-html-editor-actions.c:1501
 msgid "Cell Contents"
 msgstr "Zelleninhalt"
 
-#: ../e-util/e-html-editor-actions.c:1482
+#: ../e-util/e-html-editor-actions.c:1508
 msgid "Column"
 msgstr "Spalte"
 
-#: ../e-util/e-html-editor-actions.c:1489
+#: ../e-util/e-html-editor-actions.c:1515
 msgid "Row"
 msgstr "Zeile"
 
-#: ../e-util/e-html-editor-actions.c:1496
-#: ../e-util/e-html-editor-actions.c:1581
+#: ../e-util/e-html-editor-actions.c:1522
+#: ../e-util/e-html-editor-actions.c:1607
 msgid "Table"
 msgstr "Tabelle"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1506
+#: ../e-util/e-html-editor-actions.c:1532
 msgid "Table Delete"
 msgstr "Tabelle löschen"
 
-#: ../e-util/e-html-editor-actions.c:1513 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1539 ../e-util/e-text.c:2127
 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:1521
+#: ../e-util/e-html-editor-actions.c:1547
 msgid "Table Insert"
 msgstr "Tabelle einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1528
+#: ../e-util/e-html-editor-actions.c:1554
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../e-util/e-html-editor-actions.c:1546
+#: ../e-util/e-html-editor-actions.c:1572
 msgid "Column After"
 msgstr "Spalte danach"
 
-#: ../e-util/e-html-editor-actions.c:1553
+#: ../e-util/e-html-editor-actions.c:1579
 msgid "Column Before"
 msgstr "Spalte davor"
 
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../e-util/e-html-editor-actions.c:1586
 msgid "Insert _Link"
 msgstr "_Verweis einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1567
+#: ../e-util/e-html-editor-actions.c:1593
 msgid "Row Above"
 msgstr "Zeile darüber"
 
-#: ../e-util/e-html-editor-actions.c:1574
+#: ../e-util/e-html-editor-actions.c:1600
 msgid "Row Below"
 msgstr "Zeile darunter"
 
-#: ../e-util/e-html-editor-actions.c:1588
+#: ../e-util/e-html-editor-actions.c:1614
 msgid "Cell..."
 msgstr "Zelle …"
 
-#: ../e-util/e-html-editor-actions.c:1595
+#: ../e-util/e-html-editor-actions.c:1621
 msgid "Image..."
 msgstr "Bild …"
 
-#: ../e-util/e-html-editor-actions.c:1602
+#: ../e-util/e-html-editor-actions.c:1628
 msgid "Link..."
 msgstr "Verweis …"
 
-#: ../e-util/e-html-editor-actions.c:1609
+#: ../e-util/e-html-editor-actions.c:1635
 msgid "Page..."
 msgstr "Seite …"
 
-#: ../e-util/e-html-editor-actions.c:1616
+#: ../e-util/e-html-editor-actions.c:1642
 msgid "Paragraph..."
 msgstr "Absatz …"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1624
+#: ../e-util/e-html-editor-actions.c:1650
 msgid "Rule..."
 msgstr "Trennlinie …"
 
-#: ../e-util/e-html-editor-actions.c:1631
+#: ../e-util/e-html-editor-actions.c:1657
 msgid "Table..."
 msgstr "Tabelle …"
 
-#: ../e-util/e-html-editor-actions.c:1638
+#: ../e-util/e-html-editor-actions.c:1664
 msgid "Text..."
 msgstr "Text …"
 
-#: ../e-util/e-html-editor-actions.c:1645
+#: ../e-util/e-html-editor-actions.c:1671
 msgid "Remove Link"
 msgstr "Verweis entfernen"
 
-#: ../e-util/e-html-editor-actions.c:1662
+#: ../e-util/e-html-editor-actions.c:1688
 msgid "Add Word to Dictionary"
 msgstr "Wort zu Wörterbuch hinzufügen"
 
-#: ../e-util/e-html-editor-actions.c:1669
+#: ../e-util/e-html-editor-actions.c:1695
 msgid "Ignore Misspelled Word"
 msgstr "Falsch geschriebenes Wort ignorieren"
 
-#: ../e-util/e-html-editor-actions.c:1676
+#: ../e-util/e-html-editor-actions.c:1702
 msgid "Add Word To"
 msgstr "Wort hinzufügen zu"
 
-#: ../e-util/e-html-editor-actions.c:1685
+#: ../e-util/e-html-editor-actions.c:1711
 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:1793
+#: ../e-util/e-html-editor-actions.c:1819
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s-Wörterbuch"
 
-#: ../e-util/e-html-editor-actions.c:1873
+#: ../e-util/e-html-editor-actions.c:1906
 msgid "_Emoticon"
 msgstr "_Emoticon"
 
-#: ../e-util/e-html-editor-actions.c:1874
+#: ../e-util/e-html-editor-actions.c:1907
 msgid "Insert Emoticon"
 msgstr "Emoticon einfügen"
 
-#: ../e-util/e-html-editor-actions.c:1942
+#: ../e-util/e-html-editor-actions.c:1975
 msgid "Re_place"
 msgstr "Erset_zen"
 
-#: ../e-util/e-html-editor-actions.c:1945
+#: ../e-util/e-html-editor-actions.c:1978
 msgid "_Image"
 msgstr "_Bild"
 
-#: ../e-util/e-html-editor-actions.c:1948
+#: ../e-util/e-html-editor-actions.c:1981
 msgid "_Link"
 msgstr "_Verweis"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1952
+#: ../e-util/e-html-editor-actions.c:1985
 msgid "_Rule"
 msgstr "T_rennlinie"
 
-#: ../e-util/e-html-editor-actions.c:1955
-#: ../e-util/e-html-editor-cell-dialog.c:627
+#: ../e-util/e-html-editor-actions.c:1988
+#: ../e-util/e-html-editor-cell-dialog.c:658
 msgid "_Table"
 msgstr "_Tabelle"
 
-#: ../e-util/e-html-editor-cell-dialog.c:587
+#: ../e-util/e-html-editor.c:669
+msgid "Paragraph Style"
+msgstr "Absatzstil"
+
+#: ../e-util/e-html-editor.c:683
+msgid "Editing Mode"
+msgstr "Bearbeitungsmodus"
+
+#: ../e-util/e-html-editor.c:695
+msgid "Font Color"
+msgstr "Schriftfarbe"
+
+#: ../e-util/e-html-editor.c:713
+msgid "Font Size"
+msgstr "Schriftgröße"
+
+#: ../e-util/e-html-editor-cell-dialog.c:618
 msgid "<b>Scope</b>"
 msgstr "<b>Geltungsbereich</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:601
+#: ../e-util/e-html-editor-cell-dialog.c:632
 msgid "C_ell"
 msgstr "_Zelle"
 
-#: ../e-util/e-html-editor-cell-dialog.c:614
+#: ../e-util/e-html-editor-cell-dialog.c:645
 msgid "_Row"
 msgstr "_Zeile"
 
-#: ../e-util/e-html-editor-cell-dialog.c:640
+#: ../e-util/e-html-editor-cell-dialog.c:671
 msgid "Col_umn"
 msgstr "_Spalte"
 
-#: ../e-util/e-html-editor-cell-dialog.c:650
+#: ../e-util/e-html-editor-cell-dialog.c:681
 msgid "<b>Alignment &amp; Behavior</b>"
-msgstr ""
+msgstr "<b>Ausrichtung und Verhalten</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:663
+#: ../e-util/e-html-editor-cell-dialog.c:694
 #: ../e-util/e-html-editor-hrule-dialog.c:384
-#: ../e-util/e-html-editor-table-dialog.c:785
+#: ../e-util/e-html-editor-table-dialog.c:819
 msgid "Left"
 msgstr "Links"
 
-#: ../e-util/e-html-editor-cell-dialog.c:664
+#: ../e-util/e-html-editor-cell-dialog.c:695
 #: ../e-util/e-html-editor-hrule-dialog.c:386
-#: ../e-util/e-html-editor-table-dialog.c:786
+#: ../e-util/e-html-editor-table-dialog.c:820
 msgid "Center"
 msgstr "Mitte"
 
-#: ../e-util/e-html-editor-cell-dialog.c:665
+#: ../e-util/e-html-editor-cell-dialog.c:696
 #: ../e-util/e-html-editor-hrule-dialog.c:388
-#: ../e-util/e-html-editor-table-dialog.c:787
+#: ../e-util/e-html-editor-table-dialog.c:821
 msgid "Right"
 msgstr "Rechts"
 
-#: ../e-util/e-html-editor-cell-dialog.c:673
+#: ../e-util/e-html-editor-cell-dialog.c:704
 msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:681
-#: ../e-util/e-html-editor-image-dialog.c:578
+#: ../e-util/e-html-editor-cell-dialog.c:712
+#: ../e-util/e-html-editor-image-dialog.c:581
 msgid "Top"
 msgstr "Oben"
 
-#: ../e-util/e-html-editor-cell-dialog.c:682
-#: ../e-util/e-html-editor-image-dialog.c:579
+#: ../e-util/e-html-editor-cell-dialog.c:713
+#: ../e-util/e-html-editor-image-dialog.c:582
 msgid "Middle"
 msgstr "Mitte"
 
-#: ../e-util/e-html-editor-cell-dialog.c:683
-#: ../e-util/e-html-editor-image-dialog.c:580
+#: ../e-util/e-html-editor-cell-dialog.c:714
+#: ../e-util/e-html-editor-image-dialog.c:583
 msgid "Bottom"
 msgstr "Unten"
 
 # CHECK - macht überhaupt keinen Sinn
-#: ../e-util/e-html-editor-cell-dialog.c:691
+#: ../e-util/e-html-editor-cell-dialog.c:722
 msgid "_Vertical:"
 msgstr "_Vertikal:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:697
+#: ../e-util/e-html-editor-cell-dialog.c:728
 msgid "_Wrap Text"
 msgstr "_Zeilenumbruch"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:705
+#: ../e-util/e-html-editor-cell-dialog.c:736
 msgid "_Header Style"
 msgstr "_Kopfstil"
 
-#: ../e-util/e-html-editor-cell-dialog.c:719
-#: ../e-util/e-html-editor-image-dialog.c:518
-#: ../e-util/e-html-editor-table-dialog.c:697
+#: ../e-util/e-html-editor-cell-dialog.c:750
+#: ../e-util/e-html-editor-image-dialog.c:521
+#: ../e-util/e-html-editor-table-dialog.c:731
 msgid "<b>Layout</b>"
 msgstr "<b>Aufbau</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:730
+#: ../e-util/e-html-editor-cell-dialog.c:761
 msgid "_Width"
 msgstr "_Breite"
 
-#: ../e-util/e-html-editor-cell-dialog.c:769
+#: ../e-util/e-html-editor-cell-dialog.c:800
 msgid "Row S_pan:"
 msgstr "Verbundene Zei_len:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:783
+#: ../e-util/e-html-editor-cell-dialog.c:814
 msgid "Co_lumn Span:"
-msgstr ""
+msgstr "Spa_ltenbreite:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:790
-#: ../e-util/e-html-editor-table-dialog.c:801
+#: ../e-util/e-html-editor-cell-dialog.c:821
+#: ../e-util/e-html-editor-table-dialog.c:835
 msgid "<b>Background</b>"
 msgstr "<b>Hintergrund</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:810
+#: ../e-util/e-html-editor-cell-dialog.c:834
+#: ../e-util/e-html-editor-table-dialog.c:848
+msgid "Transparent"
+msgstr "Transparent"
+
+#: ../e-util/e-html-editor-cell-dialog.c:842
 msgid "C_olor:"
 msgstr "_Farbe:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:818
-#: ../e-util/e-html-editor-image-dialog.c:480
-#: ../e-util/e-html-editor-table-dialog.c:829
+#: ../e-util/e-html-editor-cell-dialog.c:850
+#: ../e-util/e-html-editor-image-dialog.c:483
+#: ../e-util/e-html-editor-table-dialog.c:864
 msgid "Choose Background Image"
 msgstr "Wählen Sie das Hintergrundbild"
 
-#: ../e-util/e-html-editor-cell-dialog.c:823
-#: ../e-util/e-html-editor-image-dialog.c:486
-#: ../e-util/e-html-editor-table-dialog.c:834
+#: ../e-util/e-html-editor-cell-dialog.c:855
+#: ../e-util/e-html-editor-image-dialog.c:489
+#: ../e-util/e-html-editor-table-dialog.c:869
 msgid "Images"
 msgstr "Bilder"
 
-#: ../e-util/e-html-editor-cell-dialog.c:836
+#: ../e-util/e-html-editor-cell-dialog.c:868
 msgid "_Image:"
 msgstr "_Bild:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:852
+#: ../e-util/e-html-editor-cell-dialog.c:875
+#: ../e-util/e-html-editor-page-dialog.c:516
+#: ../e-util/e-html-editor-table-dialog.c:889
+msgid "_Remove image"
+msgstr "Bild _entfernen"
+
+#: ../e-util/e-html-editor-cell-dialog.c:895
 msgid "Cell Properties"
 msgstr "Zelleneigenschaften"
 
@@ -12540,8 +12618,8 @@ msgstr "<b>Größe</b>"
 
 #. Width
 #: ../e-util/e-html-editor-hrule-dialog.c:339
-#: ../e-util/e-html-editor-image-dialog.c:536
-#: ../e-util/e-html-editor-table-dialog.c:708
+#: ../e-util/e-html-editor-image-dialog.c:539
+#: ../e-util/e-html-editor-table-dialog.c:742
 msgid "_Width:"
 msgstr "_Breite:"
 
@@ -12554,7 +12632,7 @@ msgid "<b>Style</b>"
 msgstr "<b>Stil</b>"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:396
-#: ../e-util/e-html-editor-table-dialog.c:794
+#: ../e-util/e-html-editor-table-dialog.c:828
 msgid "_Alignment:"
 msgstr "_Ausrichtung:"
 
@@ -12567,51 +12645,48 @@ msgstr "_Schattiert"
 msgid "Rule properties"
 msgstr "Trennlinien-Eigenschaften"
 
-#: ../e-util/e-html-editor-image-dialog.c:468
+#: ../e-util/e-html-editor-image-dialog.c:471
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:651
+#: ../e-util/e-html-editor-table-dialog.c:685
 msgid "<b>General</b>"
 msgstr "<b>Allgemein</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:497
+#: ../e-util/e-html-editor-image-dialog.c:500
 msgid "_Source:"
 msgstr "_Quelle:"
 
-#: ../e-util/e-html-editor-image-dialog.c:560
+#: ../e-util/e-html-editor-image-dialog.c:563
 msgid "_Height:"
 msgstr "_Höhe:"
 
-#: ../e-util/e-html-editor-image-dialog.c:601
-#, fuzzy
+#: ../e-util/e-html-editor-image-dialog.c:604
 msgid "_X-Padding:"
 msgstr "_X-Polster:"
 
-#: ../e-util/e-html-editor-image-dialog.c:617
-#, fuzzy
+#: ../e-util/e-html-editor-image-dialog.c:620
 msgid "_Y-Padding:"
 msgstr "_Y-Polster:"
 
-#: ../e-util/e-html-editor-image-dialog.c:633
-#: ../e-util/e-html-editor-table-dialog.c:775
+#: ../e-util/e-html-editor-image-dialog.c:636
+#: ../e-util/e-html-editor-table-dialog.c:809
 msgid "_Border:"
 msgstr "_Rand:"
 
-#: ../e-util/e-html-editor-image-dialog.c:643
+#: ../e-util/e-html-editor-image-dialog.c:646
 msgid "<b>Link</b>"
 msgstr "<b>Verweis</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:661
+#: ../e-util/e-html-editor-image-dialog.c:664
 #: ../e-util/e-html-editor-link-dialog.c:334
-#| msgid "URL:"
 msgid "_URL:"
 msgstr "_Adresse:"
 
-#: ../e-util/e-html-editor-image-dialog.c:666
+#: ../e-util/e-html-editor-image-dialog.c:669
 #: ../e-util/e-html-editor-link-dialog.c:339
 msgid "_Test URL..."
 msgstr "Adresse über_prüfen …"
 
-#: ../e-util/e-html-editor-image-dialog.c:683
+#: ../e-util/e-html-editor-image-dialog.c:686
 msgid "Image Properties"
 msgstr "Bildeigenschaften"
 
@@ -12620,74 +12695,71 @@ msgid "_Remove Link"
 msgstr "Verknüpfung en_tfernen"
 
 #: ../e-util/e-html-editor-link-dialog.c:388
-#| msgid "_Properties"
 msgid "Link Properties"
 msgstr "Verweis-Eigenschaften"
 
-#: ../e-util/e-html-editor-page-dialog.c:66
+#: ../e-util/e-html-editor-page-dialog.c:69
 msgid "Perforated Paper"
 msgstr "Perforiertes Papier"
 
-#: ../e-util/e-html-editor-page-dialog.c:75
+#: ../e-util/e-html-editor-page-dialog.c:78
 msgid "Blue Ink"
 msgstr "Blaue Tinte"
 
-#: ../e-util/e-html-editor-page-dialog.c:84
+#: ../e-util/e-html-editor-page-dialog.c:87
 msgid "Paper"
 msgstr "Papier"
 
-#: ../e-util/e-html-editor-page-dialog.c:93
+#: ../e-util/e-html-editor-page-dialog.c:96
 msgid "Ribbon"
 msgstr "Band"
 
-#: ../e-util/e-html-editor-page-dialog.c:102
+#: ../e-util/e-html-editor-page-dialog.c:105
 msgid "Midnight"
 msgstr "Mitternacht"
 
-#: ../e-util/e-html-editor-page-dialog.c:120 ../mail/filtertypes.xml.in.h:35
-#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+#: ../e-util/e-html-editor-page-dialog.c:123 ../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:129
+#: ../e-util/e-html-editor-page-dialog.c:132
 msgid "Graph Paper"
 msgstr "Millimeterpapier"
 
-#: ../e-util/e-html-editor-page-dialog.c:384
+#: ../e-util/e-html-editor-page-dialog.c:415
 msgid "<b>Colors</b>"
 msgstr "<b>Farben</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:403
+#: ../e-util/e-html-editor-page-dialog.c:434
 msgid "_Text:"
 msgstr "_Text:"
 
-#: ../e-util/e-html-editor-page-dialog.c:418
+#: ../e-util/e-html-editor-page-dialog.c:449
 msgid "_Link:"
 msgstr "_Verweis:"
 
-#: ../e-util/e-html-editor-page-dialog.c:433
+#: ../e-util/e-html-editor-page-dialog.c:464
 msgid "_Background:"
 msgstr "_Hintergrund:"
 
-#: ../e-util/e-html-editor-page-dialog.c:441
+#: ../e-util/e-html-editor-page-dialog.c:472
 msgid "<b>Background Image</b>"
 msgstr "<b>Hintergrundbild</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:463
+#: ../e-util/e-html-editor-page-dialog.c:494
 msgid "_Template:"
 msgstr "_Vorlage:"
 
-#: ../e-util/e-html-editor-page-dialog.c:471
-#, fuzzy
-#| msgid "Select a file"
+#: ../e-util/e-html-editor-page-dialog.c:502
 msgid "Selection a file"
-msgstr "Einstellungen des Dateiwählers"
+msgstr "Eine Datei auswählen"
 
-#: ../e-util/e-html-editor-page-dialog.c:478
+#: ../e-util/e-html-editor-page-dialog.c:509
 msgid "_Custom:"
 msgstr "_Angepasst:"
 
-#: ../e-util/e-html-editor-page-dialog.c:494
+#: ../e-util/e-html-editor-page-dialog.c:536
 msgid "Page Properties"
 msgstr "Seiteneigenschaften"
 
@@ -12696,7 +12768,6 @@ msgid "_Style:"
 msgstr "_Stil:"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:90
-#| msgid "A_lignment"
 msgid "<b>Alignment</b>"
 msgstr "<b>Ausrichtung</b>"
 
@@ -12706,7 +12777,6 @@ msgstr "Absatzeigenschaften"
 
 #: ../e-util/e-html-editor-replace-dialog.c:148
 #, c-format
-#| msgid "occurrences"
 msgid "%d occurences replaced"
 msgstr "%d Vorkommnisse wurden ersetzt"
 
@@ -12723,7 +12793,6 @@ msgid "_Case sensitive"
 msgstr "Groß-/Kleinschreibung _berücksichtigen"
 
 #: ../e-util/e-html-editor-replace-dialog.c:237
-#| msgid "_Search"
 msgid "Wra_p search"
 msgstr "Suche umbrechen"
 
@@ -12790,32 +12859,32 @@ msgstr "Wort hin_zufügen"
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../e-util/e-html-editor-table-dialog.c:673
+#: ../e-util/e-html-editor-table-dialog.c:707
 msgid "_Rows:"
 msgstr "_Zeilen:"
 
-#: ../e-util/e-html-editor-table-dialog.c:690
+#: ../e-util/e-html-editor-table-dialog.c:724
 msgid "C_olumns:"
 msgstr "_Spalten:"
 
-#: ../e-util/e-html-editor-table-dialog.c:741
+#: ../e-util/e-html-editor-table-dialog.c:775
 msgid "_Spacing:"
 msgstr "A_bstand:"
 
-#: ../e-util/e-html-editor-table-dialog.c:758
+#: ../e-util/e-html-editor-table-dialog.c:792
 msgid "_Padding:"
 msgstr "_Füllung:"
 
-#: ../e-util/e-html-editor-table-dialog.c:821
+#: ../e-util/e-html-editor-table-dialog.c:856
 #: ../e-util/e-html-editor-text-dialog.c:261
 msgid "_Color:"
 msgstr "_Farbe:"
 
-#: ../e-util/e-html-editor-table-dialog.c:847
+#: ../e-util/e-html-editor-table-dialog.c:882
 msgid "Image:"
 msgstr "Bild:"
 
-#: ../e-util/e-html-editor-table-dialog.c:863
+#: ../e-util/e-html-editor-table-dialog.c:909
 msgid "Table Properties"
 msgstr "Tabelleneigenschaften"
 
@@ -12827,47 +12896,29 @@ msgstr "_Größe:"
 msgid "Text Properties"
 msgstr "Texteigenschaften"
 
-#: ../e-util/e-html-editor-view.c:2949
+#: ../e-util/e-html-editor-view.c:3149
 msgid "Changed property"
 msgstr "Geänderte Eigenschaft"
 
-#: ../e-util/e-html-editor-view.c:2950
+#: ../e-util/e-html-editor-view.c:3150
 msgid "Whether editor changed"
 msgstr "Ob eine Änderung des Editors vorliegt"
 
-#: ../e-util/e-html-editor-view.c:6542
+#: ../e-util/e-html-editor-view.c:6898
 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:6546
-#, fuzzy
-#| msgid "Address formatting"
+#: ../e-util/e-html-editor-view.c:6902
 msgid "_Don't lose formatting"
-msgstr "Adressformatierung"
+msgstr "Formatierung _nicht entfernen"
 
-#: ../e-util/e-html-editor-view.c:6547
-#, fuzzy
-#| msgid "Address formatting"
+#: ../e-util/e-html-editor-view.c:6903
 msgid "_Lose formatting"
-msgstr "Textformatierung"
-
-#: ../e-util/e-html-editor.c:669
-msgid "Paragraph Style"
-msgstr "Absatzstil"
-
-#: ../e-util/e-html-editor.c:683
-msgid "Editing Mode"
-msgstr "Bearbeitungsmodus"
-
-#: ../e-util/e-html-editor.c:695
-msgid "Font Color"
-msgstr "Schriftfarbe"
-
-#: ../e-util/e-html-editor.c:713
-msgid "Font Size"
-msgstr "Schriftgröße"
+msgstr "Formatierung _entfernen"
 
 #: ../e-util/e-import-assistant.c:256
 msgid ""
@@ -12989,27 +13040,27 @@ msgstr "Schließen"
 msgid "_Save and Close"
 msgstr "_Speichern und schließen"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:531
 msgid "Edit Signature"
 msgstr "Signatur bearbeiten"
 
-#: ../e-util/e-mail-signature-editor.c:562
+#: ../e-util/e-mail-signature-editor.c:564
 msgid "_Signature Name:"
 msgstr "_Signaturname:"
 
-#: ../e-util/e-mail-signature-editor.c:598
+#: ../e-util/e-mail-signature-editor.c:600
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: ../e-util/e-mail-signature-manager.c:336
+#: ../e-util/e-mail-signature-manager.c:337
 msgid "Add _Script"
 msgstr "_Skript hinzufügen"
 
-#: ../e-util/e-mail-signature-manager.c:425
+#: ../e-util/e-mail-signature-manager.c:426
 msgid "Add Signature Script"
 msgstr "Signaturskript hinzufügen"
 
-#: ../e-util/e-mail-signature-manager.c:496
+#: ../e-util/e-mail-signature-manager.c:497
 msgid "Edit Signature Script"
 msgstr "Signatur bearbeiten"
 
@@ -13023,6 +13074,13 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zur Anzeige verwendet."
 
+#: ../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
+msgid "_Name:"
+msgstr "_Name:"
+
 #: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "_Skript:"
@@ -13044,14 +13102,34 @@ msgstr ""
 "Tastaturbenutzer sollten die Zeitzone stattdessen mit der Auswahlliste im "
 "unteren Bereich festlegen."
 
-#: ../e-util/e-misc-utils.c:246
+#: ../e-util/e-misc-utils.c:248
 msgid "Could not open the link."
 msgstr "Verknüpfung konnte nicht geöffnet werden."
 
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:295
 msgid "Could not display help for Evolution."
 msgstr "Hilfe für Evolution konnte nicht angezeigt werden."
 
+#: ../e-util/e-misc-utils.c:2390
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Kalender »%s« wird geöffnet"
+
+#: ../e-util/e-misc-utils.c:2393
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "Notizliste »%s« wird geöffnet"
+
+#: ../e-util/e-misc-utils.c:2396
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "Aufgabenliste »%s« wird geöffnet"
+
+#: ../e-util/e-misc-utils.c:2399
+#, c-format
+msgid "Opening address book '%s'"
+msgstr "Adressbuch »%s« wird geöffnet"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Kontakte anzeigen"
@@ -13071,9 +13149,9 @@ msgstr "_Suchen:"
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
 #: ../modules/addressbook/e-book-shell-view-actions.c:1215
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:881
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
@@ -13092,7 +13170,7 @@ msgstr "Adressbuch"
 
 #: ../e-util/e-name-selector-dialog.c:451
 #: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -13101,25 +13179,25 @@ 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:3065
+#: ../e-util/e-name-selector-entry.c:3183
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s aus_klappen"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3081
+#: ../e-util/e-name-selector-entry.c:3199
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s _kopieren"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3092
+#: ../e-util/e-name-selector-entry.c:3210
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ausschnei_den"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3110
+#: ../e-util/e-name-selector-entry.c:3228
 #, c-format
 msgid "_Edit %s"
 msgstr "%s _bearbeiten"
@@ -13147,29 +13225,29 @@ msgstr ""
 "Evolution ist im Augenblick im Offline-Modus, weil das Netzwerk nicht "
 "verfügbar ist."
 
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 "Schlüssel des Schlüsselbundes kann nicht genutzt werden: Kein Benutzer- oder "
 "Servername"
 
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
 msgstr "Die Feststelltaste ist aktiviert."
 
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
 msgid "_Remember this passphrase"
 msgstr "Diese Passphrase _merken"
 
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an diese Passphrase _erinnern"
 
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
 msgid "_Remember this password"
 msgstr "Dieses Passwort _merken"
 
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort _erinnern"
 
@@ -13192,63 +13270,63 @@ msgstr ""
 "Das Drucksystem hat keine weiteren Details über den aufgetretenen Fehler "
 "berichtet."
 
-#: ../e-util/e-proxy-editor.c:314
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "_Methode:"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "Auf Einstellungen der Arbeitsumgebung verschieben"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "Einstellungen der Arbeitsumgebung ö_ffnen"
 
-#: ../e-util/e-proxy-editor.c:366
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../e-util/e-proxy-editor.c:385
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "_HTTP Proxy:"
 
-#: ../e-util/e-proxy-editor.c:416
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS Proxy:"
 
-#: ../e-util/e-proxy-editor.c:447
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "_Socks Proxy:"
 
-#: ../e-util/e-proxy-editor.c:478
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "Rechner _ignorieren:"
 
-#: ../e-util/e-proxy-editor.c:504
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../e-util/e-proxy-editor.c:523
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "_Konfigurationsadresse:"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "Eine direkte Verbindung verwenden. Kein Proxy erforderlich."
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "Auf einfache Proxy-Einstellungen umschalten"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "Auf erweiterte Proxy-Einstellungen umschalten"
 
-#: ../e-util/e-proxy-preferences.c:462
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "Angepasste Proxy-Einstellungen für diese Konten verwenden:"
 
-#: ../e-util/e-proxy-preferences.c:497
+#: ../e-util/e-proxy-preferences.c:561
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
@@ -13323,7 +13401,8 @@ msgstr "Seitenanfang erreicht, ab Ende wird fortgesetzt"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1097
+#: ../modules/mail/e-mail-shell-view.c:1163
+#: ../smime/gui/certificate-manager.c:1669
 msgid "Mail"
 msgstr "E-Mail"
 
@@ -13331,6 +13410,141 @@ msgstr "E-Mail"
 msgid "When de_leted:"
 msgstr "Wenn ge_löscht:"
 
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Standard"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Proprietär"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Geheim"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Streng geheim"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Streng geheim"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Keine"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Empfangsbestätigung"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "Rüc_kmeldung gewünscht"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "B_innen"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "Tage"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "_Wenn passend"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "Nachrichtenzustellung ver_zögern"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "D_anach"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "Tage"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "_Verfallsdatum angeben"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Bis"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Zustellungsoptionen"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Priorität:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "E_instufung:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Allge_meine Optionen"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "Ein gesendetes _Element erstellen, um Informationen zu verfolgen"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "Zuge_stellt"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "_Zugestellt und geöffnet"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Alle Informationen"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "Gesendetes Element a_utomatisch löschen"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Statusverfolgung"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Wenn geöffnet:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Wenn abge_lehnt:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Wenn a_bgeschlossen:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "Wenn a_ngenommen:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Rücksendemitteilung"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Sta_tusverfolgung"
+
 #: ../e-util/e-source-config.c:684 ../e-util/e-source-config.c:688
 msgid "Type:"
 msgstr "Art:"
@@ -13381,26 +13595,26 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:384
+#: ../e-util/e-spell-entry.c:379
 msgid "(no suggestions)"
 msgstr "(Keine Vorschläge)"
 
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:403
 msgid "More..."
 msgstr "Mehr …"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:493
+#: ../e-util/e-spell-entry.c:488
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "»%s« zum Wörterbuch hinzufügen"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:542
+#: ../e-util/e-spell-entry.c:537
 msgid "Ignore All"
 msgstr "Alle ignorieren"
 
-#: ../e-util/e-spell-entry.c:574
+#: ../e-util/e-spell-entry.c:569
 msgid "Spelling Suggestions"
 msgstr "Rechtschreibvorschläge"
 
@@ -13558,9 +13772,71 @@ msgstr ""
 "Wählen Sie die Reihenfolge der Informationen, die in der Nachrichtenliste "
 "erscheinen sollen."
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "Spalte hinzufügen"
+#: ../e-util/e-table-config.ui.h:2
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:281
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:191
+msgid "_Apply"
+msgstr "An_wenden"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "_Sortieren …"
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "_Gruppieren nach …"
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "An_gezeigte Felder …"
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "Alles _entfernen"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "Fel_d in Ansicht anzeigen"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "Aufsteigend"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "Absteigend"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "Objekte gruppieren nach"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "_Feld in Ansicht anzeigen"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "Dann nach"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "Feld in A_nsicht anzeigen"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "Feld in Ansicht an_zeigen"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Sortieren"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Alles entfernen"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "Objekte sortieren nach"
 
 #: ../e-util/e-table-field-chooser.c:166
 msgid ""
@@ -13570,6 +13846,10 @@ msgstr ""
 "Um eine Spalte zur Tabelle hinzuzufügen, ziehen Sie\n"
 "sie an die Stelle, an der die Spalte erscheinen soll."
 
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Spalte hinzufügen"
+
 #: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
@@ -13652,6 +13932,32 @@ msgstr "Alle auswählen"
 msgid "UTC"
 msgstr "UTC"
 
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Eine Zeitzone wählen"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Benutzen Sie die linke Maustaste, um einen Kartenausschnitt zu vergrößern "
+"und wählen Sie eine Zeitzone.\n"
+"Mit der rechten Maustaste können Sie die Ansicht verkleinern."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Zeitzonen"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "Au_swahl"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "Auswahlliste für die Zeitzone"
+
 #: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Klicken Sie hier, um die Adresse zu öffnen"
@@ -13660,6 +13966,24 @@ msgstr "Klicken Sie hier, um die Adresse zu öffnen"
 msgid "Enter a URL here"
 msgstr "Geben Sie hier eine Adresse ein"
 
+#: ../e-util/evolution-source-viewer.c:637
+msgid "Evolution Source Viewer"
+msgstr "Evolution Quellansicht"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "Angezeigter Name"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "Markierungen"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:722
+msgid "Identity"
+msgstr "Identität"
+
 #: ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "Verweis-Ziel _kopieren"
@@ -13710,13 +14034,11 @@ msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
 #: ../e-util/e-web-view.c:1014
-#, fuzzy, c-format
-#| msgid "Enter the recipients of the message"
+#, c-format
 msgid "Go to the section %s of the message"
-msgstr "Geben Sie die Empfänger der Nachricht ein"
+msgstr "Zu Abschnitt »%s« in der Nachricht springen"
 
 #: ../e-util/e-web-view.c:1016
-#| msgid "Enter the recipients of the message"
 msgid "Go to the beginning of the message"
 msgstr "Zum Anfang der aktuellen Zeile springen"
 
@@ -13754,37 +14076,6 @@ msgstr "»Text löschen« rückgängig machen"
 msgid "Redo 'Delete text'"
 msgstr "»Text löschen« wiederholen"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
-msgid "%d %B %Y"
-msgstr " %d. %B %Y"
-
-#: ../e-util/ea-calendar-item.c:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalender: von %s bis %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "Evolution Kalenderelement"
-
-#: ../e-util/evolution-source-viewer.c:636
-msgid "Evolution Source Viewer"
-msgstr "Evolution Quellansicht"
-
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
-msgid "Display Name"
-msgstr "Angezeigter Name"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "Markierungen"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:676
-msgid "Identity"
-msgstr "Identität"
-
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Datum fehlt."
@@ -13845,6 +14136,85 @@ msgstr "Wert fehlt."
 msgid "One or more values cannot be empty."
 msgstr "Einer oder mehrere Werte dürfen nicht leer sein."
 
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "Die aktuelle Zeit"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "die von Ihnen angegebene Zeit"
+
+#: ../e-util/filter.ui.h:4
+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:85
+msgid "seconds"
+msgstr "Sekunden"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "Wochen"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "Monaten"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "Jahren"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "vor"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "in der Zukunft"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Anzeigen der Filter für E-Mail:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "_Filterregeln"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "Vergleichen mit"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Das Datum der Nachricht wird mit dem Datum\n"
+"verglichen, an dem der Filter angewandt wird."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Das Datum der Nachricht wird mit 12:00 am\n"
+"des angegebenen Datums verglichen"
+
+# CHECK - time <=> date?!?!
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Die Datum der Nachricht wird mit einer Zeit\n"
+"relativ zu der verglichen, an der der Filter\n"
+"angewandt wird."
+
+#: ../e-util/gal-a11y-e-cell.c:122
+msgid "Table Cell"
+msgstr "Zelle"
+
 #. Translators: description of a "popup" action
 #: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
@@ -13865,10 +14235,6 @@ msgstr "Die Zeile des ETrees ausklappen, die diese Zelle enthält"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "Die Zeile des ETrees einrollen, die diese Zelle enthält"
 
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "Zelle"
-
 #: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "Klicken"
@@ -13881,6 +14247,14 @@ msgstr "Sortieren"
 msgid "Save Current View"
 msgstr "Aktuelle Ansicht speichern"
 
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "Neue Ansicht er_stellen"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "Vorhandene Ansicht erset_zen"
+
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "Sollen die vorgenommenen Änderungen gespeichert werden?"
@@ -13917,6 +14291,27 @@ msgstr "Die Signatur konnte nicht geladen werden."
 msgid "Could not save signature."
 msgstr "Die Signatur konnte nicht gespeichert werden."
 
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution ist eine Anwendung zur Verwaltung persönlicher Informationen, die "
+"ein E-Mail-Programm, einen Kalender und ein Adressbuch enthält."
+
+#: ../evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Evolution unterstützt eine Vielzahl von industriellen Standard-Formaten und "
+"Netzwerk-Protokollen zum Informationsaustausch, mit einem Schwerpunkt auf "
+"Standard-Konformität und Sicherheit. Evolution arbeitet außerdem problemlos "
+"mit Microsoft Exchange mittels der Erweiterung »Exchange Web Services« (EWS) "
+"zusammen."
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -13983,87 +14378,56 @@ msgstr[1] "%d Nachrichten werden gespeichert"
 msgid "Invalid folder URI '%s'"
 msgstr "Ungültiger Ordneradresse »%s«"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "Keine Email-Dienste verfügbar."
-
-#: ../libemail-engine/e-mail-session-utils.c:659
-#: ../libemail-engine/mail-ops.c:730
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:708
-#: ../libemail-engine/mail-ops.c:773
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-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:734
-#: ../libemail-engine/mail-ops.c:797
-#, 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:935
-#: ../libemail-engine/mail-ops.c:942 ../libemail-engine/mail-ops.c:1044
-msgid "Sending message"
-msgstr "Nachricht wird verschickt"
-
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:410
 #: ../mail/em-folder-tree-model.c:1174
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Inbox"
 msgstr "Eingang"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1167
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1167
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Drafts"
 msgstr "Entwürfe"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1178
-#: ../modules/mail/e-mail-shell-view-private.c:1068
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1178
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Outbox"
 msgstr "Ausgang"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1182
-#: ../modules/mail/e-mail-shell-view-private.c:1070
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1182
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "Verschickt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1170
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1170
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
 #: ../plugins/templates/templates.c:1442
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1261
 #, c-format
 msgid "User cancelled operation"
 msgstr "Vorgang wurde vom Benutzer abgebrochen"
 
-#: ../libemail-engine/e-mail-session.c:1373
+#: ../libemail-engine/e-mail-session.c:1389
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s-Legitimation ist fehlgeschlagen"
 
-#: ../libemail-engine/e-mail-session.c:1423
+#: ../libemail-engine/e-mail-session.c:1439
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "Keine Datenquelle gefunden für UID »%s«"
 
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1502
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -14072,13 +14436,63 @@ msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse "
 "angegeben wurde."
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1515
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine nutzbare "
 "Identität gefunden wurde."
 
+#: ../libemail-engine/e-mail-session.c:2509
+#, c-format
+#| msgid "Storing folder '%s'"
+msgid "Waiting for '%s'"
+msgstr "Warten auf »%s«"
+
+#: ../libemail-engine/e-mail-session-utils.c:539
+msgid "No mail transport service available"
+msgstr "Keine Email-Dienste verfügbar."
+
+#: ../libemail-engine/e-mail-session-utils.c:635
+#: ../libemail-engine/mail-ops.c:723
+#, c-format
+msgid "Posting message to '%s'"
+msgstr "Nachricht an »%s« verschicken"
+
+#: ../libemail-engine/e-mail-session-utils.c:672
+#: ../libemail-engine/mail-ops.c:759
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:702
+#: ../libemail-engine/e-mail-session-utils.c:737
+#: ../libemail-engine/mail-ops.c:783 ../libemail-engine/mail-ops.c:818
+#, c-format
+msgid "Storing sent message to '%s'"
+msgstr "Verschickte Nachricht unter »%s« ablegen"
+
+#: ../libemail-engine/e-mail-session-utils.c:726
+#: ../libemail-engine/mail-ops.c:807
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+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:756
+#: ../libemail-engine/mail-ops.c:835
+#, 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:958
+#: ../libemail-engine/mail-ops.c:983 ../libemail-engine/mail-ops.c:1085
+msgid "Sending message"
+msgstr "Nachricht wird verschickt"
+
 #: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -14116,7 +14530,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "E-Mail wird von »%s« abgerufen"
 
-#: ../libemail-engine/mail-ops.c:724
+#: ../libemail-engine/mail-ops.c:753
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -14129,56 +14543,61 @@ msgstr ""
 "Bitte prüfen Sie Ihre Filter unter Bearbeiten->Nachrichtenfilter.\n"
 "Ursprüngliche Fehlermeldung ist: %s"
 
-#: ../libemail-engine/mail-ops.c:953
+#: ../libemail-engine/mail-ops.c:994
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../libemail-engine/mail-ops.c:1005
+#: ../libemail-engine/mail-ops.c:1046
 #, 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:1011
+#: ../libemail-engine/mail-ops.c:1052
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../libemail-engine/mail-ops.c:1013
+#: ../libemail-engine/mail-ops.c:1054
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../libemail-engine/mail-ops.c:1125
+#: ../libemail-engine/mail-ops.c:1168
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Nachrichten werden nach »%s« verschoben"
 
-#: ../libemail-engine/mail-ops.c:1126
+#: ../libemail-engine/mail-ops.c:1169
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Nachrichten werden nach »%s« kopiert"
 
-#: ../libemail-engine/mail-ops.c:1245
+#: ../libemail-engine/mail-ops.c:1288
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../libemail-engine/mail-ops.c:1373
+#: ../libemail-engine/mail-ops.c:1416
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../libemail-engine/mail-ops.c:1374
+#: ../libemail-engine/mail-ops.c:1417
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../libemail-engine/mail-ops.c:1449
+#: ../libemail-engine/mail-ops.c:1492
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Papierkorb in »%s« wird geleert"
 
+#: ../libemail-engine/mail-ops.c:1584
+#, c-format
+msgid "Processing folder changes in '%s'"
+msgstr "Veränderungen an Ordner »%s« werden verarbeitet"
+
 #: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -14188,7 +14607,7 @@ msgstr "Spool-Ordner »%s« konnte nicht angelegt werden: %s"
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr ""
-"Es wurde versucht, movemail auf eine nicht-mbox-Quelle »%s« auszuführen"
+"Es wurde versucht, movemail auf einer nicht-mbox-Quelle »%s« auszuführen"
 
 #: ../libemail-engine/mail-tools.c:236
 #, c-format
@@ -14254,7 +14673,7 @@ msgid "De_fault"
 msgstr "_Vorgabe"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1173
+#: ../modules/mail/em-composer-prefs.c:1228
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
@@ -14264,11 +14683,11 @@ msgstr "Aktiv"
 msgid "Account Name"
 msgstr "Kontoname"
 
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "Keine E-Mail-Adresse angegeben"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "Domain in E-Mail-Adresse fehlt"
 
@@ -14276,8 +14695,8 @@ msgstr "Domain in E-Mail-Adresse fehlt"
 msgid "Unknown background operation"
 msgstr "Unbekannter Vorgang im Hintergrund"
 
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
-#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
+#: ../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
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
@@ -14291,15 +14710,15 @@ msgid "Go _Back"
 msgstr "_Zurück gehen"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "Nachschlagen _überspringen"
 
-#: ../mail/e-mail-config-assistant.c:653
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
-#: ../mail/e-mail-config-assistant.c:935
+#: ../mail/e-mail-config-assistant.c:952
 msgid "_Revise Details"
 msgstr "Details ü_berarbeiten"
 
@@ -14328,93 +14747,103 @@ msgstr ""
 msgid "Done"
 msgstr "Fertig"
 
-#: ../mail/e-mail-config-defaults-page.c:548
+#: ../mail/e-mail-config-defaults-page.c:549
 msgid "Special Folders"
 msgstr "Spezielle Ordner"
 
-#: ../mail/e-mail-config-defaults-page.c:557
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Draft Messages _Folder:"
 msgstr "_Ordner für Nachrichtenentwürfe:"
 
-#: ../mail/e-mail-config-defaults-page.c:567
+#: ../mail/e-mail-config-defaults-page.c:568
 msgid "Choose a folder for saving draft messages."
 msgstr ""
 "Wählen Sie einen Ordner, in dem Nachrichtenentwürfe abgelegt werden sollen."
 
-#: ../mail/e-mail-config-defaults-page.c:581
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Sent _Messages Folder:"
 msgstr "Ordner für _verschickte Nachrichten:"
 
-#: ../mail/e-mail-config-defaults-page.c:591
+#: ../mail/e-mail-config-defaults-page.c:592
 msgid "Choose a folder for saving sent messages."
 msgstr ""
 "Wählen Sie einen Ordner, in dem verschickte Nachrichten abgelegt werden "
 "sollen."
 
-#: ../mail/e-mail-config-defaults-page.c:610
+#: ../mail/e-mail-config-defaults-page.c:611
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "Antworten im Ordner der beantworteten Nachricht _speichern"
 
-#: ../mail/e-mail-config-defaults-page.c:627
+#: ../mail/e-mail-config-defaults-page.c:628
+msgid "Archi_ve Folder:"
+msgstr "Archi_vierungsordner:"
+
+#: ../mail/e-mail-config-defaults-page.c:638
+#: ../modules/mail/em-mailer-prefs.c:1079
+msgid "Choose a folder to archive messages to."
+msgstr ""
+"Wählen Sie einen Ordner, in denen Nachrichten archiviert werden sollen."
+
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
 msgstr "Voreinstellung _wiederherstellen"
 
-#: ../mail/e-mail-config-defaults-page.c:641
+#: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
 msgstr "Realen Ordner für den _Papierkorb verwenden:"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:667
 msgid "Choose a folder for deleted messages."
 msgstr ""
 "Wählen Sie einen Ordner, in dem gelöschte Nachrichten abgelegt werden sollen."
 
-#: ../mail/e-mail-config-defaults-page.c:651
+#: ../mail/e-mail-config-defaults-page.c:676
 msgid "Use a Real Folder for _Junk:"
 msgstr "Realen Ordner für _unerwünschte Nachrichten verwenden:"
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:677
 msgid "Choose a folder for junk messages."
 msgstr ""
 "Wählen Sie einen Ordner, in dem unerwünschte Nachrichten abgelegt werden "
 "sollen."
 
-#: ../mail/e-mail-config-defaults-page.c:669
+#: ../mail/e-mail-config-defaults-page.c:694
 msgid "Composing Messages"
 msgstr "Verfassen von Nachrichten"
 
-#: ../mail/e-mail-config-defaults-page.c:678
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Immer _Kopie schicken an:"
 
-#: ../mail/e-mail-config-defaults-page.c:703
+#: ../mail/e-mail-config-defaults-page.c:728
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Immer _Blindkopie schicken an:"
 
-#: ../mail/e-mail-config-defaults-page.c:738
+#: ../mail/e-mail-config-defaults-page.c:763
 msgid "Message Receipts"
 msgstr "Lesebestätigungen"
 
-#: ../mail/e-mail-config-defaults-page.c:747
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "S_end message receipts:"
 msgstr "Lese_bestätigungen verschicken:"
 
-#: ../mail/e-mail-config-defaults-page.c:772
+#: ../mail/e-mail-config-defaults-page.c:797
 msgid "Never"
 msgstr "Nie"
 
-#: ../mail/e-mail-config-defaults-page.c:778
+#: ../mail/e-mail-config-defaults-page.c:803
 msgid "Always"
 msgstr "Immer"
 
-#: ../mail/e-mail-config-defaults-page.c:784
+#: ../mail/e-mail-config-defaults-page.c:809
 msgid "Ask for each message"
 msgstr "Bei jeder Nachricht nachfragen"
 
-#: ../mail/e-mail-config-defaults-page.c:855
+#: ../mail/e-mail-config-defaults-page.c:880
 msgid "Defaults"
 msgstr "Vorgaben"
 
-#: ../mail/e-mail-config-identity-page.c:264
+#: ../mail/e-mail-config-identity-page.c:282
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14425,12 +14854,12 @@ msgstr ""
 "ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschließen."
 
-#: ../mail/e-mail-config-identity-page.c:292
+#: ../mail/e-mail-config-identity-page.c:310
 #: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "Konteninformation"
 
-#: ../mail/e-mail-config-identity-page.c:301
+#: ../mail/e-mail-config-identity-page.c:319
 #: ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14439,38 +14868,44 @@ 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:346
+#: ../mail/e-mail-config-identity-page.c:364
 msgid "Required Information"
 msgstr "Benötigte Informationen"
 
-#: ../mail/e-mail-config-identity-page.c:355
+#: ../mail/e-mail-config-identity-page.c:373
 msgid "Full Nam_e:"
 msgstr "_Voller Name:"
 
-#: ../mail/e-mail-config-identity-page.c:382
+#: ../mail/e-mail-config-identity-page.c:400
 msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: ../mail/e-mail-config-identity-page.c:429
+#: ../mail/e-mail-config-identity-page.c:447
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Zusätzliche Informationen"
 
-#: ../mail/e-mail-config-identity-page.c:438
+#: ../mail/e-mail-config-identity-page.c:456
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../mail/e-mail-config-identity-page.c:465
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../mail/e-mail-config-identity-page.c:520
+#: ../mail/e-mail-config-identity-page.c:538
 msgid "Add Ne_w Signature..."
 msgstr "N_eue Signatur …"
 
+#: ../mail/e-mail-config-identity-page.c:556
+msgid "Try _setup account automatically, based on Email Address"
+msgstr ""
+"Versuchen das Konto automatisch _einzurichten, ausgehend von der E-Mail-"
+"Adresse"
+
 #: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
-msgstr "Nach Kontendetails wird gesucht …"
+msgstr "Es wird nach Kontendetails gesucht …"
 
 #: ../mail/e-mail-config-provider-page.c:484
 msgid "Checking for New Mail"
@@ -14499,7 +14934,7 @@ msgstr "%s - %s"
 #: ../mail/e-mail-config-security-page.c:340
 #: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:28
 #: ../modules/addressbook/autocompletion-config.c:114
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
@@ -14569,7 +15004,7 @@ 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:1007
+#: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "_Leeren"
 
@@ -14663,9 +15098,9 @@ msgstr "Konto-Zusammenfassung"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
-"Willkommen zum Evolution-E-Mail-Konfigurationsassistenten!\n"
+"Willkommen zum Konfigurationsassistenten von Evolution E-Mail.\n"
 "\n"
 "Klicken Sie auf »Vor«, um die Konfiguration zu beginnen."
 
@@ -14718,6 +15153,56 @@ msgstr "_Anlegen"
 msgid "Folder _name:"
 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
+#| msgid "Answered"
+msgctxt "ffe"
+msgid "Answered"
+msgstr "Beantwortet"
+
+#: ../mail/e-mail-free-form-exp.c:227
+#| msgid "Deleted"
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "Gelöscht"
+
+#: ../mail/e-mail-free-form-exp.c:228
+#| msgid "Draft"
+msgctxt "ffe"
+msgid "Draft"
+msgstr "Entwurf"
+
+#: ../mail/e-mail-free-form-exp.c:229
+#| msgid "Flagged"
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "Markiert"
+
+#: ../mail/e-mail-free-form-exp.c:230
+#| msgid "Seen"
+msgctxt "ffe"
+msgid "Seen"
+msgstr "Gelesen"
+
+#: ../mail/e-mail-free-form-exp.c:231
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "Anlage"
+
+#: ../mail/e-mail-free-form-exp.c:479
+#| msgid "now"
+msgctxt "ffe"
+msgid "no"
+msgstr "nein"
+
+#: ../mail/e-mail-free-form-exp.c:480
+msgctxt "ffe"
+msgid "false"
+msgstr "falsch"
+
 #: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "Software-Filter für unerwünschte Nachrichten:"
@@ -14726,32 +15211,32 @@ msgstr "Software-Filter für unerwünschte Nachrichten:"
 msgid "_Label name:"
 msgstr "_Beschriftungsname:"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "_Wichtig"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "_Geschäftlich"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Persönlich"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "Zu er_ledigen"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "S_päter"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
@@ -14799,7 +15284,7 @@ msgstr "Name der Kopfzeile"
 msgid "Header Value"
 msgstr "Kopfzeilenwert"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:110
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:113
 msgid "Headers"
 msgstr "Kopfzeilen"
 
@@ -14809,582 +15294,627 @@ msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
 #: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
+msgid "Move to Folder"
+msgstr "In Ordner verschieben"
+
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
 #: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
-msgid "C_opy"
-msgstr "K_opieren"
-
-#: ../mail/e-mail-reader.c:848 ../mail/filtertypes.xml.in.h:62
-msgid "Move to Folder"
-msgstr "In Ordner verschieben"
-
-#: ../mail/e-mail-reader.c:852 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../mail/e-mail-reader.c:1173 ../mail/e-mail-reader.c:1385
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:350 ../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
 msgid "_Do not ask me again."
 msgstr "_Nicht mehr nachfragen."
 
-#: ../mail/e-mail-reader.c:1431
+#: ../mail/e-mail-reader.c:1526
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "»_Antwort an« bei Mailinglisten immer ignorieren"
 
-#: ../mail/e-mail-reader.c:1633
+#: ../mail/e-mail-reader.c:1728
 msgid "Failed to retrieve message:"
 msgstr "Abrufen der Nachricht schlug fehl:"
 
-#: ../mail/e-mail-reader.c:1678 ../mail/e-mail-reader.c:2855
+#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3013
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Nachricht »%s« wird abgerufen"
 
-#: ../mail/e-mail-reader.c:1866
+#: ../mail/e-mail-reader.c:1961
 msgid "A_dd Sender to Address Book"
 msgstr "A_bsender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:1868
+#: ../mail/e-mail-reader.c:1963
 msgid "Add sender to address book"
 msgstr "Absender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:1873
+#: ../mail/e-mail-reader.c:1968
+msgid "_Archive..."
+msgstr "_Archivieren …"
+
+#: ../mail/e-mail-reader.c:1970
+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
 msgid "Check for _Junk"
-msgstr "Über_prüfung auf unerwünschte Nachrichten"
+msgstr "Auf unerwünschte Nachrichten über_prüfen"
 
-#: ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1977
 msgid "Filter the selected messages for junk status"
 msgstr "Die gewählten Nachrichten auf den Status »Unerwünscht« filtern"
 
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:1982
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren …"
 
-#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:1984
 msgid "Copy selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:1887
+#: ../mail/e-mail-reader.c:1989
 msgid "_Delete Message"
 msgstr "Nachricht _löschen"
 
-#: ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1991
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewählten Nachrichten zum Löschen markieren"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1996
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Filterregel über Mailing_liste erstellen …"
 
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1998
 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:1901
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Filterregel über _Empfänger erstellen …"
 
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:2005
 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:1908
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Filterregel über _Absender erstellen …"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:2012
 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:1915
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Filterregel über _Betreff erstellen …"
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:2019
 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:1922
+#: ../mail/e-mail-reader.c:2024
 msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:2026
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewählten Nachrichten anwenden"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:2031
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen …"
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:2033
 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:1936
+#: ../mail/e-mail-reader.c:2038
 msgid "_Clear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:2040
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Die Folgemarkierung aus den gewählten Nachrichten entfernen"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:2045
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:2047
 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:1950
+#: ../mail/e-mail-reader.c:2052
 msgid "Follow _Up..."
 msgstr "_Folgenachricht …"
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:2054
 msgid "Flag the selected messages for follow-up"
 msgstr "Die gewählten Nachrichten zur Nachverfolgung markieren"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:2059
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../mail/e-mail-reader.c:1959 ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
 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:1964
+#: ../mail/e-mail-reader.c:2066
 msgid "Forward As _Attached"
 msgstr "Als _Anhang weiterleiten"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:2073
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../mail/e-mail-reader.c:1973 ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
 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:1978
+#: ../mail/e-mail-reader.c:2080
 msgid "Forward As _Inline"
 msgstr "_Eingebettet weiterleiten"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:2087
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ../mail/e-mail-reader.c:1987 ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
 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:1992
+#: ../mail/e-mail-reader.c:2094
 msgid "Forward As _Quoted"
 msgstr "_Zitiert weiterleiten"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2101
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2103
 msgid "Force images in HTML mail to be loaded"
-msgstr "Laden von Bildern in HTML-E-Mail erzwingen"
+msgstr "Laden von Bildern in HTML-E-Mails erzwingen"
+
+#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+msgid "_Ignore Sub-Thread"
+msgstr "Unterkonversation _ignorieren"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2110
+msgid "Mark new mails in a sub-thread as read automatically"
+msgstr ""
+"Neue E-Mails in Unterkonversationen werden automatisch als gelesen markiert"
+
+#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+msgid "_Ignore Thread"
+msgstr "Konversation _ignorieren"
+
+#: ../mail/e-mail-reader.c:2117
+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
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as important"
 msgstr "Die gewählten Nachrichten als wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2129
 msgid "_Junk"
 msgstr "Unerwü_nscht"
 
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as junk"
 msgstr "Die gewählten Nachrichten als unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2136
 msgid "_Not Junk"
 msgstr "E_rwünscht"
 
-#: ../mail/e-mail-reader.c:2022
+# doppelte Verneinung?
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as not being junk"
 msgstr "Die gewählten Nachrichten als nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2143
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewählten Nachrichten als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+msgid "Do not _Ignore Sub-Thread"
+msgstr "Unterkonversation nicht _ignorieren"
+
+#: ../mail/e-mail-reader.c:2152
+msgid "Do not mark new mails in a sub-thread as read automatically"
+msgstr ""
+"Neue E-Mails in dieser Unterkonversation nicht automatisch als gelesen "
+"markieren"
+
+#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+msgid "Do not _Ignore Thread"
+msgstr "Konversation nicht _ignorieren"
+
+#: ../mail/e-mail-reader.c:2159
+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
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2166
 msgid "Mark the selected messages as unimportant"
 msgstr "Die gewählten Nachrichten als unwichtig markieren"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2171
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2173
 msgid "Mark the selected messages as not having been read"
 msgstr "Die gewählten Nachrichten als ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2178
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten …"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2180
 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:2055
+#: ../mail/e-mail-reader.c:2185
 msgid "Compose _New Message"
 msgstr "_Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2187
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht öffnen"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2192
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2194
 msgid "Open the selected messages in a new window"
 msgstr "Die gewählten Nachrichten in einem neuen Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2199
 msgid "_Move to Folder..."
 msgstr "In Ordner _verschieben …"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2201
 msgid "Move selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:2076
+#: ../mail/e-mail-reader.c:2206
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2208
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2213
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next important message"
 msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Thread"
-msgstr "Nächster _Thread"
+msgstr "Nächste _Konversation"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next thread"
-msgstr "Nächsten Thread anzeigen"
+msgstr "Nächste Konversation anzeigen"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next unread message"
 msgstr "Die nächste ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2234
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2241
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous important message"
 msgstr "Die vorhergehende wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2248
 msgid "Previous T_hread"
-msgstr "Vo_rheriger Thread"
+msgstr "Vo_rherige Konversation"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous thread"
-msgstr "Den vorhergehenden Thread anzeigen"
+msgstr "Die vorhergehende Konversation anzeigen"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2255
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous unread message"
 msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2264
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2271
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2276
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2278
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden umleiten"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2283
 msgid "Remo_ve Attachments"
 msgstr "Anlagen _löschen"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2285
 msgid "Remove attachments"
 msgstr "Anlagen löschen"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2290
 msgid "Remove Du_plicate Messages"
 msgstr "Do_ppelte Nachrichten löschen"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2292
 msgid "Checks selected messages for duplicates"
 msgstr "Die gewählten Nachrichten auf Duplikate überprüfen"
 
-#: ../mail/e-mail-reader.c:2167 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1538
+#: ../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
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2299
 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:2174 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2306
 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:2181
+#: ../mail/e-mail-reader.c:2311
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2313
 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:2188
+#: ../mail/e-mail-reader.c:2318
 msgid "_Save as mbox..."
 msgstr "_Speichern als mbox …"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2320
 msgid "Save selected messages as an mbox file"
 msgstr "Die gewählten Nachrichten als mbox-Datei speichern"
 
-#: ../mail/e-mail-reader.c:2195
+#: ../mail/e-mail-reader.c:2325
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2327
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2339
 msgid "_Undelete Message"
 msgstr "Löschen der Nachricht _rückgängig"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2341
 msgid "Undelete the selected messages"
 msgstr "Löschen der gewählten Nachrichten rückgängig machen"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2346
 msgid "_Normal Size"
 msgstr "_Normale Größe"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2348
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2353
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2355
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ../mail/e-mail-reader.c:2232
+#: ../mail/e-mail-reader.c:2362
 msgid "Decrease the text size"
 msgstr "Die Textgröße heruntersetzen"
 
-#: ../mail/e-mail-reader.c:2239
+#: ../mail/e-mail-reader.c:2369
 msgid "Cre_ate"
 msgstr "_Erstellen"
 
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2376
 msgid "Ch_aracter Encoding"
 msgstr "Zeichenko_dierung"
 
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2383
 msgid "F_orward As"
 msgstr "_Weiterleiten als …"
 
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2390
 msgid "_Group Reply"
 msgstr "Antwort an _Gruppe"
 
-#: ../mail/e-mail-reader.c:2267
+#: ../mail/e-mail-reader.c:2397
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../mail/e-mail-reader.c:2274
+#: ../mail/e-mail-reader.c:2404
 msgid "Mar_k As"
 msgstr "Mar_kieren als"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2411
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../mail/e-mail-reader.c:2288
+#: ../mail/e-mail-reader.c:2418
 msgid "_Zoom"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2428
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Einen Suchordner für diese Mailing_liste anlegen …"
 
-#: ../mail/e-mail-reader.c:2300
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a search folder for this mailing list"
 msgstr "Einen Suchordner für diese Mailingliste anlegen"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Einen Suchordner über _Empfänger anlegen …"
 
-#: ../mail/e-mail-reader.c:2307
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for these recipients"
 msgstr "Einen Suchordner für diese Empfänger anlegen"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Einen Suchordner über _Absender anlegen …"
 
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for this sender"
 msgstr "Einen Suchordner für diesen Absender anlegen"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Einen Suchordner über _Betreff anlegen …"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this subject"
 msgstr "Einen Suchordner für diesen Betreff anlegen"
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2478
 msgid "Mark for Follo_w Up..."
 msgstr "Als _Folgenachricht markieren …"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2494
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2498
 msgid "Mark as _Junk"
 msgstr "Als un_erwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2502
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2506
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2518
 msgid "Mark as Uni_mportant"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2522
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2416
+#: ../mail/e-mail-reader.c:2566
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2568
 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:2424
+#: ../mail/e-mail-reader.c:2574
 msgid "All Message _Headers"
 msgstr "Alle Nachrichtenk_öpfe"
 
-#: ../mail/e-mail-reader.c:2426
+#: ../mail/e-mail-reader.c:2576
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../mail/e-mail-reader.c:2861
+#: ../mail/e-mail-reader.c:3019
 msgid "Retrieving message"
 msgstr "Nachricht wird abgerufen"
 
-#: ../mail/e-mail-reader.c:3826
+#: ../mail/e-mail-reader.c:4027
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../mail/e-mail-reader.c:3827
+#: ../mail/e-mail-reader.c:4028
 msgid "Forward the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden weiterleiten"
 
-#: ../mail/e-mail-reader.c:3846
+#: ../mail/e-mail-reader.c:4047
 msgid "Group Reply"
 msgstr "Antwort an Gruppe"
 
-#: ../mail/e-mail-reader.c:3847
+#: ../mail/e-mail-reader.c:4048
 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:3913 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:4114 ../mail/filtertypes.xml.in.h:65
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../mail/e-mail-reader.c:3925
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../mail/e-mail-reader.c:4126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Weiter"
 
-#: ../mail/e-mail-reader.c:3929
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../mail/e-mail-reader.c:4130
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../mail/e-mail-reader.c:3938 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4139 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Antworten"
 
@@ -15393,17 +15923,33 @@ msgid "Do not warn me again"
 msgstr "Nicht mehr nachfragen"
 
 #: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
+#: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../mail/e-mail-reader-utils.c:973
+#: ../mail/e-mail-reader-utils.c:1033
+msgid "Marking thread to be ignored"
+msgstr "Die Konversation zum Ignorieren markieren"
+
+#: ../mail/e-mail-reader-utils.c:1037
+msgid "Unmarking thread from being ignored"
+msgstr "Markierung zum Ignorieren der Konversation entfernen"
+
+#: ../mail/e-mail-reader-utils.c:1041
+msgid "Marking sub-thread to be ignored"
+msgstr "Unterkonversation als ignoriert markieren"
+
+#: ../mail/e-mail-reader-utils.c:1045
+msgid "Unmarking sub-thread from being ignored"
+msgstr "Markierung zum Ignorieren der Unterkonversation entfernen"
+
+#: ../mail/e-mail-reader-utils.c:1280
 msgid "Printing"
 msgstr "Drucken"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1208
+#: ../mail/e-mail-reader-utils.c:1515
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15418,7 +15964,7 @@ msgstr[1] ""
 "Der Ordner »%s« enthält %u doppelte Nachrichten. Sollen diese wirklich "
 "gelöscht werden?"
 
-#: ../mail/e-mail-reader-utils.c:2023
+#: ../mail/e-mail-reader-utils.c:2345
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Nachricht speichern"
@@ -15429,13 +15975,13 @@ 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:2044
+#: ../mail/e-mail-reader-utils.c:2366
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Nachricht"
 msgstr[1] "Nachrichten"
 
-#: ../mail/e-mail-reader-utils.c:2413
+#: ../mail/e-mail-reader-utils.c:2739
 msgid "Parsing message"
 msgstr "Nachricht wird verarbeitet"
 
@@ -15451,7 +15997,7 @@ msgstr "Als Folgenachricht markieren"
 #. * 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:1491
+#: ../mail/em-composer-utils.c:1507
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -15459,24 +16005,24 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1497
+#: ../mail/em-composer-utils.c:1513
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:1502
+#: ../mail/em-composer-utils.c:1518
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:2652
+#: ../mail/em-composer-utils.c:2668
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3047
+#: ../mail/em-composer-utils.c:3076
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../mail/em-composer-utils.c:3052
+#: ../mail/em-composer-utils.c:3081
 msgid "Choose folders to post the message to."
 msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
@@ -15557,12 +16103,12 @@ msgstr "Ordner %s wird verschoben"
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2309
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2470
 #, 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:2311
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2472
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
@@ -15604,7 +16150,7 @@ 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:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
@@ -15641,7 +16187,7 @@ msgid "Su_bscribe"
 msgstr "A_bonnieren"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Unsubscribe from the selected folder"
 msgstr "Den gewählten Ordner abbestellen"
 
@@ -15666,8 +16212,8 @@ msgid "Refresh the folder list"
 msgstr "Die Ordnerliste auffrischen"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "_Refresh"
 msgstr "_Aktualisieren"
 
@@ -15829,200 +16375,207 @@ msgstr "Ausdruck"
 
 #: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
 #: ../mail/vfoldertypes.xml.in.h:26
-msgid "Date sent"
-msgstr "Verschickt-Datum"
+#, fuzzy
+#| msgid "Expression"
+msgid "Free Form Expression"
+msgstr "Ausdruck"
 
 #: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
 #: ../mail/vfoldertypes.xml.in.h:27
-msgid "is before"
-msgstr "ist vor"
+msgid "Date sent"
+msgstr "Verschickt-Datum"
 
 #: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
 #: ../mail/vfoldertypes.xml.in.h:28
-msgid "is after"
-msgstr "ist nach"
+msgid "is before"
+msgstr "ist vor"
 
 #: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
 #: ../mail/vfoldertypes.xml.in.h:29
-msgid "Date received"
-msgstr "Empfangsdatum"
+msgid "is after"
+msgstr "ist nach"
 
 #: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
 #: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "Empfangsdatum"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Beschriftung"
 
-#: ../mail/filtertypes.xml.in.h:29 ../mail/message-list.etspec.h:3
-#: ../mail/searchtypes.xml.in.h:31 ../mail/vfoldertypes.xml.in.h:31
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
 msgid "Score"
 msgstr "Bewertung"
 
-#: ../mail/filtertypes.xml.in.h:32 ../mail/searchtypes.xml.in.h:34
-#: ../mail/vfoldertypes.xml.in.h:34
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
 msgid "Size (kB)"
 msgstr "Größe (kB)"
 
-#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
 msgid "Replied to"
 msgstr "Beantwortet"
 
-#: ../mail/filtertypes.xml.in.h:36 ../mail/searchtypes.xml.in.h:39
-#: ../mail/vfoldertypes.xml.in.h:39
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
 msgid "Important"
 msgstr "Wichtig"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:37 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:40 ../mail/vfoldertypes.xml.in.h:40
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Read"
 msgstr "Gelesen"
 
-#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-config.ui.h:117
-#: ../mail/vfoldertypes.xml.in.h:41
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:120
+#: ../mail/vfoldertypes.xml.in.h:42
 msgid "Junk"
 msgstr "Unerwünscht"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:41
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
 msgid "Follow Up"
 msgstr "Folgenachricht"
 
-#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:43
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
 msgid "is Flagged"
 msgstr "ist markiert"
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
 msgid "is not Flagged"
 msgstr "ist nicht markiert"
 
-#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
-#: ../mail/vfoldertypes.xml.in.h:45
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
 msgid "Completed On"
 msgstr "Abgeschlossen am"
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
+#: ../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:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
+#: ../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"
 
-#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
-#: ../mail/vfoldertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: ../mail/filtertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:52
 msgid "Source Account"
 msgstr "Quellkonto"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:53
 msgid "Pipe to Program"
 msgstr "An Programm weiterleiten"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:54
 msgid "returns"
 msgstr "liefert"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:55
 msgid "does not return"
 msgstr "liefert nicht"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns greater than"
 msgstr "liefert größer als"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:57
 msgid "returns less than"
 msgstr "liefert kleiner als"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:58
 msgid "Junk Test"
 msgstr "Unerwünscht-Test"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:59
 msgid "Message is Junk"
 msgstr "Nachricht ist unerwünscht"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:60
 msgid "Message is not Junk"
 msgstr "Nachricht ist nicht unerwünscht"
 
-#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
 msgid "Message Location"
 msgstr "Nachrichtenort"
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:56
 msgid "Match All"
 msgstr "Auf alles zutreffen"
 
-#: ../mail/filtertypes.xml.in.h:65
+#: ../mail/filtertypes.xml.in.h:66
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:67
 msgid "Set Label"
 msgstr "Beschriftung setzen"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Assign Color"
 msgstr "Farbe zuweisen"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Unset Color"
 msgstr "Farbe zurücksetzen"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Adjust Score"
 msgstr "Bewertung anpassen"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:72
 msgid "Set Status"
 msgstr "Status setzen"
 
-#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:37
-#: ../mail/vfoldertypes.xml.in.h:37
+#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Unset Status"
 msgstr "Status nicht setzen"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:75
 msgid "Beep"
 msgstr "Signalton"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Play Sound"
 msgstr "Klang abspielen"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Run Program"
 msgstr "Programm ausführen"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:78
 msgid "Forward to"
 msgstr "Weiterleiten an"
 
@@ -16191,20 +16744,17 @@ msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Dateinamen wie _Outlook/GMail kodieren"
 
 #: ../mail/mail-config.ui.h:12
-#, fuzzy
-#| msgid "Saving message to Outbox."
 msgid "Send messages through Outbo_x folder"
-msgstr "Nachricht wird im Nachrichtenausgang gespeichert"
+msgstr "Nachrichten über den Nachrichten_ausgang verschicken"
 
 #: ../mail/mail-config.ui.h:13
 msgid "Number of characters for word w_rapping:"
-msgstr ""
+msgstr "Anzahl der Zeichen für Zeilenumbruch:"
 
 #: ../mail/mail-config.ui.h:14
 msgid "Ch_aracter encoding:"
 msgstr "Zeichenko_dierung:"
 
-# CHECK
 #: ../mail/mail-config.ui.h:15
 msgid "Replies and Forwards"
 msgstr "Antworten und Weiterleitungen"
@@ -16334,7 +16884,6 @@ msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:51
-#| msgid "Sending a message with an _empty subject line"
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Nachrichten mit Tastenkürzel (Strg+Eingabe) senden"
 
@@ -16443,7 +16992,7 @@ msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
 #: ../mail/mail-config.ui.h:87
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
@@ -16461,7 +17010,7 @@ msgstr "Ansichts_einstellungen auf alle Ordner anwenden"
 
 #: ../mail/mail-config.ui.h:91
 msgid "F_all back to threading messages by subject"
-msgstr "Zurückfallen auf be_treffsbezogenes Threading der Nachrichten"
+msgstr "Zurückfallen auf be_treffsbezogene Konversationen der Nachrichten"
 
 #: ../mail/mail-config.ui.h:92
 msgid "Delete Mail"
@@ -16475,106 +17024,116 @@ msgstr "_Papierkorbordner beim Beenden leeren"
 msgid "Confirm _when expunging a folder"
 msgstr "Beim _Säubern eines Ordners nachfragen"
 
-#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:95
+msgid "Archive Mail"
+msgstr "E-Mail archivieren"
+
 #: ../mail/mail-config.ui.h:96
+msgid "On This Computer A_rchive folder:"
+msgstr "Archiv-Ordner unter »Auf diesem Rechner«:"
+
+#: ../mail/mail-config.ui.h:97
+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:99
 msgid "_Show animated images"
 msgstr "_Animierte Bilder anzeigen"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 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:98
+#: ../mail/mail-config.ui.h:101
 msgid "Loading Images"
 msgstr "Bilder laden"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "_Load images only in messages from contacts"
 msgstr "Bilder nur in Nachrichten von Kontakten _laden"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:105
 msgid "HTML Messages"
 msgstr "HTML-Nachrichten"
 
-#: ../mail/mail-config.ui.h:103 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:106 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Beschriftungen"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:107
 msgid "Sender Photograph"
 msgstr "Foto des Absenders"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Foto des Absenders in der Nachrichtenvorschau anzeigen"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:109
 msgid "Search gra_vatar.com for the photograph of sender"
-msgstr ""
+msgstr "gra_vatar.com nach einem Bild des Absenders durchsuchen"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 msgid "Displayed Message Headers"
 msgstr "Angezeigte Nachrichtenköpfe"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:111
 msgid "Mail Headers Table"
 msgstr "E-Mail-Kopf-Tabelle"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 #: ../modules/addressbook/autocompletion-config.c:117
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Format von Datum/Zeit"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Check incoming _messages for junk"
 msgstr "_Eingehende E-Mail auf Unerwünschtheit prüfen"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "_Delete junk messages"
 msgstr "Unerwünscht-Ordner beim Beenden _leeren"
 
-#: ../mail/mail-config.ui.h:113
-#, fuzzy
-#| msgid "Send Options"
+#: ../mail/mail-config.ui.h:116
 msgid "Just Test Options"
-msgstr "Optionen für Tests anzeigen"
+msgstr "Optionen nur testen"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 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:115
+#: ../mail/mail-config.ui.h:118
 msgid "_Lookup in local address book only"
 msgstr "Nur in _lokalen Adressbüchern suchen"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
 msgid "Check cu_stom headers for junk"
 msgstr "_Benutzerdefinierte Kopfzeilen auf Unerwünschtheit prüfen"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:121
 #: ../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:119
+#: ../mail/mail-config.ui.h:122
 msgid "TLS encryption"
 msgstr "TLS-Verschlüsselung"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:123
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
@@ -16874,7 +17433,7 @@ msgstr ""
 "Ordnern entfernen wollen?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "_Empty Trash"
 msgstr "_Papierkorb leeren"
 
@@ -17397,39 +17956,58 @@ msgid "{0}"
 msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
+msgid "Message is not available in offline."
+msgstr "Nachricht ist nicht im Offline-Modus verfügbar."
+
+#: ../mail/mail.error.xml.h:161
+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."
+msgstr ""
+"Möglicherweise ist die Nachricht noch nicht heruntergeladen worden. Der "
+"Ordner oder das Konto kann für die Offline-Synchronisation eingerichtet "
+"werden. Sobald das Konto wieder mit dem Internet verbunden ist, verwenden "
+"Sie Datei-&gt;Nachrichten für Offline-Benutzung herunterladen. Die "
+"Nachrichten in den ausgewählten Ordnern werden nun auch im Offline-Modus zur "
+"Verfügung gestellt."
+
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to open folder."
 msgstr "Ordner konnte nicht geöffnet werden."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to find duplicate messages."
 msgstr "Doppelte Nachrichten konnten nicht gefunden werden."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to retrieve messages."
 msgstr "Nachrichten konnten nicht abgerufen werden."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to mark messages as read."
 msgstr "Nachrichten konnten nicht als gelesen markiert werden."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "Anhänge konnten nicht von Nachrichten entfernt werden."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr ""
 "Nachrichten konnten nicht für Offline-Benutzung heruntergeladen werden."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "Nachrichten konnten nicht auf Festplatte gespeichert werden."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "Eine verborgene Datei wurde beigelegt."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:171
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -17437,26 +18015,49 @@ 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:170
+#: ../mail/mail.error.xml.h:172
 msgid "Printing failed."
 msgstr "Drucken ist fehlgeschlagen."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:173
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Die Meldung des Druckers war »{0}«."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:174
 msgid "Could not perform this operation on {0}."
 msgstr "Dieser Vorgang konnte auf {0} nicht ausgeführt werden."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:175
 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:174
+#: ../mail/mail.error.xml.h:176
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Nachricht von Konto &quot;{0}&quot; :"
 
+#: ../mail/mail.error.xml.h:177
+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
+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
+msgid "Failed to mark sub-thread to be ignored in folder '{0}'"
+msgstr ""
+"Markieren zum Ignorieren der Unterkonversation im Ordner »{0}« ist "
+"fehlgeschlagen"
+
+#: ../mail/mail.error.xml.h:180
+msgid "Failed to unmark sub-thread from being ignored in folder '{0}'"
+msgstr ""
+"Entfernen der Markierung zum Ignorieren der Unterkonversation im Ordner "
+"»{0}« ist fehlgeschlagen"
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Absagevorgang …"
@@ -17486,16 +18087,15 @@ msgstr "Nach neuen E-Mails auf »%s« sehen"
 #, 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:1423
-#, fuzzy, c-format
-#| msgid "Reconnecting to '%s'"
+#, c-format
 msgid "Deleting junk at '%s'"
-msgstr "Ausschuss hinter CALL bei %C"
+msgstr "Löschen von Unerwünscht unter »%s«"
 
 #: ../mail/mail-send-recv.c:1425
-#, fuzzy, c-format
-#| msgid "Emptying trash in '%s'"
+#, c-format
 msgid "Expunging trash at '%s'"
 msgstr "Papierkorb in »%s« wird geleert"
 
@@ -17511,86 +18111,86 @@ msgstr "Suchordner bearbeiten"
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "Weitergeleitet"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "Höher"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5798
+#: ../mail/message-list.c:459 ../mail/message-list.c:5969
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1885 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1894
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1906
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../mail/message-list.c:1914
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../mail/message-list.c:1916
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2796
+#: ../mail/message-list.c:2960
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wählen"
 
-#: ../mail/message-list.c:3440 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3610 ../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:4747
+#: ../mail/message-list.c:4918
 msgid "Follow-up"
 msgstr "Folgenachricht"
 
-#: ../mail/message-list.c:5735
+#: ../mail/message-list.c:5906
 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 "
@@ -17603,7 +18203,7 @@ msgstr ""
 "Löschen mit dem Menüeintrag Suche->Löschen oder durch Ändern der Anfrage "
 "oben."
 
-#: ../mail/message-list.c:5743
+#: ../mail/message-list.c:5914
 msgid "There are no messages in this folder."
 msgstr "Es existieren keine Nachrichten in diesem Ordner."
 
@@ -17639,38 +18239,45 @@ msgstr "Betreff - Gekürzt"
 msgid "Any header"
 msgstr "Beliebige Kopfzeile"
 
-#: ../mail/searchtypes.xml.in.h:54
+#: ../mail/searchtypes.xml.in.h:55
 msgid "Subject or Addresses contains"
 msgstr "Betreff oder Adresse enthält"
 
-#: ../mail/searchtypes.xml.in.h:55
-#: ../modules/mail/e-mail-shell-view-actions.c:2095
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2109
 msgid "Recipients contain"
 msgstr "Empfänger enthalten"
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2088
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Message contains"
 msgstr "Nachricht enthält"
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2109
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2123
 msgid "Subject contains"
 msgstr "Betreff enthält"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2102
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2116
 msgid "Sender contains"
 msgstr "Absender enthält"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2081
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2088
 msgid "Body contains"
 msgstr "Rumpf enthält"
 
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2095
+#, fuzzy
+#| msgid "Expression"
+msgid "Free form expression"
+msgstr "Ausdruck"
+
 #. 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:1222
+#: ../modules/mail/em-mailer-prefs.c:1234
 msgid "_Table column:"
 msgstr "_Tabellenspalte:"
 
@@ -17798,9 +18405,9 @@ msgid "Show properties of the selected address book"
 msgstr "Die Eigenschaften des gewählten Adressbuchs anzeigen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1016
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Re_fresh"
 msgstr "Auf_frischen"
 
@@ -17817,10 +18424,10 @@ 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:1030
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
-#: ../modules/calendar/e-task-shell-view-actions.c:758
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../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:1710
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
@@ -17893,15 +18500,15 @@ msgid "Send a message to the selected contacts"
 msgstr "Eine Nachricht an die gewählten Kontakte schicken"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1109
-#: ../modules/calendar/e-cal-shell-view-actions.c:1568
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "A_ktionen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1116
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
-#: ../modules/calendar/e-task-shell-view-actions.c:823
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../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:1875
 msgid "_Preview"
 msgstr "_Vorschau"
 
@@ -17927,9 +18534,9 @@ msgstr "Karten im Kontakt-Vorschaufenster anzeigen"
 
 # CHECK
 #: ../modules/addressbook/e-book-shell-view-actions.c:1198
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:905
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../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:2005
 msgid "_Classic View"
 msgstr "_Klassische Ansicht"
 
@@ -17939,9 +18546,9 @@ msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
 
 # CHECK - macht überhaupt keinen Sinn
 #: ../modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../modules/calendar/e-memo-shell-view-actions.c:748
-#: ../modules/calendar/e-task-shell-view-actions.c:912
-#: ../modules/mail/e-mail-shell-view-actions.c:2005
+#: ../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:2012
 msgid "_Vertical View"
 msgstr "_Vertikale Ansicht"
 
@@ -17950,17 +18557,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Kontakt-Vorschaufenster neben der Kontaktliste anzeigen"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1222
-#: ../modules/calendar/e-cal-shell-view-actions.c:1745
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1232
-#: ../modules/calendar/e-cal-shell-view-actions.c:1755
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
-#: ../modules/mail/e-mail-shell-view-actions.c:2074
+#: ../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:2081
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
@@ -17995,23 +18602,23 @@ msgstr "Als VCard _speichern …"
 msgid "Save selected contacts as a vCard"
 msgstr "Gewählte Kontakte als vCard speichern"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "Kontakte weiter_leiten"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "Kontakt weiter_leiten"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "_Nachricht an Kontakte schicken"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "_Nachricht an Kontakt schicken"
 
@@ -18059,7 +18666,7 @@ msgstr "Evolution nach Wiederherstellung neu sta_rten"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:307
 msgid "_Back up Evolution Data..."
-msgstr "Evolution-Daten _sichern…"
+msgstr "Evolution-Daten _sichern …"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:309
 msgid "Back up Evolution data and settings to an archive file"
@@ -18077,105 +18684,105 @@ msgstr ""
 "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen aus einer "
 "Archivdatei"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "Evolution-Sicherungsordner"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "Evolution-Wiederherstellungsordner"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "Evolution-Datensicherung überprüfen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "Evolution neu starten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "Mit grafischer Oberfläche"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:289
-#: ../modules/backup-restore/evolution-backup-tool.c:483
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:475
 msgid "Shutting down Evolution"
 msgstr "Evolution wird heruntergefahren"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:298
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "Sichern der Evolution-Konten und -Einstellungen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:315
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sichern der Evolution-Daten (E-Mails, Kontakte, Kalender, Aufgaben, Notizen)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:331
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "Sicherung komplett"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:338
-#: ../modules/backup-restore/evolution-backup-tool.c:670
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:665
 msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:489
+#: ../modules/backup-restore/evolution-backup-tool.c:481
 msgid "Back up current Evolution data"
 msgstr "Aktuelle Evolution-Daten sichern"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:496
+#: ../modules/backup-restore/evolution-backup-tool.c:488
 msgid "Extracting files from back up"
 msgstr "Dateien werden aus dem Sicherungsarchiv entpackt"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:578
+#: ../modules/backup-restore/evolution-backup-tool.c:570
 msgid "Loading Evolution settings"
 msgstr "Evolution-Einstellungen laden"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:644
+#: ../modules/backup-restore/evolution-backup-tool.c:636
 msgid "Removing temporary back up files"
 msgstr "Temporäre Sicherungsdateien werden entfernt"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:655
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Reloading registry service"
 msgstr "Registrierungsdienst wird neu geladen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:884
+#: ../modules/backup-restore/evolution-backup-tool.c:853
 msgid "Evolution Back Up"
 msgstr "Evolution-Datensicherung"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:885
+#: ../modules/backup-restore/evolution-backup-tool.c:854
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:889
+#: ../modules/backup-restore/evolution-backup-tool.c:858
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:890
+#: ../modules/backup-restore/evolution-backup-tool.c:859
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:959
+#: ../modules/backup-restore/evolution-backup-tool.c:928
 msgid "Backing up Evolution Data"
 msgstr "Sichern der Evolution-Daten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:960
+#: ../modules/backup-restore/evolution-backup-tool.c:929
 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:962
+#: ../modules/backup-restore/evolution-backup-tool.c:931
 msgid "Restoring Evolution Data"
 msgstr "Wiederherstellen der Evolution-Daten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:963
+#: ../modules/backup-restore/evolution-backup-tool.c:932
 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:985
+#: ../modules/backup-restore/evolution-backup-tool.c:954
 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."
 
@@ -18259,9 +18866,14 @@ msgid "Convert message text to _Unicode"
 msgstr "Nachrichtentext nach _Unicode konvertieren"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+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
 msgid "Standard LDAP Port"
 msgstr "Standard-LDAP-Port"
@@ -18338,7 +18950,7 @@ msgid "Using LDAP"
 msgstr "LDAP wird verwendet"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Suchen"
 
@@ -18536,26 +19148,103 @@ msgstr "Kelvin (K)"
 msgid "Units:"
 msgstr "Einheiten:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "I_mportieren"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+msgid "Importing an event"
+msgstr "Ereignis wird importiert"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Importing a memo"
+msgstr "Notiz wird importiert"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+msgid "Importing a task"
+msgstr "Aufgabe wird importiert"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Einen Kalender auswählen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+msgid "Select a Memo List"
+msgstr "Notizliste auswählen"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "Eine Aufgabenliste auswählen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "In _Kalender importieren"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
-msgstr "In _Aufgaben importieren"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+msgid "I_mport to Memo List"
+msgstr "In _Notizliste importieren"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+msgid "I_mport to Task List"
+msgstr "In _Aufgabenliste importieren"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:186
+#: ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "Neuer Kalender"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "Neue Notizliste"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194
+#: ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "Neue Aufgabenliste"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "Calendar Selector"
+msgstr "Kalenderquellenauswahl"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+msgid "Memo List Selector"
+msgstr "Notizquellenauswahl"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+msgid "Task List Selector"
+msgstr "Aufgabenlistenauswahl"
 
 #: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
@@ -18626,7 +19315,7 @@ msgid "_24 hour"
 msgstr "_24 Stunden"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Work Week"
 msgstr "Arbeitswoche"
 
@@ -18682,13 +19371,9 @@ msgstr "_So"
 msgid "Day _ends:"
 msgstr "Tag _endet:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Alarme"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "Beim _Löschen von Objekten nachfragen"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "View Options"
+msgstr "Ansichtsoptionen"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -18714,138 +19399,131 @@ msgstr "Wi_ederkehrende Ereignisse im Kalender unten links kursiv anzeigen"
 msgid "Sc_roll Month View by a week"
 msgstr "Monatsansicht _wochenweise blättern"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "Alarme"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "Beim _Löschen von Objekten nachfragen"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Display"
 msgstr "Anzeigen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Highlight t_asks due today"
 msgstr "_Heute fällige Aufgaben hervorheben"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Highlight _overdue tasks"
 msgstr "Ü_berfällige Aufgaben hervorheben"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Display reminders in _notification area only"
 msgstr "Erinnerungen nur im _Benachrichtigungsfeld anzeigen"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Sh_ow a reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show a _reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "vor jedem Jahrestag/Geburtstag"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Select the calendars for reminder notification"
 msgstr "Kalender für Erinnerungsmeldungen auswählen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Default Free/Busy Server"
 msgstr "Vorgegebener Verfügbarkeits-Server"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Template:"
 msgstr "Vorlage:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #, 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:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Publishing Information"
 msgstr "Information zur Veröffentlichung"
 
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:191
-msgid "New Calendar"
-msgstr "Neuer Kalender"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztägigen Termin anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kalen_der"
 
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:712
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "Kalender »%s« wird geöffnet"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "Kalenderquellenauswahl"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
 msgstr "Drucken"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:291
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
 msgid "Calendar Properties"
 msgstr "Kalendereigenschaften"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -18857,355 +19535,351 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:339
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
 msgid "Purge events older than"
 msgstr "Ereignisse löschen älter als"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:576
-msgid "Copying Items"
-msgstr "Objekte werden kopiert"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:869
-msgid "Moving Items"
-msgstr "Objekte werden verschoben"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+msgid "Making an occurrence movable"
+msgstr "Eine Wiederholung verschiebbar machen"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1202
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "Ereignis"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1204
-#: ../modules/calendar/e-cal-shell-view-memopad.c:230
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:518
-#: ../modules/calendar/e-task-shell-view-actions.c:635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
 msgid "Save as iCalendar"
 msgstr "Als iCalendar speichern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "_Kopieren …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "Kalender _löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "Den gewählten Kalender löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "Zurück gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "Vor gehen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "Heute wählen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "_Datum wählen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "Ein bestimmtes Datum wählen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
-#: ../modules/calendar/e-task-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr "_Säubern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Besprechungen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "Den gewählten Kalender aktualisieren"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
 msgstr "Den gewählten Kalender umbenennen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Find _Next"
 msgstr "_Nächster Treffer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Find next occurrence of the current search string"
 msgstr "Das nächste Vorkommen des aktuellen Suchbegriffs finden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Find _Previous"
 msgstr "_Vorheriger Treffer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Find previous occurrence of the current search string"
 msgstr "Das vorherige Vorkommen des aktuellen Suchbegriffs finden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Stop _Running Search"
 msgstr "Suchvorgang _anhalten"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Stop currently running search"
 msgstr "Derzeit laufende Suche stoppen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
 msgstr "Nur diesen _Kalender anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "Den Termin _löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "Ausgewählte Termine löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "Dieses V_orkommen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "Diesen Treffer löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "Alle _Vorkommen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "Alle Vorkommen löschen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "Neues _ganztägiges Ereignis …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "Ein neues ganztägiges Ereignis anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-memopad.c:242
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "Neue Bes_prechung …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "Eine neue Besprechung anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "Neuer _Termin …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "Termin ö_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "Den aktuellen Termin anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1547
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr "Wandelt einen Termin in eine Besprechung um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
-msgstr "In T_ermin umwandeln…"
+msgstr "In T_ermin umwandeln …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1554
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr "Wandelt eine Besprechung in einen Termin um"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "Tag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "Tagesansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "Listenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "Monat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "Monatsansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "Woche"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "Wochenansicht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "Eine Arbeitswoche anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "Aktuelle Termine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr "Kommt weniger als fünf Mal vor"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1769
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1776
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1786
-#: ../modules/calendar/e-cal-shell-view-actions.c:1800
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-memo-shell-view-actions.c:820
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
-#: ../modules/calendar/e-task-shell-view-actions.c:1019
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Print..."
 msgstr "Drucken …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1788
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1795
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr "Vorschau auf den zu druckenden Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1817
-#: ../modules/calendar/e-cal-shell-view-memopad.c:305
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
-#: ../modules/calendar/e-memo-shell-view-actions.c:837
-#: ../modules/calendar/e-task-shell-view-actions.c:1036
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "_Save as iCalendar..."
 msgstr "Als i_Calendar speichern …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1894
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Go To"
 msgstr "Gehe zu"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:516
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "Notiz"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "Neue _Notiz"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-memo-shell-backend.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "Eine neue Notiz anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "Notiz ö_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "Die gewählte Notiz anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:285
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:662
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "Die gewählte Notiz drucken"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "Nächstes zutreffendes Ereignis suchen"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "Vorheriges zutreffendes Ereignis suchen"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../modules/calendar/e-cal-shell-view-private.c:832
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -19215,7 +19889,7 @@ msgstr[1] ""
 "Übereinstimmendes Ereignis konnte in den nächsten %d Jahren nicht gefunden "
 "werden"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1587
+#: ../modules/calendar/e-cal-shell-view-private.c:836
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -19225,7 +19899,7 @@ msgstr[1] ""
 "Übereinstimmendes Ereignis konnte in den letzten %d Jahren nicht gefunden "
 "werden"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1612
+#: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
 msgstr "Suche kann ohne aktiven Kalender nicht ausgeführt werden"
 
@@ -19233,237 +19907,209 @@ msgstr "Suche kann ohne aktiven Kalender nicht ausgeführt werden"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
-#: ../modules/calendar/e-task-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "Aufgabe"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr "Aufgabe _zuweisen"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "Die gewählten Aufgaben als abgeschlossen markieren"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "Als _offen markieren"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "Die gewählten Aufgaben als unvollständig markieren"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "_Neue Aufgabe"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../modules/calendar/e-task-shell-backend.c:215
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "Aufgabe ö_ffnen"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "Die gewählte Aufgabe anzeigen"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "Die gewählte Aufgabe drucken"
 
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
-msgid "New Memo List"
-msgstr "Neue Notizliste"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Notiz"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Ge_meinsame Notiz"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "Eine neue gemeinsame Notiz anlegen"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Notizli_ste"
 
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "Notizliste »%s« wird geöffnet"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "Notizquellenauswahl"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "Notizen drucken"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
 msgid "Memo List Properties"
 msgstr "Notizlisteneigenschaften"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "Notiz _löschen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "In Notiz _suchen …"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "In der angezeigten Notiz einen Text suchen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "Notizlist_e löschen "
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "Die gewählte Notizliste löschen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "_Neue Notizliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "Die ausgewählte Notizliste aktualisieren"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "Die ausgewählte Notizliste umbenennen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
 msgstr "Nur diese N_otizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:720
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "Notiz_vorschau"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:722
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr "Vorschaufeld für Notizen anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr "Notizvorschau unter der Notizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr "Notizvorschau neben der Notizliste anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "Die Liste von Notizen drucken"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "Vorschau auf die zu druckende Liste von Notizen anzeigen"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "Notizen löschen"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "Notiz löschen"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d Notiz"
 msgstr[1] "%d Notizen"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:767
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:539
 #, c-format
 msgid "%d selected"
 msgstr "%d gewählt"
 
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:219
-msgid "New Task List"
-msgstr "Neue Aufgabenliste"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Zuge_wiesene Aufgabe"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "Eine neue zugewiesene Aufgabe anlegen"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "_Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "Aufgabenliste »%s« wird geöffnet"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "Aufgabenlistenauswahl"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:291
+#: ../modules/calendar/e-task-shell-view-actions.c:259
 msgid "Task List Properties"
 msgstr "Aufgabenlisteneigenschaften"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -19476,111 +20122,107 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:584
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "Nicht mehr nachfragen."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "Aufgabe _löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "In Aufgabe _suchen …"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "In der angezeigten Aufgabe nach Text suchen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "Aufgabenlist_e löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "Die gewählte Aufgabenliste löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "Die gewählte Aufgabenliste aktualisieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "Die gewählte Aufgabenliste umbenennen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "Nur diese Auf_gabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "Als unvollständig mar_kieren"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "Die abgeschlossenen Aufgaben löschen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:884
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "Aufgaben_vorschau"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:886
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr "Aufgabenvorschaufeld anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr "Aufgabenvorschau unter der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr "Aufgabenvorschau neben der Aufgabenliste anzeigen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "Aktuelle Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "Abgeschlossene Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr "Aufgaben der nächsten 7 Tage"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "Überfällige Aufgaben"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "Die Aufgabenliste drucken"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr "Vorschau auf die zu druckende Aufgabenliste"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "Aufgaben löschen"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "Aufgabe löschen"
 
-#: ../modules/calendar/e-task-shell-view-private.c:652
-msgid "Expunging"
-msgstr "Wird gesäubert"
-
-#: ../modules/calendar/e-task-shell-view-private.c:763
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -20022,6 +20664,7 @@ msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
 #: ../modules/itip-formatter/itip-view.c:1047
+#: ../smime/gui/certificate-manager.c:1664
 msgid "_Update"
 msgstr "A_ktualisieren"
 
@@ -20517,383 +21160,383 @@ msgctxt "label"
 msgid "None"
 msgstr "Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:749
+#: ../modules/mail/e-mail-shell-view-actions.c:752
 msgid "Marking messages as read..."
 msgstr "Nachrichten werden als gelesen markiert …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Disable this account"
 msgstr "Dieses Konto deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 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:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "Edit properties of this account"
 msgstr "Die Eigenschaften dieses Kontos bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Refresh list of folders of this account"
 msgstr "Die Ordnerliste dieses Kontos neu einlesen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nachrichten für Offline-Benutzung herunterladen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1642
 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:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "_Copy Folder To..."
 msgstr "Ordner _kopieren nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1649
+#: ../modules/mail/e-mail-shell-view-actions.c:1656
 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:1656
+#: ../modules/mail/e-mail-shell-view-actions.c:1663
 msgid "Permanently remove this folder"
 msgstr "Diesen Ordner dauerhaft entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
 msgid "E_xpunge"
 msgstr "_Säubern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1663
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
 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:1668
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Mar_k All Messages as Read"
 msgstr "Alle Nachrichten als gelesen _markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1770
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1777
 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:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "_Move Folder To..."
 msgstr "Ordner verschie_ben nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Move the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner verschieben"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "_New..."
 msgstr "_Neu …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 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:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Refresh the folder"
 msgstr "Den Ordner auffrischen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
 msgid "Select Message _Thread"
-msgstr "Nachrichten-_Thread auswählen"
+msgstr "Nachrichten-_Konversation auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Select all messages in the same thread as the selected message"
-msgstr "Alle Nachrichten im selben Thread wie die gewählte Nachricht markieren"
+msgstr "Alle Nachrichten in der selben Konversation markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Select Message S_ubthread"
-msgstr "Nachrichten-_Subthread auswählen"
+msgstr "Nachrichten-_Unterkonversation auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 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:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Empty _Trash"
 msgstr "_Papierkorb leeren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 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:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "N_one"
 msgstr "_Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "_Manage Subscriptions"
 msgstr "Abonnements _verwalten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1763
-#: ../modules/mail/e-mail-shell-view-actions.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1770
+#: ../modules/mail/e-mail-shell-view-actions.c:1854
 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:1775
-#: ../modules/mail/e-mail-shell-view-actions.c:1796
+#: ../modules/mail/e-mail-shell-view-actions.c:1782
+#: ../modules/mail/e-mail-shell-view-actions.c:1803
 msgid "Send / _Receive"
 msgstr "Verschicken/Ab_rufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1777
+#: ../modules/mail/e-mail-shell-view-actions.c:1784
 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:1782
+#: ../modules/mail/e-mail-shell-view-actions.c:1789
 msgid "R_eceive All"
 msgstr "Alle _abrufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1784
+#: ../modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Receive new items from all accounts"
 msgstr "Neue Objekte in von allen Konten empfangen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1789
+#: ../modules/mail/e-mail-shell-view-actions.c:1796
 msgid "_Send All"
 msgstr "Alle _verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1791
+#: ../modules/mail/e-mail-shell-view-actions.c:1798
 msgid "Send queued items in all accounts"
 msgstr "Objekte in den Warteschlangen aller Konten verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1819
+#: ../modules/mail/e-mail-shell-view-actions.c:1826
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgeführten E-Mail-Vorgang abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1824
+#: ../modules/mail/e-mail-shell-view-actions.c:1831
 msgid "Collapse All _Threads"
-msgstr "Alle _Threads einklappen"
+msgstr "Alle _Konversationen einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1826
+#: ../modules/mail/e-mail-shell-view-actions.c:1833
 msgid "Collapse all message threads"
-msgstr "Alle Nachrichten-Threads einklappen"
+msgstr "Alle Nachrichtenkonversationen einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1831
+#: ../modules/mail/e-mail-shell-view-actions.c:1838
 msgid "E_xpand All Threads"
-msgstr "Alle Threads a_usklappen"
+msgstr "Alle Konversationen a_usklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1840
 msgid "Expand all message threads"
-msgstr "Alle Nachrichten-Threads ausklappen"
+msgstr "Alle Nachrichtenkonversationen ausklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1838
+#: ../modules/mail/e-mail-shell-view-actions.c:1845
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1840
+#: ../modules/mail/e-mail-shell-view-actions.c:1847
 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:1845
+#: ../modules/mail/e-mail-shell-view-actions.c:1852
 msgid "_Subscriptions..."
 msgstr "A_bonnements …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1854
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "F_older"
 msgstr "_Ordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1868
 msgid "_Label"
 msgstr "Bes_chriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1878
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "C_reate Search Folder From Search..."
 msgstr "Sucho_rdner aus Suche anlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1892
 msgid "Search F_olders"
 msgstr "S_uchordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1894
 msgid "Create or edit search folder definitions"
 msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1926
+#: ../modules/mail/e-mail-shell-view-actions.c:1933
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1954
+#: ../modules/mail/e-mail-shell-view-actions.c:1961
 msgid "Show Message _Preview"
 msgstr "Nachrichten_vorschau anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1956
+#: ../modules/mail/e-mail-shell-view-actions.c:1963
 msgid "Show message preview pane"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1962
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "Show _Deleted Messages"
 msgstr "Gel_öschte Nachrichten anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:1971
 msgid "Show deleted messages with a line through them"
 msgstr "Gelöschte Nachrichten (durchgestrichen) anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1970
+#: ../modules/mail/e-mail-shell-view-actions.c:1977
 msgid "_Group By Threads"
-msgstr "Nach Threads _gruppieren"
+msgstr "Nach Konversationen _gruppieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1972
+#: ../modules/mail/e-mail-shell-view-actions.c:1979
 msgid "Threaded message list"
-msgstr "Nachrichtenliste nach Threads sortieren"
+msgstr "Nachrichtenliste nach Konversationen sortieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1978
+#: ../modules/mail/e-mail-shell-view-actions.c:1985
 msgid "_Unmatched Folder Enabled"
 msgstr "Trefferlosen Suchordner _aktiviert"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1980
+#: ../modules/mail/e-mail-shell-view-actions.c:1987
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Legt fest, ob trefferlose Suchordner aktiviert sind"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2000
+#: ../modules/mail/e-mail-shell-view-actions.c:2007
 msgid "Show message preview below the message list"
 msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2007
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Show message preview alongside the message list"
 msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2015
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2029
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2029
+#: ../modules/mail/e-mail-shell-view-actions.c:2036
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fünf Tage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2036
+#: ../modules/mail/e-mail-shell-view-actions.c:2043
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2043
+#: ../modules/mail/e-mail-shell-view-actions.c:2050
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2050
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2116
+#: ../modules/mail/e-mail-shell-view-actions.c:2130
 msgid "Subject or Addresses contain"
 msgstr "Betreff oder Adresse enthält"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2126
+#: ../modules/mail/e-mail-shell-view-actions.c:2140
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2133
+#: ../modules/mail/e-mail-shell-view-actions.c:2147
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2140
+#: ../modules/mail/e-mail-shell-view-actions.c:2154
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
 msgstr "Alle Konten durchsuchen"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
 msgstr "Konto durchsuchen"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d gewählt, "
 msgstr[1] "%d gewählt, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:987
-#: ../modules/mail/e-mail-shell-view-private.c:1004
+#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d gelöscht"
 msgstr[1] "%d gelöscht"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1019
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d unerwünscht"
 msgstr[1] "%d unerwünscht"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d Entwurf"
 msgstr[1] "%d Entwürfe"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nicht verschickt"
 msgstr[1] "%d nicht verschickt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d verschickt"
 msgstr[1] "%d verschickt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ungelesen, "
 msgstr[1] "%d ungelesen, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 #, 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:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1561
+#: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
 msgstr "Verschicken/Abrufen"
 
@@ -20909,7 +21552,19 @@ msgstr "Ordner"
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: ../modules/mail/em-composer-prefs.c:1177
+#: ../modules/mail/em-composer-prefs.c:1157
+msgid "Keep in Outbox"
+msgstr "Im Nachrichtenausgang behalten"
+
+#: ../modules/mail/em-composer-prefs.c:1158
+msgid "Send immediately"
+msgstr "Sofort versenden"
+
+#: ../modules/mail/em-composer-prefs.c:1159
+msgid "Send after 5 minutes"
+msgstr "Nach 5 Minuten verschicken"
+
+#: ../modules/mail/em-composer-prefs.c:1232
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
@@ -20942,11 +21597,11 @@ 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:1224
+#: ../modules/mail/em-mailer-prefs.c:1236
 msgid "_Date header:"
 msgstr "_Datum in der Kopfzeile:"
 
-#: ../modules/mail/em-mailer-prefs.c:1225
+#: ../modules/mail/em-mailer-prefs.c:1237
 msgid "Show _original header value"
 msgstr "_Originalwert der Kopfzeile anzeigen"
 
@@ -21017,7 +21672,7 @@ msgstr "Autor(en)"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:253
 msgid "Plugin Manager"
-msgstr "Plugin-Verwaltung"
+msgstr "Erweiterungs-Verwaltung"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:268
 msgid "Note: Some changes will not take effect until restart"
@@ -21030,15 +21685,15 @@ msgstr "Überblick"
 #: ../modules/plugin-manager/evolution-plugin-manager.c:366
 #: ../modules/plugin-manager/evolution-plugin-manager.c:449
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "Erweiterung"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "_Plugins"
-msgstr "_Plugins"
+msgstr "_Erweiterungen"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "Enable and disable plugins"
-msgstr "Plugins aktivieren und deaktivieren"
+msgstr "Erweiterungen aktivieren und deaktivieren"
 
 #: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version"
@@ -21056,22 +21711,22 @@ msgstr "HTML-Version anzeigen"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Multipart/alternative Nachrichten als HTML anzeigen"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "HTML anzeigen, wenn vorhanden"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Evolution den besten Teil zur Anzeige auswählen lassen."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Klartext anzeigen, wenn vorhanden"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
@@ -21080,12 +21735,12 @@ msgstr ""
 "Klartext-Teil anzeigen, wenn verfügbar, ansonsten Evolution den besten Teil "
 "zur Anzeige auswählen lassen."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Immer als einfachen Text anzeigen"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
 #: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -21153,9 +21808,15 @@ msgstr ""
 "Dies erhöht die Zuverlässigkeit von SpamAssassin, verlangsamt ihn jedoch."
 
 #: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+msgid "Junk filter using SpamAssassin"
+msgstr ""
+"Filter für unerwünschte Nachrichten, der den SpamAssassin-Filter verwendet"
+
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
 #: ../modules/startup-wizard/e-mail-config-import-page.c:260
@@ -21195,11 +21856,11 @@ msgstr "_Formatieren als …"
 msgid "_Other languages"
 msgstr "_Andere Sprachen"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:437
 msgid "Text Highlight"
 msgstr "Texthervorhebung"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:483
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Syntax highlighting of mail parts"
 msgstr "Syntaxhervorhebung der Nachrichtenteile"
 
@@ -21490,38 +22151,38 @@ msgstr "Anlagenerinnerung"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Sie werden bei vergessener Anlage zur Nachricht erinnert."
 
-#: ../plugins/bbdb/bbdb.c:694 ../plugins/bbdb/bbdb.c:703
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatische Kontakte"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "_Automatische Erstellung von Adressbucheinträgen bei Versendung von E-Mails"
 
-#: ../plugins/bbdb/bbdb.c:725
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "Adressbuch für automatische Kontakte auswählen"
 
-#: ../plugins/bbdb/bbdb.c:742
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "Instant-Messaging-Kontakte"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:757
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Kontaktinformationen und -bilder regelmäßig mit der Pidgin-Kontaktliste "
 "_abgleichen"
 
-#: ../plugins/bbdb/bbdb.c:764
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Adressbuch für die Pidgin-Kontaktliste auswählen"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:777
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "Jetzt mit der _Buddy-Liste abgleichen"
 
@@ -22061,12 +22722,12 @@ msgstr "Ein ungültiges Objekt wurde vom Server zurückgegeben."
 msgid "An error occurred during processing: %s"
 msgstr "Ein Fehler ist während der Verarbeitung aufgetreten: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:854
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalender konnte nicht geöffnet werden. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:858
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -22074,7 +22735,7 @@ msgstr ""
 "Der gewählte Kalender ist schreibgeschützt, deshalb kann dort kein neues "
 "Ereignis erstellt werden. Bitte wählen Sie einen anderen Ordner aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -22082,7 +22743,7 @@ msgstr ""
 "Die gewählte Aufgabenliste ist schreibgeschützt, deshalb kann keine neue "
 "Aufgabe erstellt werden. Bitte wählen Sie eine andere Aufgabenliste aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -22090,35 +22751,35 @@ msgstr ""
 "Die gewählte Notizliste ist schreibgeschützt, deshalb kann keine neue Notiz "
 "erstellt werden. Bitte wählen Sie eine andere Notizliste aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create an _Appointment"
 msgstr "Einen neuen _Termin anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a new event from the selected message"
 msgstr "Ein neues Ereignis mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create a Mem_o"
 msgstr "Eine _Notiz anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a new memo from the selected message"
 msgstr "Eine neue Notiz mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a _Task"
 msgstr "Eine _Aufgabe anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new task from the selected message"
 msgstr "Eine neue Aufgabe mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1290
 msgid "Create a _Meeting"
 msgstr "Eine _Besprechung anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1292
 msgid "Create a new meeting from the selected message"
 msgstr "Eine neue Besprechung mit Hilfe der gewählten Nachricht anlegen"
 
@@ -22215,7 +22876,8 @@ msgstr "Sind Sie sicher, dass Sie diesen Ort entfernen wollen?"
 #. * ever happen, and if so, then something is really wrong.
 #: ../plugins/publish-calendar/publish-calendar.c:1144
 msgid "Could not create publish thread."
-msgstr "Thema zum Veröffentlichen der Nachricht konnte nicht erstellt werden."
+msgstr ""
+"Konversation zum Veröffentlichen der Nachricht konnte nicht erstellt werden."
 
 #: ../plugins/publish-calendar/publish-calendar.c:1154
 msgid "_Publish Calendar Information"
@@ -22298,6 +22960,7 @@ msgid "_Username:"
 msgstr "_Benutzername:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:772
 msgid "_Password:"
 msgstr "_Passwort:"
 
@@ -22309,8 +22972,8 @@ msgstr "Passwort _merken"
 msgid "Publishing Location"
 msgstr "Ort der Veröffentlichung"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Ungültige Quellen-Benutzerkennung »%s«"
@@ -22428,15 +23091,15 @@ msgstr "%d.%m.%YT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF-Format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Zieldatei wählen"
 
-#: ../plugins/save-calendar/save-calendar.c:190
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "Speichern _unter"
 
@@ -22458,7 +23121,7 @@ msgid ""
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
-"Auf Entwürfen basierendes Vorlagen-Plugin. Sie können Variablen wie "
+"Auf Entwürfen basierende Vorlagen-Erweiterung. Sie können Variablen wie "
 "$ORIG[subject], $ORIG[from], $ORIG[to] oder $ORIG[body] verwenden. Diese "
 "werden durch die entsprechenden Werte aus einer Nachricht ersetzt, auf die "
 "Sie antworten."
@@ -22475,19 +23138,19 @@ msgstr "Als V_orlage speichern"
 msgid "Save as Template"
 msgstr "Als Vorlage speichern"
 
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:320
 msgid "Preparing to go offline..."
 msgstr "Offline-Betrieb wird vorbereitet …"
 
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:373
 msgid "Preparing to go online..."
 msgstr "Online-Betrieb wird vorbereitet …"
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:480
 msgid "Preparing to quit"
 msgstr "Beenden wird vorbereitet"
 
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:486
 msgid "Preparing to quit..."
 msgstr "Beenden wird vorbereitet …"
 
@@ -22527,14 +23190,14 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Alle Dateien (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "Zustand der Benutzerschnittstelle wird gespeichert"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
 "Kai Lahmann <kl linuxfaqs de>\n"
@@ -22549,276 +23212,277 @@ msgstr ""
 "Mario Blättermann <mario blaettermann gmail com>\n"
 "Paul Seyfert <pseyfert mathphys fsk uni-heidelberg de>\n"
 "Tobias Endrigkeit <tobiasendrigkeit googlemail com>\n"
-"Benjamin Steinwender <b stbe at>"
+"Benjamin Steinwender <b stbe at>\n"
+"Bernd Homuth <dev hmt im>"
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "Evolution-Webseite"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr "Kategorien-Editor"
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: ../shell/e-shell-window-actions.c:717
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:894
 msgid "_About"
 msgstr "_Info"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "Informationen zu Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "Fenster s_chließen"
 
-#: ../shell/e-shell-window-actions.c:923
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "_Inhalte"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr "Das Benutzerhandbuch von Evolution öffnen"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "Impor_tieren …"
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr "Daten aus anderen Programmen importieren"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "Neues F_enster"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr "Ein neues Fenster öffnen, das diese Ansicht anzeigt"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "Verfügbare Kate_gorien"
 
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr "Verfügbare Kategorien verwalten"
 
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
 msgstr "_Kurzreferenz"
 
-#: ../shell/e-shell-window-actions.c:988
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr "Die Tastenkürzel von Evolution anzeigen"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:992
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "Das Programm beenden"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "Er_weiterte Suche …"
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "Erweiterte Suche ausführen"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr "Die aktuellen Suchparameter leeren"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "Gespeicherte Suchen _bearbeiten …"
 
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "Ihre gespeicherten Suchvorgänge verwalten"
 
-#: ../shell/e-shell-window-actions.c:1023
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu ändern"
 
-#: ../shell/e-shell-window-actions.c:1028
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
-#: ../shell/e-shell-window-actions.c:1030
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr "Die aktuellen Suchparameter anwenden"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "Suche _speichern …"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr "Die aktuellen Suchparameter speichern"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
 msgstr "Fehler_bericht einschicken …"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ../shell/e-shell-window-actions.c:1056
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "Evolution in den Offline-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-actions.c:1065
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "Evolution in den Online-Modus versetzen"
 
-#: ../shell/e-shell-window-actions.c:1093
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr "_Anordnung"
 
-#: ../shell/e-shell-window-actions.c:1107
+#: ../shell/e-shell-window-actions.c:1106
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:1113
 msgid "_Switcher Appearance"
 msgstr "Erscheinungsbild der Knö_pfe"
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:1127
 msgid "_Window"
 msgstr "_Fenster"
 
-#: ../shell/e-shell-window-actions.c:1157
+#: ../shell/e-shell-window-actions.c:1156
 msgid "Show Side _Bar"
 msgstr "Sei_tenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1159
+#: ../shell/e-shell-window-actions.c:1158
 msgid "Show the side bar"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1164
 msgid "Show _Buttons"
 msgstr "_Knöpfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1166
 msgid "Show the switcher buttons"
 msgstr "Umschaltknöpfe anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1173
+#: ../shell/e-shell-window-actions.c:1172
 msgid "Show _Status Bar"
 msgstr "Stat_usleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1174
 msgid "Show the status bar"
 msgstr "Die Statusleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1180
 msgid "Show _Tool Bar"
 msgstr "_Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Show the tool bar"
 msgstr "Die Werkzeugleiste anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1205
+#: ../shell/e-shell-window-actions.c:1204
 msgid "_Icons Only"
 msgstr "Nur S_ymbole"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1206
 msgid "Display window buttons with icons only"
 msgstr "Fensterknöpfe nur als Symbole anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1212
+#: ../shell/e-shell-window-actions.c:1211
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../shell/e-shell-window-actions.c:1214
+#: ../shell/e-shell-window-actions.c:1213
 msgid "Display window buttons with text only"
 msgstr "Fensterknöpfe nur als Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Icons _and Text"
 msgstr "Symbole _und Text"
 
-#: ../shell/e-shell-window-actions.c:1221
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Display window buttons with icons and text"
 msgstr "Fensterknöpfe mit Symbolen und Text anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1225
 msgid "Tool_bar Style"
 msgstr "_Werkzeugleistenstil"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1227
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Fensterknöpfe mit der Systemeinstellung für Werkzeugleisten anzeigen"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Delete Current View"
 msgstr "Aktuelle Ansicht löschen"
 
-#: ../shell/e-shell-window-actions.c:1243
+#: ../shell/e-shell-window-actions.c:1242
 msgid "Save Custom View..."
 msgstr "Benutzerdefinierte Ansicht speichern …"
 
-#: ../shell/e-shell-window-actions.c:1245
+#: ../shell/e-shell-window-actions.c:1244
 msgid "Save current custom view"
 msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1251
 msgid "C_urrent View"
 msgstr "A_ktuelle Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1262
+#: ../shell/e-shell-window-actions.c:1261
 msgid "Custom View"
 msgstr "Benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1264
+#: ../shell/e-shell-window-actions.c:1263
 msgid "Current view is a customized view"
 msgstr "Aktuelle Ansicht ist eine benutzerdefinierte Ansicht"
 
-#: ../shell/e-shell-window-actions.c:1272
+#: ../shell/e-shell-window-actions.c:1271
 msgid "Page Set_up..."
 msgstr "Seite _einrichten …"
 
-#: ../shell/e-shell-window-actions.c:1274
+#: ../shell/e-shell-window-actions.c:1273
 msgid "Change the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker ändern"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1634
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1757
 #, c-format
 msgid "Select view: %s"
 msgstr "Ansicht wählen: %s"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1774
 #, c-format
 msgid "Delete view: %s"
 msgstr "Ansicht löschen: %s"
 
-#: ../shell/e-shell-window-actions.c:1869
+#: ../shell/e-shell-window-actions.c:1868
 msgid "Execute these search parameters"
 msgstr "Diese Suchparameter ausführen"
 
@@ -22833,7 +23497,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -22872,7 +23536,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -22880,13 +23544,13 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:218
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:307
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -22894,41 +23558,41 @@ msgstr ""
 "Evolution mit einer bestimmten Komponente starten. Mögliche Optionen sind "
 "»mail«, »calendar«, »contacts« und »memos«"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "Die angegebene Geometrie auf das Hauptfenster anwenden"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "Verfügbarkeit des Netzwerks ignorieren"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution zum Herunterfahren zwingen"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
-msgstr "Das Laden von allen Plugins deaktivieren."
+msgstr "Das Laden von allen Erweiterungen deaktivieren."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:329
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr ""
 "Adressen oder Dateinamen importieren, die als restliche Argumente angegeben "
 "wurden."
 
-#: ../shell/main.c:331
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "Einen laufenden Evolution-Prozess zum Beenden auffordern"
 
-#: ../shell/main.c:408
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -22937,11 +23601,11 @@ msgstr ""
 "Evolution kann nicht gestartet werden. Eine andere Instanz von Evolution "
 "könnte nicht reagieren. Systemfehler: %s"
 
-#: ../shell/main.c:502 ../shell/main.c:507
+#: ../shell/main.c:454 ../shell/main.c:459
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:517
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -22950,7 +23614,7 @@ msgstr ""
 "%s: »--online« und »--offline« können nicht gemeinsam verwendet werden.\n"
 "  Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:523
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -22998,6 +23662,28 @@ msgstr ""
 "Es ist allerdings möglich, zunächst auf Version 2 und dann auf Version 3 zu "
 "aktualisieren."
 
+#: ../shell/shell.error.xml.h:11
+msgid "Close Evolution with pending background operations?"
+msgstr "Evolution trotz ausstehender Hintergrundaufgaben beenden?"
+
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr ""
+"Evolution braucht sehr lange zum Beenden; möglicherweise auf Grund von "
+"Verbindungsproblemen. Möchten Sie alle ausstehenden Aktivitäten beenden und "
+"sofort beenden oder möchten Sie warten?"
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr "Sofort _schließen"
+
+#: ../shell/shell.error.xml.h:14
+msgid "Keep _Waiting"
+msgstr "_Warten"
+
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
@@ -23009,101 +23695,296 @@ msgstr ""
 "\n"
 "Einstellungen zur Vertrauenswürdigkeit bearbeiten:"
 
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Zertifikatname"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Einer Organisation ausgestellt"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Einer Organisationseinheit (OU) ausgestellt"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Verwendungszwecke"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Ausgestellt von"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Von einer Organisation ausgestellt"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Von einer Organisationseinheit (OU) ausgestellt"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Aussteller"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Läuft aus"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-Fingerabdruck"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "MD5-Fingerabdruck"
 
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: ../smime/gui/certificate-manager.c:621
-msgid "Select a certificate to import..."
-msgstr "Wählen Sie ein zu importierendes Zertifikat …"
+#: ../smime/gui/certificate-manager.c:650
+msgid "Select a file to backup your key and certificate..."
+msgstr "Wählen Sie eine Datei zum Sichern ihres Schlüssels und Zertifikats …"
+
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:662
+#, c-format
+msgid "%s-backup.p12"
+msgstr "%s-backup.p12"
 
-#: ../smime/gui/certificate-manager.c:635
+#: ../smime/gui/certificate-manager.c:676
+#: ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:728
+msgid "Backup Certificate"
+msgstr "Zertifikat sichern"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:742
+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
+msgid "Please select a file..."
+msgstr "Bitte eine Datei wählen …"
+
+#: ../smime/gui/certificate-manager.c:761
+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
+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."
+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
+msgid "_Repeat Password:"
+msgstr "Passwort _wiederholen:"
+
+#: ../smime/gui/certificate-manager.c:805
+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
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+"Wichtig:\n"
+"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
+msgid "No file name provided"
+msgstr "Kein Dateiname angegeben"
+
+#: ../smime/gui/certificate-manager.c:862
+msgid "Failed to backup key and certificate"
+msgstr "Zertifikat und Notfallschlüssel konnten nicht gesichert werden"
+
+#: ../smime/gui/certificate-manager.c:951
+msgid "Select a certificate to import..."
+msgstr "Wählen Sie ein zu importierendes Zertifikat …"
+
+#: ../smime/gui/certificate-manager.c:1001
 msgid "Failed to import certificate"
 msgstr "Zertifikat konnte nicht importiert werden"
 
-#: ../smime/gui/certificate-manager.c:1053
+#: ../smime/gui/certificate-manager.c:1117
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1119
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Nie"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Marginal"
+msgstr "Geringfügig"
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "Vollkommen"
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Ultimate"
+msgstr "Uneingeschränkt"
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Temporary"
+msgstr "Vorübergehend"
+
+#: ../smime/gui/certificate-manager.c:1333
+#| msgid "Certificate Authority Trust"
+msgid "Change certificate trust"
+msgstr "Vertrauenswürdigkeit eines Zertifikats ändern"
+
+#: ../smime/gui/certificate-manager.c:1345
+#, c-format
+#| msgid "Copying memos to the memo list '%s'"
+msgid "Change trust for the host '%s':"
+msgstr "Vertrauenswürdigkeit für Rechner »%s« ändern:"
+
+#: ../smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Temporary (this session only)"
+msgstr "_Vorübergehend (nur für diese Sitzung)"
+
+#: ../smime/gui/certificate-manager.c:1371
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "_Never"
+msgstr "_Nie"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Marginal"
+msgstr "_Geringfügig"
+
+#: ../smime/gui/certificate-manager.c:1373
+#| msgid "_Full name"
+msgctxt "CamelTrust"
+msgid "_Fully"
+msgstr "_Vollkommen"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Ultimate"
+msgstr "_Uneingeschränkt"
+
+# CHECK
+#: ../smime/gui/certificate-manager.c:1378
+#| msgid ""
+#| "Before trusting this CA for any purpose, you should examine its "
+#| "certificate and its policy and procedures (if available)."
+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
+#| msgid "_View Certificate"
+msgid "_Display certificate"
+msgstr "_Zertifikat anzeigen"
+
+#: ../smime/gui/certificate-manager.c:1598
+#| msgid "You have certificates on file that identify these people:"
+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
+#| msgid "_List name:"
+msgid "Host name"
+msgstr "Rechnername"
+
+#: ../smime/gui/certificate-manager.c:1631
+#| msgid "Issued"
+msgid "Issuer"
+msgstr "Aussteller"
+
+#: ../smime/gui/certificate-manager.c:1632
+#| msgid "Fingerprints"
+msgid "Fingerprint"
+msgstr "Fingerabdruck"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Trust"
+msgstr "Vertrauenswürdigkeit"
+
+#: ../smime/gui/certificate-manager.c:1654
+#| msgid "_Edit CA Trust"
+msgid "_Edit Trust"
+msgstr "Vertrauenswürdigkeit _bearbeiten"
+
+#: ../smime/gui/certificate-manager.c:1973
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-Dateien"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1990
 msgid "All email certificate files"
 msgstr "Alle E-Mail-Zertifikatdateien"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:2007
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
@@ -23251,19 +24132,49 @@ msgstr "Signieren"
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "Zertifikat existiert bereits"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "PKCS12-Dateipasswort"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "Geben Sie das Passwort für die PKCS12-Datei ein:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:329
+#, c-format
+msgid "Unable to create export context, err_code: %i"
+msgstr "Export-Kontext konnte nicht erstellt werden. Fehlernummer: %i"
+
+# Bitte prüfen
+#: ../smime/lib/e-pkcs12.c:336
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr "Passwortsicherheit konnte nicht eingerichtet werden. Fehlernummer: %i"
+
+#: ../smime/lib/e-pkcs12.c:346
+#, c-format
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "Ein Safe-Bag konnte nicht erstellt werden. Fehlernummer: %i"
+
+#: ../smime/lib/e-pkcs12.c:364
+#, c-format
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr ""
+"Schlüssel/Zertifikat konnte nicht zum Speicher hinzugefügt werden. "
+"Fehlernummer: %i"
+
+#: ../smime/lib/e-pkcs12.c:382
+#, c-format
+msgid "Unable to write store to disk, err_code: %i"
+msgstr ""
+"Speicher konnte nicht auf den Datenträger geschrieben werden. Fehlernummer: "
+"%i"
+
+#: ../smime/lib/e-pkcs12.c:409
 msgid "Imported Certificate"
 msgstr "Importierte Zertifikate"
 
@@ -23340,6 +24251,74 @@ msgstr "Mit _Fälligkeitsdatum"
 msgid "With _Status"
 msgstr "Mit _Status"
 
+#~ msgid "Web addresses"
+#~ msgstr "Web-Adressen"
+
+#~ msgid "Could not open destination"
+#~ msgstr "Ziel konnte nicht geöffnet werden"
+
+#~ msgid "Cannot create object"
+#~ msgstr "Objekt kann nicht angelegt werden"
+
+#~ msgid "Could not open source"
+#~ msgstr "Quelle konnte nicht geöffnet werden"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr ""
+#~ "Das Ereignis konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: "
+#~ "%s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr ""
+#~ "Die Aufgabe konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr ""
+#~ "Die Notiz konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr ""
+#~ "Das Objekt konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr ""
+#~ "Das Ereignis konnte nicht gelöscht werden, weil der Zugriff verweigert "
+#~ "wurde"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr ""
+#~ "Die Aufgabe konnte nicht gelöscht werden, weil der Zugriff verweigert "
+#~ "wurde"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr ""
+#~ "Diese Notiz konnte nicht gelöscht werden, weil der Zugriff verweigert "
+#~ "wurde"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr ""
+#~ "Das Objekt konnte nicht gelöscht werden, weil der Zugriff verweigert wurde"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr ""
+#~ "Das Ereignis konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr ""
+#~ "Die Aufgabe konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "Die Notiz konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "Gewählte Objekte werden gelöscht"
+
+#~ msgid "Expunging"
+#~ msgstr "Wird gesäubert"
+
 #~ msgid "Untitled Message"
 #~ msgstr "Namenlose Nachricht"
 
@@ -23476,9 +24455,6 @@ msgstr "Mit _Status"
 #~ msgid "Expires On"
 #~ msgstr "Läuft aus"
 
-#~ msgid "Fingerprints"
-#~ msgstr "Fingerabdrücke"
-
 #~ msgid "Certificate Hierarchy"
 #~ msgstr "Zertifikathierarchie"
 



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